diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 18:39:10 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 18:39:10 -0800 |
| commit | b846f1dc3a502d157ecf871e2a4a1ff49915f871 (patch) | |
| tree | 4a86feaaddd8d00d32f7cc093736d02be92bf358 /src/main/java/goodgenerator/util | |
| parent | 3194d4cbab82e336ecb82b5a2dc80153ed9b1b81 (diff) | |
| download | GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.tar.gz GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.tar.bz2 GT5-Unofficial-b846f1dc3a502d157ecf871e2a4a1ff49915f871.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/goodgenerator/util')
| -rw-r--r-- | src/main/java/goodgenerator/util/CharExchanger.java | 40 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/CrackRecipeAdder.java | 417 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/DescTextLocalization.java | 9 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/ItemRefer.java | 5 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/Log.java | 1 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/MaterialFix.java | 158 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/MyRecipeAdder.java | 425 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/StackUtils.java | 21 | ||||
| -rw-r--r-- | src/main/java/goodgenerator/util/StructureHelper.java | 48 |
9 files changed, 523 insertions, 601 deletions
diff --git a/src/main/java/goodgenerator/util/CharExchanger.java b/src/main/java/goodgenerator/util/CharExchanger.java index 2677e3fa69..f080678d66 100644 --- a/src/main/java/goodgenerator/util/CharExchanger.java +++ b/src/main/java/goodgenerator/util/CharExchanger.java @@ -4,19 +4,17 @@ import net.minecraft.util.EnumChatFormatting; public class CharExchanger { - public static final String[] tierName = new String[] { - EnumChatFormatting.RED + "ULV" + EnumChatFormatting.RESET, - EnumChatFormatting.GRAY + "LV" + EnumChatFormatting.RESET, - EnumChatFormatting.AQUA + "MV" + EnumChatFormatting.RESET, - EnumChatFormatting.GOLD + "HV" + EnumChatFormatting.RESET, - EnumChatFormatting.DARK_PURPLE + "EV" + EnumChatFormatting.RESET, - EnumChatFormatting.DARK_BLUE + "IV" + EnumChatFormatting.RESET, - EnumChatFormatting.LIGHT_PURPLE + "LuV" + EnumChatFormatting.RESET, - EnumChatFormatting.WHITE + "ZPM" + EnumChatFormatting.RESET, - EnumChatFormatting.DARK_AQUA + "UV" + EnumChatFormatting.RESET, - EnumChatFormatting.DARK_RED + "UHV" + EnumChatFormatting.RESET, - EnumChatFormatting.GREEN + "UEV" + EnumChatFormatting.RESET, - }; + public static final String[] tierName = new String[] { EnumChatFormatting.RED + "ULV" + EnumChatFormatting.RESET, + EnumChatFormatting.GRAY + "LV" + EnumChatFormatting.RESET, + EnumChatFormatting.AQUA + "MV" + EnumChatFormatting.RESET, + EnumChatFormatting.GOLD + "HV" + EnumChatFormatting.RESET, + EnumChatFormatting.DARK_PURPLE + "EV" + EnumChatFormatting.RESET, + EnumChatFormatting.DARK_BLUE + "IV" + EnumChatFormatting.RESET, + EnumChatFormatting.LIGHT_PURPLE + "LuV" + EnumChatFormatting.RESET, + EnumChatFormatting.WHITE + "ZPM" + EnumChatFormatting.RESET, + EnumChatFormatting.DARK_AQUA + "UV" + EnumChatFormatting.RESET, + EnumChatFormatting.DARK_RED + "UHV" + EnumChatFormatting.RESET, + EnumChatFormatting.GREEN + "UEV" + EnumChatFormatting.RESET, }; public static char shifter(int unicode) { return (char) unicode; @@ -51,13 +49,13 @@ public class CharExchanger { } /** - * ">" : 1 <BR> - * "<" : 2 <BR> - * "==" : 13 <BR> - * "!=" : 14 <BR> - * ">=" : 11 <BR> - * "<=" : 12 <BR> - * INVALID : -1 + * ">" : 1 <BR> + * "<" : 2 <BR> + * "==" : 13 <BR> + * "!=" : 14 <BR> + * ">=" : 11 <BR> + * "<=" : 12 <BR> + * INVALID : -1 */ public static int getOperator(String exp) { char c1, c2; @@ -91,7 +89,7 @@ public class CharExchanger { public static boolean compareExpression(String exp, int num) { int op = getOperator(exp); String NumExp = exp; - String[] opChar = new String[] {">", "<", "=", "!"}; + String[] opChar = new String[] { ">", "<", "=", "!" }; if (op == -1) throw new IllegalArgumentException(); for (String re : opChar) NumExp = NumExp.replace(re, ""); long num2 = 0; diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index 5af5773a7e..bf2779b64d 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -1,6 +1,12 @@ package goodgenerator.util; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -9,24 +15,15 @@ import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class CrackRecipeAdder { - static float[] coe1 = {1.25f, 1.2f, 1.1f, 0.9f, 0.85f, 0.8f, 0.75f}; - static float[] coe2 = {1.4f, 1.25f, 1.2f, 0.8f, 0.75f, 0.7f, 0.65f}; - static float[] coe3 = {1.6f, 1.5f, 1.45f, 0.7f, 0.6f, 0.55f, 0.45f}; - public static void crackerAdder( - FluidStack inputFluid, - FluidStack cracker, - FluidStack[] outputFluids, - ItemStack outputItem, - int num, - int EUt, - int Duration) { + static float[] coe1 = { 1.25f, 1.2f, 1.1f, 0.9f, 0.85f, 0.8f, 0.75f }; + static float[] coe2 = { 1.4f, 1.25f, 1.2f, 0.8f, 0.75f, 0.7f, 0.65f }; + static float[] coe3 = { 1.6f, 1.5f, 1.45f, 0.7f, 0.6f, 0.55f, 0.45f }; + + public static void crackerAdder(FluidStack inputFluid, FluidStack cracker, FluidStack[] outputFluids, + ItemStack outputItem, int num, int EUt, int Duration) { String name; FluidStack[] actOutput = new FluidStack[num]; @@ -40,7 +37,12 @@ public class CrackRecipeAdder { (int) (Duration * 0.8), EUt); GT_Values.RA.addCrackingRecipe( - 2, inputFluid, cracker, FluidRegistry.getFluidStack("moderatelycracked" + name, 1000), Duration, EUt); + 2, + inputFluid, + cracker, + FluidRegistry.getFluidStack("moderatelycracked" + name, 1000), + Duration, + EUt); GT_Values.RA.addCrackingRecipe( 3, inputFluid, @@ -89,20 +91,40 @@ public class CrackRecipeAdder { EUt / 3); } - public static void addUniversalCircuitAssemblerRecipe( - ItemStack[] inputs, ItemStack output, int solders, int duration, int EUt, boolean isClean) { + public static void addUniversalCircuitAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders, + int duration, int EUt, boolean isClean) { GT_Values.RA.addCircuitAssemblerRecipe( - inputs, Materials.SolderingAlloy.getMolten(solders), output, duration, EUt, isClean); + inputs, + Materials.SolderingAlloy.getMolten(solders), + output, + duration, + EUt, + isClean); GT_Values.RA.addCircuitAssemblerRecipe( - inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean); + inputs, + Materials.Tin.getMolten(solders * 2), + output, + duration, + EUt, + isClean); GT_Values.RA.addCircuitAssemblerRecipe( - inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, isClean); + inputs, + Materials.Lead.getMolten(solders * 4), + output, + duration, + EUt, + isClean); } - public static void addUniversalAssemblerRecipe( - ItemStack[] inputs, ItemStack output, int solders, int duration, int EUt, boolean isClean) { + public static void addUniversalAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders, int duration, + int EUt, boolean isClean) { GT_Values.RA.addAssemblerRecipe( - inputs, Materials.SolderingAlloy.getMolten(solders), output, duration, EUt, isClean); + inputs, + Materials.SolderingAlloy.getMolten(solders), + output, + duration, + EUt, + isClean); GT_Values.RA.addAssemblerRecipe(inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean); GT_Values.RA.addAssemblerRecipe(inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, isClean); } @@ -123,7 +145,15 @@ public class CrackRecipeAdder { level); } else { GT_Values.RA.addBlastRecipe( - input, GT_Utility.getIntegratedCircuit(1), null, null, output, null, duration, EUt, level); + input, + GT_Utility.getIntegratedCircuit(1), + null, + null, + output, + null, + duration, + EUt, + level); } } @@ -138,63 +168,58 @@ public class CrackRecipeAdder { GT_OreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID, - "GT_Pipe_" + unName + "_Tiny", - "Tiny " + Name + " Fluid Pipe", - 0.25F, - material.getBridgeMaterial(), - flow / 6, - temp, - gas) - .getStackForm(1L)); + ID, + "GT_Pipe_" + unName + "_Tiny", + "Tiny " + Name + " Fluid Pipe", + 0.25F, + material.getBridgeMaterial(), + flow / 6, + temp, + gas).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID + 1, - "GT_Pipe_" + unName + "_Small", - "Small " + Name + " Fluid Pipe", - 0.375F, - material.getBridgeMaterial(), - flow / 3, - temp, - gas) - .getStackForm(1L)); + ID + 1, + "GT_Pipe_" + unName + "_Small", + "Small " + Name + " Fluid Pipe", + 0.375F, + material.getBridgeMaterial(), + flow / 3, + temp, + gas).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID + 2, - "GT_Pipe_" + unName, - Name + " Fluid Pipe", - 0.5F, - material.getBridgeMaterial(), - flow, - temp, - gas) - .getStackForm(1L)); + ID + 2, + "GT_Pipe_" + unName, + Name + " Fluid Pipe", + 0.5F, + material.getBridgeMaterial(), + flow, + temp, + gas).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID + 3, - "GT_Pipe_" + unName + "_Large", - "Large " + Name + " Fluid Pipe", - 0.75F, - material.getBridgeMaterial(), - flow * 2, - temp, - gas) - .getStackForm(1L)); + ID + 3, + "GT_Pipe_" + unName + "_Large", + "Large " + Name + " Fluid Pipe", + 0.75F, + material.getBridgeMaterial(), + flow * 2, + temp, + gas).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material.getBridgeMaterial()), new GT_MetaPipeEntity_Fluid( - ID + 4, - "GT_Pipe_" + unName + "_Huge", - "Huge " + Name + " Fluid Pipe", - 0.875F, - material.getBridgeMaterial(), - flow * 4, - temp, - gas) - .getStackForm(1L)); + ID + 4, + "GT_Pipe_" + unName + "_Huge", + "Huge " + Name + " Fluid Pipe", + 0.875F, + material.getBridgeMaterial(), + flow * 4, + temp, + gas).getStackForm(1L)); GT_Values.RA.addExtruderRecipe( material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Tiny.get(0), @@ -269,183 +294,171 @@ public class CrackRecipeAdder { OrePrefixes.wireGt01, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 0, - aTextWire1 + unName + ".01", - "1x " + Name + aTextWire2, - 0.125F, - material.getBridgeMaterial(), - aLoss, - 1L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 0, + aTextWire1 + unName + ".01", + "1x " + Name + aTextWire2, + 0.125F, + material.getBridgeMaterial(), + aLoss, + 1L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt02, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 1, - aTextWire1 + unName + ".02", - "2x " + Name + aTextWire2, - 0.25F, - material.getBridgeMaterial(), - aLoss, - 2L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 1, + aTextWire1 + unName + ".02", + "2x " + Name + aTextWire2, + 0.25F, + material.getBridgeMaterial(), + aLoss, + 2L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt04, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 2, - aTextWire1 + unName + ".04", - "4x " + Name + aTextWire2, - 0.375F, - material.getBridgeMaterial(), - aLoss, - 4L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 2, + aTextWire1 + unName + ".04", + "4x " + Name + aTextWire2, + 0.375F, + material.getBridgeMaterial(), + aLoss, + 4L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt08, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 3, - aTextWire1 + unName + ".08", - "8x " + Name + aTextWire2, - 0.5F, - material.getBridgeMaterial(), - aLoss, - 8L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 3, + aTextWire1 + unName + ".08", + "8x " + Name + aTextWire2, + 0.5F, + material.getBridgeMaterial(), + aLoss, + 8L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt12, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 4, - aTextWire1 + unName + ".12", - "12x " + Name + aTextWire2, - 0.625F, - material.getBridgeMaterial(), - aLoss, - 12L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 4, + aTextWire1 + unName + ".12", + "12x " + Name + aTextWire2, + 0.625F, + material.getBridgeMaterial(), + aLoss, + 12L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt16, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 5, - aTextWire1 + unName + ".16", - "16x " + Name + aTextWire2, - 0.75F, - material.getBridgeMaterial(), - aLoss, - 16L * aAmperage, - aVoltage, - false, - true) - .getStackForm(1L)); + ID + 5, + aTextWire1 + unName + ".16", + "16x " + Name + aTextWire2, + 0.75F, + material.getBridgeMaterial(), + aLoss, + 16L * aAmperage, + aVoltage, + false, + true).getStackForm(1L)); if (cover) { GT_OreDictUnificator.registerOre( OrePrefixes.cableGt01, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 6, - aTextCable1 + unName + ".01", - "1x " + Name + aTextCable2, - 0.25F, - material.getBridgeMaterial(), - aLossInsulated, - 1L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 6, + aTextCable1 + unName + ".01", + "1x " + Name + aTextCable2, + 0.25F, + material.getBridgeMaterial(), + aLossInsulated, + 1L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt02, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 7, - aTextCable1 + unName + ".02", - "2x " + Name + aTextCable2, - 0.375F, - material.getBridgeMaterial(), - aLossInsulated, - 2L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 7, + aTextCable1 + unName + ".02", + "2x " + Name + aTextCable2, + 0.375F, + material.getBridgeMaterial(), + aLossInsulated, + 2L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt04, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 8, - aTextCable1 + unName + ".04", - "4x " + Name + aTextCable2, - 0.5F, - material.getBridgeMaterial(), - aLossInsulated, - 4L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 8, + aTextCable1 + unName + ".04", + "4x " + Name + aTextCable2, + 0.5F, + material.getBridgeMaterial(), + aLossInsulated, + 4L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt08, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 9, - aTextCable1 + unName + ".08", - "8x " + Name + aTextCable2, - 0.625F, - material.getBridgeMaterial(), - aLossInsulated, - 8L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 9, + aTextCable1 + unName + ".08", + "8x " + Name + aTextCable2, + 0.625F, + material.getBridgeMaterial(), + aLossInsulated, + 8L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt12, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 10, - aTextCable1 + unName + ".12", - "12x " + Name + aTextCable2, - 0.75F, - material.getBridgeMaterial(), - aLossInsulated, - 12L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 10, + aTextCable1 + unName + ".12", + "12x " + Name + aTextCable2, + 0.75F, + material.getBridgeMaterial(), + aLossInsulated, + 12L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt16, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable( - ID + 11, - aTextCable1 + unName + ".16", - "16x " + Name + aTextCable2, - 0.875F, - material.getBridgeMaterial(), - aLossInsulated, - 16L * aAmperage, - aVoltage, - true, - false) - .getStackForm(1L)); + ID + 11, + aTextCable1 + unName + ".16", + "16x " + Name + aTextCable2, + 0.875F, + material.getBridgeMaterial(), + aLossInsulated, + 16L * aAmperage, + aVoltage, + true, + false).getStackForm(1L)); } GT_Values.RA.addWiremillRecipe( material.get(OrePrefixes.ingot, 1), diff --git a/src/main/java/goodgenerator/util/DescTextLocalization.java b/src/main/java/goodgenerator/util/DescTextLocalization.java index b65f529475..cb015a25c9 100644 --- a/src/main/java/goodgenerator/util/DescTextLocalization.java +++ b/src/main/java/goodgenerator/util/DescTextLocalization.java @@ -5,9 +5,12 @@ import net.minecraft.util.StatCollector; public class DescTextLocalization { - public static final String BLUE_PRINT_INFO = - "Follow the" + EnumChatFormatting.BLUE + " Structure" + EnumChatFormatting.DARK_BLUE + "Lib" - + EnumChatFormatting.GRAY + " hologram projector to build the main structure."; + public static final String BLUE_PRINT_INFO = "Follow the" + EnumChatFormatting.BLUE + + " Structure" + + EnumChatFormatting.DARK_BLUE + + "Lib" + + EnumChatFormatting.GRAY + + " hologram projector to build the main structure."; public static String[] addText(String preFix, int length) { String[] text = new String[length]; diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java index 86ac3db64d..98baad7d94 100644 --- a/src/main/java/goodgenerator/util/ItemRefer.java +++ b/src/main/java/goodgenerator/util/ItemRefer.java @@ -3,12 +3,13 @@ package goodgenerator.util; import static goodgenerator.loader.FuelRodLoader.*; import static goodgenerator.loader.Loaders.*; -import gregtech.api.util.GT_Utility; -import ic2.core.Ic2Items; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import gregtech.api.util.GT_Utility; +import ic2.core.Ic2Items; + public final class ItemRefer { public static ItemRefer NULL = getItemStack(_null_); diff --git a/src/main/java/goodgenerator/util/Log.java b/src/main/java/goodgenerator/util/Log.java index 8b88ddf5f1..4cf9e40484 100644 --- a/src/main/java/goodgenerator/util/Log.java +++ b/src/main/java/goodgenerator/util/Log.java @@ -4,5 +4,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; public class Log { + public static final Logger LOGGER = LogManager.getLogger("GoodGenerator"); } diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index 795686f676..d3a0548aca 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -1,6 +1,7 @@ package goodgenerator.util; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -10,75 +11,72 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; public class MaterialFix { + public static void MaterialFluidExtractionFix(Werkstoff material) { if (material.hasItemType(OrePrefixes.ingot)) { - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.ingot), null, material.getMolten(144), 0, 32, 8); + GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.ingot), null, material.getMolten(144), 0, 32, 8); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Ingot.get(0), material.getMolten(144), material.get(OrePrefixes.ingot), 32, 48); + ItemList.Shape_Mold_Ingot.get(0), + material.getMolten(144), + material.get(OrePrefixes.ingot), + 32, + 48); } if (material.hasItemType(OrePrefixes.plate)) { - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.plate), null, material.getMolten(144), 0, 32, 8); + GT_Values.RA + .addFluidExtractionRecipe(material.get(OrePrefixes.plate), null, material.getMolten(144), 0, 32, 8); GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Plate.get(0), material.getMolten(144), material.get(OrePrefixes.plate), 32, 48); + ItemList.Shape_Mold_Plate.get(0), + material.getMolten(144), + material.get(OrePrefixes.plate), + 32, + 48); } - if (material.hasItemType(OrePrefixes.gearGtSmall)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.gearGtSmall), null, material.getMolten(144), 0, 32, 8); - if (material.hasItemType(OrePrefixes.stickLong)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.stickLong), null, material.getMolten(144), 0, 32, 8); - if (material.hasItemType(OrePrefixes.spring)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.spring), null, material.getMolten(144), 0, 32, 8); - if (material.hasItemType(OrePrefixes.stick)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.stick), null, material.getMolten(72), 0, 16, 8); - if (material.hasItemType(OrePrefixes.itemCasing)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.itemCasing), null, material.getMolten(72), 0, 16, 8); - if (material.hasItemType(OrePrefixes.wireGt01)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.wireGt01), null, material.getMolten(72), 0, 16, 8); - if (material.hasItemType(OrePrefixes.cableGt01)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.cableGt01), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2), - material.getMolten(72), - 10000, - 16, - 8); - if (material.hasItemType(OrePrefixes.foil)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.foil), null, material.getMolten(36), 0, 8, 8); - if (material.hasItemType(OrePrefixes.springSmall)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.springSmall), null, material.getMolten(36), 0, 8, 8); - if (material.hasItemType(OrePrefixes.ring)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.ring), null, material.getMolten(36), 0, 8, 8); - if (material.hasItemType(OrePrefixes.bolt)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.bolt), null, material.getMolten(18), 0, 4, 8); - if (material.hasItemType(OrePrefixes.wireFine)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.wireFine), null, material.getMolten(18), 0, 4, 8); - if (material.hasItemType(OrePrefixes.round)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.round), null, material.getMolten(16), 0, 4, 8); - if (material.hasItemType(OrePrefixes.screw)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.screw), null, material.getMolten(16), 0, 4, 8); - if (material.hasItemType(OrePrefixes.nugget)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.nugget), null, material.getMolten(16), 0, 4, 8); - if (material.hasItemType(OrePrefixes.rotor)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.rotor), null, material.getMolten(612), 0, 136, 8); - if (material.hasItemType(OrePrefixes.gearGt)) - GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.gearGt), null, material.getMolten(576), 0, 128, |
