fix: Fix crash on dedicated server due to fluid render handler

TwelveIterationMods · Aug 19, 2024 · ce1c54d · ce1c54d
1 parent 3784052
commit ce1c54d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/fabric/src/main/java/net/blay09/mods/balm/fabric/FabricBalm.java b/fabric/src/main/java/net/blay09/mods/balm/fabric/FabricBalm.java
@@ -7,6 +7,7 @@
 import net.blay09.mods.balm.api.entity.BalmEntity;
 import net.blay09.mods.balm.api.fluid.BalmFluidTankProvider;
 import net.blay09.mods.balm.api.fluid.FluidTank;
+import net.blay09.mods.balm.api.proxy.SidedProxy;
 import net.blay09.mods.balm.config.ExampleConfig;
 import net.blay09.mods.balm.fabric.fluid.BalmFluidStorage;
 import net.blay09.mods.balm.fabric.provider.FabricBalmProviders;
@@ -19,8 +20,12 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.Container;
 
+import static net.blay09.mods.balm.api.Balm.sidedProxy;
+
 public class FabricBalm implements ModInitializer {
 
+    private static final SidedProxy<FabricBalmProxy> proxy = sidedProxy("net.blay09.mods.balm.fabric.FabricBalmProxy", "net.blay09.mods.balm.fabric.client.FabricBalmClientProxy");
+
     @Override
     public void onInitialize() {
         ((FabricBalmHooks) Balm.getHooks()).initialize();
@@ -58,4 +63,8 @@ public void onInitialize() {
 
         Balm.initializeIfLoaded("team_reborn_energy", "net.blay09.mods.balm.fabric.compat.energy.RebornEnergy");
     }
+
+    public static FabricBalmProxy getProxy() {
+        return proxy.get();
+    }
 }
diff --git a/fabric/src/main/java/net/blay09/mods/balm/fabric/FabricBalmProxy.java b/fabric/src/main/java/net/blay09/mods/balm/fabric/FabricBalmProxy.java
@@ -0,0 +1,13 @@
+package net.blay09.mods.balm.fabric;
+
+import net.blay09.mods.balm.fabric.fluid.SimpleMilkFluid;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.material.Fluid;
+
+public class FabricBalmProxy {
+    public Fluid enableMilkFluid() {
+        return Registry.register(BuiltInRegistries.FLUID, new ResourceLocation("balm-fabric", "milk"), new SimpleMilkFluid());
+    }
+}
diff --git a/fabric/src/main/java/net/blay09/mods/balm/fabric/FabricBalmRegistries.java b/fabric/src/main/java/net/blay09/mods/balm/fabric/FabricBalmRegistries.java
@@ -74,8 +74,7 @@ public TagKey<Item> getItemTag(ResourceLocation key) {
 
     @Override
     public void enableMilkFluid() {
-        milkFluid = Registry.register(BuiltInRegistries.FLUID, new ResourceLocation("balm-fabric", "milk"), new SimpleMilkFluid());
-        FluidRenderHandlerRegistry.INSTANCE.register(milkFluid, new SimpleFluidRenderHandler(SimpleFluidRenderHandler.WATER_STILL, SimpleFluidRenderHandler.WATER_FLOWING, 0xFFFFFFFF));
+        milkFluid = FabricBalm.getProxy().enableMilkFluid();
     }
 
     @Override

diff --git a/fabric/src/main/java/net/blay09/mods/balm/fabric/client/FabricBalmClientProxy.java b/fabric/src/main/java/net/blay09/mods/balm/fabric/client/FabricBalmClientProxy.java
@@ -0,0 +1,16 @@
+package net.blay09.mods.balm.fabric.client;
+
+import net.blay09.mods.balm.fabric.FabricBalmProxy;
+import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry;
+import net.fabricmc.fabric.api.client.render.fluid.v1.SimpleFluidRenderHandler;
+import net.minecraft.world.level.material.Fluid;
+
+public class FabricBalmClientProxy extends FabricBalmProxy {
+
+    @Override
+    public Fluid enableMilkFluid() {
+        final var fluid = super.enableMilkFluid();
+        FluidRenderHandlerRegistry.INSTANCE.register(fluid, new SimpleFluidRenderHandler(SimpleFluidRenderHandler.WATER_STILL, SimpleFluidRenderHandler.WATER_FLOWING, 0xFFFFFFFF));
+        return fluid;
+    }
+}