Remove item and fluid syncers from UISyncer and use syncObject instead

Author: Zorbatron

src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIBuilder.java

@@ -15,15 +15,13 @@
 import gregtech.api.util.GTHashMaps;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.KeyUtil;
-import gregtech.api.util.NetworkUtil;
 import gregtech.api.util.TextFormattingUtil;
 import gregtech.common.ConfigHolder;
 import gregtech.common.items.ToolItems;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import com.cleanroommc.modularui.api.drawable.IDrawable;
@@ -993,39 +991,6 @@ public <T> T[] syncArray(T[] initial, IByteBufSerializer<T> serializer, IByteBuf
             return initial;
         }
 
-        @Override
-        public @NotNull ItemStack syncItemStack(@NotNull Supplier<@NotNull ItemStack> initial) {
-            if (isServer()) {
-                ItemStack stack = initial.get();
-                NetworkUtil.writeItemStack(internal, stack);
-                return stack;
-            } else {
-                return NetworkUtil.readItemStack(internal);
-            }
-        }
-
-        @Override
-        public @Nullable FluidStack syncFluidStack(@NotNull Supplier<@Nullable FluidStack> initial) {
-            if (isServer()) {
-                FluidStack stack = initial.get();
-                NetworkUtil.writeFluidStack(internal, stack);
-                return stack;
-            } else {
-                return NetworkUtil.readFluidStack(internal);
-            }
-        }
-
-        @Override
-        public @Nullable Fluid syncFluid(@NotNull Supplier<@Nullable Fluid> initial) {
-            if (isServer()) {
-                Fluid fluid = initial.get();
-                NetworkUtil.writeFluid(internal, fluid);
-                return fluid;
-            } else {
-                return NetworkUtil.readFluid(internal);
-            }
-        }
-
         public void readBuffer(ByteBuf buf) {
             clear();
             internal.clear();

src/main/java/gregtech/api/metatileentity/multiblock/ui/UISyncer.java

@@ -2,16 +2,11 @@
 
 import gregtech.api.mui.GTByteBufAdapters;
 
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
 import com.cleanroommc.modularui.utils.serialization.ByteBufAdapters;
 import com.cleanroommc.modularui.utils.serialization.IByteBufAdapter;
 import com.cleanroommc.modularui.utils.serialization.IByteBufDeserializer;
 import com.cleanroommc.modularui.utils.serialization.IByteBufSerializer;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.math.BigInteger;
 import java.util.Collection;
@@ -180,30 +175,6 @@ default <T> T[] syncArray(T[] initial, IByteBufAdapter<T> adapter) {
         return syncArray(initial, adapter, adapter);
     }
 
-    @NotNull
-    ItemStack syncItemStack(@NotNull Supplier<@NotNull ItemStack> initial);
-
-    @NotNull
-    default ItemStack syncItemStack(@NotNull ItemStack initial) {
-        return syncItemStack(() -> initial);
-    }
-
-    @Nullable
-    FluidStack syncFluidStack(@NotNull Supplier<@Nullable FluidStack> initial);
-
-    @Nullable
-    default FluidStack syncFluidStack(@Nullable FluidStack initial) {
-        return syncFluidStack(() -> initial);
-    }
-
-    @Nullable
-    Fluid syncFluid(@NotNull Supplier<@Nullable Fluid> initial);
-
-    @Nullable
-    default Fluid syncFluid(@Nullable Fluid initial) {
-        return syncFluid(() -> initial);
-    }
-
     interface ByteSupplier {
 
         byte getByte();

src/main/java/gregtech/api/mui/GTByteBufAdapters.java

@@ -2,8 +2,10 @@
 
 import gregtech.api.recipes.chance.output.impl.ChancedFluidOutput;
 import gregtech.api.recipes.chance.output.impl.ChancedItemOutput;
+import gregtech.api.util.NetworkUtil;
 
 import net.minecraft.network.PacketBuffer;
+import net.minecraftforge.fluids.Fluid;
 
 import com.cleanroommc.modularui.utils.serialization.*;
 import org.jetbrains.annotations.NotNull;
@@ -24,6 +26,8 @@ public class GTByteBufAdapters {
             buffer -> new BigInteger(buffer.readByteArray()),
             (buffer, value) -> buffer.writeByteArray(value.toByteArray()));
 
+    public static final IByteBufAdapter<Fluid> FLUID = makeAdapter(NetworkUtil::readFluid, NetworkUtil::writeFluid);
+
     public static <T> IByteBufAdapter<T> makeAdapter(@NotNull IByteBufDeserializer<T> deserializer,
                                                      @NotNull IByteBufSerializer<T> serializer) {
         return makeAdapter(deserializer, serializer, IEquals.defaultTester());

src/main/java/gregtech/api/util/NetworkUtil.java

@@ -7,7 +7,6 @@
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import io.netty.buffer.ByteBuf;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -32,16 +31,6 @@ public static void writeFluidStack(@NotNull PacketBuffer to, @Nullable FluidStac
         to.writeCompoundTag(tag);
     }
 
-    /**
-     * {@link #writeFluidStack(PacketBuffer, FluidStack)} but with a netty {@link ByteBuf}
-     *
-     * @param to    the buffer to write to
-     * @param stack the stack to write
-     */
-    public static void writeFluidStack(@NotNull ByteBuf to, @Nullable FluidStack stack) {
-        writeFluidStack(new PacketBuffer(to), stack);
-    }
-
     /**
      * Read a {@link FluidStack} from a {@link PacketBuffer}
      *
@@ -63,16 +52,6 @@ public static void writeFluidStack(@NotNull ByteBuf to, @Nullable FluidStack sta
         }
     }
 
-    /**
-     * {@link #readFluidStack(PacketBuffer)} but with a netty {@link ByteBuf}
-     *
-     * @param from the packet buffer to read from
-     * @return the decoded fluid stack
-     */
-    public static @Nullable FluidStack readFluidStack(@NotNull ByteBuf from) {
-        return readFluidStack(new PacketBuffer(from));
-    }
-
     /**
      * Write a {@link Fluid} to a {@link PacketBuffer}.
      *
@@ -88,16 +67,6 @@ public static void writeFluid(@NotNull PacketBuffer to, @Nullable Fluid fluid) {
         }
     }
 
-    /**
-     * {@link #writeFluid(PacketBuffer, Fluid)} but with a netty {@link ByteBuf}
-     *
-     * @param to    the buffer to write to
-     * @param fluid the fluid to write
-     */
-    public static void writeFluid(@NotNull ByteBuf to, @Nullable Fluid fluid) {
-        writeFluid(new PacketBuffer(to), fluid);
-    }
-
     /**
      * Read a {@link Fluid} from a {@link PacketBuffer}
      *
@@ -112,16 +81,6 @@ public static void writeFluid(@NotNull ByteBuf to, @Nullable Fluid fluid) {
         }
     }
 
-    /**
-     * {@link #readFluid(PacketBuffer)} but with a netty {@link ByteBuf}
-     *
-     * @param from the packet buffer to read from
-     * @return the decoded fluid
-     */
-    public static @Nullable Fluid readFluid(@NotNull ByteBuf from) {
-        return readFluid(new PacketBuffer(from));
-    }
-
     /**
      * Write an {@link ItemStack} to a {@link PacketBuffer}.
      *
@@ -132,16 +91,6 @@ public static void writeItemStack(@NotNull PacketBuffer to, @NotNull ItemStack s
         to.writeItemStack(stack);
     }
 
-    /**
-     * {@link #writeItemStack(PacketBuffer, ItemStack)} but with a netty {@link ByteBuf}
-     *
-     * @param to    the buffer to write to
-     * @param stack the stack to write
-     */
-    public static void writeItemStack(@NotNull ByteBuf to, @NotNull ItemStack stack) {
-        writeItemStack(new PacketBuffer(to), stack);
-    }
-
     /**
      * Read an {@link ItemStack} from a {@link PacketBuffer}
      *
@@ -156,14 +105,4 @@ public static void writeItemStack(@NotNull ByteBuf to, @NotNull ItemStack stack)
             return ItemStack.EMPTY;
         }
     }
-
-    /**
-     * {@link #readItemStack(PacketBuffer)} but with a netty {@link ByteBuf}
-     *
-     * @param from the buffer to read from
-     * @return the decoded item stack
-     */
-    public static @NotNull ItemStack readItemStack(@NotNull ByteBuf from) {
-        return readItemStack(new PacketBuffer(from));
-    }
 }

src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFluidDrill.java

@@ -14,6 +14,7 @@
 import gregtech.api.metatileentity.multiblock.*;
 import gregtech.api.metatileentity.multiblock.ui.MultiblockUIBuilder;
 import gregtech.api.metatileentity.multiblock.ui.TemplateBarBuilder;
+import gregtech.api.mui.GTByteBufAdapters;
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.pattern.BlockPattern;
 import gregtech.api.pattern.FactoryBlockPattern;
@@ -174,7 +175,8 @@ protected void configureDisplayText(MultiblockUIBuilder builder) {
                     if (isStructureFormed()) {
                         if (syncer.syncBoolean(minerLogic.getDrilledFluid() != null)) {
                             // Fluid name
-                            Fluid drilledFluid = syncer.syncFluid(minerLogic.getDrilledFluid());
+                            Fluid drilledFluid = syncer.syncObject(minerLogic.getDrilledFluid(),
+                                    GTByteBufAdapters.FLUID);
                             IKey fluidInfo = KeyUtil.fluid(drilledFluid).style(TextFormatting.GREEN);
 
                             list.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.multiblock.fluid_rig.drilled_fluid",