feat(API): Implements a featured API for GT_Fluid (#1345)

* feat(API): Implements a featured API for GT_Fluid

*** Rationale

The current implementation, which is based on the `GT_Fluid` object,
does not allow for the evolution of the functionalities, or the
variation of the fluid-related implementations in GregTech.

*** Objectives

This replacement API should free from these constraints, by providing :

1. The separation of responsibilities of the different tasks and steps:
  - The definition and progressive construction of an `IGT_Fluid`,
  - Registration of the `IGT_Fluid`,
  - Configuration of related equipment, such as containers,
  - Propagation of properties of an `IGT_Fluid` to related services
    such as Materials

2. The separation of interfaces exposed to the API from their internal
   implementations to allow:
  - Evolve the implementations in the most transparent way possible
  - To have internal GregTech implementations or outsourced
    implementations coexist in its extensions.

*** Specificity of this new API

- Provides a new interface to build and interact with fluid related records
- Deprecates the old `api/objects/GT_Fluid` object and the
  `common/GT_Proxy.addFluid` record methods

* fix(conversations): addresses @Glease review comments

https://github.com/GTNewHorizons/GT5-Unofficial/pull/1345#pullrequestreview-1096261703

* ./gradlew :spotlessApply

* fix(review): add review comments from @eigenraven

Added missing final qualifiers on methods parameters.
https://github.com/GTNewHorizons/GT5-Unofficial/pull/1345#pullrequestreview-1096318523

* fix(review) address remaining review comments from @eigenraven

2 files changed, 1276 insertions, 1761 deletions

diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
index 463f2fff63..d6d3373248 100644
--- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
+++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java
@@ -1,10 +1,12 @@
 package gregtech.loaders.load;
 
-import gregtech.GT_Mod;
+import static gregtech.api.enums.FluidState.LIQUID;
+
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.fluid.GT_FluidFactory;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -12,20 +14,20 @@ import gregtech.api.util.GT_Recipe;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
 
 public class GT_FuelLoader implements Runnable {
     @Override
     public void run() {
         GT_Log.out.println("GT_Mod: Initializing various Fuels.");
         ItemList.sBlueVitriol =
-                GT_Mod.gregtechproxy.addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295);
+                (Fluid) GT_FluidFactory.of("solution.bluevitriol", "Blue Vitriol water solution", LIQUID, 295);
         ItemList.sNickelSulfate =
-                GT_Mod.gregtechproxy.addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295);
-        ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid(
-                "indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3
-        ItemList.sLeadZincSolution =
-                GT_Mod.gregtechproxy.addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295);
-        ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295);
+                (Fluid) GT_FluidFactory.of("solution.nickelsulfate", "Nickel sulfate water solution", LIQUID, 295);
+        ItemList.sIndiumConcentrate =
+                (Fluid) GT_FluidFactory.of("indiumconcentrate", "Indium Concentrate", LIQUID, 295); // TODO CHECK NEW x3
+        ItemList.sLeadZincSolution = (Fluid) GT_FluidFactory.of("leadzincsolution", "Lead-Zinc solution", LIQUID, 295);
+        ItemList.sRocketFuel = (Fluid) GT_FluidFactory.of("rocket_fuel", "Rocket Fuel", LIQUID, 295);
         new GT_Recipe(
                 new ItemStack(Items.lava_bucket),
                 new ItemStack(Blocks.obsidian),
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index d39cb75a63..633a8d77ae 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -1,11 +1,24 @@
 package gregtech.loaders.preload;
 
+import static gregtech.api.enums.FluidState.GAS;
+import static gregtech.api.enums.FluidState.LIQUID;
+import static gregtech.api.enums.FluidState.MOLTEN;
+import static gregtech.api.enums.FluidState.SLURRY;
+
 import codechicken.nei.api.API;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.*;
+import gregtech.api.enums.ConfigCategories;
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsKevlar;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.SubTag;
+import gregtech.api.fluid.GT_FluidFactory;
 import gregtech.api.items.GT_Block_LongDistancePipe;
 import gregtech.api.items.GT_BreederCell_Item;
 import gregtech.api.items.GT_Generic_Item;
@@ -16,8 +29,32 @@ import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import gregtech.common.blocks.*;
-import gregtech.common.items.*;
+import gregtech.common.blocks.GT_Block_Casings1;
+import gregtech.common.blocks.GT_Block_Casings2;
+import gregtech.common.blocks.GT_Block_Casings3;
+import gregtech.common.blocks.GT_Block_Casings4;
+import gregtech.common.blocks.GT_Block_Casings5;
+import gregtech.common.blocks.GT_Block_Casings6;
+import gregtech.common.blocks.GT_Block_Casings8;
+import gregtech.common.blocks.GT_Block_Concretes;
+import gregtech.common.blocks.GT_Block_Granites;
+import gregtech.common.blocks.GT_Block_Machines;
+import gregtech.common.blocks.GT_Block_Metal;
+import gregtech.common.blocks.GT_Block_Ores;
+import gregtech.common.blocks.GT_Block_Reinforced;
+import gregtech.common.blocks.GT_Block_Stones;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.common.items.GT_DepletetCell_Item;
+import gregtech.common.items.GT_FluidDisplayItem;
+import gregtech.common.items.GT_IntegratedCircuit_Item;
+import gregtech.common.items.GT_MetaGenerated_Item_01;
+import gregtech.common.items.GT_MetaGenerated_Item_02;
+import gregtech.common.items.GT_MetaGenerated_Item_03;
+import gregtech.common.items.GT_MetaGenerated_Item_98;
+import gregtech.common.items.GT_MetaGenerated_Item_99;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gregtech.common.items.GT_NeutronReflector_Item;
+import gregtech.common.items.GT_VolumetricFlask;
 import java.util.Locale;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -26,7 +63,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
 
 public class GT_Loader_Item_Block_And_Fluid implements Runnable {
     @Override
@@ -37,44 +73,49 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
 
         GT_Log.out.println("GT_Mod: Register Books.");
 
-        GT_Utility.getWrittenBook("Manual_Printer", "Printer Manual V2.0", "Gregorius Techneticies", new String[] {
-            "This Manual explains the different Functionalities the GregTech Printing Factory has built in, which are not in NEI. Most got NEI Support now, but there is still some left without it.",
-            "1. Coloring Items and Blocks: You know those Crafting Recipes, which have a dye surrounded by 8 Item to dye them? Or the ones which have just one Item and one Dye in the Grid? Those two Recipe Types can be cheaply automated using the Printer.",
-            "The Colorization Functionality even optimizes the Recipes, which normally require 8 Items + 1 Dye to 1 Item and an 8th of the normally used Dye in Fluid Form, isn't that awesome?",
-            "2. Copying Books: This Task got slightly harder. The first Step is putting the written and signed Book inside the Scanner with a Data Stick ready to receive the Data.",
-            "Now insert the Stick into the Data Slot of the Printer and add 3 pieces of Paper together with 144 Liters of actual Ink Fluid. Water mixed and chemical Dyes won't work on Paper without messing things up!",
-            "You got a stack of Pages for your new Book, just put them into the Assembler with some Glue and a piece of Leather for the Binding, and you receive an identical copy of the Book, which would stack together with the original.",
-            "3. Renaming Items: This Functionality is no longer Part of the Printer. There is now a Name Mold for the Forming Press to imprint a Name into an Item, just rename the Mold in an Anvil and use it in the Forming Press on any Item.",
-            "4. Crafting of Books, Maps, Nametags etc etc etc: Those Recipes moved to other Machines, just look them up in NEI."
-        });
+        GT_Utility.getWrittenBook(
+                "Manual_Printer",
+                "Printer Manual V2.0",
+                "Gregorius Techneticies",
+                "This Manual explains the different Functionalities the GregTech Printing Factory has built in, which are not in NEI. Most got NEI Support now, but there is still some left without it.",
+                "1. Coloring Items and Blocks: You know those Crafting Recipes, which have a dye surrounded by 8 Item to dye them? Or the ones which have just one Item and one Dye in the Grid? Those two Recipe Types can be cheaply automated using the Printer.",
+                "The Colorization Functionality even optimizes the Recipes, which normally require 8 Items + 1 Dye to 1 Item and an 8th of the normally used Dye in Fluid Form, isn't that awesome?",
+                "2. Copying Books: This Task got slightly harder. The first Step is putting the written and signed Book inside the Scanner with a Data Stick ready to receive the Data.",
+                "Now insert the Stick into the Data Slot of the Printer and add 3 pieces of Paper together with 144 Liters of actual Ink Fluid. Water mixed and chemical Dyes won't work on Paper without messing things up!",
+                "You got a stack of Pages for your new Book, just put them into the Assembler with some Glue and a piece of Leather for the Binding, and you receive an identical copy of the Book, which would stack together with the original.",
+                "3. Renaming Items: This Functionality is no longer Part of the Printer. There is now a Name Mold for the Forming Press to imprint a Name into an Item, just rename the Mold in an Anvil and use it in the Forming Press on any Item.",
+                "4. Crafting of Books, Maps, Nametags etc etc etc: Those Recipes moved to other Machines, just look them up in NEI.");
 
         GT_Utility.getWrittenBook(
-                "Manual_Punch_Cards", "Punch Card Manual V0.0", "Gregorius Techneticies", new String[] {
-                    "This Manual will explain the Functionality of the Punch Cards, once they are fully implemented. And no, they won't be like the IRL Punch Cards. This is just a current Idea Collection.",
-                    "(i1&&i2)?o1=15:o1=0;=10",
-                    "ignore all Whitespace Characters, use Long for saving the Numbers",
-                    "&& || ^^ & | ^ ! ++ -- + - % / // * ** << >> >>> < > <= >= == !=  ~ ( ) ?: , ; ;= ;=X; = i0 i1 i2 i3 i4 i5 o0 o1 o2 o3 o4 o5 v0 v1 v2 v3 v4 v5 v6 v7 v8 v9 m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 A B C D E F",
-                    "'0' = false, 'everything but 0' = true, '!' turns '0' into '1' and everything else into '0'",
-                    "',' is just a separator for multiple executed Codes in a row.",
-                    "';' means that the Program waits until the next tick before continuing. ';=10' and ';=10;' both mean that it will wait 10 Ticks instead of 1. And ';=0' or anything < 0 will default to 0.",
-                    "If the '=' Operator is used within Brackets, it returns the value the variable has been set to.",
-                    "The Program saves the Char Index of the current Task, the 10 Variables (which reset to 0 as soon as the Program Loop stops), the 10 Member Variables and the remaining waiting Time in its NBT.",
-                    "A = 10, B = 11, C = 12, D = 13, E = 14, F = 15, just for Hexadecimal Space saving, since Redstone has only 4 Bits.",
-                    "For implementing Loops you just need 1 Punch Card per Loop, these Cards can restart once they are finished, depending on how many other Cards there are in the Program Loop you inserted your Card into, since it will process them procedurally.",
-                    "A Punch Card Processor can run up to four Loops, each with the length of seven Punch Cards, parallel.",
-                    "Why does the Punch Card need Ink to be made, you ask? Because the empty one needs to have some lines on, and the for the punched one it prints the Code to execute in a human readable format on the Card."
-                });
+                "Manual_Punch_Cards",
+                "Punch Card Manual V0.0",
+                "Gregorius Techneticies",
+                "This Manual will explain the Functionality of the Punch Cards, once they are fully implemented. And no, they won't be like the IRL Punch Cards. This is just a current Idea Collection.",
+                "(i1&&i2)?o1=15:o1=0;=10",
+                "ignore all Whitespace Characters, use Long for saving the Numbers",
+                "&& || ^^ & | ^ ! ++ -- + - % / // * ** << >> >>> < > <= >= == !=  ~ ( ) ?: , ; ;= ;=X; = i0 i1 i2 i3 i4 i5 o0 o1 o2 o3 o4 o5 v0 v1 v2 v3 v4 v5 v6 v7 v8 v9 m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 A B C D E F",
+                "'0' = false, 'everything but 0' = true, '!' turns '0' into '1' and everything else into '0'",
+                "',' is just a separator for multiple executed Codes in a row.",
+                "';' means that the Program waits until the next tick before continuing. ';=10' and ';=10;' both mean that it will wait 10 Ticks instead of 1. And ';=0' or anything < 0 will default to 0.",
+                "If the '=' Operator is used within Brackets, it returns the value the variable has been set to.",
+                "The Program saves the Char Index of the current Task, the 10 Variables (which reset to 0 as soon as the Program Loop stops), the 10 Member Variables and the remaining waiting Time in its NBT.",
+                "A = 10, B = 11, C = 12, D = 13, E = 14, F = 15, just for Hexadecimal Space saving, since Redstone has only 4 Bits.",
+                "For implementing Loops you just need 1 Punch Card per Loop, these Cards can restart once they are finished, depending on how many other Cards there are in the Program Loop you inserted your Card into, since it will process them procedurally.",
+                "A Punch Card Processor can run up to four Loops, each with the length of seven Punch Cards, parallel.",
+                "Why does the Punch Card need Ink to be made, you ask? Because the empty one needs to have some lines on, and the for the punched one it prints the Code to execute in a human readable format on the Card.");
 
-        GT_Utility.getWrittenBook("Manual_Microwave", "Microwave Oven Manual", "Kitchen Industries", new String[] {
-            "Congratulations, you inserted a random seemingly empty Book into the Microwave and these Letters appeared out of nowhere.",
-            "You just got a Microwave Oven and asked yourself 'why do I even need it?'. It's simple, the Microwave can cook for just 128 EU and at an insane speed. Not even a normal E-furnace can do it that fast and cheap!",
-            "This is the cheapest and fastest way to cook for you. That is why the Microwave Oven can be found in almost every Kitchen (see www.youwannabuyakitchen.ly).",
-            "Long time exposure to Microwaves can cause Cancer, but we doubt Steve lives long enough to die because of that.",
-            "Do not insert any Metals. It might result in an Explosion.",
-            "Do not dry Animals with it. It will result in a Hot Dog, no matter which Animal you put into it.",
-            "Do not insert inflammable Objects. The Oven will catch on Fire.",
-            "Do not insert Explosives such as Eggs. Just don't."
-        });
+        GT_Utility.getWrittenBook(
+                "Manual_Microwave",
+                "Microwave Oven Manual",
+                "Kitchen Industries",
+                "Congratulations, you inserted a random seemingly empty Book into the Microwave and these Letters appeared out of nowhere.",
+                "You just got a Microwave Oven and asked yourself 'why do I even need it?'. It's simple, the Microwave can cook for just 128 EU and at an insane speed. Not even a normal E-furnace can do it that fast and cheap!",
+                "This is the cheapest and fastest way to cook for you. That is why the Microwave Oven can be found in almost every Kitchen (see www.youwannabuyakitchen.ly).",
+                "Long time exposure to Microwaves can cause Cancer, but we doubt Steve lives long enough to die because of that.",
+                "Do not insert any Metals. It might result in an Explosion.",
+                "Do not dry Animals with it. It will result in a Hot Dog, no matter which Animal you put into it.",
+                "Do not insert inflammable Objects. The Oven will catch on Fire.",
+                "Do not insert Explosives such as Eggs. Just don't.");
 
         GT_Log.out.println("GT_Mod: Register Items.");
 
@@ -166,7 +207,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     0.4F,
                     0,
                     0.25F,
-                    ItemList.Depleted_Thorium_1.get(1, new Object[0]),
+                    ItemList.Depleted_Thorium_1.get(1),
                     false));
             ItemList.ThoriumCell_2.set(new GT_RadioactiveCellIC_Item(
                     "Double_Thoriumcell",
@@ -176,7 +217,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     0.4F,
                     0,
                     0.25F,
-                    ItemList.Depleted_Thorium_2.get(1, new Object[0]),
+                    ItemList.Depleted_Thorium_2.get(1),
                     false));
             ItemList.ThoriumCell_4.set(new GT_RadioactiveCellIC_Item(
                     "Quad_Thoriumcell",
@@ -186,27 +227,27 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     0.4F,
                     0,
                     0.25F,
-                    ItemList.Depleted_Thorium_4.get(1, new Object[0]),
+                    ItemList.Depleted_Thorium_4.get(1),
                     false));
 
             GT_ModHandler.addThermalCentrifugeRecipe(
-                    ItemList.Depleted_Thorium_1.get(1, new Object[0]), 5000, new Object[] {
-                        GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L)
-                    });
+                    ItemList.Depleted_Thorium_1.get(1),
+                    5000,
+                    GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 2L),
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L),
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L));
             GT_ModHandler.addThermalCentrifugeRecipe(
-                    ItemList.Depleted_Thorium_2.get(1, new Object[0]), 5000, new Object[] {
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L)
-                    });
+                    ItemList.Depleted_Thorium_2.get(1),
+                    5000,
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L),
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 2L),
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L));
             GT_ModHandler.addThermalCentrifugeRecipe(
-                    ItemList.Depleted_Thorium_4.get(1, new Object[0]), 5000, new Object[] {
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 2L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 4L),
-                        GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L)
-                    });
+                    ItemList.Depleted_Thorium_4.get(1),
+                    5000,
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 2L),
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 4L),
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L));
 
             ItemList.Depleted_Naquadah_1.set(
                     new GT_DepletetCell_Item("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1));
@@ -222,7 +263,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     4F,
                     1,
                     1F,
-                    ItemList.Depleted_Naquadah_1.get(1, new Object[0]),
+                    ItemList.Depleted_Naquadah_1.get(1),
                     false));
             ItemList.NaquadahCell_2.set(new GT_RadioactiveCellIC_Item(
                     "Double_Naquadahcell",
@@ -232,7 +273,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     4F,
                     1,
                     1F,
-                    ItemList.Depleted_Naquadah_2.get(1, new Object[0]),
+                    ItemList.Depleted_Naquadah_2.get(1),
                     false));
             ItemList.NaquadahCell_4.set(new GT_RadioactiveCellIC_Item(
                     "Quad_Naquadahcell",
@@ -242,7 +283,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     4F,
                     1,
                     1F,
-                    ItemList.Depleted_Naquadah_4.get(1, new Object[0]),
+                    ItemList.Depleted_Naquadah_4.get(1),
                     false));
 
             GT_Values.RA.addCentrifugeRecipe(
@@ -300,7 +341,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     4F,
                     1,
                     1F,
-                    ItemList.Depleted_MNq_1.get(1, new Object[0]),
+                    ItemList.Depleted_MNq_1.get(1),
                     true));
             ItemList.MNqCell_2.set(new GT_RadioactiveCellIC_Item(
                     "Double_MNqCell",
@@ -310,7 +351,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     4F,
                     1,
                     1F,
-                    ItemList.Depleted_MNq_2.get(1, new Object[0]),
+                    ItemList.Depleted_MNq_2.get(1),
                     true));
             ItemList.MNqCell_4.set(new GT_RadioactiveCellIC_Item(
                     "Quad_MNqCell",
@@ -320,7 +361,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     4F,
                     1,
                     1F,
-                    ItemList.Depleted_MNq_4.get(1, new Object[0]),
+                    ItemList.Depleted_MNq_4.get(1),
                     true));
 
             GT_Values.RA.addCentrifugeRecipe(
@@ -731,169 +772,141 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
                     .getFluid();
         }
 
-        GT_Mod.gregtechproxy.addFluid(
-                "Air",
-                "Air",
-                Materials.Air,
-                2,
-                295,
-                ItemList.Cell_Air.get(1L, new Object[0]),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                2000);
-        GT_Mod.gregtechproxy.addFluid(
-                "LiquidOxygen",
-                "Liquid Oxygen",
-                Materials.LiquidOxygen,
-                2,
-                60,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "LiquidNitrogen",
-                "Liquid Nitrogen",
-                Materials.LiquidNitrogen,
-                2,
-                77,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "LiquidAir",
-                "Liquid Air",
-                Materials.LiquidAir,
-                1,
-                77,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Oxygen",
-                "Oxygen",
-                Materials.Oxygen,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Hydrogen",
-                "Hydrogen",
-                Materials.Hydrogen,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Deuterium",
-                "Deuterium",
-                Materials.Deuterium,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Tritium",
-                "Tritium",
-                Materials.Tritium,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Helium",
-                "Helium",
-                Materials.Helium,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Argon",
-                "Argon",
-                Materials.Argon,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Radon",
-                "Radon",
-                Materials.Radon,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-
-        GT_Mod.gregtechproxy.addFluid(
-                "Fluorine",
-                "Fluorine",
-                Materials.Fluorine,
-                2,
-                53,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Titaniumtetrachloride",
-                "Titaniumtetrachloride",
-                Materials.Titaniumtetrachloride,
-                1,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Helium-3",
-                "Helium-3",
-                Materials.Helium_3,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Methane",
-                "Methane",
-                Materials.Methane,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Nitrogen",
-                "Nitrogen",
-                Materials.Nitrogen,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "NitrogenDioxide",
-                "Nitrogen Dioxide",
-                Materials.NitrogenDioxide,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "Steam",
-                "Steam",
-                Materials.Water,
-                2,
-                375,
-                GT_ModHandler.getIC2Item("steamCell", 1),
-                Materials.Empty.getCells(1),
-                1000);
+        GT_FluidFactory.builder("Air")
+                .withLocalizedName("Air")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Air)
+                .registerContainers(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L), 2000);
+        GT_FluidFactory.builder("LiquidOxygen")
+                .withLocalizedName("Liquid Oxygen")
+                .withStateAndTemperature(GAS, 60)
+                .buildAndRegister()
+                .configureMaterials(Materials.LiquidOxygen)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("LiquidNitrogen")
+                .withLocalizedName("Liquid Nitrogen")
+                .withStateAndTemperature(GAS, 77)
+                .buildAndRegister()
+                .configureMaterials(Materials.LiquidNitrogen)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("LiquidAir")
+                .withLocalizedName("Liquid Air")
+                .withStateAndTemperature(LIQUID, 77)
+                .buildAndRegister()
+                .configureMaterials(Materials.LiquidAir)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Oxygen")
+                .withLocalizedName("Oxygen")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Oxygen)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Hydrogen")
+                .withLocalizedName("Hydrogen")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Hydrogen)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Deuterium")
+                .withLocalizedName("Deuterium")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Deuterium)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Tritium")
+                .withLocalizedName("Tritium")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Tritium)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L), ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Helium")
+                .withLocalizedName("Helium")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Helium)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L), ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Argon")
+                .withLocalizedName("Argon")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Argon)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Radon")
+                .withLocalizedName("Radon")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Radon)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), ItemList.Cell_Empty.get(1L));
+
+        GT_FluidFactory.builder("Fluorine")
+                .withLocalizedName("Fluorine")
+                .withStateAndTemperature(GAS, 53)
+                .buildAndRegister()
+                .configureMaterials(Materials.Fluorine)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Titaniumtetrachloride")
+                .withLocalizedName("Titaniumtetrachloride")
+                .withStateAndTemperature(LIQUID, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Titaniumtetrachloride)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Helium-3")
+                .withLocalizedName("Helium-3")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Helium_3)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Methane")
+                .withLocalizedName("Methane")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Methane)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L), ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Nitrogen")
+                .withLocalizedName("Nitrogen")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.Nitrogen)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("NitrogenDioxide")
+                .withLocalizedName("Nitrogen Dioxide")
+                .withStateAndTemperature(GAS, 295)
+                .buildAndRegister()
+                .configureMaterials(Materials.NitrogenDioxide)
+                .registerBContainers(
+                        GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L),
+                        ItemList.Cell_Empty.get(1L));
+        GT_FluidFactory.builder("Steam")
+                .withLocalizedName("Steam")
+                .withStateAndTemperature(GAS, 375)
+                .buildAndRegister()
+                .configureMaterials(Materials.Water)
+                .registerBContainers(GT_ModHandler.getIC2Item("steamCell", 1), Materials.Empty.getCells(1));
         GT_Values.RA.addFluidCannerRecipe(
                 Materials.Empty.getCells(1),
                 GT_ModHandler.getIC2Item("steamCell", 1),
@@ -902,448 +915,386 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
         Materials.Ice.mGas = Materials.Water.mGas;
         Materials.Water.mGas.setTemperature(375).setGaseous(true);
 
-        ItemList.sOilExtraHeavy =
-                GT_Mod.gregtechproxy.addFluid("liquid_extra_heavy_oil", "Very Heavy Oil", null, 1, 295);
-        ItemList.sEpichlorhydrin = GT_Mod.gregtechproxy.addFluid(
-                "liquid_epichlorhydrin",
-                "Epichlorohydrin",
-                Materials.Epichlorohydrin,
-                1,
-                295,
-                Materials.Epichlorohydrin.getCells(1),
-                Materials.Empty.getCells(1),
-                1000);
-        ItemList.sDrillingFluid = GT_Mod.gregtechproxy.addFluid("liquid_drillingfluid", "Drilling Fluid", null, 1, 295);
-        ItemList.sToluene = GT_Mod.gregtechproxy.addFluid(
-                "liquid_toluene",
-                "Toluene",
-                Materials.Toluene,
-                1,
-                295,
-                Materials.Toluene.getCells(1),
-                Materials.Empty.getCells(1),
-                1000);
-        ItemList.sNitrationMixture = GT_Mod.gregtechproxy.addFluid(
-                "liquid_nitrationmixture",
-                "Nitration Mixture",
-                Materials.NitrationMixture,
-                1,
-                295,
-                Materials.NitrationMixture.getCells(1),
-                Materials.Empty.getCells(1),
-                1000);
-
-        GT_Mod.gregtechproxy.addFluid(
-                "liquid_heavy_oil",
-                "Heavy Oil",
-                Materials.OilHeavy,
-                1,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilHeavy, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "liquid_medium_oil",
-                "Raw Oil",
-                Materials.OilMedium,
-                1,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilMedium, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "liquid_light_oil",
-                "Light Oil",
-                Materials.OilLight,
-                1,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilLight, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        GT_Mod.gregtechproxy.addFluid(
-                "gas_natural_gas",
-                "Natural Gas",
-                Materials.NatruralGas,
-                2,
-                295,
-                GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 1L),
-                ItemList.Cell_Empty.get(1L, new Object[0]),
-                1000);
-        ItemList.sHydricSulfur = GT_Mod.gregtechproxy.addFluid(