Use new GT Fluid API (#248)

* Use new GT Fluid API

* spotlessApply (#249)

Co-authored-by: iouter <62897714+iouter@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>

* molten

* spotlessApply (#250)

Co-authored-by: iouter <62897714+iouter@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Former-commit-id: a79338de40ca9c0dd4b6a601cbec6ae7ef80bed7

2 files changed, 27 insertions, 14 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
index a0c5e63ef3..9de2ff0549 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
@@ -1287,6 +1287,14 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
             return (this.quality & 0x40) != 0;
         }
 
+        public FluidState getFluidState() {
+            if ((this.quality & 0x40) != 0) {
+                return FluidState.GAS;
+            } else {
+                return FluidState.LIQUID;
+            }
+        }
+
         public Werkstoff.Stats setGas(boolean gas) {
             if (gas) this.quality = (byte) (this.quality | 0x40);
             else this.quality = (byte) (this.quality & 0b0111111);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index 1ddf4a90e8..ef42104e64 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -51,9 +51,8 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.ProgressManager;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.*;
+import gregtech.api.fluid.GT_FluidFactory;
 import gregtech.api.interfaces.ISubTagContainer;
-import gregtech.api.objects.GT_Fluid;
-import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import ic2.api.recipe.IRecipeInput;
@@ -1739,11 +1738,13 @@ public class WerkstoffLoader {
             if (werkstoff.hasItemType(cell)) {
                 if (!FluidRegistry.isFluidRegistered(werkstoff.getDefaultName())) {
                     DebugLog.log("Adding new Fluid: " + werkstoff.getDefaultName());
-                    GT_Fluid fluid =
-                            (GT_Fluid) new GT_Fluid(werkstoff.getDefaultName(), "autogenerated", werkstoff.getRGBA())
-                                    .setGaseous(werkstoff.getStats().isGas());
-                    FluidRegistry.registerFluid(fluid);
-                    GT_LanguageManager.addStringLocalization(fluid.getUnlocalizedName(), werkstoff.getDefaultName());
+                    Fluid fluid = GT_FluidFactory.builder(werkstoff.getDefaultName())
+                            .withLocalizedName(werkstoff.getDefaultName())
+                            .withStateAndTemperature(werkstoff.getStats().getFluidState(), 300)
+                            .withColorRGBA(werkstoff.getRGBA())
+                            .withTextureName("autogenerated")
+                            .buildAndRegister()
+                            .asFluid();
                     WerkstoffLoader.fluids.put(werkstoff, fluid);
                 } else {
                     WerkstoffLoader.fluids.put(werkstoff, FluidRegistry.getFluid(werkstoff.getDefaultName()));
@@ -1752,13 +1753,17 @@ public class WerkstoffLoader {
             if (werkstoff.hasItemType(WerkstoffLoader.cellMolten)) {
                 if (!FluidRegistry.isFluidRegistered("molten." + werkstoff.getDefaultName())) {
                     DebugLog.log("Adding new Molten: " + werkstoff.getDefaultName());
-                    Fluid fluid = new GT_Fluid(
-                            "molten." + werkstoff.getDefaultName(), "molten.autogenerated", werkstoff.getRGBA());
-                    if (werkstoff.getStats().getMeltingPoint() > 0)
-                        fluid = fluid.setTemperature(werkstoff.getStats().getMeltingPoint());
-                    FluidRegistry.registerFluid(fluid);
-                    GT_LanguageManager.addStringLocalization(
-                            fluid.getUnlocalizedName(), "Molten " + werkstoff.getDefaultName());
+                    Fluid fluid = GT_FluidFactory.builder("molten." + werkstoff.getDefaultName())
+                            .withLocalizedName("Molten " + werkstoff.getDefaultName())
+                            .withStateAndTemperature(
+                                    FluidState.MOLTEN,
+                                    werkstoff.getStats().getMeltingPoint() > 0
+                                            ? werkstoff.getStats().getMeltingPoint()
+                                            : 300)
+                            .withColorRGBA(werkstoff.getRGBA())
+                            .withTextureName("molten.autogenerated")
+                            .buildAndRegister()
+                            .asFluid();
                     WerkstoffLoader.molten.put(werkstoff, fluid);
                 } else {
                     WerkstoffLoader.molten.put(werkstoff, FluidRegistry.getFluid(werkstoff.getDefaultName()));