Repair the fluid registry for addons (#2216)

Author: serenibyss

src/main/java/gregtech/api/fluids/GTFluidRegistration.java

@@ -21,6 +21,7 @@
 
 import java.lang.reflect.Field;
 import java.util.Collection;
+import java.util.Objects;
 
 public class GTFluidRegistration {
 
@@ -30,6 +31,8 @@ public class GTFluidRegistration {
 
     private static @Nullable BiMap<String, Fluid> MASTER_FLUID_REFERENCE;
 
+    private static @Nullable BiMap<String, String> DEFAULT_FLUID_NAME;
+
     /**
      * Fixes all registered fluids being under the gregtech modid
      *
@@ -49,7 +52,29 @@ private static void fixFluidRegistryName(@NotNull Fluid fluid, @NotNull String m
                 throw new IllegalStateException("Could not reflect the Forge Master Fluid Registry", e);
             }
         }
-        MASTER_FLUID_REFERENCE.inverse().put(fluid, modid + ':' + fluid.getName());
+        Objects.requireNonNull(MASTER_FLUID_REFERENCE);
+
+        if (DEFAULT_FLUID_NAME == null) {
+            try {
+                Field field = FluidRegistry.class.getDeclaredField("defaultFluidName");
+                field.setAccessible(true);
+                // noinspection unchecked
+                DEFAULT_FLUID_NAME = (BiMap<String, String>) field.get(null);
+            } catch (NoSuchFieldException | IllegalAccessException e) {
+                throw new IllegalStateException("Could not reflect the Forge Default Fluid Name map", e);
+            }
+        }
+        Objects.requireNonNull(DEFAULT_FLUID_NAME);
+
+        String masterKey = MASTER_FLUID_REFERENCE.inverse().get(fluid);
+        if (masterKey != null && masterKey.startsWith(GTValues.MODID + ":")) {
+            MASTER_FLUID_REFERENCE.inverse().put(fluid, modid + ':' + fluid.getName());
+        }
+
+        String defaultName = DEFAULT_FLUID_NAME.get(fluid.getName());
+        if (defaultName.startsWith(GTValues.MODID + ":")) {
+            DEFAULT_FLUID_NAME.put(fluid.getName(), modid + ':' + fluid.getName());
+        }
     }
 
     @ApiStatus.Internal