Remove fluid render handler for empty fluid

Sinytra · Aug 21, 2023 · d354449 · d354449
1 parent 686077d
commit d354449
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=true
 
 # Versions
 versionConnector=1.0.0-beta.7
-versionAdapter=1.20.1-20230815.003105
+versionAdapter=1.20.1-20230821.150928
 versionAdapterDefinition=1.0.3
 
 versionMc=1.20.1

diff --git a/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/FluidHandlerCompat.java b/src/mod/java/dev/su5ed/sinytra/connector/mod/compat/FluidHandlerCompat.java
@@ -10,6 +10,7 @@
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.material.Fluids;
 import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
 import net.minecraftforge.fluids.FluidType;
@@ -31,11 +32,13 @@ public static void onClientSetup(FMLClientSetupEvent event) {
         Map<Fluid, FluidRenderHandler> registryHandlers = ObfuscationReflectionHelper.getPrivateValue(FluidRenderHandlerRegistryImpl.class, (FluidRenderHandlerRegistryImpl) FluidRenderHandlerRegistry.INSTANCE, "handlers");
         Map<FluidType, FluidRenderHandler> forgeHandlers = new HashMap<>();
         for (Map.Entry<ResourceKey<Fluid>, Fluid> entry : ForgeRegistries.FLUIDS.getEntries()) {
-            ResourceKey<Fluid> key = entry.getKey();
-            if (!ConnectorEarlyLoader.isConnectorMod(key.location().getNamespace())) {
-                Fluid fluid = entry.getValue();
-                FluidRenderHandler handler = forgeHandlers.computeIfAbsent(fluid.getFluidType(), ForgeFluidRenderHandler::new);
-                registryHandlers.put(fluid, handler);
+            Fluid fluid = entry.getValue();
+            if (fluid != Fluids.EMPTY) {
+                ResourceKey<Fluid> key = entry.getKey();
+                if (!ConnectorEarlyLoader.isConnectorMod(key.location().getNamespace())) {
+                    FluidRenderHandler handler = forgeHandlers.computeIfAbsent(fluid.getFluidType(), ForgeFluidRenderHandler::new);
+                    registryHandlers.put(fluid, handler);
+                }
             }
         }
     }