Fix Ranged Fluid Ingredients deserializing incorrectly in SMP (#4150)

Co-authored-by: Jurre Groenendijk <[email protected]>

Author: DilithiumThoride

src/main/java/com/gregtechceu/gtceu/api/recipe/content/SerializerFluidIngredient.java

@@ -1,27 +1,50 @@
 package com.gregtechceu.gtceu.api.recipe.content;
 
 import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient;
+import com.gregtechceu.gtceu.api.recipe.ingredient.IntProviderFluidIngredient;
 
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.fluids.FluidStack;
 
 import com.google.gson.JsonElement;
 import com.mojang.serialization.Codec;
 
+import static com.gregtechceu.gtceu.api.registry.GTRegistries.FLUID_SERIALIZERS;
+
 public class SerializerFluidIngredient implements IContentSerializer<FluidIngredient> {
 
     public static SerializerFluidIngredient INSTANCE = new SerializerFluidIngredient();
 
+    static {
+        FLUID_SERIALIZERS.unfreeze();
+        FLUID_SERIALIZERS.register("FluidIngredient", FluidIngredient::fromNetwork);
+        FLUID_SERIALIZERS.register("IntProviderFluidIngredient", IntProviderFluidIngredient::fromNetwork);
+    };
+
     private SerializerFluidIngredient() {}
 
     @Override
     public void toNetwork(FriendlyByteBuf buf, FluidIngredient content) {
+        String name = content.getClass().getSimpleName();
+        if (!FLUID_SERIALIZERS.containKey(name)) {
+            throw new IllegalArgumentException(
+                    "SerializerFluidIngredient tried to serialize a FluidIngredient's subclass %s, which is not in the FluidSerializers registry!"
+                            .formatted(name));
+        }
+        buf.writeUtf(name);
         content.toNetwork(buf);
     }
 
     @Override
     public FluidIngredient fromNetwork(FriendlyByteBuf buf) {
-        return FluidIngredient.fromNetwork(buf);
+        String name = buf.readUtf();
+        var fromNetworkFunction = FLUID_SERIALIZERS.get(name);
+        if (fromNetworkFunction == null) {
+            throw new IllegalArgumentException(
+                    "SerializerFluidIngredient's fromNetwork received a package containing an invalid FluidSerializer name." +
+                            " Name: %s ".formatted(name));
+        }
+        return fromNetworkFunction.apply(buf);
     }
 
     @Override

src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntProviderFluidIngredient.java

@@ -6,6 +6,7 @@
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
+import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.util.ExtraCodecs;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.util.RandomSource;
@@ -226,4 +227,16 @@ public CompoundTag toNBT() {
     public static IntProviderFluidIngredient fromNBT(CompoundTag nbt) {
         return IntProviderFluidIngredient.fromJson(NbtOps.INSTANCE.convertTo(JsonOps.INSTANCE, nbt));
     }
+
+    public void toNetwork(FriendlyByteBuf buffer) {
+        inner.toNetwork(buffer);
+        buffer.writeVarIntArray(new int[] { countProvider.getMinValue(), countProvider.getMaxValue() });
+    }
+
+    public static IntProviderFluidIngredient fromNetwork(FriendlyByteBuf buffer) {
+        FluidIngredient inner = FluidIngredient.fromNetwork(buffer);
+        int[] range = buffer.readVarIntArray(2);
+        IntProvider provider = UniformInt.of(range[0], range[1]);
+        return new IntProviderFluidIngredient(inner, provider);
+    }
 }

src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java

@@ -13,13 +13,15 @@
 import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory;
 import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic;
 import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType;
+import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient;
 import com.gregtechceu.gtceu.api.sound.SoundEntry;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.RecipeSerializer;
@@ -36,6 +38,8 @@
 import com.mojang.serialization.Codec;
 import org.jetbrains.annotations.ApiStatus;
 
+import java.util.function.Function;
+
 public final class GTRegistries {
 
     // GT Registry
@@ -67,6 +71,8 @@ public final class GTRegistries {
             .create(Registries.PLACEMENT_MODIFIER_TYPE, GTCEu.MOD_ID);
     public static final DeferredRegister<Codec<? extends IGlobalLootModifier>> GLOBAL_LOOT_MODIFIES = DeferredRegister
             .create(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, GTCEu.MOD_ID);
+    public static final GTRegistry<String, Function<FriendlyByteBuf, FluidIngredient>> FLUID_SERIALIZERS = new GTRegistry.String<>(
+            GTCEu.id("fluid_serializers"));
 
     public static <V, T extends V> T register(Registry<V> registry, ResourceLocation name, T value) {
         ResourceKey<?> registryKey = registry.key();