Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/compressor_recipes_mk2' into com…
Browse files Browse the repository at this point in the history
…pressor_recipes_mk2
  • Loading branch information
FourIsTheNumber committed Sep 8, 2024
2 parents b4c41d8 + aab78b9 commit 76416c2
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 22 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
Original file line number Diff line number Diff line change
@@ -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);

}
}
40 changes: 20 additions & 20 deletions src/main/java/com/dreammaster/main/MainRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 76416c2

Please sign in to comment.