From 39be4bf993bfd1080e5671eeee1e1f8a76f5bb91 Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Sat, 7 Sep 2024 18:27:22 +0200 Subject: [PATCH 1/3] Add superheated steam recipe to fluid heater (#975) Co-authored-by: Martin Robertz --- .../gthandler/recipes/FluidHeaterRecipes.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java index 742e742f6..8545bb708 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidHeaterRecipes.java @@ -1,7 +1,20 @@ package com.dreammaster.gthandler.recipes; +import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; + +import gregtech.api.enums.GTValues; +import gregtech.api.enums.TierEU; +import gtPlusPlus.core.util.minecraft.FluidUtils; + public class FluidHeaterRecipes implements Runnable { @Override - public void run() {} + public void run() { + + GTValues.RA.stdBuilder().fluidInputs(FluidUtils.getSteam(3840)) + .fluidOutputs(FluidUtils.getSuperHeatedSteam(3840)).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV) + .noOptimize().addTo(fluidHeaterRecipes); + + } } From c2e6c0f8a75b31acbb7dc2b9c3c809b3ceaa32f3 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 7 Sep 2024 18:29:03 +0200 Subject: [PATCH 2/3] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index d0b57e2ac..b20e4ab23 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.68:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.76:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") From 34a7aba3a4d21e7a044a82a7dd6dbb024e7b563b Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sun, 8 Sep 2024 07:46:26 +0200 Subject: [PATCH 3/3] move ItemBucketList registration to postload (#981) --- .../com/dreammaster/main/MainRegistry.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java index c98f68a22..d652fabee 100644 --- a/src/main/java/com/dreammaster/main/MainRegistry.java +++ b/src/main/java/com/dreammaster/main/MainRegistry.java @@ -274,26 +274,6 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) { Logger.warn("Some fluids failed to register. Check the logfile for details"); AddLoginError("[CoreMod-Fluids] Some fluids failed to register. Check the logfile for details"); } - ItemBucketList.SodiumPotassium.set( - FluidContainerRegistry - .fillFluidContainer(FluidList.SodiumPotassium.getFluidStack(), new ItemStack(Items.bucket))); - ItemBucketList.NitricAcid.set( - FluidContainerRegistry - .fillFluidContainer(FluidList.NitricAcid.getFluidStack(), new ItemStack(Items.bucket))); - ItemBucketList.RadioactiveBacterialSludge.set( - FluidContainerRegistry.fillFluidContainer( - FluidList.EnrichedBacterialSludge.getFluidStack(), - new ItemStack(Items.bucket))); - ItemBucketList.FermentedBacterialSludge.set( - FluidContainerRegistry.fillFluidContainer( - FluidList.FermentedBacterialSludge.getFluidStack(), - new ItemStack(Items.bucket))); - ItemBucketList.Concrete.set( - FluidContainerRegistry - .fillFluidContainer(FluidList.Concrete.getFluidStack(), new ItemStack(Items.bucket))); - ItemBucketList.Pollution.set( - FluidContainerRegistry - .fillFluidContainer(FluidList.Pollution.getFluidStack(), new ItemStack(Items.bucket))); // ------------------------------------------------------------ // register final list with valid items to forge @@ -437,6 +417,26 @@ private void RegisterModuleEvents() { @Mod.EventHandler public void PostLoad(FMLPostInitializationEvent PostEvent) { + ItemBucketList.SodiumPotassium.set( + FluidContainerRegistry + .fillFluidContainer(FluidList.SodiumPotassium.getFluidStack(), new ItemStack(Items.bucket))); + ItemBucketList.NitricAcid.set( + FluidContainerRegistry + .fillFluidContainer(FluidList.NitricAcid.getFluidStack(), new ItemStack(Items.bucket))); + ItemBucketList.RadioactiveBacterialSludge.set( + FluidContainerRegistry.fillFluidContainer( + FluidList.EnrichedBacterialSludge.getFluidStack(), + new ItemStack(Items.bucket))); + ItemBucketList.FermentedBacterialSludge.set( + FluidContainerRegistry.fillFluidContainer( + FluidList.FermentedBacterialSludge.getFluidStack(), + new ItemStack(Items.bucket))); + ItemBucketList.Concrete.set( + FluidContainerRegistry + .fillFluidContainer(FluidList.Concrete.getFluidStack(), new ItemStack(Items.bucket))); + ItemBucketList.Pollution.set( + FluidContainerRegistry + .fillFluidContainer(FluidList.Pollution.getFluidStack(), new ItemStack(Items.bucket))); if (CoreConfig.ModHazardousItems_Enabled) { Module_HazardousItems.LoadConfig();