diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders')
34 files changed, 1711 insertions, 1929 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java index 894d45ee39..980efc1bdb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java @@ -1,5 +1,9 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.lang.reflect.*; +import java.util.HashMap; +import java.util.Map; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gtPlusPlus.api.objects.Logger; @@ -8,9 +12,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import java.lang.reflect.*; -import java.util.HashMap; -import java.util.Map; public class GT_Material_Loader { @@ -43,14 +44,16 @@ public class GT_Material_Loader { // Make this class Dynamically implement IMaterialHandler if (mProxyObject == null) { mProxyObject = Proxy.newProxyInstance( - mInterface.getClassLoader(), new Class[] {mInterface}, new MaterialHandler(getInstance())); + mInterface.getClassLoader(), + new Class[] { mInterface }, + new MaterialHandler(getInstance())); } if (ReflectionUtils.invoke( Materials.class, "add", - new Class[] {ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler")}, - new Object[] {mProxyObject})) { + new Class[] { ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler") }, + new Object[] { mProxyObject })) { Logger.REFLECTION("Successfully invoked add, on the proxied object implementing IMaterialHandler."); Logger.REFLECTION("Examining Proxy to ensure it implements the correct Interface."); @@ -134,17 +137,22 @@ public class GT_Material_Loader { enableComponent.invoke(prefix, mMaterial); Logger.DEBUG_MATERIALS("Enabled " + prefix.name() + " for " + mMaterial.mDefaultLocalName + "."); return true; - } catch (IllegalAccessException - | IllegalArgumentException - | InvocationTargetException - | NoSuchMethodException + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException error) { - Logger.DEBUG_MATERIALS("Failed to enabled " + prefix.name() + " for " + mMaterial.mDefaultLocalName - + ". Caught " + error.getCause().toString() + "."); + Logger.DEBUG_MATERIALS( + "Failed to enabled " + prefix.name() + + " for " + + mMaterial.mDefaultLocalName + + ". Caught " + + error.getCause().toString() + + "."); error.printStackTrace(); } - Logger.DEBUG_MATERIALS("Did not enable " + prefix.name() + " for " + mMaterial.mDefaultLocalName - + ". Report this error to Alkalus on Github."); + Logger.DEBUG_MATERIALS( + "Did not enable " + prefix.name() + + " for " + + mMaterial.mDefaultLocalName + + ". Report this error to Alkalus on Github."); return false; } @@ -169,8 +177,9 @@ public class GT_Material_Loader { } return mValid > 0; } catch (SecurityException | IllegalArgumentException e) { - Logger.DEBUG_MATERIALS("Total Failure - Unable to re-enable " + MaterialUtils.getMaterialName(material) - + ". Most likely an IllegalArgumentException, but small chance it's a SecurityException."); + Logger.DEBUG_MATERIALS( + "Total Failure - Unable to re-enable " + MaterialUtils.getMaterialName(material) + + ". Most likely an IllegalArgumentException, but small chance it's a SecurityException."); return false; } } @@ -203,77 +212,29 @@ public class GT_Material_Loader { } /* - public static class ProxyListener implements java.lang.reflect.InvocationHandler { - - public static Object IMaterialHandlerProxy; - - ProxyListener(){ - - Logger.REFLECTION("Failed setting IMaterialHandler Proxy instance."); - } - - //Loading the class at runtime - public static void main(String[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException { - Class<?> someInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler"); - Object instance = Proxy.newProxyInstance(someInterface.getClassLoader(), new Class<?>[]{someInterface}, new InvocationHandler() { - - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - //Handle the invocations - if(method.getName().equals("onMaterialsInit")){ - Logger.REFLECTION("Invoked onMaterialsInit() via IMaterialHandler proxy"); - return 1; - } - else if(method.getName().equals("onComponentInit")){ - Logger.REFLECTION("Invoked onComponentInit() via IMaterialHandler proxy"); - return 2; - } - else if(method.getName().equals("onComponentIteration")){ - Logger.REFLECTION("Invoked onComponentIteration() via IMaterialHandler proxy"); - return 3; - } - else { - return -1; - } - } - }); - System.out.println(instance.getClass().getDeclaredMethod("someMethod", (Class<?>[])null).invoke(instance, new Object[]{})); - } - - private static class MaterialHandler implements InvocationHandler { - private final Object original; - - public MaterialHandler(Object original) { - this.original = original; - } - - @Override - public Object invoke(Object proxy, Method method, Object[] args) - throws IllegalAccessException, IllegalArgumentException, - InvocationTargetException { - System.out.println("BEFORE"); - method.invoke(original, args); - System.out.println("AFTER"); - return null; - } - } - - public static void init(){ - - Class<?> someInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler"); - GT_Material_Loader original = GT_Material_Loader.instance; - MaterialHandler handler = new MaterialHandler(original); - - Object f = Proxy.newProxyInstance(someInterface.getClassLoader(), - new Class[] { someInterface }, - handler); - - f.originalMethod("Hallo"); - } - - - - } - + * public static class ProxyListener implements java.lang.reflect.InvocationHandler { public static Object + * IMaterialHandlerProxy; ProxyListener(){ Logger.REFLECTION("Failed setting IMaterialHandler Proxy instance."); } + * //Loading the class at runtime public static void main(String[] args) throws IllegalAccessException, + * IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, + * ClassNotFoundException { Class<?> someInterface = + * ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler"); Object instance = + * Proxy.newProxyInstance(someInterface.getClassLoader(), new Class<?>[]{someInterface}, new InvocationHandler() { + * @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { //Handle the + * invocations if(method.getName().equals("onMaterialsInit")){ + * Logger.REFLECTION("Invoked onMaterialsInit() via IMaterialHandler proxy"); return 1; } else + * if(method.getName().equals("onComponentInit")){ + * Logger.REFLECTION("Invoked onComponentInit() via IMaterialHandler proxy"); return 2; } else + * if(method.getName().equals("onComponentIteration")){ + * Logger.REFLECTION("Invoked onComponentIteration() via IMaterialHandler proxy"); return 3; } else { return -1; } } + * }); System.out.println(instance.getClass().getDeclaredMethod("someMethod", (Class<?>[])null).invoke(instance, new + * Object[]{})); } private static class MaterialHandler implements InvocationHandler { private final Object + * original; public MaterialHandler(Object original) { this.original = original; } + * @Override public Object invoke(Object proxy, Method method, Object[] args) throws IllegalAccessException, + * IllegalArgumentException, InvocationTargetException { System.out.println("BEFORE"); method.invoke(original, + * args); System.out.println("AFTER"); return null; } } public static void init(){ Class<?> someInterface = + * ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler"); GT_Material_Loader original = + * GT_Material_Loader.instance; MaterialHandler handler = new MaterialHandler(original); Object f = + * Proxy.newProxyInstance(someInterface.getClassLoader(), new Class[] { someInterface }, handler); + * f.originalMethod("Hallo"); } } */ } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java index f43a255534..247cdb890b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.loaders; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -16,36 +18,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -import net.minecraft.item.ItemStack; public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, Runnable { + public ProcessingAngleGrinder() { GregtechOrePrefixes.toolAngleGrinder.add(this); } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { if (aMaterial != Materials.Rubber) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) {} } } } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final GT_Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { // TODO Auto-generated method stub } @@ -58,12 +51,10 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R Materials aMaterial = null; for (int r = 0; r < size; r++) { aMaterial = i[r]; - if ((aMaterial != Materials.Stone) - && (aMaterial != Materials.Flint) + if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.TRANSPARENT)) && (!aMaterial.contains(SubTag.FLAMMABLE)) @@ -83,8 +74,11 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R } else { Logger.MATERIALS( "Unable to generate Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial) - + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null) - + " | Rod? " + (longrod == null) + " |"); + + ", Plate or Long Rod may be invalid. Invalid | Plate? " + + (plate == null) + + " | Rod? " + + (longrod == null) + + " |"); } // GT_ModHandler.addCraftingRecipe(, // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | @@ -113,38 +107,27 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) { ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats( - MetaGeneratedGregtechTools.ANGLE_GRINDER, 1, aMaterial, Materials.Titanium, new long[] { - aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L - }); + MetaGeneratedGregtechTools.ANGLE_GRINDER, + 1, + aMaterial, + Materials.Titanium, + new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); if (aDura <= 32000) { - Logger.MATERIALS("Unable to generate Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial) - + ", Durability: " + aDura); + Logger.MATERIALS( + "Unable to generate Angle Grinder from " + MaterialUtils.getMaterialName(aMaterial) + + ", Durability: " + + aDura); return false; } return GT_ModHandler.addCraftingRecipe( aOutputStack, RecipeBits.DISMANTLEABLE | RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | RecipeBits.BUFFERED, - new Object[] { - "SXL", - "GMG", - "PBP", - 'X', - ItemList.Component_Grinder_Tungsten.get(1), - 'M', - CI.getElectricMotor(aVoltageTier, 1), - 'S', - OrePrefixes.screw.get(Materials.Titanium), - 'L', - OrePrefixes.stickLong.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial), - 'G', - ELEMENT.STANDALONE.BLACK_METAL.getGear(1), - 'B', - aBattery - }); + new Object[] { "SXL", "GMG", "PBP", 'X', ItemList.Component_Grinder_Tungsten.get(1), 'M', + CI.getElectricMotor(aVoltageTier, 1), 'S', OrePrefixes.screw.get(Materials.Titanium), 'L', + OrePrefixes.stickLong.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'G', + ELEMENT.STANDALONE.BLACK_METAL.getGear(1), 'B', aBattery }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java index 43c9d31727..f1493f2e63 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.loaders; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -15,36 +17,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -import net.minecraft.item.ItemStack; public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegistrator, Runnable { + public ProcessingElectricButcherKnife() { GregtechOrePrefixes.toolElectricButcherKnife.add(this); } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { if (aMaterial != Materials.Rubber) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) {} } } } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final GT_Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { // TODO Auto-generated method stub } @@ -57,12 +50,10 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist Materials aMaterial = null; for (int r = 0; r < size; r++) { aMaterial = i[r]; - if ((aMaterial != Materials.Stone) - && (aMaterial != Materials.Flint) + if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.TRANSPARENT)) && (!aMaterial.contains(SubTag.FLAMMABLE)) @@ -81,10 +72,13 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1)); used++; } else { - Logger.MATERIALS("Unable to generate Electric Butcher Knife from " - + MaterialUtils.getMaterialName(aMaterial) - + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null) + " | Rod? " - + " |"); + Logger.MATERIALS( + "Unable to generate Electric Butcher Knife from " + + MaterialUtils.getMaterialName(aMaterial) + + ", Plate or Long Rod may be invalid. Invalid | Plate? " + + (plate == null) + + " | Rod? " + + " |"); } // GT_ModHandler.addCraftingRecipe(, // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | @@ -93,8 +87,9 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); } else { - Logger.MATERIALS("Unable to generate Electric Butcher Knife from " - + MaterialUtils.getMaterialName(aMaterial)); + Logger.MATERIALS( + "Unable to generate Electric Butcher Knife from " + + MaterialUtils.getMaterialName(aMaterial)); } } else { Logger.MATERIALS( @@ -114,17 +109,21 @@ public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegist public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) { ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats( - MetaGeneratedGregtechTools.ELECTRIC_BUTCHER_KNIFE, 1, aMaterial, Materials.Titanium, new long[] { - aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L - }); + MetaGeneratedGregtechTools.ELECTRIC_BUTCHER_KNIFE, + 1, + aMaterial, + Materials.Titanium, + new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); - ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null); + ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null); long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); if (aDura <= 32000) { - Logger.MATERIALS("Unable to generate Electric Butcher Knife from " - + MaterialUtils.getMaterialName(aMaterial) + ", Durability: " + aDura); + Logger.MATERIALS( + "Unable to generate Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial) + + ", Durability: " + + aDura); return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java index 5d6e87b204..ee1cbc2744 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.loaders; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -16,36 +18,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -import net.minecraft.item.ItemStack; public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator, Runnable { + public ProcessingElectricLighter() { GregtechOrePrefixes.toolElectricLighter.add(this); } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { if (aMaterial != Materials.Rubber) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) {} } } } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final GT_Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { // TODO Auto-generated method stub } @@ -58,12 +51,10 @@ public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator Materials aMaterial = null; for (int r = 0; r < size; r++) { aMaterial = i[r]; - if ((aMaterial != Materials.Stone) - && (aMaterial != Materials.Flint) + if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.TRANSPARENT)) && (!aMaterial.contains(SubTag.FLAMMABLE)) @@ -82,8 +73,10 @@ public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator } else { Logger.MATERIALS( "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial) - + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null) - + " | Rod? " + " |"); + + ", Plate or Long Rod may be invalid. Invalid | Plate? " + + (plate == null) + + " | Rod? " + + " |"); } // GT_ModHandler.addCraftingRecipe(, // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | @@ -113,17 +106,21 @@ public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) { ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats( - MetaGeneratedGregtechTools.ELECTRIC_LIGHTER, 1, aMaterial, Materials.Titanium, new long[] { - aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L - }); + MetaGeneratedGregtechTools.ELECTRIC_LIGHTER, + 1, + aMaterial, + Materials.Titanium, + new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); - ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, aMaterial, aMaterial, null); + ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, aMaterial, aMaterial, null); long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); if (aDura <= 32000) { - Logger.MATERIALS("Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial) - + ", Durability: " + aDura); + Logger.MATERIALS( + "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial) + + ", Durability: " + + aDura); return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java index 9ea8eaf867..a431d4a500 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.loaders; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -16,36 +18,27 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -import net.minecraft.item.ItemStack; public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, Runnable { + public ProcessingElectricSnips() { GregtechOrePrefixes.toolElectricSnips.add(this); } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { if (aMaterial != Materials.Rubber) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) {} } } } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final GT_Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { // TODO Auto-generated method stub } @@ -58,12 +51,10 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, Materials aMaterial = null; for (int r = 0; r < size; r++) { aMaterial = i[r]; - if ((aMaterial != Materials.Stone) - && (aMaterial != Materials.Flint) + if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.TRANSPARENT)) && (!aMaterial.contains(SubTag.FLAMMABLE)) @@ -82,8 +73,10 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, } else { Logger.MATERIALS( "Unable to generate Electric Snips from " + MaterialUtils.getMaterialName(aMaterial) - + ", Plate or Long Rod may be invalid. Invalid | Plate? " + (plate == null) - + " | Rod? " + " |"); + + ", Plate or Long Rod may be invalid. Invalid | Plate? " + + (plate == null) + + " | Rod? " + + " |"); } // GT_ModHandler.addCraftingRecipe(, // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | @@ -112,17 +105,21 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) { ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats( - MetaGeneratedGregtechTools.ELECTRIC_SNIPS, 1, aMaterial, Materials.Titanium, new long[] { - aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L - }); + MetaGeneratedGregtechTools.ELECTRIC_SNIPS, + 1, + aMaterial, + Materials.Titanium, + new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); - ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null); + ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null); long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); if (aDura <= 32000) { - Logger.MATERIALS("Unable to generate Electric Snips from " + MaterialUtils.getMaterialName(aMaterial) - + ", Durability: " + aDura); + Logger.MATERIALS( + "Unable to generate Electric Snips from " + MaterialUtils.getMaterialName(aMaterial) + + ", Durability: " + + aDura); return false; } return RecipeUtils.addShapedRecipe( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java index a9011ca3bc..7e02cfba09 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.loaders; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -9,42 +11,33 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -import net.minecraft.item.ItemStack; public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrator, Runnable { + public ProcessingToolHeadChoocher() { GregtechOrePrefixes.toolSkookumChoocher.add(this); } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { if (aMaterial != Materials.Rubber) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) { GT_ModHandler.addCraftingRecipe( MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(16, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"IhI", "III", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "IhI", "III", " I ", Character.valueOf('I'), + OrePrefixes.ingot.get(aMaterial) }); } } } } @Override - public void registerOre( - final GregtechOrePrefixes aPrefix, - final GT_Materials aMaterial, - final String aOreDictName, - final String aModName, - final ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName, + final String aModName, final ItemStack aStack) { // TODO Auto-generated method stub } @@ -57,12 +50,10 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato Materials aMaterial = null; for (int r = 0; r < size; r++) { aMaterial = i[r]; - if ((aMaterial != Materials.Stone) - && (aMaterial != Materials.Flint) + if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.TRANSPARENT)) && (!aMaterial.contains(SubTag.FLAMMABLE)) @@ -76,8 +67,7 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato final ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L); final ItemStack hammerhead = GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L); - if ((null != plate) - && (null != ingot) + if ((null != plate) && (null != ingot) && (null != hammerhead) && (null != longrod) && (null != screw)) { @@ -92,12 +82,22 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato screw, null, MetaGeneratedGregtechTools.INSTANCE.getToolWithStats( - MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER, 1, aMaterial, null, null)); + MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER, + 1, + aMaterial, + null, + null)); used++; } else { - Logger.WARNING("" + aMaterial.name() + " could not be used for all input compoenents. [3x" - + aMaterial.name() + " plates, 2x" + aMaterial.name() + " ingots, 1x" + aMaterial.name() - + " Hard Hammer Head."); + Logger.WARNING( + "" + aMaterial.name() + + " could not be used for all input compoenents. [3x" + + aMaterial.name() + + " plates, 2x" + + aMaterial.name() + + " ingots, 1x" + + aMaterial.name() + + " Hard Hammer Head."); } // GT_ModHandler.addCraftingRecipe(, GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", Character.valueOf('I'), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java index c2f0d1e623..28d0609e93 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java @@ -1,13 +1,14 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashSet; -import java.util.Set; public class RecipeGen_AlloySmelter extends RecipeGen_Base { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java index 90195a15e8..79a5947d66 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java @@ -1,14 +1,16 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.item.ItemStack; public class RecipeGen_Assembler extends RecipeGen_Base { @@ -31,7 +33,7 @@ public class RecipeGen_Assembler extends RecipeGen_Base { private void generateRecipes(final Material material) { // Frame Box - if (ItemUtils.checkForInvalidItems(new ItemStack[] {material.getRod(1), material.getFrameBox(1)})) + if (ItemUtils.checkForInvalidItems(new ItemStack[] { material.getRod(1), material.getFrameBox(1) })) GT_Values.RA.addAssemblerRecipe( material.getRod(4), ItemUtils.getGregtechCircuit(4), @@ -41,22 +43,37 @@ public class RecipeGen_Assembler extends RecipeGen_Base { // Rotor if (ItemUtils.checkForInvalidItems( - new ItemStack[] {material.getPlate(1), material.getRing(1), material.getRotor(1)})) + new ItemStack[] { material.getPlate(1), material.getRing(1), material.getRotor(1) })) addAssemblerRecipe( - material.getPlate(4), material.getRing(1), material.getRotor(1), 240, material.vVoltageMultiplier); + material.getPlate(4), + material.getRing(1), + material.getRotor(1), + 240, + material.vVoltageMultiplier); } - private static void addAssemblerRecipe( - final ItemStack input1, - final ItemStack input2, - final ItemStack output1, - final int seconds, - final int euCost) { + private static void addAssemblerRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1, + final int seconds, final int euCost) { GT_Values.RA.addAssemblerRecipe( - input1, input2, FluidUtils.getFluidStack("molten.solderingalloy", 16), output1, seconds, euCost); + input1, + input2, + FluidUtils.getFluidStack("molten.solderingalloy", 16), + output1, + seconds, + euCost); GT_Values.RA.addAssemblerRecipe( - input1, input2, FluidUtils.getFluidStack("molten.tin", 32), output1, seconds, euCost); + input1, + input2, + FluidUtils.getFluidStack("molten.tin", 32), + output1, + seconds, + euCost); GT_Values.RA.addAssemblerRecipe( - input1, input2, FluidUtils.getFluidStack("molten.lead", 48), output1, seconds, euCost); + input1, + input2, + FluidUtils.getFluidStack("molten.lead", 48), + output1, + seconds, + euCost); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index b6b8a3f7ac..58f8d3e349 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -1,5 +1,12 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gtPlusPlus.api.interfaces.RunnableWithInfo; @@ -15,11 +22,6 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeGen_BlastSmelter extends RecipeGen_Base { @@ -45,14 +47,8 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { ItemStack tStack; if (null != (tStack = M.getDust(1))) { - final Material[] badMaterials = { - FLUORIDES.THORIUM_HEXAFLUORIDE, - FLUORIDES.THORIUM_TETRAFLUORIDE, - ALLOY.BLOODSTEEL, - NUCLIDE.LiFBeF2ThF4UF4, - NUCLIDE.LiFBeF2ZrF4UF4, - NUCLIDE.LiFBeF2ZrF4U235 - }; + final Material[] badMaterials = { FLUORIDES.THORIUM_HEXAFLUORIDE, FLUORIDES.THORIUM_TETRAFLUORIDE, + ALLOY.BLOODSTEEL, NUCLIDE.LiFBeF2ThF4UF4, NUCLIDE.LiFBeF2ZrF4UF4, NUCLIDE.LiFBeF2ZrF4U235 }; for (final Material R : badMaterials) { if (M == R) { return; @@ -71,13 +67,10 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { ItemStack circuitGT = ItemUtils.getGregtechCircuit(0); // Set a duration - OLD - /*int duration = 0; - if (M.getMeltingPointK() > 150){ - duration = (int) Math.max(M.getMass() / 50L, 1L) * M.getMeltingPointK(); - } - else { - duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; - }*/ + /* + * int duration = 0; if (M.getMeltingPointK() > 150){ duration = (int) Math.max(M.getMass() / 50L, 1L) * + * M.getMeltingPointK(); } else { duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; } + */ long aVoltage = MaterialUtils.getVoltageForTier(M.vTier); @@ -112,15 +105,24 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { // Make a simple one Material Materialstack[] and log it for validity. circuitGT = ItemUtils.getGregtechCircuit(1); - final ItemStack[] tItemStackTest = new ItemStack[] {circuitGT, tStack}; + final ItemStack[] tItemStackTest = new ItemStack[] { circuitGT, tStack }; inputStackCount = 1; fluidAmount = 144 * inputStackCount; - Logger.WARNING("[BAS] Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName() + ". Gives " - + fluidAmount + "L of molten metal."); + Logger.WARNING( + "[BAS] Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName() + + ". Gives " + + fluidAmount + + "L of molten metal."); for (int das = 0; das < tItemStackTest.length; das++) { if (tItemStackTest[das] != null) { - Logger.WARNING("[BAS] tMaterial[" + das + "]: " + tItemStackTest[das].getDisplayName() + " Meta: " - + tItemStackTest[das].getItemDamage() + ", Amount: " + tItemStackTest[das].stackSize); + Logger.WARNING( + "[BAS] tMaterial[" + das + + "]: " + + tItemStackTest[das].getDisplayName() + + " Meta: " + + tItemStackTest[das].getItemDamage() + + ", Amount: " + + tItemStackTest[das].stackSize); } } @@ -137,18 +139,18 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { (int) aVoltage)) { Logger.WARNING("[BAS] Success."); Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe."); - /*if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, duration, 120)){ - Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); - } - if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, duration/9, 120)){ - Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); - }*/ - /*if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){ - Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); - } - if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/9, 120)){ - Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); - }*/ + /* + * if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, + * duration, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } if + * (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, + * duration/9, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } + */ + /* + * if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, + * duration/4, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } + * if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, + * duration/9, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } + */ } } else { Logger.WARNING("[BAS] Failed."); @@ -162,20 +164,24 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { (int) aVoltage)) { Logger.WARNING("[BAS] Success."); if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Ingot.get(0), M.getFluidStack(144), M.getIngot(1), duration / 2, 60)) { + ItemList.Shape_Mold_Ingot.get(0), + M.getFluidStack(144), + M.getIngot(1), + duration / 2, + 60)) { Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe."); - /*if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, duration/2, 60)){ - Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); - } - if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, duration/2/9, 60)){ - Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); - }*/ - /*if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/2/4, 60)){ - Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); - } - if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/2/9, 60)){ - Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); - }*/ + /* + * if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, + * duration/2, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } if + * (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, + * duration/2/9, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } + */ + /* + * if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, + * duration/2/4, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } + * if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, + * duration/2/9, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } + */ } } else { Logger.WARNING("[BAS] Failed."); @@ -188,8 +194,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { // If this Material has some kind of compound list, proceed if (mMaterialListSize > 1) { - final gtPlusPlus.core.material.MaterialStack[] tempStack = - new gtPlusPlus.core.material.MaterialStack[mMaterialListSize]; + final gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize]; circuitGT = ItemUtils.getGregtechCircuit(mMaterialListSize); // Just double checking if (tempStack.length > 1) { @@ -199,10 +204,8 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { for (final gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()) { if (xMaterial != null) { if (xMaterial.getStackMaterial() != null) { - Logger.WARNING("[BAS] FOUND: " - + xMaterial.getStackMaterial().getLocalizedName()); - Logger.WARNING("[BAS] ADDING: " - + xMaterial.getStackMaterial().getLocalizedName()); + Logger.WARNING("[BAS] FOUND: " + xMaterial.getStackMaterial().getLocalizedName()); + Logger.WARNING("[BAS] ADDING: " + xMaterial.getStackMaterial().getLocalizedName()); } tempStack[ooo] = xMaterial; } @@ -218,21 +221,14 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { if (M.getComposites().get(irc) != null) { final int r = (int) M.vSmallestRatio[irc]; inputStackCount = inputStackCount + r; - if ((M.getComposites() - .get(irc) - .getStackMaterial() - .getState() - != MaterialState.SOLID) - || !ItemUtils.checkForInvalidItems( - M.getComposites().get(irc).getDustStack(r))) { + if ((M.getComposites().get(irc).getStackMaterial().getState() != MaterialState.SOLID) + || !ItemUtils + .checkForInvalidItems(M.getComposites().get(irc).getDustStack(r))) { final int xr = r; if ((xr > 0) && (xr <= 100)) { final int mathmatics = (r * 1000); componentsFluid = FluidUtils.getFluidStack( - M.getComposites() - .get(irc) - .getStackMaterial() - .getFluidStack(mathmatics), + M.getComposites().get(irc).getStackMaterial().getFluidStack(mathmatics), mathmatics); } } else { @@ -253,8 +249,10 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { components[fr] = components_NoCircuit[fr - 1]; } } - Logger.WARNING("[BAS] Should have added a circuit. mMaterialListSize: " + mMaterialListSize - + " | circuit: " + components[0].getDisplayName()); + Logger.WARNING( + "[BAS] Should have added a circuit. mMaterialListSize: " + mMaterialListSize + + " | circuit: " + + components[0].getDisplayName()); } else { Logger.WARNING("[BAS] Did not add a circuit. mMaterialListSize: " + mMaterialListSize); } @@ -262,23 +260,36 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { // Set Fluid output fluidAmount = 144 * inputStackCount; - Logger.WARNING("[BAS] Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName() - + " using it's compound dusts. This material has " + inputStackCount + " parts. Gives " - + fluidAmount + "L of molten metal."); + Logger.WARNING( + "[BAS] Adding an Alloy Blast Smelter Recipe for " + M.getLocalizedName() + + " using it's compound dusts. This material has " + + inputStackCount + + " parts. Gives " + + fluidAmount + + "L of molten metal."); Logger.WARNING("[BAS] tMaterial.length: " + components.length + "."); for (int das = 0; das < components.length; das++) { if (components[das] != null) { - Logger.WARNING("[BAS] tMaterial[" + das + "]: " + components[das].getDisplayName() - + " Meta: " + components[das].getItemDamage() + ", Amount: " - + components[das].stackSize); + Logger.WARNING( + "[BAS] tMaterial[" + das + + "]: " + + components[das].getDisplayName() + + " Meta: " + + components[das].getItemDamage() + + ", Amount: " + + components[das].stackSize); } } // Adds Recipe if (M.requiresBlastFurnace()) { if (CORE.RA.addBlastSmelterRecipe( - components, componentsFluid, M.getFluidStack(fluidAmount), 100, duration, (int) - aVoltage)) { + components, + componentsFluid, + M.getFluidStack(fluidAmount), + 100, + duration, + (int) aVoltage)) { Logger.WARNING("[BAS] Success."); } else { Logger.WARNING("[BAS] Failed."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java index 2e47eaf807..97807f3053 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; @@ -9,31 +12,20 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { - private final OrePrefixes[] mSmeltingPrefixes = { - OrePrefixes.crushed, - OrePrefixes.ingot, - OrePrefixes.crushedPurified, - OrePrefixes.crushedCentrifuged, - OrePrefixes.dust, - OrePrefixes.dustPure, - OrePrefixes.dustImpure, - OrePrefixes.dustRefined, - OrePrefixes.dustSmall, - OrePrefixes.dustTiny - }; + private final OrePrefixes[] mSmeltingPrefixes = { OrePrefixes.crushed, OrePrefixes.ingot, + OrePrefixes.crushedPurified, OrePrefixes.crushedCentrifuged, OrePrefixes.dust, OrePrefixes.dustPure, + OrePrefixes.dustImpure, OrePrefixes.dustRefined, OrePrefixes.dustSmall, OrePrefixes.dustTiny }; public RecipeGen_BlastSmelterGT_Ex() { for (OrePrefixes tPrefix : this.mSmeltingPrefixes) tPrefix.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { boolean keepHighTempRecipes = !CORE.GTNH; @@ -45,14 +37,14 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { && (!aMaterial.contains(SubTag.NO_SMELTING))) { if (aMaterial.mBlastFurnaceRequired) { addBlastRecipe( - GT_Utility.copyAmount(1L, new Object[] {aStack}), + GT_Utility.copyAmount(1L, new Object[] { aStack }), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) - : GT_Utility.copyAmount(1L, new Object[] {tDustStack}), + ? GT_OreDictUnificator + .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) + : GT_Utility.copyAmount(1L, new Object[] { tDustStack }), null, (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, 120, @@ -71,14 +63,14 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { && (!aMaterial.contains(SubTag.NO_SMELTING))) { if (aMaterial.mBlastFurnaceRequired) { addBlastRecipe( - GT_Utility.copyAmount(1L, new Object[] {aStack}), + GT_Utility.copyAmount(1L, new Object[] { aStack }), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) - : GT_Utility.copyAmount(1L, new Object[] {tDustStack}), + ? GT_OreDictUnificator + .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) + : GT_Utility.copyAmount(1L, new Object[] { tDustStack }), null, (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, 120, @@ -91,7 +83,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) { if (aMaterial.mBlastFurnaceRequired) { addBlastRecipe( - GT_Utility.copyAmount(4L, new Object[] {aStack}), + GT_Utility.copyAmount(4L, new Object[] { aStack }), null, null, null, @@ -114,7 +106,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) { if (aMaterial.mBlastFurnaceRequired) { addBlastRecipe( - GT_Utility.copyAmount(9L, new Object[] {aStack}), + GT_Utility.copyAmount(9L, new Object[] { aStack }), null, null, null, @@ -122,8 +114,8 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { ? GT_OreDictUnificator.get( OrePrefixes.ingotHot, aMaterial.mSmeltInto, - GT_OreDictUnificator.get( - OrePrefixes.ingot, aMaterial.mSmeltInto, 1L), + GT_OreDictUnificator + .get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L), 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L), null, @@ -139,17 +131,15 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { if (!aMaterial.contains(SubTag.NO_SMELTING)) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { addBlastRecipe( - GT_Utility.copyAmount(1L, new Object[] {aStack}), + GT_Utility.copyAmount(1L, new Object[] { aStack }), null, null, null, - aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - 1L) - : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + aMaterial, + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), null, (int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp, 120, @@ -165,16 +155,8 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { } } - public boolean addBlastRecipe( - ItemStack input1, - ItemStack input2, - FluidStack fluid1, - FluidStack fluid2, - ItemStack output1, - ItemStack output2, - int time, - int euCost, - Materials smeltInto) { + public boolean addBlastRecipe(ItemStack input1, ItemStack input2, FluidStack fluid1, FluidStack fluid2, + ItemStack output1, ItemStack output2, int time, int euCost, Materials smeltInto) { // Set up variables. ItemStack[] components; @@ -194,7 +176,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { } // Set up input components. ItemStack configCircuit = ItemUtils.getGregtechCircuit(count); - components = new ItemStack[] {configCircuit, input1, input2}; + components = new ItemStack[] { configCircuit, input1, input2 }; if (fluid1 != null || fluid2 != null) { // If it uses an input fluid, we cannot handle this. So let's not try. (Annealed copper for example) // return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java index f9e083a44a..bfd5fdc2cb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java @@ -1,5 +1,13 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import gregtech.api.util.*; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.ItemStackData; @@ -8,12 +16,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class RecipeGen_BlastSmelterGT_GTNH { @@ -46,13 +48,9 @@ public class RecipeGen_BlastSmelterGT_GTNH { return null; } - private static boolean isValid( - final ItemStack[] inputs, - final ItemStack outputs[], - final FluidStack[] fluidIn, + private static boolean isValid(final ItemStack[] inputs, final ItemStack outputs[], final FluidStack[] fluidIn, final FluidStack fluidOut) { - if (inputs != null - && outputs != null + if (inputs != null && outputs != null && fluidIn != null && fluidOut != null && inputs.length > 0 @@ -83,8 +81,7 @@ public class RecipeGen_BlastSmelterGT_GTNH { if (CORE.GTNH) { mType = "ingot"; } - if (oreName.startsWith(mType) - && !oreName.contains("double") + if (oreName.startsWith(mType) && !oreName.contains("double") && !oreName.contains("triple") && !oreName.contains("quad") && !oreName.contains("quintuple")) { @@ -98,8 +95,12 @@ public class RecipeGen_BlastSmelterGT_GTNH { if (validInput != null && validOutput != null) { ItemStackData R = new ItemStackData(validInput); setIngotToFluid(R, validOutput); - Logger.MACHINE_INFO("[ABS][I2F] Cached " + validInput.getDisplayName() + " to " - + validOutput.getLocalizedName() + ". Stored Under ID of " + R.getUniqueDataIdentifier()); + Logger.MACHINE_INFO( + "[ABS][I2F] Cached " + validInput.getDisplayName() + + " to " + + validOutput.getLocalizedName() + + ". Stored Under ID of " + + R.getUniqueDataIdentifier()); } } } @@ -122,9 +123,14 @@ public class RecipeGen_BlastSmelterGT_GTNH { ItemStackData R1 = new ItemStackData(validInput); ItemStackData R2 = new ItemStackData(validOutput); setHotToCold(R1, R2); - Logger.MACHINE_INFO("[ABS][H2C] Cached " + validInput.getDisplayName() + " to " - + validOutput.getDisplayName() + ". Stored Under ID of " + R1.getUniqueDataIdentifier() - + ", links to ID " + R2.getUniqueDataIdentifier()); + Logger.MACHINE_INFO( + "[ABS][H2C] Cached " + validInput.getDisplayName() + + " to " + + validOutput.getDisplayName() + + ". Stored Under ID of " + + R1.getUniqueDataIdentifier() + + ", links to ID " + + R2.getUniqueDataIdentifier()); } } } @@ -159,9 +165,12 @@ public class RecipeGen_BlastSmelterGT_GTNH { if (x.mOutputs != null && x.mOutputs[0] != null) { mMoltenCount = x.mOutputs[0].stackSize; ItemStackData R = new ItemStackData(x.mOutputs[0]); - Logger.MACHINE_INFO("[ABS] Found " + x.mOutputs[0].getDisplayName() - + " as valid EBF output, finding it's fluid from the cache. We will require " - + (144 * mMoltenCount) + "L. Looking for ID " + R.getUniqueDataIdentifier()); + Logger.MACHINE_INFO( + "[ABS] Found " + x.mOutputs[0].getDisplayName() + + " as valid EBF output, finding it's fluid from the cache. We will require " + + (144 * mMoltenCount) + + "L. Looking for ID " + + R.getUniqueDataIdentifier()); FluidStack tempFluid = getFluidFromIngot(R); if (tempFluid != null) { // Logger.MACHINE_INFO("[ABS] Got Fluid from Cache."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index d3143b9706..ed8c18ba4b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -1,5 +1,11 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.util.GT_ModHandler; @@ -16,10 +22,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeGen_DustGeneration extends RecipeGen_Base { @@ -57,8 +59,8 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { Logger.INFO("9 Tiny dust to 1 Dust Recipe: " + M.getLocalizedName() + " - Failed"); } - if (RecipeUtils.addShapedRecipe( - normalDust, null, null, null, null, null, null, null, null, M.getTinyDust(9))) { + if (RecipeUtils + .addShapedRecipe(normalDust, null, null, null, null, null, null, null, null, M.getTinyDust(9))) { Logger.INFO("9 Tiny dust from 1 Recipe: " + M.getLocalizedName() + " - Success"); } else { Logger.INFO("9 Tiny dust from 1 Recipe: " + M.getLocalizedName() + " - Failed"); @@ -67,13 +69,22 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { if (smallDust != null && normalDust != null) { if (RecipeUtils.addShapedRecipe( - smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)) { + smallDust, + smallDust, + null, + smallDust, + smallDust, + null, + null, + null, + null, + normalDust)) { Logger.INFO("4 Small dust to 1 Dust Recipe: " + M.getLocalizedName() + " - Success"); } else { Logger.INFO("4 Small dust to 1 Dust Recipe: " + M.getLocalizedName() + " - Failed"); } - if (RecipeUtils.addShapedRecipe( - null, normalDust, null, null, null, null, null, null, null, M.getSmallDust(4))) { + if (RecipeUtils + .addShapedRecipe(null, normalDust, null, null, null, null, null, null, null, M.getSmallDust(4))) { Logger.INFO("4 Small dust from 1 Dust Recipe: " + M.getLocalizedName() + " - Success"); } else { Logger.INFO("4 Small dust from 1 Dust Recipe: " + M.getLocalizedName() + " - Failed"); @@ -162,15 +173,10 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { input[0] = CI.getNumberedCircuit(inputStacks.length + 10); } - /*for (int g = 0; g<4; g++) { - if(inputStacks.length > g) { - input[g] = inputStacks[g] != null ? inputStacks[g] : null; - } - else { - input[g] = CI.getNumberedCircuit(g+10); - break; - } - }*/ + /* + * for (int g = 0; g<4; g++) { if(inputStacks.length > g) { input[g] = inputStacks[g] != null ? + * inputStacks[g] : null; } else { input[g] = CI.getNumberedCircuit(g+10); break; } } + */ // Add mixer Recipe FluidStack oxygen = GT_Values.NF; @@ -213,14 +219,12 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { } // Add Shapeless recipe for low tier alloys. - /*if (tVoltageMultiplier <= 30){ - if (RecipeUtils.addShapedGregtechRecipe(inputStacks, outputStacks)){ - Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Success"); - } - else { - Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Failed"); - } - }*/ + /* + * if (tVoltageMultiplier <= 30){ if (RecipeUtils.addShapedGregtechRecipe(inputStacks, + * outputStacks)){ + * Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Success"); } else { + * Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Failed"); } } + */ } } } @@ -252,14 +256,11 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { // Get us four ItemStacks to input into the mixer ItemStack input1, input2, input3, input4; input1 = inputStacks[0]; - input2 = (inputStacks.length >= 2) - ? (input2 = (inputStacks[1] == null) ? null : inputStacks[1]) + input2 = (inputStacks.length >= 2) ? (input2 = (inputStacks[1] == null) ? null : inputStacks[1]) : null; - input3 = (inputStacks.length >= 3) - ? (input3 = (inputStacks[2] == null) ? null : inputStacks[2]) + input3 = (inputStacks.length >= 3) ? (input3 = (inputStacks[2] == null) ? null : inputStacks[2]) : null; - input4 = (inputStacks.length >= 4) - ? (input4 = (inputStacks[3] == null) ? null : inputStacks[3]) + input4 = (inputStacks.length >= 4) ? (input4 = (inputStacks[3] == null) ? null : inputStacks[3]) : null; if (inputStacks.length == 1) { @@ -286,14 +287,12 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { if (x != null) { if (x.getStackMaterial() != null) { if (x.getStackMaterial().getDust(1) == null) { - MaterialState f = - x.getStackMaterial().getState(); - if (f == MaterialState.GAS - || f == MaterialState.LIQUID + MaterialState f = x.getStackMaterial().getState(); + if (f == MaterialState.GAS || f == MaterialState.LIQUID || f == MaterialState.PURE_LIQUID || f == MaterialState.PURE_GAS) { - oxygen = x.getStackMaterial().getFluidStack((int) - (material.vSmallestRatio[compSlot] * 1000)); + oxygen = x.getStackMaterial().getFluidStack( + (int) (material.vSmallestRatio[compSlot] * 1000)); } } } @@ -341,19 +340,21 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { public static boolean generatePackagerRecipes(Material aMatInfo) { AutoMap<Boolean> aResults = new AutoMap<Boolean>(); // Small Dust - aResults.put(GT_Values.RA.addBoxingRecipe( - GT_Utility.copyAmount(4L, new Object[] {aMatInfo.getSmallDust(4)}), - ItemList.Schematic_Dust.get(0L, new Object[0]), - aMatInfo.getDust(1), - 100, - 4)); + aResults.put( + GT_Values.RA.addBoxingRecipe( + GT_Utility.copyAmount(4L, new Object[] { aMatInfo.getSmallDust(4) }), + ItemList.Schematic_Dust.get(0L, new Object[0]), + aMatInfo.getDust(1), + 100, + 4)); // Tiny Dust - aResults.put(GT_Values.RA.addBoxingRecipe( - GT_Utility.copyAmount(9L, new Object[] {aMatInfo.getTinyDust(9)}), - ItemList.Schematic_Dust.get(0L, new Object[0]), - aMatInfo.getDust(1), - 100, - 4)); + aResults.put( + GT_Values.RA.addBoxingRecipe( + GT_Utility.copyAmount(9L, new Object[] { aMatInfo.getTinyDust(9) }), + ItemList.Schematic_Dust.get(0L, new Object[0]), + aMatInfo.getDust(1), + 100, + 4)); for (boolean b : aResults) { if (!b) { @@ -405,13 +406,8 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { } } - private boolean addBlastFurnaceRecipe( - Material aMatInfo, - final ItemStack input1, - final ItemStack input2, - final ItemStack output1, - final ItemStack output2, - final int tempRequired) { + private boolean addBlastFurnaceRecipe(Material aMatInfo, final ItemStack input1, final ItemStack input2, + final ItemStack output1, final ItemStack output2, final int tempRequired) { try { int timeTaken = 125 * aMatInfo.vTier * 10; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java index e675f2758f..3d2ed68a3f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gtPlusPlus.api.interfaces.RunnableWithInfo; @@ -7,9 +12,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.item.ItemStack; public class RecipeGen_Extruder extends RecipeGen_Base { @@ -121,10 +123,10 @@ public class RecipeGen_Extruder extends RecipeGen_Base { material.getRod(2), (int) Math.max(material.getMass() * 2L * 1, 1), material.vVoltageMultiplier)) { - Logger.WARNING("Extruder Rod Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Extruder Rod Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Extruder Rod Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Extruder Rod Recipe: " + material.getLocalizedName() + " - Failed"); + } // Bolt Recipe if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1))) @@ -143,8 +145,7 @@ public class RecipeGen_Extruder extends RecipeGen_Base { // Rotor Recipe // Shape_Extruder_Rotor - if (mRotorShapeEnabled - && ItemUtils.checkForInvalidItems(material.getIngot(1)) + if (mRotorShapeEnabled && ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRotor(1))) if (GT_Values.RA.addExtruderRecipe( material.getIngot(5), @@ -152,9 +153,9 @@ public class RecipeGen_Extruder extends RecipeGen_Base { material.getRotor(1), 200, 60)) { - Logger.WARNING("Extruder Rotor Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Extruder Rotor Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Extruder Rotor Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Extruder Rotor Recipe: " + material.getLocalizedName() + " - Failed"); + } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java index 4b1f407809..561c0884cd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe; @@ -9,9 +14,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import java.util.HashSet; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeGen_FluidCanning implements Runnable { @@ -60,30 +62,19 @@ public class RecipeGen_FluidCanning implements Runnable { this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, null, null); } - public RecipeGen_FluidCanning( - boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, FluidStack aFluidOut) { + public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, + FluidStack aFluidOut) { this(aExtracting, aEmpty, aFull, aFluidIn, aFluidOut, null, null); } - public RecipeGen_FluidCanning( - boolean aExtracting, - ItemStack aEmpty, - ItemStack aFull, - FluidStack aFluid, - Integer aDuration, - Integer aEUt) { + public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid, + Integer aDuration, Integer aEUt) { this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, aDuration, aEUt); } // Alternative Constructor - public RecipeGen_FluidCanning( - boolean aExtracting, - ItemStack aEmpty, - ItemStack aFull, - FluidStack aFluidIn, - FluidStack aFluidOut, - Integer aDuration, - Integer aEUt) { + public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, + FluidStack aFluidOut, Integer aDuration, Integer aEUt) { ItemStack aInput; ItemStack aOutput; FluidStack aFluidInput; @@ -91,8 +82,8 @@ public class RecipeGen_FluidCanning implements Runnable { // Safety check on the duration if (aDuration == null || aDuration <= 0) { - aDuration = - (aFluidIn != null) ? (aFluidIn.amount / 62) : ((aFluidOut != null) ? (aFluidOut.amount / 62) : 10); + aDuration = (aFluidIn != null) ? (aFluidIn.amount / 62) + : ((aFluidOut != null) ? (aFluidOut.amount / 62) : 10); } // Safety check on the EU @@ -121,12 +112,12 @@ public class RecipeGen_FluidCanning implements Runnable { GTPP_Recipe aRecipe = new GTPP_Recipe( true, - new ItemStack[] {aInput}, - new ItemStack[] {aOutput}, + new ItemStack[] { aInput }, + new ItemStack[] { aOutput }, null, - new int[] {10000}, - new FluidStack[] {aFluidInput}, - new FluidStack[] {aFluidOutput}, + new int[] { 10000 }, + new FluidStack[] { aFluidInput }, + new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0); @@ -187,9 +178,15 @@ public class RecipeGen_FluidCanning implements Runnable { boolean result = false; CORE.crash(); Logger.INFO( - "[FE-Debug] " + aRecipe.mFluidOutputs[0].amount + "L of " + aRecipe.mFluidOutputs[0].getLocalizedName() - + " fluid extractor from 1 " + aRecipe.mInputs[0].getDisplayName() + " - Success. Time: " - + aRecipe.mDuration + ", Voltage: " + aRecipe.mEUt); + "[FE-Debug] " + aRecipe.mFluidOutputs[0].amount + + "L of " + + aRecipe.mFluidOutputs[0].getLocalizedName() + + " fluid extractor from 1 " + + aRecipe.mInputs[0].getDisplayName() + + " - Success. Time: " + + aRecipe.mDuration + + ", Voltage: " + + aRecipe.mEUt); int aCount1 = GT_Recipe_Map.sFluidExtractionRecipes.mRecipeList.size(); int aCount2 = aCount1; GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(aRecipe); @@ -201,10 +198,14 @@ public class RecipeGen_FluidCanning implements Runnable { // "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", // "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); } else { - Logger.INFO("[ERROR] Failed adding Extraction recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) - + ", " + ItemUtils.getArrayStackNames(aRecipe.mOutputs) + ", " - + ItemUtils.getArrayStackNames(aRecipe.mFluidInputs) + ", " - + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); + Logger.INFO( + "[ERROR] Failed adding Extraction recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) + + ", " + + ItemUtils.getArrayStackNames(aRecipe.mOutputs) + + ", " + + ItemUtils.getArrayStackNames(aRecipe.mFluidInputs) + + ", " + + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); dumpStack(); } return result; @@ -223,10 +224,14 @@ public class RecipeGen_FluidCanning implements Runnable { // "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", // "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); } else { - Logger.INFO("[ERROR] Failed adding Canning recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) - + ", " + ItemUtils.getArrayStackNames(aRecipe.mOutputs) + ", " - + ItemUtils.getArrayStackNames(aRecipe.mFluidInputs) + ", " - + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); + Logger.INFO( + "[ERROR] Failed adding Canning recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) + + ", " + + ItemUtils.getArrayStackNames(aRecipe.mOutputs) + + ", " + + ItemUtils.getArrayStackNames(aRecipe.mFluidInputs) + + ", " + + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); dumpStack(); } return result; @@ -235,16 +240,21 @@ public class RecipeGen_FluidCanning implements Runnable { private void dumpStack() { int parents = 2; for (int i = 0; i < 6; i++) { - Logger.INFO((disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG | " - + (i == 0 ? "Called from: " : "Parent: ") + ReflectionUtils.getMethodName(i + parents)); + Logger.INFO( + (disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG | " + + (i == 0 ? "Called from: " : "Parent: ") + + ReflectionUtils.getMethodName(i + parents)); } } private String buildLogString() { int solidSize = getMapSize(GT_Recipe_Map.sCannerRecipes); int fluidSize = getMapSize(GT_Recipe_Map.sFluidCannerRecipes); - return (disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG | Solids: " + solidSize + " | Liquids: " - + fluidSize + " | "; + return (disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG | Solids: " + + solidSize + + " | Liquids: " + + fluidSize + + " | "; } private final int getMapSize(GT_Recipe_Map aMap) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java index 50827ae39a..9f12a591ff 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gtPlusPlus.api.interfaces.RunnableWithInfo; @@ -8,8 +11,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashSet; -import java.util.Set; public class RecipeGen_Fluids extends RecipeGen_Base { @@ -49,83 +50,73 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Making Shapes from fluid // Ingot - if (ItemUtils.checkForInvalidItems(material.getIngot(1))) - if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Ingot.get(0), // Item Shape - material.getFluidStack(144), // Fluid Input - material.getIngot(1), // output - 32, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING( - "144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING( - "144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Failed"); - } + if (ItemUtils.checkForInvalidItems(material.getIngot(1))) if (GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Ingot.get(0), // Item Shape + material.getFluidStack(144), // Fluid Input + material.getIngot(1), // output + 32, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING("144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("144l fluid molder for 1 ingot Recipe: " + material.getLocalizedName() + " - Failed"); + } // Plate - if (ItemUtils.checkForInvalidItems(material.getPlate(1))) - if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Plate.get(0), // Item Shape - material.getFluidStack(144), // Fluid Input - material.getPlate(1), // output - 32, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING( - "144l fluid molder for 1 plate Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING( - "144l fluid molder for 1 plate Recipe: " + material.getLocalizedName() + " - Failed"); - } + if (ItemUtils.checkForInvalidItems(material.getPlate(1))) if (GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Plate.get(0), // Item Shape + material.getFluidStack(144), // Fluid Input + material.getPlate(1), // output + 32, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING("144l fluid molder for 1 plate Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("144l fluid molder for 1 plate Recipe: " + material.getLocalizedName() + " - Failed"); + } // Nugget - if (ItemUtils.checkForInvalidItems(material.getNugget(1))) - if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Nugget.get(0), // Item Shape - material.getFluidStack(16), // Fluid Input - material.getNugget(1), // output - 16, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING( - "16l fluid molder for 1 nugget Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING( - "16l fluid molder for 1 nugget Recipe: " + material.getLocalizedName() + " - Failed"); - } + if (ItemUtils.checkForInvalidItems(material.getNugget(1))) if (GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Nugget.get(0), // Item Shape + material.getFluidStack(16), // Fluid Input + material.getNugget(1), // output + 16, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING("16l fluid molder for 1 nugget Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("16l fluid molder for 1 nugget Recipe: " + material.getLocalizedName() + " - Failed"); + } // Gears - if (ItemUtils.checkForInvalidItems(material.getGear(1))) - if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Gear.get(0), // Item Shape - material.getFluidStack(576), // Fluid Input - material.getGear(1), // output - 128, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING( - "576l fluid molder for 1 gear Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("576l fluid molder for 1 gear Recipe: " + material.getLocalizedName() + " - Failed"); - } + if (ItemUtils.checkForInvalidItems(material.getGear(1))) if (GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Gear.get(0), // Item Shape + material.getFluidStack(576), // Fluid Input + material.getGear(1), // output + 128, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING("576l fluid molder for 1 gear Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("576l fluid molder for 1 gear Recipe: " + material.getLocalizedName() + " - Failed"); + } // Blocks - if (ItemUtils.checkForInvalidItems(material.getBlock(1))) - if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Block.get(0), // Item Shape - material.getFluidStack(144 * 9), // Fluid Input - material.getBlock(1), // output - 288, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING((144 * 9) + "l fluid molder from 1 block Recipe: " + material.getLocalizedName() - + " - Success"); - } else { - Logger.WARNING((144 * 9) + "l fluid molder from 1 block Recipe: " + material.getLocalizedName() - + " - Failed"); - } + if (ItemUtils.checkForInvalidItems(material.getBlock(1))) if (GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Block.get(0), // Item Shape + material.getFluidStack(144 * 9), // Fluid Input + material.getBlock(1), // output + 288, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 block Recipe: " + + material.getLocalizedName() + + " - Success"); + } else { + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 block Recipe: " + material.getLocalizedName() + " - Failed"); + } if (CORE.GTNH) { @@ -146,105 +137,123 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Rod if (ItemUtils.checkForInvalidItems(material.getRod(1))) - if (mold_Rod != null - && GT_Values.RA.addFluidSolidifierRecipe( - mold_Rod.get(0), // Item Shape - material.getFluidStack(72), // Fluid Input - material.getRod(1), // output - 150, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING((144 * 9) + "l fluid molder from 1 rod Recipe: " + material.getLocalizedName() - + " - Success"); + if (mold_Rod != null && GT_Values.RA.addFluidSolidifierRecipe( + mold_Rod.get(0), // Item Shape + material.getFluidStack(72), // Fluid Input + material.getRod(1), // output + 150, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 rod Recipe: " + + material.getLocalizedName() + + " - Success"); } else { - Logger.WARNING((144 * 9) + "l fluid molder from 1 rod Recipe: " + material.getLocalizedName() - + " - Failed"); + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 rod Recipe: " + + material.getLocalizedName() + + " - Failed"); } // Rod Long if (ItemUtils.checkForInvalidItems(material.getLongRod(1))) - if (mold_Rod_Long != null - && GT_Values.RA.addFluidSolidifierRecipe( - mold_Rod_Long.get(0), // Item - // Shape - material.getFluidStack(144), // Fluid Input - material.getLongRod(1), // output - 300, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING((144 * 9) + "l fluid molder from 1 rod long Recipe: " - + material.getLocalizedName() + " - Success"); + if (mold_Rod_Long != null && GT_Values.RA.addFluidSolidifierRecipe( + mold_Rod_Long.get(0), // Item + // Shape + material.getFluidStack(144), // Fluid Input + material.getLongRod(1), // output + 300, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 rod long Recipe: " + + material.getLocalizedName() + + " - Success"); } else { - Logger.WARNING((144 * 9) + "l fluid molder from 1 rod long Recipe: " - + material.getLocalizedName() + " - Failed"); + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 rod long Recipe: " + + material.getLocalizedName() + + " - Failed"); } // Bolt if (ItemUtils.checkForInvalidItems(material.getBolt(1))) - if (mold_Bolt != null - && GT_Values.RA.addFluidSolidifierRecipe( - mold_Bolt.get(0), // Item Shape - material.getFluidStack(18), // Fluid Input - material.getBolt(1), // output - 50, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING((144 * 9) + "l fluid molder from 1 bolt Recipe: " + material.getLocalizedName() - + " - Success"); + if (mold_Bolt != null && GT_Values.RA.addFluidSolidifierRecipe( + mold_Bolt.get(0), // Item Shape + material.getFluidStack(18), // Fluid Input + material.getBolt(1), // output + 50, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 bolt Recipe: " + + material.getLocalizedName() + + " - Success"); } else { - Logger.WARNING((144 * 9) + "l fluid molder from 1 bolt Recipe: " + material.getLocalizedName() - + " - Failed"); + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 bolt Recipe: " + + material.getLocalizedName() + + " - Failed"); } // Screw if (ItemUtils.checkForInvalidItems(material.getScrew(1))) - if (mold_Screw != null - && GT_Values.RA.addFluidSolidifierRecipe( - mold_Screw.get(0), // Item Shape - material.getFluidStack(18), // Fluid Input - material.getScrew(1), // output - 50, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING((144 * 9) + "l fluid molder from 1 screw Recipe: " + material.getLocalizedName() - + " - Success"); + if (mold_Screw != null && GT_Values.RA.addFluidSolidifierRecipe( + mold_Screw.get(0), // Item Shape + material.getFluidStack(18), // Fluid Input + material.getScrew(1), // output + 50, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 screw Recipe: " + + material.getLocalizedName() + + " - Success"); } else { - Logger.WARNING((144 * 9) + "l fluid molder from 1 screw Recipe: " + material.getLocalizedName() - + " - Failed"); + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 screw Recipe: " + + material.getLocalizedName() + + " - Failed"); } // Ring if (ItemUtils.checkForInvalidItems(material.getRing(1))) - if (mold_Ring != null - && GT_Values.RA.addFluidSolidifierRecipe( - mold_Ring.get(0), // Item Shape - material.getFluidStack(36), // Fluid Input - material.getRing(1), // output - 100, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING((144 * 9) + "l fluid molder from 1 ring Recipe: " + material.getLocalizedName() - + " - Success"); + if (mold_Ring != null && GT_Values.RA.addFluidSolidifierRecipe( + mold_Ring.get(0), // Item Shape + material.getFluidStack(36), // Fluid Input + material.getRing(1), // output + 100, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 ring Recipe: " + + material.getLocalizedName() + + " - Success"); } else { - Logger.WARNING((144 * 9) + "l fluid molder from 1 ring Recipe: " + material.getLocalizedName() - + " - Failed"); + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 ring Recipe: " + + material.getLocalizedName() + + " - Failed"); } // Rotor if (ItemUtils.checkForInvalidItems(material.getRotor(1))) - if (mold_Rotor != null - && GT_Values.RA.addFluidSolidifierRecipe( - mold_Rotor.get(0), // Item Shape - material.getFluidStack(612), // Fluid Input - material.getRotor(1), // output - 100, // Duration - material.vVoltageMultiplier // Eu Tick - )) { - Logger.WARNING((144 * 9) + "l fluid molder from 1 rotor Recipe: " + material.getLocalizedName() - + " - Success"); + if (mold_Rotor != null && GT_Values.RA.addFluidSolidifierRecipe( + mold_Rotor.get(0), // Item Shape + material.getFluidStack(612), // Fluid Input + material.getRotor(1), // output + 100, // Duration + material.vVoltageMultiplier // Eu Tick + )) { + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 rotor Recipe: " + + material.getLocalizedName() + + " - Success"); } else { - Logger.WARNING((144 * 9) + "l fluid molder from 1 rotor Recipe: " + material.getLocalizedName() - + " - Failed"); + Logger.WARNING( + (144 * 9) + "l fluid molder from 1 rotor Recipe: " + + material.getLocalizedName() + + " - Failed"); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java index 67819c8699..d1bcab904c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java @@ -1,5 +1,11 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.interfaces.RunnableWithInfo; @@ -13,10 +19,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeGen_Fluorite extends RecipeGen_Base { @@ -74,28 +76,55 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { final ItemStack tinyDust = material.getTinyDust(1); if (RecipeUtils.addShapedRecipe( - tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, normalDust)) { + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + normalDust)) { Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); } - if (RecipeUtils.addShapedRecipe( - normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) { + if (RecipeUtils + .addShapedRecipe(normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) { Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils.addShapedRecipe( - smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)) { + smallDust, + smallDust, + null, + smallDust, + smallDust, + null, + null, + null, + null, + normalDust)) { Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils.addShapedRecipe( - null, normalDust, null, null, null, null, null, null, null, material.getSmallDust(4))) { + null, + normalDust, + null, + null, + null, + null, + null, + null, + null, + material.getSmallDust(4))) { Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); @@ -133,8 +162,8 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { // Macerate ore to Crushed if (GT_Values.RA.addPulveriserRecipe( material.getOre(1), - new ItemStack[] {material.getCrushed(2)}, - new int[] {10000}, + new ItemStack[] { material.getCrushed(2) }, + new int[] { 10000 }, 20 * 20, tVoltageMultiplier / 2)) { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate ore to Crushed ore'"); @@ -142,8 +171,8 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { // Macerate Centrifuged to Pure Dust if (GT_Values.RA.addPulveriserRecipe( material.getCrushedCentrifuged(1), - new ItemStack[] {matDust, matDustA}, - new int[] {10000, 1000}, + new ItemStack[] { matDust, matDustA }, + new int[] { 10000, 1000 }, 20 * 20, tVoltageMultiplier / 2)) { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Centrifuged ore to Pure Dust'"); @@ -154,10 +183,16 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { material.getCrushedCentrifuged(1), tinyDustA, dustStone)) { - Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: " - + material.getCrushedPurified(1).getDisplayName() + " | Outputs: " - + material.getCrushedCentrifuged(1).getDisplayName() + ", " + tinyDustA.getDisplayName() + ", " - + dustStone.getDisplayName() + "."); + Logger.MATERIALS( + "[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: " + + material.getCrushedPurified(1).getDisplayName() + + " | Outputs: " + + material.getCrushedCentrifuged(1).getDisplayName() + + ", " + + tinyDustA.getDisplayName() + + ", " + + dustStone.getDisplayName() + + "."); } GT_Values.RA.addChemicalBathRecipe( @@ -166,7 +201,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { FLUORIDES.FLUORITE.getCrushedPurified(8), FLUORIDES.FLUORITE.getDustImpure(4), FLUORIDES.FLUORITE.getDustPurified(2), - new int[] {10000, 5000, 1000}, + new int[] { 10000, 5000, 1000 }, 30 * 20, 240); @@ -192,7 +227,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { null, null, null, - new int[] {10000, 10000}, // Chances + new int[] { 10000, 10000 }, // Chances (int) Math.max(1L, material.getMass() * 8L), // Time tVoltageMultiplier / 2)) { // Eu Logger.MATERIALS("[Centrifuge] Added Recipe: Purified Dust to Clean Dust"); @@ -210,7 +245,7 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { null, null, null, - new int[] {10000, 10000}, // Chances + new int[] { 10000, 10000 }, // Chances (int) Math.max(1L, material.getMass() * 8L), // Time tVoltageMultiplier / 2)) { // Eu Logger.MATERIALS("[Centrifuge] Added Recipe: Inpure Dust to Clean Dust"); @@ -223,19 +258,15 @@ public class RecipeGen_Fluorite extends RecipeGen_Base { } CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(5), FLUORIDES.FLUORITE.getDust(37), - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(5), FLUORIDES.FLUORITE.getDust(37), }, FluidUtils.getFluidStack("sulfuricacid", 8000), aGregtechHydro, // Fluid output (slot 2) - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 15), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) - }, - new int[] {10000, 1000, 1000, 3000, 2000}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 15), + ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) }, + new int[] { 10000, 1000, 1000, 3000, 2000 }, 10 * 60 * 20, 240); // EU } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java index 958c97c652..397f590c12 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java @@ -1,5 +1,11 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; @@ -12,10 +18,6 @@ import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeGen_MaterialProcessing extends RecipeGen_Base { @@ -79,16 +81,25 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { int mCounter = 0; for (Pair<Integer, Material> f : componentMap) { if (f.getValue().getState() != MaterialState.SOLID) { - Logger.MATERIALS("[Centrifuge] Found Fluid Component, adding " + f.getKey() + " cells of " - + f.getValue().getLocalizedName() + "."); + Logger.MATERIALS( + "[Centrifuge] Found Fluid Component, adding " + f.getKey() + + " cells of " + + f.getValue().getLocalizedName() + + "."); mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey()); mCellCount += f.getKey(); mTotalCount += f.getKey(); - Logger.MATERIALS("[Centrifuge] In total, adding " + mCellCount + " cells for " - + material.getLocalizedName() + " processing."); + Logger.MATERIALS( + "[Centrifuge] In total, adding " + mCellCount + + " cells for " + + material.getLocalizedName() + + " processing."); } else { - Logger.MATERIALS("[Centrifuge] Found Solid Component, adding " + f.getKey() + " dusts of " - + f.getValue().getLocalizedName() + "."); + Logger.MATERIALS( + "[Centrifuge] Found Solid Component, adding " + f.getKey() + + " dusts of " + + f.getValue().getLocalizedName() + + "."); mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey()); mTotalCount += f.getKey(); } @@ -96,8 +107,10 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { // Build Output Array for (int g = 0; g < mInternalOutputs.length; g++) { - Logger.MATERIALS("[Centrifuge] Is output[" + g + "] valid with a chance? " - + (mInternalOutputs[g] != null ? 10000 : 0)); + Logger.MATERIALS( + "[Centrifuge] Is output[" + g + + "] valid with a chance? " + + (mInternalOutputs[g] != null ? 10000 : 0)); mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0); } @@ -109,14 +122,20 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing); if (mainDust != null) { - Logger.MATERIALS("[Centrifuge] Recipe now requires " + material.smallestStackSizeWhenProcessing - + "x " + mainDust.getDisplayName() + " as input."); + Logger.MATERIALS( + "[Centrifuge] Recipe now requires " + material.smallestStackSizeWhenProcessing + + "x " + + mainDust.getDisplayName() + + " as input."); } else { mainDust = material.getDust(mTotalCount); Logger.MATERIALS("[Centrifuge] Could not find valid input dust, trying alternative."); if (mainDust != null) { - Logger.MATERIALS("[Centrifuge] Recipe now requires " + mTotalCount + "x " - + mainDust.getDisplayName() + " as input."); + Logger.MATERIALS( + "[Centrifuge] Recipe now requires " + mTotalCount + + "x " + + mainDust.getDisplayName() + + " as input."); } else { Logger.MATERIALS("[Centrifuge] Could not find valid input dust, exiting."); } @@ -147,11 +166,12 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { mChances, 20 * 1 * (tVoltageMultiplier / 10), tVoltageMultiplier)) { - Logger.MATERIALS("[Centrifuge] Generated Centrifuge recipe for " - + material.getDust(1).getDisplayName()); + Logger.MATERIALS( + "[Centrifuge] Generated Centrifuge recipe for " + material.getDust(1).getDisplayName()); } else { - Logger.MATERIALS("[Centrifuge] Failed to generate Centrifuge recipe for " - + material.getDust(1).getDisplayName()); + Logger.MATERIALS( + "[Centrifuge] Failed to generate Centrifuge recipe for " + + material.getDust(1).getDisplayName()); } } catch (Throwable t) { t.printStackTrace(); @@ -170,16 +190,25 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { int mCounter = 0; for (Pair<Integer, Material> f : componentMap) { if (f.getValue().getState() != MaterialState.SOLID) { - Logger.MATERIALS("[Dehydrator] Found Fluid Component, adding " + f.getKey() + " cells of " - + f.getValue().getLocalizedName() + "."); + Logger.MATERIALS( + "[Dehydrator] Found Fluid Component, adding " + f.getKey() + + " cells of " + + f.getValue().getLocalizedName() + + "."); mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey()); mCellCount += f.getKey(); mTotalCount += f.getKey(); - Logger.MATERIALS("[Dehydrator] In total, adding " + mCellCount + " cells for " - + material.getLocalizedName() + " processing."); + Logger.MATERIALS( + "[Dehydrator] In total, adding " + mCellCount + + " cells for " + + material.getLocalizedName() + + " processing."); } else { - Logger.MATERIALS("[Dehydrator] Found Solid Component, adding " + f.getKey() + " dusts of " - + f.getValue().getLocalizedName() + "."); + Logger.MATERIALS( + "[Dehydrator] Found Solid Component, adding " + f.getKey() + + " dusts of " + + f.getValue().getLocalizedName() + + "."); mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey()); mTotalCount += f.getKey(); } @@ -187,8 +216,10 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { // Build Output Array for (int g = 0; g < mInternalOutputs.length; g++) { - Logger.MATERIALS("[Dehydrator] Is output[" + g + "] valid with a chance? " - + (mInternalOutputs[g] != null ? 10000 : 0)); + Logger.MATERIALS( + "[Dehydrator] Is output[" + g + + "] valid with a chance? " + + (mInternalOutputs[g] != null ? 10000 : 0)); mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0); } @@ -200,14 +231,20 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing); if (mainDust != null) { - Logger.MATERIALS("[Dehydrator] Recipe now requires " + material.smallestStackSizeWhenProcessing - + "x " + mainDust.getDisplayName() + " as input."); + Logger.MATERIALS( + "[Dehydrator] Recipe now requires " + material.smallestStackSizeWhenProcessing + + "x " + + mainDust.getDisplayName() + + " as input."); } else { mainDust = material.getDust(mTotalCount); Logger.MATERIALS("[Dehydrator] Could not find valid input dust, trying alternative."); if (mainDust != null) { - Logger.MATERIALS("[Dehydrator] Recipe now requires " + mTotalCount + "x " - + mainDust.getDisplayName() + " as input."); + Logger.MATERIALS( + "[Dehydrator] Recipe now requires " + mTotalCount + + "x " + + mainDust.getDisplayName() + + " as input."); } else { Logger.MATERIALS("[Dehydrator] Could not find valid input dust, exiting."); } @@ -226,18 +263,19 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { try { if (CORE.RA.addDehydratorRecipe( - new ItemStack[] {mainDust, emptyCell}, + new ItemStack[] { mainDust, emptyCell }, null, null, mInternalOutputs, mChances, 20 * 1 * (tVoltageMultiplier / 10), tVoltageMultiplier)) { - Logger.MATERIALS("[Dehydrator] Generated Dehydrator recipe for " - + material.getDust(1).getDisplayName()); + Logger.MATERIALS( + "[Dehydrator] Generated Dehydrator recipe for " + material.getDust(1).getDisplayName()); } else { - Logger.MATERIALS("[Dehydrator] Failed to generate Dehydrator recipe for " - + material.getDust(1).getDisplayName()); + Logger.MATERIALS( + "[Dehydrator] Failed to generate Dehydrator recipe for " + + material.getDust(1).getDisplayName()); } } catch (Throwable t) { t.printStackTrace(); @@ -246,20 +284,9 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { } } - public static boolean addCentrifgeRecipe( - ItemStack aInput1, - ItemStack aInput2, - FluidStack aFluidInput, - FluidStack aFluidOutput, - ItemStack aOutput1, - ItemStack aOutput2, - ItemStack aOutput3, - ItemStack aOutput4, - ItemStack aOutput5, - ItemStack aOutput6, - int[] aChances, - int aDuration, - int aEUt) { + public static boolean addCentrifgeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, + FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, + ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) { return GT_Values.RA.addCentrifugeRecipe( aInput1, aInput2, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java index eb6fa4ee75..0464ae80d7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.interfaces.RunnableWithInfo; @@ -8,8 +11,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashSet; -import java.util.Set; public class RecipeGen_MetalRecipe extends RecipeGen_Base { @@ -47,10 +48,10 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { material.getSmallDust(2), (int) Math.max(material.getMass() / 8L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Lathe Rod Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Lathe Rod Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Lathe Rod Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Lathe Rod Recipe: " + material.getLocalizedName() + " - Failed"); + } if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1))) if (GT_Values.RA.addCutterRecipe( @@ -59,10 +60,10 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { null, (int) Math.max(material.getMass() * 2L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Cut Bolt Recipe: " + material.getLocalizedName() + " - Failed"); + } if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getHotIngot(1))) @@ -71,30 +72,41 @@ public class RecipeGen_MetalRecipe extends RecipeGen_Base { material.getIngot(1), (int) Math.max(material.getMass() * 3L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Cool Hot Ingot Recipe: " + material.getLocalizedName() + " - Failed"); + } if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getLongRod(1))) { if (GT_Values.RA.addForgeHammerRecipe( - material.getRod(2), material.getLongRod(1), (int) Math.max(material.getMass(), 1L), 16)) { + material.getRod(2), + material.getLongRod(1), + (int) Math.max(material.getMass(), 1L), + 16)) { Logger.WARNING("Hammer Long Rod Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("Hammer Long Rod Recipe: " + material.getLocalizedName() + " - Failed"); } GT_Values.RA.addCutterRecipe( - material.getLongRod(1), material.getRod(2), null, (int) Math.max(material.getMass(), 1L), 4); + material.getLongRod(1), + material.getRod(2), + null, + (int) Math.max(material.getMass(), 1L), + 4); } if (ItemUtils.checkForInvalidItems(material.getBolt(1)) && ItemUtils.checkForInvalidItems(material.getScrew(1))) if (GT_Values.RA.addLatheRecipe( - material.getBolt(1), material.getScrew(1), null, (int) Math.max(material.getMass() / 8L, 1L), 4)) { - Logger.WARNING("Lathe Screw Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Lathe Screw Recipe: " + material.getLocalizedName() + " - Failed"); - } + material.getBolt(1), + material.getScrew(1), + null, + (int) Math.max(material.getMass() / 8L, 1L), + 4)) { + Logger.WARNING("Lathe Screw Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Lathe Screw Recipe: " + material.getLocalizedName() + " - Failed"); + } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java index 39d9456115..25300ed515 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; @@ -8,9 +13,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeGen_MultisUsingFluidInsteadOfCells { @@ -71,8 +73,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { int aInvalidRecipesToConvert = 0; int aOriginalCount = aInputs.mRecipeList.size(); - recipe: - for (GT_Recipe x : aInputs.mRecipeList) { + recipe: for (GT_Recipe x : aInputs.mRecipeList) { if (x != null) { ItemStack[] aInputItems = x.mInputs.clone(); @@ -86,8 +87,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { AutoMap<FluidStack> aOutputFluidsMap = new AutoMap<FluidStack>(); // Iterate Inputs, Convert valid items into fluids - inputs: - for (ItemStack aInputStack : aInputItems) { + inputs: for (ItemStack aInputStack : aInputItems) { FluidStack aFoundFluid = getFluidFromItemStack(aInputStack); if (aFoundFluid == null) { for (ItemStack aBadStack : mItemsToIgnore) { @@ -104,8 +104,7 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { } } // Iterate Outputs, Convert valid items into fluids - outputs: - for (ItemStack aOutputStack : aOutputItems) { + outputs: for (ItemStack aOutputStack : aOutputItems) { FluidStack aFoundFluid = getFluidFromItemStack(aOutputStack); if (aFoundFluid == null) { for (ItemStack aBadStack : mItemsToIgnore) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java index 4e163119a0..f276ea218f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java @@ -1,5 +1,12 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -17,11 +24,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeGen_Ore extends RecipeGen_Base { @@ -96,18 +98,15 @@ public class RecipeGen_Ore extends RecipeGen_Base { if (material.getComposites().size() >= 2 && material.getComposites().get(1) != null) { bonusB = material.getComposites().get(1).getStackMaterial(); // If Secondary Output has no solid output, try the third (If it exists) - if (!bonusB.hasSolidForm() - && material.getComposites().size() >= 3 + if (!bonusB.hasSolidForm() && material.getComposites().size() >= 3 && material.getComposites().get(2) != null) { bonusB = material.getComposites().get(2).getStackMaterial(); // If Third Output has no solid output, try the Fourth (If it exists) - if (!bonusB.hasSolidForm() - && material.getComposites().size() >= 4 + if (!bonusB.hasSolidForm() && material.getComposites().size() >= 4 && material.getComposites().get(3) != null) { bonusB = material.getComposites().get(3).getStackMaterial(); // If Fourth Output has no solid output, try the Fifth (If it exists) - if (!bonusB.hasSolidForm() - && material.getComposites().size() >= 5 + if (!bonusB.hasSolidForm() && material.getComposites().size() >= 5 && material.getComposites().get(4) != null) { bonusB = material.getComposites().get(4).getStackMaterial(); // If Fifth Output has no solid output, default out to Stone dust. @@ -177,8 +176,8 @@ public class RecipeGen_Ore extends RecipeGen_Base { // Macerate ore to Crushed if (GT_Values.RA.addPulveriserRecipe( material.getOre(1), - new ItemStack[] {material.getCrushed(2)}, - new int[] {10000}, + new ItemStack[] { material.getCrushed(2) }, + new int[] { 10000 }, 20 * 20, tVoltageMultiplier / 2)) { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate ore to Crushed ore'"); @@ -186,8 +185,8 @@ public class RecipeGen_Ore extends RecipeGen_Base { // Macerate Crushed to Impure Dust if (GT_Values.RA.addPulveriserRecipe( material.getCrushed(1), - new ItemStack[] {material.getDustImpure(1), matDustA}, - new int[] {10000, 1000}, + new ItemStack[] { material.getDustImpure(1), matDustA }, + new int[] { 10000, 1000 }, 20 * 20, tVoltageMultiplier / 2)) { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Crushed ore to Impure Dust'"); @@ -195,8 +194,8 @@ public class RecipeGen_Ore extends RecipeGen_Base { // Macerate Washed to Purified Dust if (GT_Values.RA.addPulveriserRecipe( material.getCrushedPurified(1), - new ItemStack[] {material.getDustPurified(1), matDustA}, - new int[] {10000, 1000}, + new ItemStack[] { material.getDustPurified(1), matDustA }, + new int[] { 10000, 1000 }, 20 * 20, tVoltageMultiplier / 2)) { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Washed ore to Purified Dust'"); @@ -204,8 +203,8 @@ public class RecipeGen_Ore extends RecipeGen_Base { // Macerate Centrifuged to Pure Dust if (GT_Values.RA.addPulveriserRecipe( material.getCrushedCentrifuged(1), - new ItemStack[] {matDust, matDustA}, - new int[] {10000, 1000}, + new ItemStack[] { matDust, matDustA }, + new int[] { 10000, 1000 }, 20 * 20, tVoltageMultiplier / 2)) { Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Centrifuged ore to Pure Dust'"); @@ -215,13 +214,15 @@ public class RecipeGen_Ore extends RecipeGen_Base { * Wash */ // Wash into Purified Crushed - /*if (GT_Values.RA.addOreWasherRecipe(material.getCrushed(1), material.getCrushedPurified(1), bonusA.getTinyDust(1), dustStone, FluidUtils.getWater(1000), 25*20, 16)){ - Logger.MATERIALS("[OreWasher] Added Recipe: 'Wash Crushed ore into Purified Crushed ore'"); - }*/ + /* + * if (GT_Values.RA.addOreWasherRecipe(material.getCrushed(1), material.getCrushedPurified(1), + * bonusA.getTinyDust(1), dustStone, FluidUtils.getWater(1000), 25*20, 16)){ + * Logger.MATERIALS("[OreWasher] Added Recipe: 'Wash Crushed ore into Purified Crushed ore'"); } + */ // .08 compat method if (GT_ModHandler.addOreWasherRecipe( material.getCrushed(1), - new int[] {10000, 1111, 10000}, + new int[] { 10000, 1111, 10000 }, 1000, material.getCrushedPurified(1), matDustA, @@ -232,14 +233,14 @@ public class RecipeGen_Ore extends RecipeGen_Base { /** * Thermal Centrifuge */ - /*//Crushed ore to Centrifuged Ore - if (GT_Values.RA.addThermalCentrifugeRecipe(material.getCrushed(1), material.getCrushedCentrifuged(1), tinyDustB, dustStone, 25*20, 24)){ - Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Crushed ore to Centrifuged Ore'"); - } - //Washed ore to Centrifuged Ore - if (GT_Values.RA.addThermalCentrifugeRecipe(material.getCrushedPurified(1), material.getCrushedCentrifuged(1), bonusA.getTinyDust(1), dustStone, 25*20, 24)){ - Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore'"); - }*/ + /* + * //Crushed ore to Centrifuged Ore if (GT_Values.RA.addThermalCentrifugeRecipe(material.getCrushed(1), + * material.getCrushedCentrifuged(1), tinyDustB, dustStone, 25*20, 24)){ + * Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Crushed ore to Centrifuged Ore'"); } //Washed ore to + * Centrifuged Ore if (GT_Values.RA.addThermalCentrifugeRecipe(material.getCrushedPurified(1), + * material.getCrushedCentrifuged(1), bonusA.getTinyDust(1), dustStone, 25*20, 24)){ + * Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore'"); } + */ Logger.MATERIALS("material.getCrushed(1): " + (material.getCrushed(1) != null)); Logger.MATERIALS("material.getCrushedPurified(1): " + (material.getCrushedPurified(1) != null)); @@ -251,33 +252,43 @@ public class RecipeGen_Ore extends RecipeGen_Base { // .08 compat if (GT_ModHandler.addThermalCentrifugeRecipe( material.getCrushed(1), - new int[] {10000, 1111, 10000}, + new int[] { 10000, 1111, 10000 }, (int) Math.min(5000L, Math.abs(material.getMass() * 20L)), material.getCrushedCentrifuged(1), matDustB, dustStone)) { - Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Crushed ore to Centrifuged Ore' | Input: " - + material.getCrushed(1).getDisplayName() + " | Outputs: " - + material.getCrushedCentrifuged(1).getDisplayName() + ", " + matDustB.getDisplayName() + ", " - + dustStone.getDisplayName() + "."); + Logger.MATERIALS( + "[ThermalCentrifuge] Added Recipe: 'Crushed ore to Centrifuged Ore' | Input: " + + material.getCrushed(1).getDisplayName() + + " | Outputs: " + + material.getCrushedCentrifuged(1).getDisplayName() + + ", " + + matDustB.getDisplayName() + + ", " + + dustStone.getDisplayName() + + "."); } - } catch (Throwable t) { - } + } catch (Throwable t) {} try { if (GT_ModHandler.addThermalCentrifugeRecipe( material.getCrushedPurified(1), - new int[] {10000, 1111, 10000}, + new int[] { 10000, 1111, 10000 }, (int) Math.min(5000L, Math.abs(material.getMass() * 20L)), material.getCrushedCentrifuged(1), matDustA, dustStone)) { - Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: " - + material.getCrushedPurified(1).getDisplayName() + " | Outputs: " - + material.getCrushedCentrifuged(1).getDisplayName() + ", " + matDustA.getDisplayName() + ", " - + dustStone.getDisplayName() + "."); + Logger.MATERIALS( + "[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: " + + material.getCrushedPurified(1).getDisplayName() + + " | Outputs: " + + material.getCrushedCentrifuged(1).getDisplayName() + + ", " + + matDustA.getDisplayName() + + ", " + + dustStone.getDisplayName() + + "."); } - } catch (Throwable t) { - } + } catch (Throwable t) {} /** * Forge Hammer @@ -286,7 +297,10 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS("[ForgeHammer] Added Recipe: 'Crushed Centrifuged to Pure Dust'"); } if (GT_Values.RA.addForgeHammerRecipe( - material.getCrushedPurified(1), material.getDustPurified(1), 10, tVoltageMultiplier / 4)) { + material.getCrushedPurified(1), + material.getDustPurified(1), + 10, + tVoltageMultiplier / 4)) { Logger.MATERIALS("[ForgeHammer] Added Recipe: 'Crushed Purified to Purified Dust'"); } if (GT_Values.RA.addForgeHammerRecipe(material.getOre(1), material.getCrushed(1), 10, tVoltageMultiplier / 4)) { @@ -308,7 +322,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { null, null, null, - new int[] {10000, 1111}, // Chances + new int[] { 10000, 1111 }, // Chances (int) Math.max(1L, material.getMass() * 8L), // Time tVoltageMultiplier / 2)) { // Eu Logger.MATERIALS("[Centrifuge] Added Recipe: Purified Dust to Clean Dust"); @@ -326,7 +340,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { null, null, null, - new int[] {10000, 1111}, // Chances + new int[] { 10000, 1111 }, // Chances (int) Math.max(1L, material.getMass() * 8L), // Time tVoltageMultiplier / 2)) { // Eu Logger.MATERIALS("[Centrifuge] Added Recipe: Inpure Dust to Clean Dust"); @@ -348,16 +362,25 @@ public class RecipeGen_Ore extends RecipeGen_Base { int mCounter = 0; for (Pair<Integer, Material> f : componentMap) { if (f.getValue().getState() != MaterialState.SOLID) { - Logger.MATERIALS("[Electrolyzer] Found Fluid Component, adding " + f.getKey() + " cells of " - + f.getValue().getLocalizedName() + "."); + Logger.MATERIALS( + "[Electrolyzer] Found Fluid Component, adding " + f.getKey() + + " cells of " + + f.getValue().getLocalizedName() + + "."); mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey()); mCellCount += f.getKey(); mTotalCount += f.getKey(); - Logger.MATERIALS("[Electrolyzer] In total, adding " + mCellCount + " cells for " - + material.getLocalizedName() + " processing."); + Logger.MATERIALS( + "[Electrolyzer] In total, adding " + mCellCount + + " cells for " + + material.getLocalizedName() + + " processing."); } else { - Logger.MATERIALS("[Electrolyzer] Found Solid Component, adding " + f.getKey() + " dusts of " - + f.getValue().getLocalizedName() + "."); + Logger.MATERIALS( + "[Electrolyzer] Found Solid Component, adding " + f.getKey() + + " dusts of " + + f.getValue().getLocalizedName() + + "."); mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey()); mTotalCount += f.getKey(); } @@ -365,8 +388,10 @@ public class RecipeGen_Ore extends RecipeGen_Base { // Build Output Array for (int g = 0; g < mInternalOutputs.length; g++) { - Logger.MATERIALS("[Electrolyzer] Is output[" + g + "] valid with a chance? " - + (mInternalOutputs[g] != null ? 10000 : 0)); + Logger.MATERIALS( + "[Electrolyzer] Is output[" + g + + "] valid with a chance? " + + (mInternalOutputs[g] != null ? 10000 : 0)); mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0); } @@ -378,14 +403,20 @@ public class RecipeGen_Ore extends RecipeGen_Base { ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing); if (mainDust != null) { - Logger.MATERIALS("[Electrolyzer] Recipe now requires " + material.smallestStackSizeWhenProcessing - + "x " + mainDust.getDisplayName() + " as input."); + Logger.MATERIALS( + "[Electrolyzer] Recipe now requires " + material.smallestStackSizeWhenProcessing + + "x " + + mainDust.getDisplayName() + + " as input."); } else { mainDust = material.getDust(mTotalCount); Logger.MATERIALS("[Electrolyzer] Could not find valid input dust, trying alternative."); if (mainDust != null) { - Logger.MATERIALS("[Electrolyzer] Recipe now requires " + mTotalCount + "x " - + mainDust.getDisplayName() + " as input."); + Logger.MATERIALS( + "[Electrolyzer] Recipe now requires " + mTotalCount + + "x " + + mainDust.getDisplayName() + + " as input."); } else { Logger.MATERIALS("[Electrolyzer] Could not find valid input dust, exiting."); } @@ -419,8 +450,9 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS( "[Electrolyzer] Generated Electrolyzer recipe for " + matDust.getDisplayName()); } else { - Logger.MATERIALS("[Electrolyzer] Failed to generate Electrolyzer recipe for " - + matDust.getDisplayName()); + Logger.MATERIALS( + "[Electrolyzer] Failed to generate Electrolyzer recipe for " + + matDust.getDisplayName()); } } catch (Throwable t) { t.printStackTrace(); @@ -440,16 +472,25 @@ public class RecipeGen_Ore extends RecipeGen_Base { for (Pair<Integer, Material> f : componentMap) { if (f.getValue().getState() != MaterialState.SOLID && f.getValue().getState() != MaterialState.ORE) { - Logger.MATERIALS("[Dehydrator] Found Fluid Component, adding " + f.getKey() + " cells of " - + f.getValue().getLocalizedName() + "."); + Logger.MATERIALS( + "[Dehydrator] Found Fluid Component, adding " + f.getKey() + + " cells of " + + f.getValue().getLocalizedName() + + "."); mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey()); mCellCount += f.getKey(); mTotalCount += f.getKey(); - Logger.MATERIALS("[Dehydrator] In total, adding " + mCellCount + " cells for " - + material.getLocalizedName() + " processing."); + Logger.MATERIALS( + "[Dehydrator] In total, adding " + mCellCount + + " cells for " + + material.getLocalizedName() + + " processing."); } else { - Logger.MATERIALS("[Dehydrator] Found Solid Component, adding " + f.getKey() + " dusts of " - + f.getValue().getLocalizedName() + "."); + Logger.MATERIALS( + "[Dehydrator] Found Solid Component, adding " + f.getKey() + + " dusts of " + + f.getValue().getLocalizedName() + + "."); mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey()); mTotalCount += f.getKey(); } @@ -457,8 +498,10 @@ public class RecipeGen_Ore extends RecipeGen_Base { // Build Output Array for (int g = 0; g < mInternalOutputs.length; g++) { - Logger.MATERIALS("[Dehydrator] Is output[" + g + "] valid with a chance? " - + (mInternalOutputs[g] != null ? 10000 : 0)); + Logger.MATERIALS( + "[Dehydrator] Is output[" + g + + "] valid with a chance? " + + (mInternalOutputs[g] != null ? 10000 : 0)); mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0); } @@ -470,14 +513,20 @@ public class RecipeGen_Ore extends RecipeGen_Base { ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing); if (mainDust != null) { - Logger.MATERIALS("[Dehydrator] Recipe now requires " + material.smallestStackSizeWhenProcessing - + "x " + mainDust.getDisplayName() + " as input."); + Logger.MATERIALS( + "[Dehydrator] Recipe now requires " + material.smallestStackSizeWhenProcessing + + "x " + + mainDust.getDisplayName() + + " as input."); } else { mainDust = material.getDust(mTotalCount); Logger.MATERIALS("[Dehydrator] Could not find valid input dust, trying alternative."); if (mainDust != null) { - Logger.MATERIALS("[Dehydrator] Recipe now requires " + mTotalCount + "x " - + mainDust.getDisplayName() + " as input."); + Logger.MATERIALS( + "[Dehydrator] Recipe now requires " + mTotalCount + + "x " + + mainDust.getDisplayName() + + " as input."); } else { Logger.MATERIALS("[Dehydrator] Could not find valid input dust, exiting."); } @@ -495,7 +544,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { try { if (CORE.RA.addDehydratorRecipe( - new ItemStack[] {mainDust, emptyCell}, + new ItemStack[] { mainDust, emptyCell }, null, null, mInternalOutputs, @@ -503,10 +552,13 @@ public class RecipeGen_Ore extends RecipeGen_Base { (int) Math.max(material.getMass() * 4L * 1, 1), tVoltageMultiplier)) { Logger.MATERIALS("[Dehydrator] Generated Dehydrator recipe for " + matDust.getDisplayName()); - Logger.MATERIALS("Inputs: " + mainDust.getDisplayName() + " x" + mainDust.stackSize + ", " - + (emptyCell == null - ? "No Cells" - : "" + emptyCell.getDisplayName() + " x" + emptyCell.stackSize)); + Logger.MATERIALS( + "Inputs: " + mainDust.getDisplayName() + + " x" + + mainDust.stackSize + + ", " + + (emptyCell == null ? "No Cells" + : "" + emptyCell.getDisplayName() + " x" + emptyCell.stackSize)); Logger.MATERIALS("Outputs " + ItemUtils.getArrayStackNames(mInternalOutputs)); Logger.MATERIALS("Time: " + ((int) Math.max(material.getMass() * 4L * 1, 1))); Logger.MATERIALS("EU: " + tVoltageMultiplier); @@ -564,28 +616,55 @@ public class RecipeGen_Ore extends RecipeGen_Base { final ItemStack tinyDust = material.getTinyDust(1); if (RecipeUtils.addShapedRecipe( - tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, normalDust)) { + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + tinyDust, + normalDust)) { Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); } - if (RecipeUtils.addShapedRecipe( - normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) { + if (RecipeUtils + .addShapedRecipe(normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) { Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils.addShapedRecipe( - smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)) { + smallDust, + smallDust, + null, + smallDust, + smallDust, + null, + null, + null, + null, + normalDust)) { Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils.addShapedRecipe( - null, normalDust, null, null, null, null, null, null, null, material.getSmallDust(4))) { + null, + normalDust, + null, + null, + null, + null, + null, + null, + null, + material.getSmallDust(4))) { Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); @@ -594,20 +673,9 @@ public class RecipeGen_Ore extends RecipeGen_Base { // } } - public static boolean addElectrolyzerRecipe( - ItemStack aInput1, - ItemStack aInput2, - FluidStack aFluidInput, - FluidStack aFluidOutput, - ItemStack aOutput1, - ItemStack aOutput2, - ItemStack aOutput3, - ItemStack aOutput4, - ItemStack aOutput5, - ItemStack aOutput6, - int[] aChances, - int aDuration, - int aEUt) { + public static boolean addElectrolyzerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, + FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, + ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) { if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { Logger.MATERIALS("[Electrolyzer] Either both inputs or outputs are null."); return false; @@ -617,10 +685,8 @@ public class RecipeGen_Ore extends RecipeGen_Base { Logger.MATERIALS("[Electrolyzer] Fail 1."); return false; } - if ((aFluidInput != null) - && ((aDuration = GregTech_API.sRecipeFile.get( - "electrolyzer", aFluidInput.getFluid().getName(), aDuration)) - <= 0)) { + if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile + .get("electrolyzer", aFluidInput.getFluid().getName(), aDuration)) <= 0)) { Logger.MATERIALS("[Electrolyzer] Fail 2."); return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java index bf9ef18720..ea77ce1761 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.interfaces.RunnableWithInfo; @@ -7,9 +12,6 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.item.ItemStack; public class RecipeGen_Plasma extends RecipeGen_Base { @@ -37,14 +39,14 @@ public class RecipeGen_Plasma extends RecipeGen_Base { ItemStack aContainerItem = GT_Utility.getFluidForFilledItem(aPlasmaCell, true) == null ? GT_Utility.getContainerItem(aPlasmaCell, true) : CI.emptyCells(1); - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aPlasmaCell, aContainerItem})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aPlasmaCell, aContainerItem })) { GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aPlasmaCell), aContainerItem, (int) Math.max(1024L, 1024L * material.getMass()), 4); } - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aCell, aPlasmaCell})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aCell, aPlasmaCell })) { GT_Values.RA.addVacuumFreezerRecipe(aPlasmaCell, aCell, (int) Math.max(material.getMass() * 2L, 1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java index 15e77ac0f5..3de61a949f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -11,9 +16,6 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.item.ItemStack; public class RecipeGen_Plates extends RecipeGen_Base { @@ -58,10 +60,10 @@ public class RecipeGen_Plates extends RecipeGen_Base { plate_SingleTwo, (int) Math.max(material.getMass(), 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Forge Hammer Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Forge Hammer Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Forge Hammer Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Forge Hammer Recipe: " + material.getLocalizedName() + " - Failed"); + } // Bender if (ItemUtils.checkForInvalidItems(ingotStackOne) && ItemUtils.checkForInvalidItems(plate_Single)) if (addBenderRecipe( @@ -69,10 +71,10 @@ public class RecipeGen_Plates extends RecipeGen_Base { plate_Single, (int) Math.max(material.getMass() * 1L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); + } if (ItemUtils.checkForInvalidItems(ingotStackOne) && ItemUtils.checkForInvalidItems(foil_SingleFour)) if (addBenderRecipe( ingotStackOne, @@ -80,10 +82,10 @@ public class RecipeGen_Plates extends RecipeGen_Base { foil_SingleFour, (int) Math.max(material.getMass() * 2L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); + } // Alloy Smelter if (ItemUtils.checkForInvalidItems(ingotStackTwo) && ItemUtils.checkForInvalidItems(plate_Single)) if (GT_Values.RA.addAlloySmelterRecipe( @@ -92,10 +94,10 @@ public class RecipeGen_Plates extends RecipeGen_Base { plate_Single, (int) Math.max(material.getMass() * 2L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Alloy Smelter Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Alloy Smelter Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Alloy Smelter Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Alloy Smelter Recipe: " + material.getLocalizedName() + " - Failed"); + } // Cutting Machine if (ItemUtils.checkForInvalidItems(block) && ItemUtils.checkForInvalidItems(plate_Single)) if (GT_Values.RA.addCutterRecipe( @@ -104,10 +106,10 @@ public class RecipeGen_Plates extends RecipeGen_Base { plate_SingleNine, (int) Math.max(material.getMass() * 10L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Cutting Machine Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Cutting Machine Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Cutting Machine Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Cutting Machine Recipe: " + material.getLocalizedName() + " - Failed"); + } // Making Double Plates if (ItemUtils.checkForInvalidItems(ingotStackTwo) && ItemUtils.checkForInvalidItems(plate_Double)) @@ -116,10 +118,10 @@ public class RecipeGen_Plates extends RecipeGen_Base { plate_Double, (int) Math.max(material.getMass() * 2L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); + } if (ItemUtils.checkForInvalidItems(plate_SingleTwo) && ItemUtils.checkForInvalidItems(plate_Double)) if (addBenderRecipe( @@ -127,10 +129,10 @@ public class RecipeGen_Plates extends RecipeGen_Base { plate_Double, (int) Math.max(material.getMass() * 2L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); + } // Bender if (ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getFoil(1))) @@ -139,14 +141,17 @@ public class RecipeGen_Plates extends RecipeGen_Base { material.getFoil(4), (int) Math.max(material.getMass(), 1L), material.vVoltageMultiplier)) { - GregTech_API.registerCover( - material.getFoil(1), - new GT_RenderedTexture(material.getTextureSet().mTextures[70], material.getRGBA(), false), - null); - Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Failed"); - } + GregTech_API.registerCover( + material.getFoil(1), + new GT_RenderedTexture( + material.getTextureSet().mTextures[70], + material.getRGBA(), + false), + null); + Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Bender Foil Recipe: " + material.getLocalizedName() + " - Failed"); + } // Making Dense Plates if (ItemUtils.checkForInvalidItems(ingotStackNine) && ItemUtils.checkForInvalidItems(plate_Dense)) @@ -155,10 +160,10 @@ public class RecipeGen_Plates extends RecipeGen_Base { plate_Dense, (int) Math.max(material.getMass() * 2L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); + } if (ItemUtils.checkForInvalidItems(plate_SingleNine) && ItemUtils.checkForInvalidItems(plate_Dense)) if (addBenderRecipe( @@ -166,28 +171,24 @@ public class RecipeGen_Plates extends RecipeGen_Base { plate_Double, (int) Math.max(material.getMass() * 2L, 1L), material.vVoltageMultiplier)) { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); - } + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Bender Recipe: " + material.getLocalizedName() + " - Failed"); + } } - public static boolean addBenderRecipe( - final ItemStack aInput1, final ItemStack aOutput1, int aDuration, final int aEUt) { + public static boolean addBenderRecipe(final ItemStack aInput1, final ItemStack aOutput1, int aDuration, + final int aEUt) { return GT_Values.RA.addBenderRecipe(aInput1, aOutput1, aDuration, aEUt); } - public static boolean addBenderRecipe( - final ItemStack aInput1, - final ItemStack aCircuit, - final ItemStack aOutput1, - int aDuration, - final int aEUt) { + public static boolean addBenderRecipe(final ItemStack aInput1, final ItemStack aCircuit, final ItemStack aOutput1, + int aDuration, final int aEUt) { return GT_Values.RA.addBenderRecipe(aInput1, aCircuit, aOutput1, aDuration, aEUt); } - public static boolean addExtruderRecipe( - final ItemStack aInput, final ItemStack aShape, final ItemStack aOutput, int aDuration, final int aEUt) { + public static boolean addExtruderRecipe(final ItemStack aInput, final ItemStack aShape, final ItemStack aOutput, + int aDuration, final int aEUt) { if ((aInput == null) || (aShape == null) || (aOutput == null)) { return false; } @@ -196,8 +197,8 @@ public class RecipeGen_Plates extends RecipeGen_Base { } GT_Recipe.GT_Recipe_Map.sExtruderRecipes.addRecipe( true, - new ItemStack[] {aInput, aShape}, - new ItemStack[] {aOutput}, + new ItemStack[] { aInput, aShape }, + new ItemStack[] { aOutput }, null, null, null, @@ -207,8 +208,8 @@ public class RecipeGen_Plates extends RecipeGen_Base { return true; } - public static boolean addForgeHammerRecipe( - final ItemStack aInput1, final ItemStack aOutput1, final int aDuration, final int aEUt) { + public static boolean addForgeHammerRecipe(final ItemStack aInput1, final ItemStack aOutput1, final int aDuration, + final int aEUt) { if ((aInput1 == null) || (aOutput1 == null)) { return false; } @@ -216,7 +217,15 @@ public class RecipeGen_Plates extends RecipeGen_Base { return false; } GT_Recipe.GT_Recipe_Map.sHammerRecipes.addRecipe( - true, new ItemStack[] {aInput1}, new ItemStack[] {aOutput1}, null, null, null, aDuration, aEUt, 0); + true, + new ItemStack[] { aInput1 }, + new ItemStack[] { aOutput1 }, + null, + null, + null, + aDuration, + aEUt, + 0); return true; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java index 18391d170f..1c938e0da4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java @@ -3,6 +3,15 @@ package gtPlusPlus.xmod.gregtech.loaders; import static gregtech.api.enums.GT_Values.L; import static gregtech.api.enums.GT_Values.M; +import java.util.ArrayList; +import java.util.Map; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import org.apache.commons.lang3.reflect.FieldUtils; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; @@ -17,12 +26,6 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import java.util.ArrayList; -import java.util.Map; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.reflect.FieldUtils; public class RecipeGen_Recycling implements Runnable { @@ -58,53 +61,24 @@ public class RecipeGen_Recycling implements Runnable { if (material != null) Logger.WARNING("Generating Recycling recipes for " + material.getLocalizedName()); - final OrePrefixes[] mValidPrefixesAsString = { - OrePrefixes.ingot, - OrePrefixes.ingotHot, - OrePrefixes.nugget, - OrePrefixes.plate, - OrePrefixes.plateDense, - OrePrefixes.plateDouble, - OrePrefixes.plateTriple, - OrePrefixes.plateQuadruple, - OrePrefixes.plateQuintuple, - OrePrefixes.stick, - OrePrefixes.stickLong, - OrePrefixes.bolt, - OrePrefixes.screw, - OrePrefixes.ring, - OrePrefixes.rotor, - OrePrefixes.gearGt, - OrePrefixes.gearGtSmall, - OrePrefixes.gear, - OrePrefixes.block, - OrePrefixes.cableGt01, - OrePrefixes.cableGt02, - OrePrefixes.cableGt04, - OrePrefixes.cableGt08, - OrePrefixes.cableGt12, - OrePrefixes.wireFine, - OrePrefixes.wireGt01, - OrePrefixes.wireGt02, - OrePrefixes.wireGt04, - OrePrefixes.wireGt08, - OrePrefixes.wireGt12, - OrePrefixes.wireGt16, - OrePrefixes.foil, - OrePrefixes.frameGt, - OrePrefixes.pipeHuge, - OrePrefixes.pipeLarge, - OrePrefixes.pipeMedium, - OrePrefixes.pipeSmall, - OrePrefixes.pipeTiny, - }; + final OrePrefixes[] mValidPrefixesAsString = { OrePrefixes.ingot, OrePrefixes.ingotHot, OrePrefixes.nugget, + OrePrefixes.plate, OrePrefixes.plateDense, OrePrefixes.plateDouble, OrePrefixes.plateTriple, + OrePrefixes.plateQuadruple, OrePrefixes.plateQuintuple, OrePrefixes.stick, OrePrefixes.stickLong, + OrePrefixes.bolt, OrePrefixes.screw, OrePrefixes.ring, OrePrefixes.rotor, OrePrefixes.gearGt, + OrePrefixes.gearGtSmall, OrePrefixes.gear, OrePrefixes.block, OrePrefixes.cableGt01, + OrePrefixes.cableGt02, OrePrefixes.cableGt04, OrePrefixes.cableGt08, OrePrefixes.cableGt12, + OrePrefixes.wireFine, OrePrefixes.wireGt01, OrePrefixes.wireGt02, OrePrefixes.wireGt04, + OrePrefixes.wireGt08, OrePrefixes.wireGt12, OrePrefixes.wireGt16, OrePrefixes.foil, OrePrefixes.frameGt, + OrePrefixes.pipeHuge, OrePrefixes.pipeLarge, OrePrefixes.pipeMedium, OrePrefixes.pipeSmall, + OrePrefixes.pipeTiny, }; int mSlotIndex = 0; Pair<OrePrefixes, ItemStack>[] mValidPairs = new Pair[mValidPrefixesAsString.length]; for (int r = 0; r < mValidPairs.length; r++) { ItemStack temp = getItemStackOfAmountFromOreDictNoBroken( - mValidPrefixesAsString[r].name() + Utils.sanitizeString(material.getLocalizedName()), 1); + mValidPrefixesAsString[r].name() + Utils.sanitizeString(material.getLocalizedName()), + 1); if (temp != null) { mValidPairs[mSlotIndex++] = new Pair<OrePrefixes, ItemStack>(mValidPrefixesAsString[r], temp.copy()); } @@ -135,8 +109,7 @@ public class RecipeGen_Recycling implements Runnable { for (final Pair<OrePrefixes, ItemStack> validPrefix : mValidPairs) { try { - if (material == null - || validPrefix == null + if (material == null || validPrefix == null || (material.getState() != MaterialState.SOLID && material.getState() != MaterialState.LIQUID) || validPrefix.getKey() == OrePrefixes.ingotHot) { @@ -146,15 +119,19 @@ public class RecipeGen_Recycling implements Runnable { final ItemStack tempStack = validPrefix.getValue(); final ItemStack mDust = getDust(material, validPrefix.getKey()); final Pair<OrePrefixes, ItemStack> mData = getDustData(material, validPrefix.getKey()); - int mFluidAmount = - (int) GT_Utility.translateMaterialToFluidAmount(validPrefix.getKey().mMaterialAmount, true); + int mFluidAmount = (int) GT_Utility + .translateMaterialToFluidAmount(validPrefix.getKey().mMaterialAmount, true); // Maceration if (ItemUtils.checkForInvalidItems(tempStack)) { // mValidItems[mSlotIndex++] = tempStack; if ((mDust != null) && GT_ModHandler.addPulverisationRecipe(tempStack, mDust)) { - Logger.WARNING("Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle " - + tempStack.getDisplayName() + " and obtain " + mDust.getDisplayName()); + Logger.WARNING( + "Recycle Recipe: " + material.getLocalizedName() + + " - Success - Recycle " + + tempStack.getDisplayName() + + " and obtain " + + mDust.getDisplayName()); } else { Logger.WARNING("Recycle Recipe: " + material.getLocalizedName() + " - Failed"); if (mDust == null) { @@ -170,20 +147,31 @@ public class RecipeGen_Recycling implements Runnable { if (ItemUtils.checkForInvalidItems(tempStack)) { // mValidItems[mSlotIndex++] = tempStack; - int aFluidAmount = - (int) ((L * validPrefix.getKey().mMaterialAmount) / (M * tempStack.stackSize)); + int aFluidAmount = (int) ((L * validPrefix.getKey().mMaterialAmount) + / (M * tempStack.stackSize)); int aDuration = (int) Math.max(1, (24 * validPrefix.getKey().mMaterialAmount) / M); boolean aGenFluidExtraction = CORE.RA.addFluidExtractionRecipe( tempStack, material.getFluidStack(aFluidAmount), aDuration, material.vVoltageMultiplier); - if (aGenFluidExtraction /*(mDust != null) && CORE.RA.addFluidExtractionRecipe(tempStack, material.getFluidStack(mFluidAmount), 30, material.vVoltageMultiplier)*/) { + if (aGenFluidExtraction /* + * (mDust != null) && CORE.RA.addFluidExtractionRecipe(tempStack, + * material.getFluidStack(mFluidAmount), 30, + * material.vVoltageMultiplier) + */) { Logger.WARNING( - "Fluid Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle " - + tempStack.getDisplayName() + " and obtain " + aFluidAmount + "mb of " - + material.getFluidStack(1).getLocalizedName() + ". Time: " + aDuration - + ", Voltage: " + material.vVoltageMultiplier); + "Fluid Recycle Recipe: " + material.getLocalizedName() + + " - Success - Recycle " + + tempStack.getDisplayName() + + " and obtain " + + aFluidAmount + + "mb of " + + material.getFluidStack(1).getLocalizedName() + + ". Time: " + + aDuration + + ", Voltage: " + + material.vVoltageMultiplier); } else { Logger.WARNING("Fluid Recycle Recipe: " + material.getLocalizedName() + " - Failed"); if (mDust == null) { @@ -275,8 +263,8 @@ public class RecipeGen_Recycling implements Runnable { return get(aPrefix, aMaterial, null, aAmount); } - public static ItemStack get( - final OrePrefixes aPrefix, final Material aMaterial, final ItemStack aReplacement, final long aAmount) { + public static ItemStack get(final OrePrefixes aPrefix, final Material aMaterial, final ItemStack aReplacement, + final long aAmount) { return get( aPrefix.name() + Utils.sanitizeString(aMaterial.getLocalizedName()), aReplacement, @@ -285,12 +273,8 @@ public class RecipeGen_Recycling implements Runnable { true); } - public static ItemStack get( - final Object aName, - final ItemStack aReplacement, - final long aAmount, - final boolean aMentionPossibleTypos, - final boolean aNoInvalidAmounts) { + public static ItemStack get(final Object aName, final ItemStack aReplacement, final long aAmount, + final boolean aMentionPossibleTypos, final boolean aNoInvalidAmounts) { if (aNoInvalidAmounts && (aAmount < 1L)) { Logger.WARNING("Returning Null. Method: " + ReflectionUtils.getMethodName(0)); Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(1)); @@ -303,7 +287,8 @@ public class RecipeGen_Recycling implements Runnable { Logger.WARNING("Unknown Key for Unification, Typo? " + aName); } return GT_Utility.copyAmount( - aAmount, new Object[] {mNameMap.get(aName.toString()), getFirstOre(aName, aAmount), aReplacement}); + aAmount, + new Object[] { mNameMap.get(aName.toString()), getFirstOre(aName, aAmount), aReplacement }); } public static ItemStack getFirstOre(final Object aName, final long aAmount) { @@ -318,7 +303,7 @@ public class RecipeGen_Recycling implements Runnable { final ItemStack tStack = mNameMap.get(aName.toString()); if (GT_Utility.isStackValid(tStack)) { Logger.WARNING("Found valid stack."); - return GT_Utility.copyAmount(aAmount, new Object[] {tStack}); + return GT_Utility.copyAmount(aAmount, new Object[] { tStack }); } return GT_Utility.copyAmount(aAmount, getOres(aName).toArray()); } @@ -342,8 +327,8 @@ public class RecipeGen_Recycling implements Runnable { public Map<String, ItemStack> getNameMap() { Map<String, ItemStack> tempMap; try { - tempMap = (Map<String, ItemStack>) - FieldUtils.readStaticField(GT_OreDictUnificator.class, "sName2StackMap", true); + tempMap = (Map<String, ItemStack>) FieldUtils + .readStaticField(GT_OreDictUnificator.class, "sName2StackMap", true); if (tempMap != null) { Logger.WARNING("Found 'sName2StackMap' in GT_OreDictUnificator.class."); return tempMap; @@ -360,7 +345,7 @@ public class RecipeGen_Recycling implements Runnable { try { if (oredictName.contains("-") || oredictName.contains("_")) { - oredictName = Utils.sanitizeString(oredictName, new char[] {'-', '_'}); + oredictName = Utils.sanitizeString(oredictName, new char[] { '-', '_' }); } else { oredictName = Utils.sanitizeString(oredictName); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java index 178e84935d..8bc90b6ba0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.HashSet; +import java.util.Set; + import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; @@ -8,8 +11,6 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import java.util.HashSet; -import java.util.Set; public class RecipeGen_ShapedCrafting extends RecipeGen_Base { @@ -36,17 +37,11 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Nuggets if (ItemUtils.checkForInvalidItems(material.getNugget(1)) && ItemUtils.checkForInvalidItems(material.getIngot(1))) - GT_ModHandler.addShapelessCraftingRecipe(material.getIngot(1), new Object[] { - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1) - }); + GT_ModHandler.addShapelessCraftingRecipe( + material.getIngot(1), + new Object[] { material.getNugget(1), material.getNugget(1), material.getNugget(1), + material.getNugget(1), material.getNugget(1), material.getNugget(1), + material.getNugget(1), material.getNugget(1), material.getNugget(1) }); } // Plates @@ -54,26 +49,19 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { // Single Plate Shaped/Shapeless if (ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getIngot(1))) - if (material.getPlate(1) != null && material.getIngot(1) != null) - GT_ModHandler.addCraftingRecipe( - material.getPlate(1), - gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "h", - "B", - "I", - Character.valueOf('I'), - material.getIngot(1), - Character.valueOf('B'), - material.getIngot(1) - }); + if (material.getPlate(1) != null && material.getIngot(1) != null) GT_ModHandler.addCraftingRecipe( + material.getPlate(1), + gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "h", "B", "I", Character.valueOf('I'), material.getIngot(1), Character.valueOf('B'), + material.getIngot(1) }); if (ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getIngot(1))) - GT_ModHandler.addShapelessCraftingRecipe(material.getPlate(1), new Object[] { - gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getIngot(1), material.getIngot(1) - }); + GT_ModHandler.addShapelessCraftingRecipe( + material.getPlate(1), + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getIngot(1), + material.getIngot(1) }); // Double Plate Shaped/Shapeless if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1)) @@ -82,32 +70,25 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { material.getPlateDouble(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "I", - "B", - "h", - Character.valueOf('I'), - material.getPlate(1), - Character.valueOf('B'), - material.getPlate(1) - }); + new Object[] { "I", "B", "h", Character.valueOf('I'), material.getPlate(1), Character.valueOf('B'), + material.getPlate(1) }); if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1))) - GT_ModHandler.addShapelessCraftingRecipe(material.getPlateDouble(1), new Object[] { - gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getPlate(1), material.getPlate(1) - }); + GT_ModHandler.addShapelessCraftingRecipe( + material.getPlateDouble(1), + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, material.getPlate(1), + material.getPlate(1) }); // Ring Recipe - if (!material.isRadioactive - && ItemUtils.checkForInvalidItems(material.getRing(1)) + if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getRing(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { if (CORE.GTNH) { if (GT_ModHandler.addCraftingRecipe( material.getRing(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"h ", "fR", 'R', material.getRod(1)})) { + new Object[] { "h ", "fR", 'R', material.getRod(1) })) { Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Failed"); @@ -132,14 +113,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { } // Framebox Recipe - if (!material.isRadioactive - && ItemUtils.checkForInvalidItems(material.getFrameBox(1)) + if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getFrameBox(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { if (GT_ModHandler.addCraftingRecipe( material.getFrameBox(2), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"RRR", "RwR", "RRR", 'R', material.getRod(1)})) { + new Object[] { "RRR", "RwR", "RRR", 'R', material.getRod(1) })) { Logger.WARNING("Framebox Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("Framebox Recipe: " + material.getLocalizedName() + " - Failed"); @@ -147,14 +127,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { } // Shaped Recipe - Bolts - if (!material.isRadioactive - && ItemUtils.checkForInvalidItems(material.getBolt(1)) + if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getBolt(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { if (GT_ModHandler.addCraftingRecipe( material.getBolt(2), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"s ", " R", 'R', material.getRod(1)})) { + new Object[] { "s ", " R", 'R', material.getRod(1) })) { Logger.WARNING("Bolt Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("Bolt Recipe: " + material.getLocalizedName() + " - Failed"); @@ -162,14 +141,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { } // Shaped Recipe - Fine Wire - if (!material.isRadioactive - && ItemUtils.checkForInvalidItems(material.getFoil(1)) + if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getFoil(1)) && ItemUtils.checkForInvalidItems(material.getFineWire(1))) { if (GT_ModHandler.addCraftingRecipe( material.getFineWire(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"Fx", 'F', material.getFoil(1)})) { + new Object[] { "Fx", 'F', material.getFoil(1) })) { Logger.WARNING("Fine Wire Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("Fine Wire Recipe: " + material.getLocalizedName() + " - Failed"); @@ -183,7 +161,7 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { material.getFoil(2), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"hP", 'P', material.getPlate(1)})) { + new Object[] { "hP", 'P', material.getPlate(1) })) { Logger.WARNING("Foil Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("Foil Recipe: " + material.getLocalizedName() + " - Failed"); @@ -196,11 +174,11 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { material.getRod(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"f ", " I", 'I', material.getIngot(1)})) { - Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed"); - } + new Object[] { "f ", " I", 'I', material.getIngot(1) })) { + Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed"); + } // Shaped Recipe - Long Rod to two smalls if (ItemUtils.checkForInvalidItems(material.getRod(1)) @@ -209,11 +187,11 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { material.getRod(2), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"s", "L", 'L', material.getLongRod(1)})) { - Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed"); - } + new Object[] { "s", "L", 'L', material.getLongRod(1) })) { + Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Rod Recipe: " + material.getLocalizedName() + " - Failed"); + } // Two small to long rod if (ItemUtils.checkForInvalidItems(material.getLongRod(1)) @@ -222,15 +200,14 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { material.getLongRod(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"RhR", 'R', material.getRod(1)})) { - Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Success"); - } else { - Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Failed"); - } + new Object[] { "RhR", 'R', material.getRod(1) })) { + Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Success"); + } else { + Logger.WARNING("Long Rod Recipe: " + material.getLocalizedName() + " - Failed"); + } // Rotor Recipe - if (!material.isRadioactive - && ItemUtils.checkForInvalidItems(material.getRotor(1)) + if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getRotor(1)) && ItemUtils.checkForInvalidItems(material.getRing(1)) && !material.isRadioactive && ItemUtils.checkForInvalidItems(material.getPlate(1)) @@ -239,17 +216,8 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { material.getRotor(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PhP", - "SRf", - "PdP", - 'P', - material.getPlate(1), - 'S', - material.getScrew(1), - 'R', - material.getRing(1), - })) { + new Object[] { "PhP", "SRf", "PdP", 'P', material.getPlate(1), 'S', material.getScrew(1), 'R', + material.getRing(1), })) { Logger.WARNING("Rotor Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("Rotor Recipe: " + material.getLocalizedName() + " - Failed"); @@ -257,17 +225,14 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { } // Gear Recipe - if (!material.isRadioactive - && ItemUtils.checkForInvalidItems(material.getGear(1)) + if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getGear(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) { if (GT_ModHandler.addCraftingRecipe( material.getGear(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "RPR", "PwP", "RPR", 'P', material.getPlate(1), 'R', material.getRod(1), - })) { + new Object[] { "RPR", "PwP", "RPR", 'P', material.getPlate(1), 'R', material.getRod(1), })) { Logger.WARNING("Gear Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("Gear Recipe: " + material.getLocalizedName() + " - Failed"); @@ -275,16 +240,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base { } // Screws - if (!material.isRadioactive - && ItemUtils.checkForInvalidItems(material.getScrew(1)) + if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getScrew(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1))) { if (GT_ModHandler.addCraftingRecipe( material.getScrew(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "fB", "B ", 'B', material.getBolt(1), - })) { + new Object[] { "fB", "B ", 'B', material.getBolt(1), })) { Logger.WARNING("Screw Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("Screw Recipe: " + material.getLocalizedName() + " - Failed"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java index 5a8306abee..c89648e25f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java @@ -4,10 +4,11 @@ import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_ProcessingArray_Manager; public class AddCustomMachineToPA { + public static void register() { // Simple Washers - GT_ProcessingArray_Manager.addRecipeMapToPA( - "simplewasher.01", GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes); + GT_ProcessingArray_Manager + .addRecipeMapToPA("simplewasher.01", GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java index 01683e8067..be7023433e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java @@ -1,5 +1,15 @@ package gtPlusPlus.xmod.gregtech.loaders.misc; +import java.util.concurrent.ConcurrentHashMap; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.stats.AchievementList; +import net.minecraft.stats.StatBase; +import net.minecraftforge.common.AchievementPage; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gregtech.GT_Mod; import gregtech.api.util.GT_Log; @@ -9,14 +19,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.StaticFields59; -import java.util.concurrent.ConcurrentHashMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; -import net.minecraft.stats.AchievementList; -import net.minecraft.stats.StatBase; -import net.minecraftforge.common.AchievementPage; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; public class AssLineAchievements { @@ -41,8 +43,8 @@ public class AssLineAchievements { if (!ready) { active = GT_Mod.gregtechproxy.mAchievements; try { - recipeTotal = - ((GT_Recipe.GT_Recipe_Map) StaticFields59.mAssLineVisualMapNEI.get(null)).mRecipeList.size(); + recipeTotal = ((GT_Recipe.GT_Recipe_Map) StaticFields59.mAssLineVisualMapNEI.get(null)).mRecipeList + .size(); } catch (IllegalArgumentException | IllegalAccessException e) { recipeTotal = 0; } @@ -54,8 +56,10 @@ public class AssLineAchievements { public static void registerAchievements() { if (active && mAchievementMap.size() > 0) { - AchievementPage.registerAchievementPage(new AchievementPage("GT Assembly Line", (Achievement[]) - mAchievementMap.values().toArray(new Achievement[mAchievementMap.size()]))); + AchievementPage.registerAchievementPage( + new AchievementPage( + "GT Assembly Line", + (Achievement[]) mAchievementMap.values().toArray(new Achievement[mAchievementMap.size()]))); } else if (active) { Logger.INFO("Unable to register custom achievement page for Assembly Line recipes."); } @@ -104,8 +108,8 @@ public class AssLineAchievements { return aYouDidSomethingInGT; } - public static Achievement registerAchievement( - String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) { + public static Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, + boolean special) { if (!GT_Mod.gregtechproxy.mAchievements) { return null; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java index 3fec531a12..379d8acda0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import java.util.HashMap; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe; @@ -9,15 +14,11 @@ import gtPlusPlus.api.objects.data.WeightedCollection; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashMap; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader_AlgaeFarm { private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); - private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = - new HashMap<Integer, AutoMap<GT_Recipe>>(); + private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); public static void generateRecipes() { for (int i = 0; i < 10; i++) { @@ -70,7 +71,8 @@ public class RecipeLoader_AlgaeFarm { aOutputTimeMulti.put(i, aValue); } - final int[] aDurations = new int[] {2000, 1800, 1600, 1400, 1200, 1000, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1}; + final int[] aDurations = new int[] { 2000, 1800, 1600, 1400, 1200, 1000, 512, 256, 128, 64, 32, 16, 8, 4, 2, + 1 }; ItemStack[] aInputs = new ItemStack[] {}; @@ -78,8 +80,9 @@ public class RecipeLoader_AlgaeFarm { // Make it use 4 compost per tier if we have some available // Compost consumption maxes out at 1 stack per cycle ItemStack aCompost = ItemUtils.getSimpleStack( - AgriculturalChem.mCompost, aTier > 1 ? (int) Math.min(64, Math.pow(2, aTier - 1)) : 1); - aInputs = new ItemStack[] {aCompost}; + AgriculturalChem.mCompost, + aTier > 1 ? (int) Math.min(64, Math.pow(2, aTier - 1)) : 1); + aInputs = new ItemStack[] { aCompost }; // Boost Tier by one if using compost so it gets a speed boost aTier++; } @@ -93,8 +96,8 @@ public class RecipeLoader_AlgaeFarm { aOutputs, (Object) null, new int[] {}, - new FluidStack[] {GT_Values.NF}, - new FluidStack[] {GT_Values.NF}, + new FluidStack[] { GT_Values.NF }, + new FluidStack[] { GT_Values.NF }, (int) (aDurations[aTier] * aOutputTimeMulti.get() / 2), // Time 0, 0); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java index c00b9b08e2..d92b117b65 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java @@ -1,9 +1,13 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import com.dreammaster.gthandler.GT_CoreModSupport; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.block.QuantumGlassBlock; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -19,8 +23,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader_ChemicalSkips { @@ -48,247 +50,175 @@ public class RecipeLoader_ChemicalSkips { ItemStack biocells = GT_Utility.copyAmountUnsafe(64 * 32, ItemList.Circuit_Chip_Biocell.get(1)); // Platline CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - WerkstoffLoader.PTMetallicPowder.get(OrePrefixes.dust, 32), - ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0) - }, + new ItemStack[] { WerkstoffLoader.PTMetallicPowder.get(OrePrefixes.dust, 32), + ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] {}, - new ItemStack[] { - Materials.Platinum.getDust(64), - Materials.Palladium.getDust(64), - Materials.Iridium.getDust(64), - Materials.Osmium.getDust(64), - WerkstoffLoader.Rhodium.get(OrePrefixes.dust, 64), - WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64) - }, - new int[] {1667, 1667, 1667, 1667, 1667, 1667}, + new ItemStack[] { Materials.Platinum.getDust(64), Materials.Palladium.getDust(64), + Materials.Iridium.getDust(64), Materials.Osmium.getDust(64), + WerkstoffLoader.Rhodium.get(OrePrefixes.dust, 64), + WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64) }, + new int[] { 1667, 1667, 1667, 1667, 1667, 1667 }, 20 * 20, (int) GT_Values.VP[8], 1); // Early Plastics CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 0) - }, - new FluidStack[] { - Materials.Oxygen.getGas(1000 * 16), - Materials.Hydrogen.getGas(1000 * 16), - Materials.Chlorine.getGas(1000 * 16), - Materials.Fluorine.getGas(1000 * 16) - }, - new FluidStack[] { - Materials.Plastic.getMolten(144 * 256), - Materials.PolyvinylChloride.getMolten(144 * 128), - Materials.Polystyrene.getMolten(144 * 64), - Materials.Polytetrafluoroethylene.getMolten(144 * 128), - Materials.Epoxid.getMolten(144 * 64), - Materials.Polybenzimidazole.getMolten(144 * 64) - }, + new ItemStack[] { Materials.Carbon.getDust(64), + ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 0) }, + new FluidStack[] { Materials.Oxygen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16), + Materials.Chlorine.getGas(1000 * 16), Materials.Fluorine.getGas(1000 * 16) }, + new FluidStack[] { Materials.Plastic.getMolten(144 * 256), + Materials.PolyvinylChloride.getMolten(144 * 128), Materials.Polystyrene.getMolten(144 * 64), + Materials.Polytetrafluoroethylene.getMolten(144 * 128), Materials.Epoxid.getMolten(144 * 64), + Materials.Polybenzimidazole.getMolten(144 * 64) }, null, - new int[] {2000, 2000, 2000, 2000, 2000, 2000}, + new int[] { 2000, 2000, 2000, 2000, 2000, 2000 }, 20 * 20, (int) GT_Values.VP[7], 1); // Early Rubbers/Cable Materials CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 0) - }, - new FluidStack[] { - Materials.Oxygen.getGas(1000 * 16), - Materials.Hydrogen.getGas(1000 * 16), - Materials.Chlorine.getGas(1000 * 16) - }, - new FluidStack[] { - Materials.Silicone.getMolten(144 * 64), - Materials.StyreneButadieneRubber.getMolten(144 * 64), - Materials.PolyphenyleneSulfide.getMolten(144 * 128), - Materials.Rubber.getMolten(144 * 256) - }, + new ItemStack[] { Materials.Carbon.getDust(64), + ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 0) }, + new FluidStack[] { Materials.Oxygen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16), + Materials.Chlorine.getGas(1000 * 16) }, + new FluidStack[] { Materials.Silicone.getMolten(144 * 64), + Materials.StyreneButadieneRubber.getMolten(144 * 64), + Materials.PolyphenyleneSulfide.getMolten(144 * 128), Materials.Rubber.getMolten(144 * 256) }, null, - new int[] {2500, 2500, 2500, 2500}, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[7], 1); // Glues and Solders CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Carbon.getDust(32), - Materials.Bismuth.getDust(32), - ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 0) - }, - new FluidStack[] {Materials.Oxygen.getFluid(10000), Materials.Hydrogen.getFluid(10000)}, - new FluidStack[] { - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1000 * 32), - Materials.AdvancedGlue.getFluid(1000 * 16), - ALLOY.INDALLOY_140.getFluidStack(144 * 64), - Materials.SolderingAlloy.getMolten(144 * 128) - }, - new ItemStack[] {ItemList.StableAdhesive.get(1)}, - new int[] {2000, 2000, 2000, 2000, 2000}, + new ItemStack[] { Materials.Carbon.getDust(32), Materials.Bismuth.getDust(32), + ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 0) }, + new FluidStack[] { Materials.Oxygen.getFluid(10000), Materials.Hydrogen.getFluid(10000) }, + new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1000 * 32), + Materials.AdvancedGlue.getFluid(1000 * 16), ALLOY.INDALLOY_140.getFluidStack(144 * 64), + Materials.SolderingAlloy.getMolten(144 * 128) }, + new ItemStack[] { ItemList.StableAdhesive.get(1) }, + new int[] { 2000, 2000, 2000, 2000, 2000 }, 20 * 20, (int) GT_Values.VP[8], 1); // Titanium, Tungsten, Indium CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Lead.getDust(16), - Materials.Bauxite.getDust(32), - Materials.Tungstate.getDust(16), - ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 0) - }, + new ItemStack[] { Materials.Lead.getDust(16), Materials.Bauxite.getDust(32), + Materials.Tungstate.getDust(16), + ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] {}, - new ItemStack[] { - Materials.Titanium.getDust(64), - Materials.TungstenSteel.getDust(64), - Materials.TungstenCarbide.getDust(64), - Materials.Indium.getDust(64) - }, - new int[] {2500, 2500, 2500, 2500}, + new ItemStack[] { Materials.Titanium.getDust(64), Materials.TungstenSteel.getDust(64), + Materials.TungstenCarbide.getDust(64), Materials.Indium.getDust(64) }, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[8], 1); // Thorium, Uranium, Plutonium CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Thorium.getDust(32), - Materials.Uranium.getDust(32), - ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 0) - }, + new ItemStack[] { Materials.Thorium.getDust(32), Materials.Uranium.getDust(32), + ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] {}, - new ItemStack[] { - ELEMENT.getInstance().THORIUM232.getDust(64), - ELEMENT.getInstance().URANIUM233.getDust(64), - Materials.Uranium235.getDust(64), - ELEMENT.getInstance().PLUTONIUM238.getDust(64), - Materials.Plutonium.getDust(64), - Materials.Plutonium241.getDust(64) - }, - new int[] {1667, 1667, 1667, 1667, 1667, 1667}, + new ItemStack[] { ELEMENT.getInstance().THORIUM232.getDust(64), + ELEMENT.getInstance().URANIUM233.getDust(64), Materials.Uranium235.getDust(64), + ELEMENT.getInstance().PLUTONIUM238.getDust(64), Materials.Plutonium.getDust(64), + Materials.Plutonium241.getDust(64) }, + new int[] { 1667, 1667, 1667, 1667, 1667, 1667 }, 20 * 20, (int) GT_Values.VP[8], 1); // Monaline CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Monazite.getDust(32), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) - }, + new ItemStack[] { Materials.Monazite.getDust(32), + ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] {}, - new ItemStack[] { - Materials.Cerium.getDust(64), - Materials.Gadolinium.getDust(64), - Materials.Samarium.getDust(64), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium - ItemList.SuperconductorComposite.get(1) - }, - new int[] {1667, 1667, 1667, 1667, 1667, 1667}, + new ItemStack[] { Materials.Cerium.getDust(64), Materials.Gadolinium.getDust(64), + Materials.Samarium.getDust(64), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium + ItemList.SuperconductorComposite.get(1) }, + new int[] { 1667, 1667, 1667, 1667, 1667, 1667 }, 20 * 20, (int) GT_Values.VP[9], 2); // Bastline CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Bastnasite.getDust(32), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) - }, + new ItemStack[] { Materials.Bastnasite.getDust(32), + ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) }, null, null, - new ItemStack[] { - Materials.Holmium.getDust(64), - Materials.Cerium.getDust(64), - Materials.Samarium.getDust(64), - Materials.Gadolinium.getDust(64), - Materials.Lanthanum.getDust(64) - }, - new int[] {2000, 2000, 2000, 2000, 2000}, + new ItemStack[] { Materials.Holmium.getDust(64), Materials.Cerium.getDust(64), + Materials.Samarium.getDust(64), Materials.Gadolinium.getDust(64), + Materials.Lanthanum.getDust(64) }, + new int[] { 2000, 2000, 2000, 2000, 2000 }, 20 * 20, (int) GT_Values.VP[9], 2); // Stem Cells CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Calcium.getDust(32), - Materials.MeatRaw.getDust(32), - GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 32, 2), - ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0) - }, + new ItemStack[] { Materials.Calcium.getDust(32), Materials.MeatRaw.getDust(32), + GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 32, 2), + ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0) }, new FluidStack[] {}, - new FluidStack[] { - Materials.GrowthMediumRaw.getFluid(1000 * 1024), - Materials.GrowthMediumSterilized.getFluid(1000 * 512) - }, - new ItemStack[] {stemcells}, - new int[] {3333, 3333, 3333}, + new FluidStack[] { Materials.GrowthMediumRaw.getFluid(1000 * 1024), + Materials.GrowthMediumSterilized.getFluid(1000 * 512) }, + new ItemStack[] { stemcells }, + new int[] { 3333, 3333, 3333 }, 20 * 20, (int) GT_Values.VP[10], 3); // Lategame Plastics (Missing Radox Polymer and Heavy Radox) CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Carbon.getDust(64), - Materials.Osmium.getDust(24), - ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) - }, - new FluidStack[] {Materials.Hydrogen.getGas(1000 * 16), Materials.Nitrogen.getGas(1000 * 16)}, - new FluidStack[] { - GT_CoreModSupport.Xenoxene.getFluid(1000 * 16), - GT_CoreModSupport.RadoxPolymer.getMolten(144 * 64), - GT_CoreModSupport.RadoxHeavy.getFluid(1000 * 16), - MaterialsKevlar.Kevlar.getMolten(144 * 64) - }, + new ItemStack[] { Materials.Carbon.getDust(64), Materials.Osmium.getDust(24), + ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) }, + new FluidStack[] { Materials.Hydrogen.getGas(1000 * 16), Materials.Nitrogen.getGas(1000 * 16) }, + new FluidStack[] { GT_CoreModSupport.Xenoxene.getFluid(1000 * 16), + GT_CoreModSupport.RadoxPolymer.getMolten(144 * 64), + GT_CoreModSupport.RadoxHeavy.getFluid(1000 * 16), MaterialsKevlar.Kevlar.getMolten(144 * 64) }, new ItemStack[] {}, - new int[] {2500, 2500, 2500, 2500}, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[11], 4); // Lategame Kevlar using Kevlar bee comb CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - GT_Bees.combs.getStackForType(CombType.KEVLAR, 24), - Materials.Carbon.getDust(64), - ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) - }, - new FluidStack[] {Materials.Nitrogen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16)}, - new FluidStack[] { - MaterialsKevlar.PolyurethaneResin.getFluid(1000 * 32), - MaterialsKevlar.LiquidCrystalKevlar.getFluid(144 * 32), - MaterialsKevlar.Kevlar.getMolten(144 * 64) - }, + new ItemStack[] { GT_Bees.combs.getStackForType(CombType.KEVLAR, 24), Materials.Carbon.getDust(64), + ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) }, + new FluidStack[] { Materials.Nitrogen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16) }, + new FluidStack[] { MaterialsKevlar.PolyurethaneResin.getFluid(1000 * 32), + MaterialsKevlar.LiquidCrystalKevlar.getFluid(144 * 32), + MaterialsKevlar.Kevlar.getMolten(144 * 64) }, new ItemStack[] {}, - new int[] {2500, 2500, 2500, 2500}, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[11], 4); // Bio Cells and Mutated Solder CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - ItemList.Circuit_Chip_Stemcell.get(16), - Materials.InfinityCatalyst.getDust(4), - ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 0) - }, + new ItemStack[] { ItemList.Circuit_Chip_Stemcell.get(16), Materials.InfinityCatalyst.getDust(4), + ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 0) }, new FluidStack[] {}, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128), - Materials.BioMediumSterilized.getFluid(1000 * 256), - Materials.BioMediumRaw.getFluid(1000 * 512) - }, - new ItemStack[] {biocells}, - new int[] {2500, 2500, 2500, 2500}, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128), + Materials.BioMediumSterilized.getFluid(1000 * 256), + Materials.BioMediumRaw.getFluid(1000 * 512) }, + new ItemStack[] { biocells }, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[11], 4); @@ -296,15 +226,15 @@ public class RecipeLoader_ChemicalSkips { private static void fusionReactorRecipes() { GT_Values.RA.addFusionReactorRecipe( - new FluidStack[] {Materials.Radon.getPlasma(100), Materials.Nitrogen.getPlasma(100)}, - new FluidStack[] {new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 100)}, + new FluidStack[] { Materials.Radon.getPlasma(100), Materials.Nitrogen.getPlasma(100) }, + new FluidStack[] { new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 100) }, 30 * 20, (int) GT_Values.VP[8], 1000000000); GT_Values.RA.addFusionReactorRecipe( - new FluidStack[] {Materials.Americium.getPlasma(100), Materials.Boron.getPlasma(100)}, - new FluidStack[] {new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 100)}, + new FluidStack[] { Materials.Americium.getPlasma(100), Materials.Boron.getPlasma(100) }, + new FluidStack[] { new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 100) }, 30 * 20, (int) GT_Values.VP[8], 1000000000); @@ -312,153 +242,100 @@ public class RecipeLoader_ChemicalSkips { private static void catalystRecipes() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 88), - Materials.Osmiridium.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 88), + Materials.Osmiridium.getDust(64), Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Polybenzimidazole.getDust(64), - Materials.Polytetrafluoroethylene.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + Materials.Polybenzimidazole.getDust(64), Materials.Polytetrafluoroethylene.getDust(64), + Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Silicone.getDust(64), - Materials.StyreneButadieneRubber.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Silicone.getDust(64), + Materials.StyreneButadieneRubber.getDust(64), Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - ALLOY.INDALLOY_140.getDust(64), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getCell(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), ALLOY.INDALLOY_140.getDust(64), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getCell(64), Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.TungstenSteel.getDust(64), - Materials.Indium.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + Materials.TungstenSteel.getDust(64), Materials.Indium.getDust(64), + Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - ELEMENT.getInstance().URANIUM235.getDust(64), - ELEMENT.getInstance().PLUTONIUM241.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + ELEMENT.getInstance().URANIUM235.getDust(64), ELEMENT.getInstance().PLUTONIUM241.getDust(64), + Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Samarium.getDust(64), - Materials.Gadolinium.getDust(64), - Materials.Silver.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Samarium.getDust(64), + Materials.Gadolinium.getDust(64), Materials.Silver.getNanite(1) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 1), 60 * 20, (int) GT_Values.VP[10]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Naquadah.getDust(64), - Materials.Adamantium.getDust(64), - Materials.Silver.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadah.getDust(64), + Materials.Adamantium.getDust(64), Materials.Silver.getNanite(1) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216), ItemUtils.getSimpleStack(GenericChem.mSimpleNaquadahCatalyst, 1), 60 * 20, (int) GT_Values.VP[10]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Naquadria.getDust(64), - Materials.Trinium.getDust(64), - Materials.Gold.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadria.getDust(64), + Materials.Trinium.getDust(64), Materials.Gold.getNanite(1) }, Materials.SpaceTime.getMolten(9216L), ItemUtils.getSimpleStack(GenericChem.mAdvancedNaquadahCatalyst, 1), 60 * 20, (int) GT_Values.VP[11]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - ItemList.Circuit_Chip_Stemcell.get(64), - Materials.Gold.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + ItemList.Circuit_Chip_Stemcell.get(64), Materials.Gold.getNanite(1) }, Materials.SpaceTime.getMolten(9216L), ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 1), 60 * 20, (int) GT_Values.VP[11]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - MaterialsKevlar.Kevlar.getDust(64), - Materials.TranscendentMetal.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), MaterialsKevlar.Kevlar.getDust(64), + Materials.TranscendentMetal.getNanite(1) }, FluidUtils.getFluidStack("molten.shirabon", 92160), ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 1), 60 * 20, (int) GT_Values.VP[12]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - ItemList.Circuit_Chip_Biocell.get(64), - Materials.TranscendentMetal.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + ItemList.Circuit_Chip_Biocell.get(64), Materials.TranscendentMetal.getNanite(1) }, FluidUtils.getFluidStack("molten.shirabon", 92160), ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 1), 60 * 20, @@ -472,20 +349,14 @@ public class RecipeLoader_ChemicalSkips { 1024, (int) GT_Values.VP[7], 32, - new ItemStack[] { - GregtechItemList.ForceFieldGlass.get(1), - Materials.Carbon.getNanite(4), - ItemList.Emitter_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 2) - }, - new FluidStack[] { - Materials.Thulium.getMolten(144 * 10), - Materials.ExcitedDTCC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) - }, + new ItemStack[] { GregtechItemList.ForceFieldGlass.get(1), Materials.Carbon.getNanite(4), + ItemList.Emitter_UV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), + GregtechItemList.Laser_Lens_Special.get(1), + GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 2) }, + new FluidStack[] { Materials.Thulium.getMolten(144 * 10), Materials.ExcitedDTCC.getFluid(5000), + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) }, GregtechItemList.NeutronPulseManipulator.get(1), 60 * 20, (int) GT_Values.VP[10]); @@ -496,21 +367,15 @@ public class RecipeLoader_ChemicalSkips { 2048, (int) GT_Values.VP[8], 32, - new ItemStack[] { - GregtechItemList.ForceFieldGlass.get(2), - Materials.Carbon.getNanite(8), - ItemList.Emitter_UEV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 4), - ItemList.StableAdhesive.get(4) - }, - new FluidStack[] { - Materials.Thulium.getMolten(144 * 12), - Materials.ExcitedDTPC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2500) - }, + new ItemStack[] { GregtechItemList.ForceFieldGlass.get(2), Materials.Carbon.getNanite(8), + ItemList.Emitter_UEV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8), + GregtechItemList.Laser_Lens_Special.get(1), + GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 4), + ItemList.StableAdhesive.get(4) }, + new FluidStack[] { Materials.Thulium.getMolten(144 * 12), Materials.ExcitedDTPC.getFluid(5000), + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2500) }, GregtechItemList.CosmicFabricManipulator.get(1), 75 * 20, (int) GT_Values.VP[11]); @@ -521,21 +386,15 @@ public class RecipeLoader_ChemicalSkips { 4096, (int) GT_Values.VP[7], 32, - new ItemStack[] { - GregtechItemList.ForceFieldGlass.get(4), - Materials.Carbon.getNanite(16), - ItemList.Emitter_UIV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 8), - ItemList.SuperconductorComposite.get(4) - }, - new FluidStack[] { - Materials.Thulium.getMolten(144 * 15), - Materials.ExcitedDTRC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 1000 * 10) - }, + new ItemStack[] { GregtechItemList.ForceFieldGlass.get(4), Materials.Carbon.getNanite(16), + ItemList.Emitter_UIV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8), + GregtechItemList.Laser_Lens_Special.get(1), + GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 8), + ItemList.SuperconductorComposite.get(4) }, + new FluidStack[] { Materials.Thulium.getMolten(144 * 15), Materials.ExcitedDTRC.getFluid(5000), + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 1000 * 10) }, GregtechItemList.InfinityInfusedManipulator.get(1), 90 * 20, (int) GT_Values.VP[12]); @@ -545,21 +404,15 @@ public class RecipeLoader_ChemicalSkips { 1024, (int) GT_Values.VP[7], 32, - new ItemStack[] { - GregtechItemList.ForceFieldGlass.get(8), - Materials.Carbon.getNanite(32), - ItemList.Emitter_UMV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 16), - ItemList.NaquadriaSupersolid.get(4) - }, - new FluidStack[] { - Materials.Thulium.getMolten(144 * 20), - Materials.ExcitedDTEC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2000 * 10) - }, + new ItemStack[] { GregtechItemList.ForceFieldGlass.get(8), Materials.Carbon.getNanite(32), + ItemList.Emitter_UMV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8), + GregtechItemList.Laser_Lens_Special.get(1), + GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 16), + ItemList.NaquadriaSupersolid.get(4) }, + new FluidStack[] { Materials.Thulium.getMolten(144 * 20), Materials.ExcitedDTEC.getFluid(5000), + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2000 * 10) }, GregtechItemList.SpaceTimeContinuumRipper.get(1), 60 * 20, (int) GT_Values.VP[13]); @@ -570,16 +423,11 @@ public class RecipeLoader_ChemicalSkips { 1024, (int) GT_Values.VP[7], 32, - new ItemStack[] { - ALLOY.QUANTUM.getFrameBox(1), - GT_OreDictUnificator.get("plateDensePreciousMetalsAlloy", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 16), - ItemList.Field_Generator_UV.get(1), - ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getScrew(16) - }, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), - }, + new ItemStack[] { ALLOY.QUANTUM.getFrameBox(1), + GT_OreDictUnificator.get("plateDensePreciousMetalsAlloy", 4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 16), + ItemList.Field_Generator_UV.get(1), ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getScrew(16) }, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), }, GregtechItemList.NeutronShieldingCore.get(1), 60 * 20, (int) GT_Values.VP[10]); @@ -590,17 +438,13 @@ public class RecipeLoader_ChemicalSkips { 2048, (int) GT_Values.VP[8], 32, - new ItemStack[] { - ALLOY.QUANTUM.getFrameBox(2), - GT_OreDictUnificator.get("plateDenseEnrichedNaquadahAlloy", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), - ItemList.Field_Generator_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.screw, GT_CoreModSupport.RadoxPolymer, 16), - ItemList.StableAdhesive.get(4) - }, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 20), - }, + new ItemStack[] { ALLOY.QUANTUM.getFrameBox(2), + GT_OreDictUnificator.get("plateDenseEnrichedNaquadahAlloy", 4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), + ItemList.Field_Generator_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.screw, GT_CoreModSupport.RadoxPolymer, 16), + ItemList.StableAdhesive.get(4) }, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 20), }, GregtechItemList.CosmicFabricShieldingCore.get(1), 75 * 20, (int) GT_Values.VP[11]); @@ -611,17 +455,11 @@ public class RecipeLoader_ChemicalSkips { 4096, (int) GT_Values.VP[9], 32, - new ItemStack[] { - ALLOY.QUANTUM.getFrameBox(4), - ELEMENT.STANDALONE.HYPOGEN.getPlateDense(4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 16), - ItemList.Field_Generator_UIV.get(1), - GT_OreDictUnificator.get("screwMetastableOganesson", 16), - ItemList.SuperconductorComposite.get(4) - }, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40), - }, + new ItemStack[] { ALLOY.QUANTUM.getFrameBox(4), ELEMENT.STANDALONE.HYPOGEN.getPlateDense(4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 16), + ItemList.Field_Generator_UIV.get(1), GT_OreDictUnificator.get("screwMetastableOganesson", 16), + ItemList.SuperconductorComposite.get(4) }, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40), }, GregtechItemList.InfinityInfusedShieldingCore.get(1), 90 * 20, (int) GT_Values.VP[12]); @@ -632,28 +470,20 @@ public class RecipeLoader_ChemicalSkips { 8192, (int) GT_Values.VP[10], 32, - new ItemStack[] { - ALLOY.QUANTUM.getFrameBox(8), - GT_OreDictUnificator.get("plateDenseShirabon", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 16), - ItemList.Field_Generator_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16), - ItemList.NaquadriaSupersolid.get(4) - }, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 80), - }, + new ItemStack[] { ALLOY.QUANTUM.getFrameBox(8), GT_OreDictUnificator.get("plateDenseShirabon", 4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 16), + ItemList.Field_Generator_UMV.get(1), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16), + ItemList.NaquadriaSupersolid.get(4) }, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 80), }, GregtechItemList.SpaceTimeBendingCore.get(1), 120 * 20, (int) GT_Values.VP[13]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(QuantumGlassBlock.INSTANCE, 1), - ItemList.Field_Generator_ZPM.get(1), - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getLongRod(6), - ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(6) - }, + new ItemStack[] { new ItemStack(QuantumGlassBlock.INSTANCE, 1), ItemList.Field_Generator_ZPM.get(1), + ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getLongRod(6), + ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(6) }, ALLOY.QUANTUM.getFluidStack(144 * 6), GregtechItemList.ForceFieldGlass.get(1), 10 * 20, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java index fa13b1d093..6caa976ac7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java @@ -1,14 +1,15 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gtPlusPlus.core.material.ELEMENT; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gtPlusPlus.core.material.ELEMENT; + public class RecipeLoader_GTNH { public static void generate() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java index 0ce18ad1d0..0edc2a2d00 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java @@ -1,5 +1,9 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -18,9 +22,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.plugin.agrichem.BioRecipes; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader_GlueLine { @@ -43,100 +44,82 @@ public class RecipeLoader_GlueLine { private static void chemicalPlantRecipes() { // CO + C3H6O2 = C4H6O3 CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(GenericChem.mBlueCatalyst, 0)}, - new FluidStack[] { - FluidUtils.getFluidStack("carbonmonoxide", 1000), FluidUtils.getFluidStack("methylacetate", 1000), - }, + new ItemStack[] { CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(GenericChem.mBlueCatalyst, 0) }, + new FluidStack[] { FluidUtils.getFluidStack("carbonmonoxide", 1000), + FluidUtils.getFluidStack("methylacetate", 1000), }, new ItemStack[] {}, - new FluidStack[] {MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000)}, + new FluidStack[] { MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000) }, 10 * 20, 500, 3); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(18)}, - new FluidStack[] { - FluidUtils.getFluidStack("aceticacid", 1000), - FluidUtils.getFluidStack("chlorine", 1000), - MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000) - }, + new ItemStack[] { CI.getNumberedCircuit(18) }, + new FluidStack[] { FluidUtils.getFluidStack("aceticacid", 1000), + FluidUtils.getFluidStack("chlorine", 1000), + MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000) }, new ItemStack[] {}, - new FluidStack[] { - MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000), - MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(950) - }, + new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000), + MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(950) }, 150 * 20, 1000, 4); // Na2CO3 + NaCN + C2H3O2Cl + 2HCl = C3H3NO2 + 3NaCl + CO2 + H2O CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedCircuit(19), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), - MISC_MATERIALS.SODIUM_CYANIDE.getDust(3) - }, - new FluidStack[] { - MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(1000), - FluidUtils.getFluidStack("hydrochloricacid_gt5u", 2000) - }, - new ItemStack[] {MISC_MATERIALS.CYANOACETIC_ACID.getDust(9), Materials.Salt.getDust(6)}, - new FluidStack[] {Materials.CarbonDioxide.getGas(1000), GT_ModHandler.getWater(1000)}, + new ItemStack[] { CI.getNumberedCircuit(19), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), + MISC_MATERIALS.SODIUM_CYANIDE.getDust(3) }, + new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(1000), + FluidUtils.getFluidStack("hydrochloricacid_gt5u", 2000) }, + new ItemStack[] { MISC_MATERIALS.CYANOACETIC_ACID.getDust(9), Materials.Salt.getDust(6) }, + new FluidStack[] { Materials.CarbonDioxide.getGas(1000), GT_ModHandler.getWater(1000) }, 20 * 20, 1000, 4); // CuSO4 + 5C3H3NO2 + 5C2H6O = CuSO4·5(H2O) + 5C5H7NO2 CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedCircuit(20), - ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0), - MISC_MATERIALS.COPPER_SULFATE.getDust(6), - MISC_MATERIALS.CYANOACETIC_ACID.getDust(45) - }, - new FluidStack[] {Materials.Ethanol.getFluid(5000)}, - new ItemStack[] {MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11)}, - new FluidStack[] {MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(5000)}, + new ItemStack[] { CI.getNumberedCircuit(20), + ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0), + MISC_MATERIALS.COPPER_SULFATE.getDust(6), MISC_MATERIALS.CYANOACETIC_ACID.getDust(45) }, + new FluidStack[] { Materials.Ethanol.getFluid(5000) }, + new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11) }, + new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(5000) }, 500 * 20, 6000, 5); // C3H3NO2 + C2H6O = C5H7NO2 + H2O CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(21), MISC_MATERIALS.CYANOACETIC_ACID.getDust(9)}, - new FluidStack[] {Materials.Ethanol.getFluid(1000)}, + new ItemStack[] { CI.getNumberedCircuit(21), MISC_MATERIALS.CYANOACETIC_ACID.getDust(9) }, + new FluidStack[] { Materials.Ethanol.getFluid(1000) }, new ItemStack[] {}, - new FluidStack[] {MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(1000)}, + new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(1000) }, 1000 * 20, 6000, 5); - BioRecipes.mFormaldehyde = - FluidUtils.getFluidStack("fluid.formaldehyde", 1).getFluid(); + BioRecipes.mFormaldehyde = FluidUtils.getFluidStack("fluid.formaldehyde", 1).getFluid(); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(22), ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0) - }, - new FluidStack[] { - MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(100), - FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100) - }, + new ItemStack[] { CI.getNumberedCircuit(22), + ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0) }, + new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(100), + FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100) }, new ItemStack[] {}, - new FluidStack[] {MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000)}, + new FluidStack[] { MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000) }, 10 * 20, 8000, 5); // CH4 + NH3 + 3O = HCN + 3H2O CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(23), ItemUtils.getSimpleStack(GenericChem.mPinkCatalyst, 0)}, - new FluidStack[] { - FluidUtils.getFluidStack("methane", 2000), - FluidUtils.getFluidStack("ammonia", 2000), - FluidUtils.getFluidStack("oxygen", 6000) - }, + new ItemStack[] { CI.getNumberedCircuit(23), ItemUtils.getSimpleStack(GenericChem.mPinkCatalyst, 0) }, + new FluidStack[] { FluidUtils.getFluidStack("methane", 2000), FluidUtils.getFluidStack("ammonia", 2000), + FluidUtils.getFluidStack("oxygen", 6000) }, new ItemStack[] {}, - new FluidStack[] {MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000)}, + new FluidStack[] { MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000) }, 10 * 20, 500, 3); @@ -153,12 +136,11 @@ public class RecipeLoader_GlueLine { 10 * 20); // #addChemicalRecipe won't generate LCR recipe if config >= 10 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - CI.getNumberedCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3) - }, - new FluidStack[] {MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000)}, - new FluidStack[] {FluidUtils.getWater(1000)}, - new ItemStack[] {MISC_MATERIALS.SODIUM_CYANIDE.getDust(3)}, + new ItemStack[] { CI.getNumberedCircuit(17), + ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3) }, + new FluidStack[] { MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000) }, + new FluidStack[] { FluidUtils.getWater(1000) }, + new ItemStack[] { MISC_MATERIALS.SODIUM_CYANIDE.getDust(3) }, 10 * 20, 30); @@ -192,23 +174,22 @@ public class RecipeLoader_GlueLine { 5 * 20); // #addChemicalRecipe won't generate LCR recipe if config >= 10 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {CI.getNumberedCircuit(19), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1)}, - new FluidStack[] {FluidUtils.getFluidStack("sulfuricacid", 2000)}, - new FluidStack[] {FluidUtils.getFluidStack("dilutedsulfuricacid", 1000)}, - new ItemStack[] {MISC_MATERIALS.COPPER_SULFATE.getDust(6)}, + new ItemStack[] { CI.getNumberedCircuit(19), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1) }, + new FluidStack[] { FluidUtils.getFluidStack("sulfuricacid", 2000) }, + new FluidStack[] { FluidUtils.getFluidStack("dilutedsulfuricacid", 1000) }, + new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE.getDust(6) }, 5 * 20, 30); } private static void dehydratorRecipes() { CORE.RA.addDehydratorRecipe( - new ItemStack[] { - MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11), - }, + new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11), }, null, GT_ModHandler.getWater(5000), - new ItemStack[] {MISC_MATERIALS.COPPER_SULFATE.getDust(6)}, - new int[] {10000, 10000, 10000}, + new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE.getDust(6) }, + new int[] { 10000, 10000, 10000 }, 300 * 20, 10); } @@ -216,11 +197,9 @@ public class RecipeLoader_GlueLine { private static void distillationTowerRecipes() { GT_Values.RA.addDistillationTowerRecipe( MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000), - new FluidStack[] { - MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(100), - MISC_MATERIALS.DICHLOROACETIC_ACID.getFluidStack(450), - MISC_MATERIALS.TRICHLOROACETIC_ACID.getFluidStack(450) - }, + new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(100), + MISC_MATERIALS.DICHLOROACETIC_ACID.getFluidStack(450), + MISC_MATERIALS.TRICHLOROACETIC_ACID.getFluidStack(450) }, null, 4 * 20, MaterialUtils.getVoltageForTier(5)); @@ -239,7 +218,7 @@ public class RecipeLoader_GlueLine { null, null, null, - new int[] {10000, 10000, 10000}, + new int[] { 10000, 10000, 10000 }, 20 * 30, 120); } @@ -282,11 +261,8 @@ public class RecipeLoader_GlueLine { private static void glueUsageRecipes() { // Braintech Tape recipe, PBI and superglue make 16 tape at once GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 1L), - GT_ModHandler.getIC2Item("carbonMesh", 1L), - CI.getNumberedCircuit(10) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 1L), + GT_ModHandler.getIC2Item("carbonMesh", 1L), CI.getNumberedCircuit(10) }, MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100), ItemList.Duct_Tape.get(16L), 120, @@ -294,7 +270,7 @@ public class RecipeLoader_GlueLine { // Maintenance Hatch recipe, using Braintech Tape GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(1), CI.getNumberedCircuit(1)}, + new ItemStack[] { ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(1), CI.getNumberedCircuit(1) }, MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100), ItemList.Hatch_Maintenance.get(1), 120, @@ -302,22 +278,16 @@ public class RecipeLoader_GlueLine { // Graphene recipes from later wafer tiers, using superglue instead of the bronze age glue GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64), - ItemList.Circuit_Silicon_Wafer4.get(2L), - CI.getNumberedCircuit(2) - }, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64), + ItemList.Circuit_Silicon_Wafer4.get(2L), CI.getNumberedCircuit(2) }, MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(500), ItemUtils.getItemStackOfAmountFromOreDict("dustGraphene", 64), 400, 30720); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64), - ItemList.Circuit_Silicon_Wafer5.get(1L), - CI.getNumberedCircuit(2) - }, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64), + ItemList.Circuit_Silicon_Wafer5.get(1L), CI.getNumberedCircuit(2) }, MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(250), ItemUtils.getItemStackOfAmountFromOreDict("dustGraphene", 64), 80, @@ -424,12 +394,10 @@ public class RecipeLoader_GlueLine { } if (LoadedMods.DreamCraft && LoadedMods.GalacticraftCore) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemUtils.getItemStackFromFQRN("GalacticraftMars:item.itemBasicAsteroids:7", 1), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Titanium, 8), - ItemUtils.getItemStackFromFQRN("dreamcraft:item.TungstenString", 8), - CI.getNumberedCircuit(1) - }, + new ItemStack[] { ItemUtils.getItemStackFromFQRN("GalacticraftMars:item.itemBasicAsteroids:7", 1), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Titanium, 8), + ItemUtils.getItemStackFromFQRN("dreamcraft:item.TungstenString", 8), + CI.getNumberedCircuit(1) }, MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(576), ItemUtils.getItemStackFromFQRN("GalaxySpace:item.ThermalClothT2", 1), 600, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java index a693cfb6d9..9c92f40608 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java @@ -1,5 +1,9 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.Materials; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GasSpargingRecipeMap; @@ -7,9 +11,6 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.nuclear.NUCLIDE; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader_LFTR { @@ -60,18 +61,15 @@ public class RecipeLoader_LFTR { new ItemStack[] {}, new ItemStack[] {}, null, - new int[] {10000, 10000, 5000, 2500}, - new FluidStack[] {NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100), Li2BeF4}, - new FluidStack[] { - NUCLIDE.LiFBeF2UF4FP.getFluidStack(100), - NUCLIDE.LiFBeF2ThF4.getFluidStack(200), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(20), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10) - }, + new int[] { 10000, 10000, 5000, 2500 }, + new FluidStack[] { NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100), Li2BeF4 }, + new FluidStack[] { NUCLIDE.LiFBeF2UF4FP.getFluidStack(100), NUCLIDE.LiFBeF2ThF4.getFluidStack(200), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(20), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10) }, 100 * 20, // time 0, // cost 32768 * 4 // fuel value - ); + ); // LiFBeF2ZrF4UF4 - T2 GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe( @@ -79,18 +77,15 @@ public class RecipeLoader_LFTR { new ItemStack[] {}, new ItemStack[] {}, null, - new int[] {10000, 10000, 2500, 1250}, - new FluidStack[] {NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100), Li2BeF4}, - new FluidStack[] { - NUCLIDE.LiFBeF2UF4FP.getFluidStack(50), - NUCLIDE.LiFBeF2ThF4.getFluidStack(100), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(5) - }, + new int[] { 10000, 10000, 2500, 1250 }, + new FluidStack[] { NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100), Li2BeF4 }, + new FluidStack[] { NUCLIDE.LiFBeF2UF4FP.getFluidStack(50), NUCLIDE.LiFBeF2ThF4.getFluidStack(100), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(5) }, 100 * 20, // time 0, // cost 8192 * 4 // fuel value - ); + ); // LiFBeF2ZrF4U235 - T1 GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.addRecipe( @@ -98,57 +93,42 @@ public class RecipeLoader_LFTR { new ItemStack[] {}, new ItemStack[] {}, null, - new int[] {10000, 10000, 1000, 500}, - new FluidStack[] {NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100), Li2BeF4}, - new FluidStack[] { - NUCLIDE.LiFBeF2UF4FP.getFluidStack(25), - NUCLIDE.LiFThF4.getFluidStack(50), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(4), - FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2) - }, + new int[] { 10000, 10000, 1000, 500 }, + new FluidStack[] { NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100), Li2BeF4 }, + new FluidStack[] { NUCLIDE.LiFBeF2UF4FP.getFluidStack(25), NUCLIDE.LiFThF4.getFluidStack(50), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(4), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2) }, 100 * 20, // time 0, // cost 8192 // fuel value - ); + ); // Sparging NEI Recipes GasSpargingRecipeMap.addRecipe( new FluidStack(mSpargeGases.get(0), 1000), NUCLIDE.LiFBeF2UF4FP.getFluidStack(50), NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(50), - new FluidStack[] { - new FluidStack(mNobleGases.get(1), 10), - new FluidStack(mNobleGases.get(2), 10), - new FluidStack(mNobleGases.get(3), 10), - new FluidStack(mNobleGases.get(4), 10), - new FluidStack(mNobleGases.get(5), 10) - }, - new int[] {20000, 20000, 20000, 20000, 20000}); + new FluidStack[] { new FluidStack(mNobleGases.get(1), 10), new FluidStack(mNobleGases.get(2), 10), + new FluidStack(mNobleGases.get(3), 10), new FluidStack(mNobleGases.get(4), 10), + new FluidStack(mNobleGases.get(5), 10) }, + new int[] { 20000, 20000, 20000, 20000, 20000 }); GasSpargingRecipeMap.addRecipe( new FluidStack(mSpargeGases.get(1), 100), NUCLIDE.LiFThF4.getFluidStack(50), NUCLIDE.Sparged_LiFThF4.getFluidStack(50), - new FluidStack[] { - new FluidStack(mFluorideGases.get(1), 5), - new FluidStack(mFluorideGases.get(2), 5), - new FluidStack(mFluorideGases.get(3), 5), - new FluidStack(mFluorideGases.get(4), 5), - new FluidStack(mFluorideGases.get(5), 5) - }, - new int[] {1000, 1000, 1000, 1000, 1000}); + new FluidStack[] { new FluidStack(mFluorideGases.get(1), 5), new FluidStack(mFluorideGases.get(2), 5), + new FluidStack(mFluorideGases.get(3), 5), new FluidStack(mFluorideGases.get(4), 5), + new FluidStack(mFluorideGases.get(5), 5) }, + new int[] { 1000, 1000, 1000, 1000, 1000 }); GasSpargingRecipeMap.addRecipe( new FluidStack(mSpargeGases.get(1), 100), NUCLIDE.LiFBeF2ThF4.getFluidStack(50), NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(50), - new FluidStack[] { - new FluidStack(mFluorideGases.get(1), 10), - new FluidStack(mFluorideGases.get(2), 10), - new FluidStack(mFluorideGases.get(3), 10), - new FluidStack(mFluorideGases.get(4), 10), - new FluidStack(mFluorideGases.get(5), 10) - }, - new int[] {2000, 2000, 2000, 2000, 2000}); + new FluidStack[] { new FluidStack(mFluorideGases.get(1), 10), new FluidStack(mFluorideGases.get(2), 10), + new FluidStack(mFluorideGases.get(3), 10), new FluidStack(mFluorideGases.get(4), 10), + new FluidStack(mFluorideGases.get(5), 10) }, + new int[] { 2000, 2000, 2000, 2000, 2000 }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java index 28e72cc0b9..44115ea7d0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java @@ -21,8 +21,9 @@ public class RecipeLoader_MolecularTransformer { int aEU = MaterialUtils.getVoltageForTier(5); Logger.INFO("======================="); Logger.INFO("Generating GT recipe for Molecular Transformer."); - Logger.INFO("Input: " + aRecipe.inputStack.getDisplayName() + ", Output: " - + aRecipe.outputStack.getDisplayName() + ", EU/t: " + aEU); + Logger.INFO( + "Input: " + aRecipe.inputStack + .getDisplayName() + ", Output: " + aRecipe.outputStack.getDisplayName() + ", EU/t: " + aEU); float aTicks = (float) aRecipe.energyPerOperation / (float) aEU; Logger.INFO("Ticks: " + aTicks); int aTicksRoundedUp = MathUtils.roundToClosestInt(Math.ceil(aTicks)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java index 4c0b93ce68..2a6715c1ac 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java @@ -2,6 +2,9 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; import static gtPlusPlus.core.lib.CORE.GTNH; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -20,8 +23,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader_Nuclear { @@ -98,7 +99,7 @@ public class RecipeLoader_Nuclear { ELEMENT.getInstance().URANIUM233.getSmallDust(1), ELEMENT.getInstance().URANIUM235.getSmallDust(1), ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1), - new int[] {0, 0, 1000, 1000, 1000, 500}, + new int[] { 0, 0, 1000, 1000, 1000, 500 }, 500 * 20, 4000); // Mox @@ -113,7 +114,7 @@ public class RecipeLoader_Nuclear { ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1), ELEMENT.getInstance().PLUTONIUM238.getTinyDust(1), ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1), - new int[] {0, 0, 500, 500, 500, 500}, + new int[] { 0, 0, 500, 500, 500, 500 }, 750 * 20, 4000); @@ -129,14 +130,14 @@ public class RecipeLoader_Nuclear { ELEMENT.getInstance().LUTETIUM.getSmallDust(1), ELEMENT.getInstance().POLONIUM.getSmallDust(1), ELEMENT.getInstance().THALLIUM.getTinyDust(1), - new int[] {0, 0, 5000, 5000, 5000, 2500}, + new int[] { 0, 0, 5000, 5000, 5000, 2500 }, 250 * 20, 4000); } private static void chemicalBathRecipes() { - int[] chances = {9000, 6000, 3000}; + int[] chances = { 9000, 6000, 3000 }; GT_Values.RA.addChemicalBathRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), FluidUtils.getFluidStack("chlorine", 2400), @@ -147,7 +148,7 @@ public class RecipeLoader_Nuclear { 30 * 20, 480); - chances = new int[] {9000, 3000, 1000}; + chances = new int[] { 9000, 3000, 1000 }; GT_Values.RA.addChemicalBathRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustRutile", 5), FluidUtils.getFluidStack("chlorine", 4000), @@ -171,8 +172,8 @@ public class RecipeLoader_Nuclear { private static void chemicalReactorRecipes() { - ItemStack aGtHydrofluoricAcid = - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellHydrofluoricAcid_GT5U", 2); + ItemStack aGtHydrofluoricAcid = ItemUtils + .getItemStackOfAmountFromOreDictNoBroken("cellHydrofluoricAcid_GT5U", 2); GT_Values.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), // Input @@ -354,38 +355,36 @@ public class RecipeLoader_Nuclear { // Makes 7-Lithium CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(14), - ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(14), + ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1) }, FluidUtils.getFluidStack("sulfuriclithium", 440), null, - new ItemStack[] { - CI.emptyCells(1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 4) - }, - new int[] {10000, 10000, 10000, 10000, 10000}, + new ItemStack[] { CI.emptyCells(1), ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 4) }, + new int[] { 10000, 10000, 10000, 10000, 10000 }, 30 * 20, 30); // Makes Lithium Carbonate CORE.RA.addDehydratorRecipe( - new ItemStack[] {CI.emptyCells(12), ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20) - }, // Item input (Array, up to 2) + new ItemStack[] { CI.emptyCells(12), ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20) }, // Item + // input + // (Array, + // up + // to + // 2) FluidUtils.getFluidStack("sulfuricacid", 10000), FluidUtils.getFluidStack("sulfuriclithium", 10000), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4), - ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), - ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4), + ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), + ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate }, // Output Array of Items - Upto 9, - new int[] {10000, 10000, 10000, 10000, 10000}, + new int[] { 10000, 10000, 10000, 10000, 10000 }, 75 * 20, // Time in ticks 1000); // EU @@ -394,13 +393,12 @@ public class RecipeLoader_Nuclear { || LoadedMods.IHL) { // CaO + H2O = Ca(OH)2 CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedBioCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 2) - }, + new ItemStack[] { CI.getNumberedBioCircuit(20), + ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 2) }, FluidUtils.getFluidStack("water", 1000), null, // Fluid output (slot 2) - new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5)}, // Output - new int[] {10000}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5) }, // Output + new int[] { 10000 }, 12 * 20, // Time in ticks 120); // EU } else { @@ -414,39 +412,35 @@ public class RecipeLoader_Nuclear { // 2 LiOH + CaCO3 CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) - }, // Item + new ItemStack[] { CI.getNumberedAdvancedCircuit(20), + ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) }, // Item null, // Fluid input (slot 1) null, // Fluid output (slot 2) - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) - }, // Output - new int[] {10000, 10000}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, // Output + new int[] { 10000, 10000 }, 120 * 20, // Time in ticks 1000); // EU // LiOH Liquid to Dust CORE.RA.addDehydratorRecipe( - new ItemStack[] {CI.getNumberedAdvancedCircuit(22)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(22) }, FluidUtils.getFluidStack("lithiumhydroxide", 144), null, - new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1)}, - new int[] {10000}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) }, + new int[] { 10000 }, 1 * 20, // Time in ticks 64); // EU // Zirconium Chloride -> TetraFluoride FluidStack aHydrogenChloride = new FluidStack(GenericChem.HydrochloricAcid, 9000); CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(11), ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), - }, // Item + new ItemStack[] { CI.getNumberedAdvancedCircuit(11), + ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), }, // Item FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), aHydrogenChloride, - new ItemStack[] {FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9)}, - new int[] {10000}, + new ItemStack[] { FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) }, + new int[] { 10000 }, 120 * 20, // Time in ticks 500); // EU @@ -454,39 +448,35 @@ public class RecipeLoader_Nuclear { FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1); if (aGregtechHydro != null || Utils.getGregtechVersionAsInt() >= 50929) { CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(10), - ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9) - }, + new ItemStack[] { CI.getNumberedAdvancedCircuit(10), + ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9) }, FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144), aHydrogenChloride, - new ItemStack[] {FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9)}, - new int[] {10000}, + new ItemStack[] { FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) }, + new int[] { 10000 }, 240 * 20, // Time in ticks 500); // EU } // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O CORE.RA.addDehydratorRecipe( - new ItemStack[] {CI.getNumberedAdvancedCircuit(6), FLUORIDES.AMMONIUM_BIFLUORIDE.getCell(4)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(6), FLUORIDES.AMMONIUM_BIFLUORIDE.getCell(4) }, FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000), // Fluid input (slot 1) FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(6000), - new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4)}, - new int[] {10000}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4) }, + new int[] { 10000 }, 32 * 20, // Time in ticks 64); // EU // (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 CORE.RA.addDehydratorRecipe( - new ItemStack[] {CI.getNumberedAdvancedCircuit(17), CI.emptyCells(5)}, + new ItemStack[] { CI.getNumberedAdvancedCircuit(17), CI.emptyCells(5) }, FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(5000), null, - new ItemStack[] { - MISC_MATERIALS.AMMONIA.getCell(2), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), - FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1) - }, - new int[] {10000, 10000, 10000}, + new ItemStack[] { MISC_MATERIALS.AMMONIA.getCell(2), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), + FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1) }, + new int[] { 10000, 10000, 10000 }, 5 * 60 * 20, 120); } @@ -499,7 +489,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1), ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1), - new int[] {10000, 2500, 4000}, + new int[] { 10000, 2500, 4000 }, 20 * 20, 24); @@ -509,7 +499,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), - new int[] {10000, 1250, 2500}, + new int[] { 10000, 1250, 2500 }, 20 * 20, 24); GT_Values.RA.addElectromagneticSeparatorRecipe( @@ -517,7 +507,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), - new int[] {10000, 1250, 2500}, + new int[] { 10000, 1250, 2500 }, 20 * 20, 24); } @@ -534,11 +524,20 @@ public class RecipeLoader_Nuclear { 500); // LFTR Fuel 1 CORE.RA.addFluidExtractionRecipe( - NUCLIDE.LiFBeF2ZrF4U235.getDust(1), NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(144), 250, 1000); + NUCLIDE.LiFBeF2ZrF4U235.getDust(1), + NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(144), + 250, + 1000); CORE.RA.addFluidExtractionRecipe( - NUCLIDE.LiFBeF2ZrF4UF4.getDust(1), NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(144), 150, 1500); + NUCLIDE.LiFBeF2ZrF4UF4.getDust(1), + NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(144), + 150, + 1500); CORE.RA.addFluidExtractionRecipe( - NUCLIDE.LiFBeF2ThF4UF4.getDust(1), NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144), 150, 2000); + NUCLIDE.LiFBeF2ThF4UF4.getDust(1), + NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144), + 150, + 2000); // ZIRCONIUM_TETRAFLUORIDE CORE.RA.addFluidExtractionRecipe( @@ -574,82 +573,70 @@ public class RecipeLoader_Nuclear { // Zirconium GT_Values.RA.addSifterRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIlmenite", 1), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustWroughtIron", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1) - }, - new int[] {5000, 278, 1000, 1000, 300, 300}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustWroughtIron", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1) }, + new int[] { 5000, 278, 1000, 1000, 300, 300 }, 20 * 30, 500); GT_Values.RA.addSifterRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) - }, - new int[] {10000, 556, 1500, 1000, 500, 500}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZinc", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) }, + new int[] { 10000, 556, 1500, 1000, 500, 500 }, 20 * 30, 500); GT_Values.RA.addSifterRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) - }, - new int[] {10000, 556, 1500, 1000, 500, 500}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) }, + new int[] { 10000, 556, 1500, 1000, 500, 500 }, 20 * 30, 500); // Radium GT_Values.RA.addSifterRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUranium", 1), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) - }, - new int[] {10000, 556, 1000, 500, 500, 500}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, + new int[] { 10000, 556, 1000, 500, 500, 500 }, 20 * 30, 500); GT_Values.RA.addSifterRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUraninite", 1), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustUraninite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) - }, - new int[] {10000, 556, 500, 250, 250, 250}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraninite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, + new int[] { 10000, 556, 500, 250, 250, 250 }, 20 * 30, 500); GT_Values.RA.addSifterRecipe( ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPitchblende", 1), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustPitchblende", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) - }, - new int[] {10000, 556, 500, 250, 250, 250}, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPitchblende", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustLead", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, + new int[] { 10000, 556, 500, 250, 250, 250 }, 20 * 30, 500); } @@ -657,6 +644,10 @@ public class RecipeLoader_Nuclear { private static void fluidHeater() { CORE.RA.addFluidHeaterRecipe( - FLUORIDES.SODIUM_FLUORIDE.getDust(1), null, FLUORIDES.SODIUM_FLUORIDE.getFluidStack(144), 20 * 30, 500); + FLUORIDES.SODIUM_FLUORIDE.getDust(1), + null, + FLUORIDES.SODIUM_FLUORIDE.getFluidStack(144), + 20 * 30, + 500); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java index 4e84e465c4..d2a6741221 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.NuclearChem; @@ -11,8 +14,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader_NuclearFuelProcessing { @@ -85,17 +86,14 @@ public class RecipeLoader_NuclearFuelProcessing { CI.getNumberedAdvancedCircuit(17), ELEMENT.getInstance().FLUORINE.getCell(6), NUCLIDE.LiFThF4.getFluidStack(10000), - new ItemStack[] { - CI.emptyCells(5), - FLUORIDES.LITHIUM_FLUORIDE.getCell(1), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233) - }, - new int[] {10000, 10000, 500, 500, 500, 250, 250, 250}, + new ItemStack[] { CI.emptyCells(5), FLUORIDES.LITHIUM_FLUORIDE.getCell(1), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233) }, + new int[] { 10000, 10000, 500, 500, 500, 250, 250, 250 }, NUCLIDE.UF6F2.getFluidStack(1500), 20 * 60 * 10, MaterialUtils.getVoltageForTier(5)); @@ -103,18 +101,14 @@ public class RecipeLoader_NuclearFuelProcessing { CI.getNumberedAdvancedCircuit(18), ELEMENT.getInstance().FLUORINE.getCell(6), NUCLIDE.LiFBeF2ThF4.getFluidStack(10000), - new ItemStack[] { - CI.emptyCells(4), - FLUORIDES.LITHIUM_FLUORIDE.getCell(1), - FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233) - }, - new int[] {10000, 10000, 10000, 1000, 1000, 1000, 500, 500, 500}, + new ItemStack[] { CI.emptyCells(4), FLUORIDES.LITHIUM_FLUORIDE.getCell(1), + FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1), ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233) }, + new int[] { 10000, 10000, 10000, 1000, 1000, 1000, 500, 500, 500 }, NUCLIDE.UF6F2.getFluidStack(3000), 20 * 60 * 10, MaterialUtils.getVoltageForTier(5)); @@ -124,17 +118,14 @@ public class RecipeLoader_NuclearFuelProcessing { CI.getNumberedAdvancedCircuit(7), ELEMENT.getInstance().FLUORINE.getCell(6), NUCLIDE.Sparged_LiFThF4.getFluidStack(10000), - new ItemStack[] { - CI.emptyCells(4), - FLUORIDES.LITHIUM_FLUORIDE.getCell(2), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233) - }, - new int[] {10000, 10000, 1000, 1000, 1000, 1000, 1000, 1000}, + new ItemStack[] { CI.emptyCells(4), FLUORIDES.LITHIUM_FLUORIDE.getCell(2), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233) }, + new int[] { 10000, 10000, 1000, 1000, 1000, 1000, 1000, 1000 }, NUCLIDE.UF6F2.getFluidStack(3000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(5)); @@ -142,18 +133,14 @@ public class RecipeLoader_NuclearFuelProcessing { CI.getNumberedAdvancedCircuit(8), ELEMENT.getInstance().FLUORINE.getCell(6), NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(10000), - new ItemStack[] { - CI.emptyCells(2), - FLUORIDES.LITHIUM_FLUORIDE.getCell(2), - FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233), - ItemUtils.getSimpleStack(ModItems.dustProtactinium233) - }, - new int[] {10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000}, + new ItemStack[] { CI.emptyCells(2), FLUORIDES.LITHIUM_FLUORIDE.getCell(2), + FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2), ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233) }, + new int[] { 10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000 }, NUCLIDE.UF6F2.getFluidStack(6000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(5)); @@ -163,32 +150,22 @@ public class RecipeLoader_NuclearFuelProcessing { 8, FLUORIDES.SODIUM_FLUORIDE.getCell(4), NUCLIDE.UF6F2.getFluidStack(3000), - new ItemStack[] { - ELEMENT.getInstance().FLUORINE.getCell(2), - FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2), - ELEMENT.getInstance().URANIUM233.getDust(1), - ELEMENT.getInstance().URANIUM233.getDust(1), - ELEMENT.getInstance().URANIUM233.getDust(1) - }, - new int[] {10000, 10000, 3000, 2000, 1000}, + new ItemStack[] { ELEMENT.getInstance().FLUORINE.getCell(2), FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2), + ELEMENT.getInstance().URANIUM233.getDust(1), ELEMENT.getInstance().URANIUM233.getDust(1), + ELEMENT.getInstance().URANIUM233.getDust(1) }, + new int[] { 10000, 10000, 3000, 2000, 1000 }, FLUORIDES.SODIUM_FLUORIDE.getFluidStack(2000), 20 * 60 * 10, MaterialUtils.getVoltageForTier(3)); // Reactor Core step 0 - Process Burnt Salt // Tier 1 Fuel - Gives back FLIBE and breeds U233 - /* CORE.RA.addReactorProcessingUnitRecipe( - CI.getNumberedAdvancedCircuit(1), - CI.emptyCells(2), - new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 4000), - new ItemStack[] { - FLUORIDES.LITHIUM_FLUORIDE.getCell(1), - ELEMENT.getInstance().URANIUM233.getCell(1) - }, - new int[] {10000, 10000}, - NUCLIDE.LiFBeF2.getFluidStack(2000), - 20 * 60 * 60, - MaterialUtils.getVoltageForTier(3));*/ + /* + * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(1), CI.emptyCells(2), new + * FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 4000), new ItemStack[] { FLUORIDES.LITHIUM_FLUORIDE.getCell(1), + * ELEMENT.getInstance().URANIUM233.getCell(1) }, new int[] {10000, 10000}, NUCLIDE.LiFBeF2.getFluidStack(2000), + * 20 * 60 * 60, MaterialUtils.getVoltageForTier(3)); + */ // LiBeF2UF4FP + F2 = LiFBeF2 & UF6F2FP // Reactor Core step 1 - Process Burnt Salt @@ -196,8 +173,8 @@ public class RecipeLoader_NuclearFuelProcessing { CI.getNumberedAdvancedCircuit(1), ELEMENT.getInstance().FLUORINE.getCell(1), NUCLIDE.LiFBeF2UF4FP.getFluidStack(1000), - new ItemStack[] {NUCLIDE.UF6F2FP.getCell(1)}, - new int[] {10000}, + new ItemStack[] { NUCLIDE.UF6F2FP.getCell(1) }, + new int[] { 10000 }, FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000), 20 * 60 * 120, MaterialUtils.getVoltageForTier(3)); @@ -208,8 +185,8 @@ public class RecipeLoader_NuclearFuelProcessing { CI.getNumberedAdvancedCircuit(1), ELEMENT.getInstance().FLUORINE.getCell(3), NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(1000), - new ItemStack[] {CI.emptyCells(1), NUCLIDE.UF6F2FP.getCell(2)}, - new int[] {10000}, + new ItemStack[] { CI.emptyCells(1), NUCLIDE.UF6F2FP.getCell(2) }, + new int[] { 10000 }, FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 2000), 20 * 60 * 60, MaterialUtils.getVoltageForTier(3)); @@ -219,18 +196,12 @@ public class RecipeLoader_NuclearFuelProcessing { 8, FLUORIDES.SODIUM_FLUORIDE.getCell(3), NUCLIDE.UF6F2FP.getFluidStack(2000), - new ItemStack[] { - ELEMENT.getInstance().FLUORINE.getCell(1), - FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1), - ELEMENT.getInstance().PHOSPHORUS.getDust(1) - }, - new int[] {10000, 10000, 5000, 5000, 5000, 5000, 5000, 5000, 5000}, + new ItemStack[] { ELEMENT.getInstance().FLUORINE.getCell(1), FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2), + ELEMENT.getInstance().PHOSPHORUS.getDust(1), ELEMENT.getInstance().PHOSPHORUS.getDust(1), + ELEMENT.getInstance().PHOSPHORUS.getDust(1), ELEMENT.getInstance().PHOSPHORUS.getDust(1), + ELEMENT.getInstance().PHOSPHORUS.getDust(1), ELEMENT.getInstance().PHOSPHORUS.getDust(1), + ELEMENT.getInstance().PHOSPHORUS.getDust(1) }, + new int[] { 10000, 10000, 5000, 5000, 5000, 5000, 5000, 5000, 5000 }, FLUORIDES.SODIUM_FLUORIDE.getFluidStack(2000), 20 * 60 * 10, MaterialUtils.getVoltageForTier(4)); @@ -238,7 +209,7 @@ public class RecipeLoader_NuclearFuelProcessing { // Reactor Core step 2B - Distillation GT_Values.RA.addDistillationTowerRecipe( FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000), - new FluidStack[] {NUCLIDE.LiFBeF2.getFluidStack(250)}, + new FluidStack[] { NUCLIDE.LiFBeF2.getFluidStack(250) }, null, 450 * 20, MaterialUtils.getVoltageForTier(5)); @@ -246,51 +217,31 @@ public class RecipeLoader_NuclearFuelProcessing { // UF6 -> UF4 reduction // UF6 + LiFBeF2 + H2 -> LiFBeF2UF4 + HF CORE.RA.addBlastRecipe( - new ItemStack[] {FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2.getCell(1)}, - new FluidStack[] {ELEMENT.getInstance().HYDROGEN.getFluidStack(2000)}, - new ItemStack[] {ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2)}, - new FluidStack[] {NUCLIDE.LiFBeF2UF4.getFluidStack(3000)}, + new ItemStack[] { FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2.getCell(1) }, + new FluidStack[] { ELEMENT.getInstance().HYDROGEN.getFluidStack(2000) }, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2) }, + new FluidStack[] { NUCLIDE.LiFBeF2UF4.getFluidStack(3000) }, 300 * 10, MaterialUtils.getVoltageForTier(5), 5400); // LiFBeF2ZrF4U235 - We can't add both ZrF4 and U235 here, so best we leave this disabled. - /*CORE.RA.addReactorProcessingUnitRecipe( - CI.getNumberedAdvancedCircuit(8), - NUCLIDE.LiFBeF2UF4.getCell(9), - ELEMENT.getInstance().URANIUM235.getFluidStack(1000), - new ItemStack[] { - CI.emptyCells(9) - }, - new int[] {10000}, - NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(10000), - 20 * 60 * 5, - MaterialUtils.getVoltageForTier(4));*/ + /* + * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(8), NUCLIDE.LiFBeF2UF4.getCell(9), + * ELEMENT.getInstance().URANIUM235.getFluidStack(1000), new ItemStack[] { CI.emptyCells(9) }, new int[] + * {10000}, NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(10000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(4)); + */ // LiFBeF2ZrF4UF4 - /*CORE.RA.addReactorProcessingUnitRecipe( - CI.getNumberedAdvancedCircuit(9), - NUCLIDE.LiFBeF2UF4.getCell(9), - FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000), - new ItemStack[] { - CI.emptyCells(9) - }, - new int[] {10000}, - NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), - 20 * 60 * 5, - MaterialUtils.getVoltageForTier(5)); - - CORE.RA.addReactorProcessingUnitRecipe( - CI.getNumberedAdvancedCircuit(9), - FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getCell(1), - NUCLIDE.LiFBeF2UF4.getFluidStack(9000), - new ItemStack[] { - CI.emptyCells(1) - }, - new int[] {10000}, - NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), - 20 * 60 * 5, - MaterialUtils.getVoltageForTier(5));*/ + /* + * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(9), NUCLIDE.LiFBeF2UF4.getCell(9), + * FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000), new ItemStack[] { CI.emptyCells(9) }, new int[] + * {10000}, NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(5)); + * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(9), + * FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2UF4.getFluidStack(9000), new ItemStack[] { + * CI.emptyCells(1) }, new int[] {10000}, NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), 20 * 60 * 5, + * MaterialUtils.getVoltageForTier(5)); + */ CORE.RA.addFissionFuel( FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000), @@ -308,29 +259,15 @@ public class RecipeLoader_NuclearFuelProcessing { MaterialUtils.getVoltageForTier(5)); // LiFBeF2ThF4UF4 - /*CORE.RA.addReactorProcessingUnitRecipe( - CI.getNumberedAdvancedCircuit(10), - NUCLIDE.LiFBeF2UF4.getCell(9), - FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000), - new ItemStack[] { - CI.emptyCells(9) - }, - new int[] {10000}, - NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), - 20 * 60 * 5, - MaterialUtils.getVoltageForTier(5)); - - CORE.RA.addReactorProcessingUnitRecipe( - CI.getNumberedAdvancedCircuit(10), - FLUORIDES.THORIUM_TETRAFLUORIDE.getCell(1), - NUCLIDE.LiFBeF2UF4.getFluidStack(9000), - new ItemStack[] { - CI.emptyCells(1) - }, - new int[] {10000}, - NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), - 20 * 60 * 5, - MaterialUtils.getVoltageForTier(5));*/ + /* + * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(10), NUCLIDE.LiFBeF2UF4.getCell(9), + * FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000), new ItemStack[] { CI.emptyCells(9) }, new int[] {10000}, + * NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), 20 * 60 * 5, MaterialUtils.getVoltageForTier(5)); + * CORE.RA.addReactorProcessingUnitRecipe( CI.getNumberedAdvancedCircuit(10), + * FLUORIDES.THORIUM_TETRAFLUORIDE.getCell(1), NUCLIDE.LiFBeF2UF4.getFluidStack(9000), new ItemStack[] { + * CI.emptyCells(1) }, new int[] {10000}, NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), 20 * 60 * 5, + * MaterialUtils.getVoltageForTier(5)); + */ CORE.RA.addFissionFuel( FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000), |