From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../xmod/gregtech/loaders/GT_Material_Loader.java | 137 ++---- .../gregtech/loaders/ProcessingAngleGrinder.java | 73 ++- .../loaders/ProcessingElectricButcherKnife.java | 63 ++- .../loaders/ProcessingElectricLighter.java | 53 +- .../gregtech/loaders/ProcessingElectricSnips.java | 53 +- .../loaders/ProcessingToolHeadChoocher.java | 54 +-- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 5 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 47 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 165 ++++--- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 76 ++- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 53 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 110 ++--- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 27 +- .../gregtech/loaders/RecipeGen_FluidCanning.java | 94 ++-- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 297 ++++++------ .../xmod/gregtech/loaders/RecipeGen_Fluorite.java | 93 ++-- .../loaders/RecipeGen_MaterialProcessing.java | 129 +++-- .../gregtech/loaders/RecipeGen_MetalRecipe.java | 54 ++- .../RecipeGen_MultisUsingFluidInsteadOfCells.java | 17 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 270 +++++++---- .../xmod/gregtech/loaders/RecipeGen_Plasma.java | 12 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 133 ++--- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 131 +++-- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 148 +++--- .../loaders/misc/AddCustomMachineToPA.java | 5 +- .../gregtech/loaders/misc/AssLineAchievements.java | 32 +- .../loaders/recipe/RecipeLoader_AlgaeFarm.java | 23 +- .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 538 +++++++-------------- .../gregtech/loaders/recipe/RecipeLoader_GTNH.java | 9 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 168 +++---- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 88 ++-- .../recipe/RecipeLoader_MolecularTransformer.java | 5 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 249 +++++----- .../recipe/RecipeLoader_NuclearFuelProcessing.java | 229 ++++----- 34 files changed, 1711 insertions(+), 1929 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders') 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