diff --git a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java index cc2fa83cc..ab15f83cd 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java @@ -33,7 +33,6 @@ import com.dreammaster.fluids.FluidList; import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.gthandler.GT_CoreModSupport; -import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.github.bartimaeusnek.bartworks.util.BioCulture; import com.github.bartimaeusnek.bartworks.util.BioDNA; import com.github.bartimaeusnek.bartworks.util.BioData; @@ -288,7 +287,7 @@ private void runBWRecipes() { new FluidStack[] { Oil.getFluid(20) }, new FluidStack[] { Xenoxene.getFluid(20) }, 3600, - BW_Util.getMachineVoltageFromTier(10), + (int) TierEU.RECIPE_UEV, Materials.NaquadahEnriched, 8, 0, @@ -300,7 +299,7 @@ private void runBWRecipes() { new int[] { 1500 }, FluidRegistry.getFluidStack("binnie.bacteria", 1000), 1200, - 7680, + (int) TierEU.RECIPE_IV, CLEANROOM); addBacterialVatRecipe( @@ -311,7 +310,7 @@ private void runBWRecipes() { new FluidStack[] { GrowthMediumRaw.getFluid(8) }, new FluidStack[] { BioMediumRaw.getFluid(2) }, 3600, - 30720, + (int) TierEU.RECIPE_LuV, Plutonium, 6, CLEANROOM, @@ -325,7 +324,7 @@ private void runBWRecipes() { new FluidStack[] { GrowthMediumRaw.getFluid(5) }, new FluidStack[] { BioMediumRaw.getFluid(5) }, 3600, - 122880, + (int) TierEU.RECIPE_ZPM, NaquadahEnriched, 7, CLEANROOM, @@ -338,7 +337,7 @@ private void runBWRecipes() { new FluidStack[] { GrowthMediumRaw.getFluid(5) }, new FluidStack[] { BioMediumRaw.getFluid(10) }, 3600, - 500000, + (int) TierEU.RECIPE_UV, Naquadria, 8, CLEANROOM, @@ -350,7 +349,7 @@ private void runBWRecipes() { new int[] { 750 }, GrowthMediumRaw.getFluid(1000), 2400, - 122880, + (int) TierEU.RECIPE_ZPM, CLEANROOM); addBioLabRecipeIncubation( @@ -359,7 +358,7 @@ private void runBWRecipes() { new int[] { 750 }, Materials.BioMediumRaw.getFluid(1000), 3600, - 500000, + (int) TierEU.RECIPE_UV, CLEANROOM); addBacterialVatRecipe( @@ -368,7 +367,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(4L) }, new FluidStack[] { FluidRegistry.getFluidStack("binnie.growthmedium", 2) }, 150, - 480, + (int) TierEU.RECIPE_HV, 0, 4, 0, @@ -380,7 +379,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(8L) }, new FluidStack[] { FluidRegistry.getFluidStack("binnie.growthmedium", 4) }, 150, - 1920, + (int) TierEU.RECIPE_EV, Bismuth, 5, 0, @@ -392,7 +391,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(16L) }, new FluidStack[] { FluidRegistry.getFluidStack("binnie.growthmedium", 8) }, 150, - 7680, + (int) TierEU.RECIPE_IV, Uranium, 5, 0, @@ -404,7 +403,7 @@ private void runBWRecipes() { new int[] { 5000 }, Water.getFluid(4000), 150, - 480, + (int) TierEU.RECIPE_HV, 0); addBioLabRecipeIncubation( @@ -413,7 +412,7 @@ private void runBWRecipes() { new int[] { 7500 }, GT_ModHandler.getDistilledWater(2000L), 150, - 480, + (int) TierEU.RECIPE_HV, 0); addBioLabRecipeIncubation( @@ -422,7 +421,7 @@ private void runBWRecipes() { new int[] { 9000 }, FluidRegistry.getFluidStack("binnie.growthmedium", 1000), 150, - 480, + (int) TierEU.RECIPE_HV, 0); addBioLabRecipeIncubation( @@ -431,7 +430,7 @@ private void runBWRecipes() { new int[] { 10000 }, FluidRegistry.getFluidStack("binnie.growthmedium", 500), 150, - 1920, + (int) TierEU.RECIPE_EV, 0); addBacterialVatRecipe( @@ -440,7 +439,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(4L) }, new FluidStack[] { FluidRegistry.getFluidStack("binnie.bacteria", 2) }, 300, - 480, + (int) TierEU.RECIPE_HV, Bismuth, 4, 0, @@ -452,7 +451,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(8L) }, new FluidStack[] { FluidRegistry.getFluidStack("binnie.bacteria", 4) }, 300, - 1920, + (int) TierEU.RECIPE_EV, Uranium, 5, 0, @@ -464,7 +463,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(16L) }, new FluidStack[] { FluidRegistry.getFluidStack("binnie.bacteria", 8) }, 300, - 7680, + (int) TierEU.RECIPE_IV, Plutonium, 6, CLEANROOM, @@ -476,7 +475,7 @@ private void runBWRecipes() { new int[] { 6000 }, FluidRegistry.getFluidStack("binnie.bacteria", 1000), 300, - 480, + (int) TierEU.RECIPE_HV, 0); addBioLabRecipeIncubation( @@ -485,7 +484,7 @@ private void runBWRecipes() { new int[] { 8000 }, FluidRegistry.getFluidStack("binnie.bacteria", 500), 300, - 7680, + (int) TierEU.RECIPE_IV, CLEANROOM); addBioLabRecipeIncubation( @@ -494,7 +493,7 @@ private void runBWRecipes() { new int[] { 10000 }, FluidRegistry.getFluidStack("binnie.bacteria", 250), 300, - 30720, + (int) TierEU.RECIPE_LuV, CLEANROOM); addBacterialVatRecipe( @@ -503,7 +502,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(4L) }, new FluidStack[] { FluidRegistry.getFluidStack("bacterialsludge", 1) }, 600, - 1920, + (int) TierEU.RECIPE_EV, Bismuth, 5, 0, @@ -515,7 +514,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(8L) }, new FluidStack[] { FluidRegistry.getFluidStack("bacterialsludge", 2) }, 600, - 7680, + (int) TierEU.RECIPE_IV, Uranium, 6, CLEANROOM, @@ -527,7 +526,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(16L) }, new FluidStack[] { FluidRegistry.getFluidStack("bacterialsludge", 4) }, 600, - 30720, + (int) TierEU.RECIPE_LuV, Plutonium, 7, CLEANROOM, @@ -539,7 +538,7 @@ private void runBWRecipes() { new int[] { 3000 }, FluidRegistry.getFluidStack("bacterialsludge", 1000), 600, - 1920, + (int) TierEU.RECIPE_EV, 0); addBioLabRecipeIncubation( @@ -548,7 +547,7 @@ private void runBWRecipes() { new int[] { 5000 }, FluidRegistry.getFluidStack("bacterialsludge", 500), 600, - 7680, + (int) TierEU.RECIPE_IV, CLEANROOM); addBioLabRecipeIncubation( @@ -557,7 +556,7 @@ private void runBWRecipes() { new int[] { 7500 }, FluidRegistry.getFluidStack("bacterialsludge", 250), 600, - 30720, + (int) TierEU.RECIPE_LuV, CLEANROOM); addBacterialVatRecipe( @@ -566,7 +565,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(4L) }, new FluidStack[] { FluidRegistry.getFluidStack("mutagen", 1) }, 1200, - 7680, + (int) TierEU.RECIPE_IV, Uranium, 6, CLEANROOM, @@ -578,7 +577,7 @@ private void runBWRecipes() { new FluidStack[] { GT_ModHandler.getDistilledWater(8L) }, new FluidStack[] { FluidRegistry.getFluidStack("mutagen", 2) }, 1200, - 30720, + (int) TierEU.RECIPE_LuV, Plutonium, 7, CLEANROOM, @@ -590,7 +589,7 @@ private void runBWRecipes() { new int[] { 1500 }, FluidRegistry.getFluidStack("mutagen", 1000), 1200, - 30720, + (int) TierEU.RECIPE_LuV, CLEANROOM); addBioLabRecipeIncubation( @@ -599,7 +598,7 @@ private void runBWRecipes() { new int[] { 3000 }, FluidRegistry.getFluidStack("mutagen", 500), 1200, - 122880, + (int) TierEU.RECIPE_ZPM, CLEANROOM); new BioItemLoader(); diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Batteries.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Batteries.java index 1da0770ec..7ee5a446e 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Loader_Batteries.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Loader_Batteries.java @@ -2,6 +2,7 @@ import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtractorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.client.GT_TooltipHandler.Tier.*; @@ -13,7 +14,6 @@ import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.TierEU; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.common.items.GT_MetaGenerated_Item_01; @@ -334,33 +334,36 @@ private void registerBatteries() { registerTieredTooltip(CustomItemList.BatteryHull_UxV_Full.get(1), UXV); // Just to be complete, extractor recipes for the filled hulls - GT_ModHandler - .addExtractionRecipe(CustomItemList.BatteryHull_EV_Full.get(1L), CustomItemList.BatteryHull_EV.get(1L)); - GT_ModHandler - .addExtractionRecipe(CustomItemList.BatteryHull_IV_Full.get(1L), CustomItemList.BatteryHull_IV.get(1L)); - GT_ModHandler.addExtractionRecipe( - CustomItemList.BatteryHull_LuV_Full.get(1L), - CustomItemList.BatteryHull_LuV.get(1L)); - GT_ModHandler.addExtractionRecipe( - CustomItemList.BatteryHull_ZPM_Full.get(1L), - CustomItemList.BatteryHull_ZPM.get(1L)); - GT_ModHandler - .addExtractionRecipe(CustomItemList.BatteryHull_UV_Full.get(1L), CustomItemList.BatteryHull_UV.get(1L)); - GT_ModHandler.addExtractionRecipe( - CustomItemList.BatteryHull_UHV_Full.get(1L), - CustomItemList.BatteryHull_UHV.get(1L)); - GT_ModHandler.addExtractionRecipe( - CustomItemList.BatteryHull_UEV_Full.get(1L), - CustomItemList.BatteryHull_UEV.get(1L)); - GT_ModHandler.addExtractionRecipe( - CustomItemList.BatteryHull_UIV_Full.get(1L), - CustomItemList.BatteryHull_UIV.get(1L)); - GT_ModHandler.addExtractionRecipe( - CustomItemList.BatteryHull_UMV_Full.get(1L), - CustomItemList.BatteryHull_UMV.get(1L)); - GT_ModHandler.addExtractionRecipe( - CustomItemList.BatteryHull_UxV_Full.get(1L), - CustomItemList.BatteryHull_UxV.get(1L)); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_EV_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_EV.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_IV_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_IV.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_LuV_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_LuV.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_ZPM_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_ZPM.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_UV_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_UV.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_UHV_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_UHV.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_UEV_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_UEV.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_UIV_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_UIV.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_UMV_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_UMV.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.BatteryHull_UxV_Full.get(1L)) + .itemOutputs(CustomItemList.BatteryHull_UxV.get(1L)).duration(15 * SECONDS).eut(2) + .addTo(sExtractorRecipes); // Recipes to actually fill the empty hulls with content // IV 2048