diff options
author | boubou19 <miisterunknown@gmail.com> | 2023-04-11 01:24:57 +0200 |
---|---|---|
committer | boubou19 <miisterunknown@gmail.com> | 2023-04-11 01:24:57 +0200 |
commit | 494b82014657c7519e6a087e103a73ffc356e5ef (patch) | |
tree | ce034cab83a90213a71c4b364da92161598aa250 /src | |
parent | 0b4c6a13b13709217102d53da7ca9870d929a6b3 (diff) | |
download | GT5-Unofficial-494b82014657c7519e6a087e103a73ffc356e5ef.tar.gz GT5-Unofficial-494b82014657c7519e6a087e103a73ffc356e5ef.tar.bz2 GT5-Unofficial-494b82014657c7519e6a087e103a73ffc356e5ef.zip |
spotless
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/common/Recipes.java | 6 | ||||
-rw-r--r-- | src/main/java/common/recipeLoaders/AlloySmelter.java | 27 | ||||
-rw-r--r-- | src/main/java/common/recipeLoaders/Assembler.java | 401 | ||||
-rw-r--r-- | src/main/java/common/recipeLoaders/AssemblyLine.java | 388 | ||||
-rw-r--r-- | src/main/java/common/recipeLoaders/ChemicalReactor.java | 27 | ||||
-rw-r--r-- | src/main/java/common/recipeLoaders/FormingPress.java | 30 | ||||
-rw-r--r-- | src/main/java/common/recipeLoaders/Mixer.java | 46 | ||||
-rw-r--r-- | src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java | 51 | ||||
-rw-r--r-- | src/main/java/common/recipeLoaders/Unpackager.java | 311 | ||||
-rw-r--r-- | src/main/java/kekztech/KekzCore.java | 2 |
10 files changed, 470 insertions, 819 deletions
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 62fe0747be..21149e1406 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -1,8 +1,9 @@ package common; +import static gregtech.api.enums.Mods.ThaumicTinkerer; + import java.util.HashMap; -import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.LuVTierEnhancer; import kekztech.KekzCore; import net.minecraft.item.ItemStack; @@ -13,6 +14,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.InfusionRecipe; +import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.LuVTierEnhancer; import common.recipeLoaders.AlloySmelter; import common.recipeLoaders.Assembler; import common.recipeLoaders.AssemblyLine; @@ -29,8 +31,6 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import static gregtech.api.enums.Mods.ThaumicTinkerer; - public class Recipes { public static final HashMap<String, InfusionRecipe> infusionRecipes = new HashMap<>(); diff --git a/src/main/java/common/recipeLoaders/AlloySmelter.java b/src/main/java/common/recipeLoaders/AlloySmelter.java index 239d9bb649..86af24d4a4 100644 --- a/src/main/java/common/recipeLoaders/AlloySmelter.java +++ b/src/main/java/common/recipeLoaders/AlloySmelter.java @@ -1,15 +1,16 @@ package common.recipeLoaders; -import gregtech.api.enums.TierEU; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import kekztech.Items; import common.items.MetaItem_CraftingComponent; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; - -import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import gregtech.api.enums.TierEU; public class AlloySmelter implements Runnable { @@ -20,16 +21,12 @@ public class AlloySmelter implements Runnable { // YSZ Cermic Plate GT_Values.RA.stdBuilder() - .itemInputs( - craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(),3), - ItemList.Shape_Mold_Plate.get(0) - ) - .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1)) - .noFluidInputs() - .noFluidOutputs() - .duration(20*SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sAlloySmelterRecipes); + .itemInputs( + craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 3), + ItemList.Shape_Mold_Plate.get(0)) + .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1)) + .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sAlloySmelterRecipes); } } } diff --git a/src/main/java/common/recipeLoaders/Assembler.java b/src/main/java/common/recipeLoaders/Assembler.java index 98d6320153..9c6ac9c3fb 100644 --- a/src/main/java/common/recipeLoaders/Assembler.java +++ b/src/main/java/common/recipeLoaders/Assembler.java @@ -1,5 +1,9 @@ package common.recipeLoaders; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import kekztech.Items; import net.minecraft.item.ItemStack; @@ -19,10 +23,6 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; - public class Assembler implements Runnable { @Override @@ -30,306 +30,217 @@ public class Assembler implements Runnable { // TFFT Casing GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(6), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3) - ) - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1) - ) - .fluidInputs( - Materials.Polytetrafluoroethylene.getMolten(144) - ) - .noFluidOutputs() - .duration(5 * SECONDS) - .eut((int) TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3)) + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144)).noFluidOutputs().duration(5 * SECONDS) + .eut((int) TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFT Multi Hatch GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), ItemList.Cover_FluidStorageMonitor.get(1), ItemList.Field_Generator_LV.get(4), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 25) - ) - .itemOutputs( - TileEntities.tfftHatch.getStackForm(1) - ) - .fluidInputs( - Materials.Plastic.getMolten(432) - ) - .noFluidOutputs() - .duration(20 * SECONDS) - .eut((int) TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + ItemList.Cover_FluidStorageMonitor.get(1), + ItemList.Field_Generator_LV.get(4), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 25)) + .itemOutputs(TileEntities.tfftHatch.getStackForm(1)).fluidInputs(Materials.Plastic.getMolten(432)) + .noFluidOutputs().duration(20 * SECONDS).eut((int) TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFTStorageField1 GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(6), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Steel, 3), ItemList.FluidRegulator_LV.get(1) - ) - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1, 1) - ) - .fluidInputs( - Materials.Glass.getMolten(144) - ) - .noFluidOutputs() - .duration(5 * SECONDS) - .eut((int) TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Steel, 3), + ItemList.FluidRegulator_LV.get(1)) + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 1)).fluidInputs(Materials.Glass.getMolten(144)) + .noFluidOutputs().duration(5 * SECONDS).eut((int) TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFTStorageField2 GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_1.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Plastic, 3), ItemList.FluidRegulator_MV.get(1) - ) - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1, 2) - ) - .fluidInputs( - Materials.Plastic.getMolten(288) - ) - .noFluidOutputs() - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(6), + ItemList.Casing_Tank_1.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Plastic, 3), + ItemList.FluidRegulator_MV.get(1)) + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 2)).fluidInputs(Materials.Plastic.getMolten(288)) + .noFluidOutputs().duration(10 * SECONDS).eut((int) TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFTStorageField3 GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_3.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.StainlessSteel, 3), ItemList.Field_Generator_LV.get(1), ItemList.FluidRegulator_HV.get(1) - ) - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1, 3) - ) - .fluidInputs( - Materials.Plastic.getMolten(432) - ) - .noFluidOutputs() - .duration(20 * SECONDS) - .eut((int) TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(6), + ItemList.Casing_Tank_3.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.StainlessSteel, 3), + ItemList.Field_Generator_LV.get(1), + ItemList.FluidRegulator_HV.get(1)) + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 3)).fluidInputs(Materials.Plastic.getMolten(432)) + .noFluidOutputs().duration(20 * SECONDS).eut((int) TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFTStorageField4 GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_5.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Polytetrafluoroethylene, 3), ItemList.Field_Generator_MV.get(2), ItemList.FluidRegulator_EV.get(1) - ) - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1, 4) - ) - .fluidInputs( - Materials.Epoxid.getMolten(864) - ) - .noFluidOutputs() - .duration(20 * SECONDS) - .eut((int) TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(6), + ItemList.Casing_Tank_5.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Polytetrafluoroethylene, 3), + ItemList.Field_Generator_MV.get(2), + ItemList.FluidRegulator_EV.get(1)) + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 4)).fluidInputs(Materials.Epoxid.getMolten(864)) + .noFluidOutputs().duration(20 * SECONDS).eut((int) TierEU.RECIPE_EV).addTo(sAssemblerRecipes); // TFFTStorageField5 GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(6), ItemList.Casing_Tank_7.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Enderium, 3), ItemList.Field_Generator_HV.get(4), ItemList.FluidRegulator_IV.get(1) - ) - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1, 5) - ) - .fluidInputs( - Materials.Epoxid.getMolten(1152) - ) - .noFluidOutputs() - .duration(20 * SECONDS) - .eut((int) TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(6), + ItemList.Casing_Tank_7.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Enderium, 3), + ItemList.Field_Generator_HV.get(4), + ItemList.FluidRegulator_IV.get(1)) + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 5)).fluidInputs(Materials.Epoxid.getMolten(1152)) + .noFluidOutputs().duration(20 * SECONDS).eut((int) TierEU.RECIPE_IV).addTo(sAssemblerRecipes); // LSC Casing GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tantalum, 4), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lapis, 1) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tantalum, 4), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lapis, 1)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0)).noFluidInputs().noFluidOutputs() + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // EV Capacitor alt recipe GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6), GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), GT_Utility.getIntegratedCircuit(7) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6), + GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), + GT_Utility.getIntegratedCircuit(7)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7)).noFluidInputs().noFluidOutputs() + .duration(10 * SECONDS).eut((int) TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // IV Capacitor alt recipe GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6), ItemList.Energy_LapotronicOrb.get(1L), GT_Utility.getIntegratedCircuit(1) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(20 * SECONDS) - .eut((int) TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6), + ItemList.Energy_LapotronicOrb.get(1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1)).noFluidInputs().noFluidOutputs() + .duration(20 * SECONDS).eut((int) TierEU.RECIPE_EV).addTo(sAssemblerRecipes); // LuV Capacitor alt recipe GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Energy_LapotronicOrb2.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24), GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(40 * SECONDS) - .eut((int) TierEU.RECIPE_IV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Energy_LapotronicOrb2.get(1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)).noFluidInputs().noFluidOutputs() + .duration(40 * SECONDS).eut((int) TierEU.RECIPE_IV).addTo(sAssemblerRecipes); // ZPM Capacitor alt recipe GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Energy_Module.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24), GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(1 * MINUTES + 20 * SECONDS) - .eut((int) TierEU.RECIPE_LuV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Energy_Module.get(1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)).noFluidInputs().noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); // UV Capacitor alt recipe GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Energy_Cluster.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24), GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(2 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_ZPM) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Energy_Cluster.get(1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)).noFluidInputs().noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); // UHV Capacitor alt recipe GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.ZPM3.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24), GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * MINUTES + 20 * SECONDS) - .eut((int) TierEU.RECIPE_UV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.ZPM3.get(1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5)).noFluidInputs().noFluidOutputs() + .duration(5 * MINUTES + 20 * SECONDS).eut((int) TierEU.RECIPE_UV).addTo(sAssemblerRecipes); // UEV Capacitor alt recipe GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.ZPM4.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24), GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(10 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_UHV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.ZPM4.get(1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8)).noFluidInputs().noFluidOutputs() + .duration(10 * MINUTES + 40 * SECONDS).eut((int) TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); // UIV Capacitor alt recipe GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.ZPM5.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24), GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(10 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_UEV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.ZPM5.get(1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9)).noFluidInputs().noFluidOutputs() + .duration(10 * MINUTES + 40 * SECONDS).eut((int) TierEU.RECIPE_UEV).addTo(sAssemblerRecipes); // UMV Capacitor alt recipe GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.ZPM6.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24), GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(10 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_UIV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.ZPM6.get(1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10)).noFluidInputs().noFluidOutputs() + .duration(10 * MINUTES + 40 * SECONDS).eut((int) TierEU.RECIPE_UIV).addTo(sAssemblerRecipes); final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance(); // YSZ Unit GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(6), craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 4), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Yttrium, 1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1), ItemList.Electric_Motor_HV.get(1L) - ) - .itemOutputs( - new ItemStack(Blocks.yszUnit, 1) - ) - .fluidInputs( - Materials.Hydrogen.getGas(4000) - ) - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(6), + craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 4), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Yttrium, 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1), + ItemList.Electric_Motor_HV.get(1L)) + .itemOutputs(new ItemStack(Blocks.yszUnit, 1)).fluidInputs(Materials.Hydrogen.getGas(4000)) + .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // GDC Unit - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(6), craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 8), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, new ItemStack(ErrorItem.getInstance(), 1), 1), ItemList.Electric_Motor_IV.get(1L) - ) - .itemOutputs( - new ItemStack(Blocks.gdcUnit, 1) - ) - .fluidInputs( - Materials.Hydrogen.getGas(16000) - ) - .noFluidOutputs() - .duration(2 * MINUTES) - .eut(TierEU.RECIPE_EV) - .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder().itemInputs( + GT_Utility.getIntegratedCircuit(6), + craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 8), + GT_OreDictUnificator + .get(OrePrefixes.frameGt, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1), + GT_OreDictUnificator + .get(OrePrefixes.rotor, Materials.Desh, new ItemStack(ErrorItem.getInstance(), 1), 1), + ItemList.Electric_Motor_IV.get(1L)).itemOutputs(new ItemStack(Blocks.gdcUnit, 1)) + .fluidInputs(Materials.Hydrogen.getGas(16000)).noFluidOutputs().duration(2 * MINUTES) + .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); // Hex Tiles GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(6),GT_OreDictUnificator.get(OrePrefixes.stone, Materials.Concrete, 1),GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),GT_OreDictUnificator.get(OrePrefixes.foil, Materials.DarkSteel, 2) - ) - .itemOutputs( - new ItemStack(Blocks.largeHexPlate, 2) - ) - .fluidInputs( - FluidRegistry.getFluidStack("molten.plastic", 36) - ) - .noFluidOutputs() - .duration(30 * SECONDS) - .eut(TierEU.RECIPE_MV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(6), + GT_OreDictUnificator.get(OrePrefixes.stone, Materials.Concrete, 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.DarkSteel, 2)) + .itemOutputs(new ItemStack(Blocks.largeHexPlate, 2)) + .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 36)).noFluidOutputs().duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); } } diff --git a/src/main/java/common/recipeLoaders/AssemblyLine.java b/src/main/java/common/recipeLoaders/AssemblyLine.java index 3f75176df3..6c56d2ccb4 100644 --- a/src/main/java/common/recipeLoaders/AssemblyLine.java +++ b/src/main/java/common/recipeLoaders/AssemblyLine.java @@ -1,20 +1,5 @@ package common.recipeLoaders; -import gregtech.api.enums.TierEU; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import common.Blocks; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; - import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.EternalSingularity; @@ -29,6 +14,21 @@ import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import common.Blocks; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; + public class AssemblyLine implements Runnable { @Override @@ -42,230 +42,164 @@ public class AssemblyLine implements Runnable { : FluidRegistry.getFluid("molten.solderingalloy"); // TFFTStorageField6 - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 5)) - .metadata(RESEARCH_TIME, 1*HOURS + 6*MINUTES + 40*SECONDS) - .itemInputs( - ItemList.Casing_Tank_7.get(4), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Naquadah, 3), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeBars", 6), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Quantium, 6), - ItemList.Field_Generator_EV.get(8), ItemList.FluidRegulator_LuV.get(1), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 4) - ) - .fluidInputs( - Materials.Enderium.getMolten(1440), - Materials.Polybenzimidazole.getMolten(1584) - ) - .noFluidOutputs() - .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 6)) - .eut(TierEU.RECIPE_LuV) - .duration(30*SECONDS) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 5)) + .metadata(RESEARCH_TIME, 1 * HOURS + 6 * MINUTES + 40 * SECONDS) + .itemInputs( + ItemList.Casing_Tank_7.get(4), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Naquadah, 3), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeBars", 6), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Quantium, 6), + ItemList.Field_Generator_EV.get(8), + ItemList.FluidRegulator_LuV.get(1), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 4)) + .fluidInputs(Materials.Enderium.getMolten(1440), Materials.Polybenzimidazole.getMolten(1584)) + .noFluidOutputs().itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 6)).eut(TierEU.RECIPE_LuV) + .duration(30 * SECONDS).addTo(AssemblyLine); // TFFTStorageField7 - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 6)) - .metadata(RESEARCH_TIME, 1*HOURS+6*MINUTES+40*SECONDS) - .itemInputs( - ItemList.Casing_Tank_10.get(16), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.NetherStar, 3), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumBars", 6), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.MysteriousCrystal, 6), - ItemList.Field_Generator_IV.get(16), ItemList.Field_Generator_LuV.get(4), - ItemList.FluidRegulator_UV.get(1), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 16) - ) - .fluidInputs( - Materials.CrystallineAlloy.getMolten(2880), - Materials.Polybenzimidazole.getMolten(2016) - ) - .noFluidOutputs() - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1, 7) - ) - .duration(30*SECONDS) - .eut(TierEU.RECIPE_UV) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 6)) + .metadata(RESEARCH_TIME, 1 * HOURS + 6 * MINUTES + 40 * SECONDS) + .itemInputs( + ItemList.Casing_Tank_10.get(16), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.NetherStar, 3), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumBars", 6), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.MysteriousCrystal, 6), + ItemList.Field_Generator_IV.get(16), + ItemList.Field_Generator_LuV.get(4), + ItemList.FluidRegulator_UV.get(1), + GT_ModHandler + .getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 16)) + .fluidInputs(Materials.CrystallineAlloy.getMolten(2880), Materials.Polybenzimidazole.getMolten(2016)) + .noFluidOutputs().itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 7)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(AssemblyLine); // TFFTStorageField8 - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 7)) - .metadata(RESEARCH_TIME, 2*HOURS+40*MINUTES) - .itemInputs( - ItemList.Quantum_Tank_IV.get(1), - GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 6), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 6), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.DraconiumAwakened, 3), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumBars", 6), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.InfinityCatalyst, 6), - ItemList.Field_Generator_ZPM.get(16), ItemList.Field_Generator_UV.get(4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 2), - GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4) - ) - .fluidInputs( - Materials.CrystallinePinkSlime.getMolten(4320), - new FluidStack(radoxPoly, 2880) - ) - .noFluidOutputs() - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1, 8) - ) - .duration(30*SECONDS) - .eut(TierEU.RECIPE_UEV) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 7)) + .metadata(RESEARCH_TIME, 2 * HOURS + 40 * MINUTES) + .itemInputs( + ItemList.Quantum_Tank_IV.get(1), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 6), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.DraconiumAwakened, 3), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumBars", 6), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.InfinityCatalyst, 6), + ItemList.Field_Generator_ZPM.get(16), + ItemList.Field_Generator_UV.get(4), + GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 2), + GT_ModHandler + .getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4)) + .fluidInputs(Materials.CrystallinePinkSlime.getMolten(4320), new FluidStack(radoxPoly, 2880)) + .noFluidOutputs().itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 8)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_UEV).addTo(AssemblyLine); - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 8)) - .metadata(RESEARCH_TIME, 2*HOURS+13*MINUTES+20*SECONDS) - .itemInputs( - ItemList.Quantum_Tank_IV.get(4), - GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 3), - ItemList.EnergisedTesseract.get(1), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemRotorHypogen", 6), - ItemList.Field_Generator_UHV.get(16), - ItemList.Field_Generator_UEV.get(4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 3), - GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4) - ) - .fluidInputs( - Materials.MelodicAlloy.getMolten(5760), - new FluidStack(radoxPoly, 3456) - ) - .noFluidOutputs() - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1, 9) - ) - .duration(30*SECONDS) - .eut(TierEU.RECIPE_UMV) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 8)) + .metadata(RESEARCH_TIME, 2 * HOURS + 13 * MINUTES + 20 * SECONDS) + .itemInputs( + ItemList.Quantum_Tank_IV.get(4), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 3), + ItemList.EnergisedTesseract.get(1), + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemRotorHypogen", 6), + ItemList.Field_Generator_UHV.get(16), + ItemList.Field_Generator_UEV.get(4), + GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 3), + GT_ModHandler + .getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4)) + .fluidInputs(Materials.MelodicAlloy.getMolten(5760), new FluidStack(radoxPoly, 3456)).noFluidOutputs() + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 9)).duration(30 * SECONDS).eut(TierEU.RECIPE_UMV) + .addTo(AssemblyLine); // TFFTStorageField10 - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 9)) - .metadata(RESEARCH_TIME,2*HOURS+46*MINUTES+40*SECONDS) - .itemInputs( - ItemList.Quantum_Tank_IV.get(16), - GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.SpaceTime, 3), - ItemList.EnergisedTesseract.get(6), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.SpaceTime, 6), - ItemList.Field_Generator_UEV.get(16), ItemList.Field_Generator_UIV.get(4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4), - GT_ModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 64, 6), - GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1) - ) - .fluidInputs( - Materials.StellarAlloy.getMolten(7200), - new FluidStack(radoxPoly, 4608) - ) - .noFluidOutputs() - .itemOutputs( - new ItemStack(Blocks.tfftStorageField, 1, 10) - ) - .duration(30*SECONDS) - .eut(TierEU.RECIPE_UXV) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 9)) + .metadata(RESEARCH_TIME, 2 * HOURS + 46 * MINUTES + 40 * SECONDS) + .itemInputs( + ItemList.Quantum_Tank_IV.get(16), + GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.SpaceTime, 3), + ItemList.EnergisedTesseract.get(6), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.SpaceTime, 6), + ItemList.Field_Generator_UEV.get(16), + ItemList.Field_Generator_UIV.get(4), + GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4), + GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4), + GT_ModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 64, 6), + GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1)) + .fluidInputs(Materials.StellarAlloy.getMolten(7200), new FluidStack(radoxPoly, 4608)).noFluidOutputs() + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 10)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_UXV).addTo(AssemblyLine); // LuV Capacitor - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1)) - .metadata(RESEARCH_TIME,4*HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24), - ItemList.Circuit_Board_Elite.get(1), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahAlloy, 64), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, - ItemList.Circuit_Parts_Crystal_Chip_Master.get(36), - ItemList.Circuit_Parts_Crystal_Chip_Master.get(36), - ItemList.Circuit_Chip_HPIC.get(64), - ItemList.Circuit_Parts_DiodeASMD.get(8), - ItemList.Circuit_Parts_CapacitorASMD.get(8), - ItemList.Circuit_Parts_ResistorASMD.get(8), - ItemList.Circuit_Parts_TransistorASMD.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64) - ) - .fluidInputs( - new FluidStack(solderIndalloy, 720) - ) - .noFluidOutputs() - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2) - ) - .duration(50*SECONDS) - .eut(80_000) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24), + ItemList.Circuit_Board_Elite.get(1), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahAlloy, 64), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + ItemList.Circuit_Parts_Crystal_Chip_Master.get(36), + ItemList.Circuit_Parts_Crystal_Chip_Master.get(36), + ItemList.Circuit_Chip_HPIC.get(64), + ItemList.Circuit_Parts_DiodeASMD.get(8), + ItemList.Circuit_Parts_CapacitorASMD.get(8), + ItemList.Circuit_Parts_ResistorASMD.get(8), + ItemList.Circuit_Parts_TransistorASMD.get(8), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64)) + .fluidInputs(new FluidStack(solderIndalloy, 720)).noFluidOutputs() + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)).duration(50 * SECONDS).eut(80_000) + .addTo(AssemblyLine); // ZPM Capacitor - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)) - .metadata(RESEARCH_TIME, 4*HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - ItemList.Energy_LapotronicOrb2.get(8L), - ItemList.Field_Generator_LuV.get(2), - ItemList.Circuit_Wafer_SoC2.get(64), - ItemList.Circuit_Wafer_SoC2.get(64), - ItemList.Circuit_Parts_DiodeASMD.get(8), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32) - ) - .fluidInputs( - new FluidStack(solderIndalloy, 2880), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - ) - .noFluidOutputs() - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3) - ) - .duration(1*MINUTES+40*SECONDS) - .eut(100_000) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + ItemList.Energy_LapotronicOrb2.get(8L), + ItemList.Field_Generator_LuV.get(2), + ItemList.Circuit_Wafer_SoC2.get(64), + ItemList.Circuit_Wafer_SoC2.get(64), + ItemList.Circuit_Parts_DiodeASMD.get(8), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32)) + .fluidInputs( + new FluidStack(solderIndalloy, 2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)) + .noFluidOutputs().itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)) + .duration(1 * MINUTES + 40 * SECONDS).eut(100_000).addTo(AssemblyLine); // UV Capacitor - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)) - .metadata(RESEARCH_TIME, 4*HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32L), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - ItemList.Energy_Module.get(8L), - ItemList.Field_Generator_ZPM.get(2), - ItemList.Circuit_Wafer_HPIC.get(64), - ItemList.Circuit_Wafer_HPIC.get(64), - ItemList.Circuit_Parts_DiodeASMD.get(16), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32) - ) - .fluidInputs( - new FluidStack(solderIndalloy, 2880), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000) - ) - .noFluidOutputs() - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4) - ) - .eut(200_000) - .duration(1*MINUTES+40*SECONDS) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32L), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + ItemList.Energy_Module.get(8L), + ItemList.Field_Generator_ZPM.get(2), + ItemList.Circuit_Wafer_HPIC.get(64), + ItemList.Circuit_Wafer_HPIC.get(64), + ItemList.Circuit_Parts_DiodeASMD.get(16), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32)) + .fluidInputs( + new FluidStack(solderIndalloy, 2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)) + .noFluidOutputs().itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)).eut(200_000) + .duration(1 * MINUTES + 40 * SECONDS).addTo(AssemblyLine); } } diff --git a/src/main/java/common/recipeLoaders/ChemicalReactor.java b/src/main/java/common/recipeLoaders/ChemicalReactor.java index f0b532e816..8d8a4a61b7 100644 --- a/src/main/java/common/recipeLoaders/ChemicalReactor.java +++ b/src/main/java/common/recipeLoaders/ChemicalReactor.java @@ -1,18 +1,16 @@ package common.recipeLoaders; -import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; + import kekztech.Items; import common.items.MetaItem_CraftingComponent; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; - -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; public class ChemicalReactor implements Runnable { @@ -21,19 +19,10 @@ public class ChemicalReactor implements Runnable { final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance(); // Ceria Dust - GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Cerium.getDust(2), - GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 2) - ) - .fluidInputs(Materials.Oxygen.getGas(3000)) - .noFluidOutputs() - .duration(20 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder().itemInputs(Materials.Cerium.getDust(2), GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 2)) + .fluidInputs(Materials.Oxygen.getGas(3000)).noFluidOutputs().duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); } } diff --git a/src/main/java/common/recipeLoaders/FormingPress.java b/src/main/java/common/recipeLoaders/FormingPress.java index 2b734d413f..b53a68da27 100644 --- a/src/main/java/common/recipeLoaders/FormingPress.java +++ b/src/main/java/common/recipeLoaders/FormingPress.java @@ -1,20 +1,15 @@ package common.recipeLoaders; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPressRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import kekztech.Items; import common.items.MetaItem_CraftingComponent; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; - -import static gregtech.api.enums.Mods.BuildCraftSilicon; -import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPressRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import gregtech.api.enums.TierEU; public class FormingPress implements Runnable { @@ -24,17 +19,10 @@ public class FormingPress implements Runnable { // YSZ Ceramic Plate GT_Values.RA.stdBuilder() - .itemInputs( - craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10), - ItemList.Shape_Mold_Plate.get(0) - ) - .itemOutputs( - craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 1) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(40 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sPressRecipes); + .itemInputs( + craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10), + ItemList.Shape_Mold_Plate.get(0)) + .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 1)) + .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sPressRecipes); } } diff --git a/src/main/java/common/recipeLoaders/Mixer.java b/src/main/java/common/recipeLoaders/Mixer.java index 204b6b738d..a3a9d6d3e6 100644 --- a/src/main/java/common/recipeLoaders/Mixer.java +++ b/src/main/java/common/recipeLoaders/Mixer.java @@ -1,6 +1,8 @@ package common.recipeLoaders; -import gregtech.api.enums.TierEU; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import kekztech.Items; import net.minecraft.item.ItemStack; @@ -11,12 +13,10 @@ import common.items.MetaItem_CraftingComponent; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; - public class Mixer implements Runnable { @Override @@ -25,34 +25,20 @@ public class Mixer implements Runnable { // YSZ Ceramic Dust GT_Values.RA.stdBuilder() - .itemInputs( - Items.YttriaDust.getOreDictedItemStack(1), - Items.ZirconiaDust.getOreDictedItemStack(5), - GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(20*SECONDS) - .eut(96) - .addTo(sMixerRecipes); + .itemInputs( + Items.YttriaDust.getOreDictedItemStack(1), + Items.ZirconiaDust.getOreDictedItemStack(5), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 6)) + .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(96).addTo(sMixerRecipes); // GDC Ceramic Dust - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1), + GT_Values.RA.stdBuilder().itemInputs( + GT_OreDictUnificator + .get(OrePrefixes.dust, Materials.Gadolinium, new ItemStack(ErrorItem.getInstance(), 1), 1), craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 9), - GT_Utility.getIntegratedCircuit(6) - ) - .itemOutputs( - craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(20*SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(sMixerRecipes); + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10)) + .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMixerRecipes); } } diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java index e78c75aaee..ce8c68fd15 100644 --- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java +++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java @@ -1,5 +1,8 @@ package common.recipeLoaders; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -8,7 +11,6 @@ import net.minecraftforge.fluids.FluidStack; import com.github.technus.tectech.recipe.TT_recipeAdder; import common.Blocks; -import cpw.mods.fml.common.Loader; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -16,9 +18,6 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; - public class ResearchableAssemblyLine implements Runnable { @Override @@ -111,27 +110,27 @@ public class ResearchableAssemblyLine implements Runnable { // Ultimate Capacitor (UHV) TT_recipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4), - 12000, - 16, - 300000, - 3, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, ItemList.ZPM2.get(8L), - ItemList.Field_Generator_UHV.get(4), ItemList.Circuit_Wafer_UHPIC.get(64), - ItemList.Circuit_Wafer_UHPIC.get(64), ItemList.Circuit_Wafer_SoC2.get(32), - ItemList.Circuit_Parts_DiodeASMD.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64) }, - new FluidStack[] { new FluidStack(solderUEV, 4608), Materials.Naquadria.getMolten(9216), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000) }, - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5), - 4000, - 1600000); + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4), + 12000, + 16, + 300000, + 3, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, ItemList.ZPM2.get(8L), + ItemList.Field_Generator_UHV.get(4), ItemList.Circuit_Wafer_UHPIC.get(64), + ItemList.Circuit_Wafer_UHPIC.get(64), ItemList.Circuit_Wafer_SoC2.get(32), + ItemList.Circuit_Parts_DiodeASMD.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 4608), Materials.Naquadria.getMolten(9216), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000) }, + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5), + 4000, + 1600000); } } diff --git a/src/main/java/common/recipeLoaders/Unpackager.java b/src/main/java/common/recipeLoaders/Unpackager.java index e5e86795bc..ed39cd1e01 100644 --- a/src/main/java/common/recipeLoaders/Unpackager.java +++ b/src/main/java/common/recipeLoaders/Unpackager.java @@ -1,8 +1,10 @@ package common.recipeLoaders; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sUnboxinatorRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.util.BW_Util; import common.Blocks; import gregtech.api.enums.GT_Values; @@ -13,9 +15,6 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sUnboxinatorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; - public class Unpackager implements Runnable { @Override @@ -24,144 +23,64 @@ public class Unpackager implements Runnable { // TFFT Recycling { GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs( + new ItemStack(Blocks.tfftStorageField, 1, 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6)).noFluidInputs() + .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 2), - ItemList.Casing_Tank_1.get(1) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 2), ItemList.Casing_Tank_1.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6)) + .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 3), - ItemList.Casing_Tank_3.get(1) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 3), ItemList.Casing_Tank_3.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6)).noFluidInputs() + .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 4), - ItemList.Casing_Tank_5.get(1) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 4), ItemList.Casing_Tank_5.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6)).noFluidInputs() + .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 5), - ItemList.Casing_Tank_7.get(1) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 5), ItemList.Casing_Tank_7.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6)) + .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 6), - ItemList.Casing_Tank_7.get(4) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 6), ItemList.Casing_Tank_7.get(4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6)) + .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 7), - ItemList.Casing_Tank_10.get(16) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 7), ItemList.Casing_Tank_10.get(16)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6)) + .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 8), - ItemList.Quantum_Tank_IV.get(1) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 12) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 8), ItemList.Quantum_Tank_IV.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 12)) + .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 9), - ItemList.Quantum_Tank_IV.get(4) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 12) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 9), ItemList.Quantum_Tank_IV.get(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 12)) + .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.tfftStorageField, 1, 10), - ItemList.Quantum_Tank_IV.get(16) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 12) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 10), ItemList.Quantum_Tank_IV.get(16)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 12)) + .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sUnboxinatorRecipes); } @@ -169,130 +88,58 @@ public class Unpackager implements Runnable { { GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7), - GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 26) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .itemInputs( + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7), + GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 26)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)).noFluidInputs().noFluidOutputs() + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1), - ItemList.Energy_LapotronicOrb.get(1L) - ) - .itemOutputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .itemInputs( + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1), + ItemList.Energy_LapotronicOrb.get(1L)) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)).noFluidInputs().noFluidOutputs() + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2), - ItemList.Energy_LapotronicOrb2.get(1L) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .itemInputs( + new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2), + ItemList.Energy_LapotronicOrb2.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24)).noFluidInputs() + .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3), - ItemList.Energy_Module.get(1L) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3), ItemList.Energy_Module.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24)) + .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4), - ItemList.Energy_Cluster.get(1L) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4), ItemList.Energy_Cluster.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24)).noFluidInputs() + .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5), - ItemList.ZPM3.get(1L) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5), ItemList.ZPM3.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24)) + .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8), - ItemList.ZPM4.get(1L) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8), ItemList.ZPM4.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24)).noFluidInputs() + .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9), - ItemList.ZPM5.get(1L) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9), ItemList.ZPM5.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24)) + .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10), - ItemList.ZPM6.get(1L) - ) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24) - ) - .noFluidInputs() - .noFluidOutputs() - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10), ItemList.ZPM6.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24)).noFluidInputs() + .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); } } diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 06c9538eaf..59d5cab059 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -3,7 +3,6 @@ package kekztech; import java.util.List; import java.util.Set; -import gregtech.api.enums.Mods; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -16,6 +15,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import gregtech.api.enums.Mods; /** * My GT-Meta-IDs are: 13101 - 13500 |