Skip to content

Remove most NHCoreMod liquid declarations #1684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nikolay-Sitnikov merged 12 commits into from
Apr 15, 2026
Merged

Remove most NHCoreMod liquid declarations #1684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
252f1a8
Replace references to Sodium Potassium
Nikolay-Sitnikov Apr 6, 2026
80a8fe7
Replace references to Bacterial Sludges
Nikolay-Sitnikov Apr 6, 2026
d8b44c4
Replace references to Nitric Acid, Molten Void, and Distilled Water
Nikolay-Sitnikov Apr 6, 2026
b391ee7
Replace references to Pollution
Nikolay-Sitnikov Apr 6, 2026
7e29002
Replace reference to Sodium Potassium (pt. 2)
Nikolay-Sitnikov Apr 6, 2026
244f06a
Replace reference to Fermented Bacterial Sludge (pt. 2)
Nikolay-Sitnikov Apr 6, 2026
30cd6ba
Remove all assets for removed liquids.
Nikolay-Sitnikov Apr 6, 2026
6106e7a
Apply spotless
Nikolay-Sitnikov Apr 6, 2026
cc274e6
Merge branch 'master' into remove-liquids
Nikolay-Sitnikov Apr 6, 2026
4d638b2
Merge branch 'master' into remove-liquids
EnderProyects Apr 7, 2026
a88c619
Bump GT5U dependency
Nikolay-Sitnikov Apr 15, 2026
b1593de
Merge branch 'master' into remove-liquids
Nikolay-Sitnikov Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
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.52.418:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.428:dev")
api("com.github.GTNewHorizons:Yamcl:0.7.4:dev")
api("com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev")

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import static gregtech.api.enums.Materials.Bismuth;
import static gregtech.api.enums.Materials.Boron;
import static gregtech.api.enums.Materials.Creosote;
import static gregtech.api.enums.Materials.FermentedBacterialSludge;
import static gregtech.api.enums.Materials.FermentedBiomass;
import static gregtech.api.enums.Materials.Fluorine;
import static gregtech.api.enums.Materials.GrowthMediumRaw;
Expand Down Expand Up @@ -74,7 +75,6 @@
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.oredict.OreDictionary;

import com.dreammaster.fluids.FluidList;
import com.dreammaster.item.NHItemList;

import bartworks.common.loaders.BioItemList;
Expand Down Expand Up @@ -262,7 +262,7 @@ private void runGTRecipes() {
Oil.getFluid(300),
Creosote.getFluid(1000),
Water.getFluid(1400),
FluidList.FermentedBacterialSludge.getFluidStack(50),
FermentedBacterialSludge.getFluid(50),
FermentedBiomass.getFluid(50),
RadoxSuperHeavy.getFluid(100),
RadoxHeavy.getFluid(150),
Expand Down
297 changes: 0 additions & 297 deletions src/main/java/com/dreammaster/fluids/ExtendedFluidCollection.java
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/main/java/com/dreammaster/fluids/FluidList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,7 @@

public enum FluidList {

SodiumPotassium(new ModSimpleBaseFluid(ModFluidManager.GetNewFluid("SodiumPotassium"), Material.water),
ModTabList.ModFluidsTab),
Concrete(new ModSimpleBaseFluid(ModFluidManager.GetNewFluid("Concrete"), Material.water), ModTabList.ModFluidsTab),
EnrichedBacterialSludge(ExtendedFluidCollection.getEnrichedBacterialSludge(), ModTabList.ModFluidsTab),
FermentedBacterialSludge(ExtendedFluidCollection.getFermentedBacterialSludge(), ModTabList.ModFluidsTab),
NitricAcid(ExtendedFluidCollection.getNitricAcid(), ModTabList.ModFluidsTab),
Ammonia(ExtendedFluidCollection.getAmmonia(), ModTabList.ModFluidsTab),
CompressedOxygen(ExtendedFluidCollection.getCompressedOxygen(), ModTabList.ModFluidsTab),
CompressedNitrogen(ExtendedFluidCollection.getCompressedNitrogen(), ModTabList.ModFluidsTab),
Pollution(ExtendedFluidCollection.getPollution(), ModTabList.ModFluidsTab),
// Do not delete this
EndOfList(null, null);

Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/dreammaster/gthandler/recipes/CannerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,17 @@ public void run() {
// NAK and Helium Cooling Cells
GTValues.RA.stdBuilder().itemInputs(NHItemList.TenKCell.get())
.itemOutputs(ItemList.Reactor_Coolant_NaK_1.get(1L))
.fluidInputs(new FluidStack(FluidRegistry.getFluid("sodiumpotassium"), 1000)).duration(16 * TICKS)
.eut(1).addTo(cannerRecipes);
.fluidInputs(Materials.SodiumPotassium.getFluid(1000)).duration(16 * TICKS).eut(1).addTo(cannerRecipes);

GTValues.RA.stdBuilder().itemInputs(NHItemList.ThirtyKCell.get())
.itemOutputs(ItemList.Reactor_Coolant_NaK_3.get(1L))
.fluidInputs(new FluidStack(FluidRegistry.getFluid("sodiumpotassium"), 3000))
.duration(2 * SECONDS + 8 * TICKS).eut(1).addTo(cannerRecipes);
.fluidInputs(Materials.SodiumPotassium.getFluid(3000)).duration(2 * SECONDS + 8 * TICKS).eut(1)
.addTo(cannerRecipes);

GTValues.RA.stdBuilder().itemInputs(NHItemList.SixtyKCell.get())
.itemOutputs(ItemList.Reactor_Coolant_NaK_6.get(1L))
.fluidInputs(new FluidStack(FluidRegistry.getFluid("sodiumpotassium"), 6000))
.duration(4 * SECONDS + 16 * TICKS).eut(1).addTo(cannerRecipes);
.fluidInputs(Materials.SodiumPotassium.getFluid(6000)).duration(4 * SECONDS + 16 * TICKS).eut(1)
.addTo(cannerRecipes);

// Space Cooling Cells
GTValues.RA.stdBuilder().itemInputs(NHItemList.Empty180SpCell.get())
Expand Down
Loading
Loading