Fix things

Author: M-W-K

src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java

@@ -30,7 +30,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.PacketBuffer;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.Constants;
@@ -1168,7 +1167,7 @@ public void invalidate() {
     }
 
     @Override
-    public void receiveCustomData(int dataId, @NotNull PacketBuffer buf) {
+    public void receiveCustomData(int dataId, @NotNull AdvancedPacketBuffer buf) {
         if (dataId == GregtechDataCodes.WORKABLE_ACTIVE) {
             this.isActive = buf.readBoolean();
             getMetaTileEntity().scheduleRenderUpdate();

src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java

@@ -16,7 +16,6 @@
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.PacketBuffer;
 import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -290,7 +289,7 @@ public void receiveInitialSyncData(@NotNull AdvancedPacketBuffer buf) {
     }
 
     @Override
-    public void receiveCustomData(int dataId, @NotNull PacketBuffer buf) {
+    public void receiveCustomData(int dataId, @NotNull AdvancedPacketBuffer buf) {
         super.receiveCustomData(dataId, buf);
         if (dataId == BOILER_HEAT) {
             this.currentHeat = buf.readVarInt();

src/main/java/gregtech/api/capability/impl/CleanroomLogic.java

@@ -232,7 +232,7 @@ public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
     /**
      * reads all needed values from CustomData
      * This MUST be called and returned in the MetaTileEntity's
-     * {@link MetaTileEntity#receiveCustomData(int, PacketBuffer)} method
+     * {@link ISyncedTileEntity#receiveCustomData(int, gregtech.api.network.AdvancedPacketBuffer)} method
      */
     public void receiveCustomData(int dataId, PacketBuffer buf) {
         if (dataId == GregtechDataCodes.IS_WORKING) {

src/main/java/gregtech/api/capability/impl/FluidDrillLogic.java

@@ -308,7 +308,7 @@ public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
     /**
      * reads all needed values from CustomData
      * This MUST be called and returned in the MetaTileEntity's
-     * {@link MetaTileEntity#receiveCustomData(int, PacketBuffer)} method
+     * {@link ISyncedTileEntity#receiveCustomData(int, gregtech.api.network.AdvancedPacketBuffer)} method
      */
     public void receiveCustomData(int dataId, PacketBuffer buf) {
         if (dataId == GregtechDataCodes.WORKABLE_ACTIVE) {

src/main/java/gregtech/api/capability/impl/RecipeLogicSteam.java

@@ -20,7 +20,6 @@
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.EntitySelectors;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumParticleTypes;
@@ -99,7 +98,7 @@ public void setVentingSide(EnumFacing ventingSide) {
     }
 
     @Override
-    public void receiveCustomData(int dataId, @NotNull PacketBuffer buf) {
+    public void receiveCustomData(int dataId, @NotNull AdvancedPacketBuffer buf) {
         super.receiveCustomData(dataId, buf);
         if (dataId == GregtechDataCodes.NEEDS_VENTING) {
             this.needsVenting = buf.readBoolean();

src/main/java/gregtech/api/capability/impl/miner/MinerLogic.java

@@ -575,7 +575,7 @@ public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
     /**
      * reads all needed values from CustomData
      * This MUST be called and returned in the MetaTileEntity's
-     * {@link MetaTileEntity#receiveCustomData(int, PacketBuffer)} method
+     * {@link ISyncedTileEntity#receiveCustomData(int, gregtech.api.network.AdvancedPacketBuffer)} method
      */
     public void receiveCustomData(int dataId, PacketBuffer buf) {
         if (dataId == GregtechDataCodes.PUMP_HEAD_LEVEL) {

src/main/java/gregtech/api/cover/Cover.java

@@ -282,7 +282,7 @@ default void writeInitialSyncData(@NotNull AdvancedPacketBuffer packetBuffer) {}
 
     default void readInitialSyncData(@NotNull AdvancedPacketBuffer packetBuffer) {}
 
-    default void writeCustomData(int discriminator, @NotNull Consumer<@NotNull PacketBuffer> buf) {
+    default void writeCustomData(int discriminator, @NotNull Consumer<@NotNull AdvancedPacketBuffer> buf) {
         getCoverableView().writeCoverData(this, discriminator, buf);
     }
 

src/main/java/gregtech/api/cover/CoverHolder.java

@@ -1,11 +1,11 @@
 package gregtech.api.cover;
 
+import gregtech.api.network.AdvancedPacketBuffer;
 import gregtech.api.util.GTUtility;
 import gregtech.client.utils.RenderUtil;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ITickable;
@@ -91,7 +91,7 @@ default void updateCovers() {
         }
     }
 
-    void writeCustomData(int discriminator, @NotNull Consumer<@NotNull PacketBuffer> buf);
+    void writeCustomData(int discriminator, @NotNull Consumer<@NotNull AdvancedPacketBuffer> buf);
 
     /**
      * It is used to render cover's baseplate if this CoverHolder is not full block length.

src/main/java/gregtech/api/cover/CoverSaveHandler.java

@@ -6,7 +6,6 @@
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.Constants;
@@ -90,7 +89,8 @@ public static void writeCoverPlacement(@NotNull CoverHolder coverHolder, int dis
         coverHolder.writeCustomData(discriminator, buf -> {
             buf.writeByte(side.getIndex());
             buf.writeVarInt(CoverDefinition.getNetworkIdForCover(cover.getDefinition()));
-            cover.writeInitialSyncData(buf);
+            cover.writeInitialSyncData(buf.openSubBuffer());
+            buf.writeSubBuffer();
         });
     }
 
@@ -100,7 +100,7 @@ public static void writeCoverPlacement(@NotNull CoverHolder coverHolder, int dis
      * @param buf         the buffer to read from
      * @param coverHolder the CoverHolder the cover is placed on
      */
-    public static void readCoverPlacement(@NotNull PacketBuffer buf, @NotNull CoverHolder coverHolder) {
+    public static void readCoverPlacement(@NotNull AdvancedPacketBuffer buf, @NotNull CoverHolder coverHolder) {
         // cover placement event
         EnumFacing placementSide = EnumFacing.VALUES[buf.readByte()];
         int id = buf.readVarInt();
@@ -112,8 +112,10 @@ public static void readCoverPlacement(@NotNull PacketBuffer buf, @NotNull CoverH
             Cover cover = coverDefinition.createCover(coverHolder, placementSide);
             coverHolder.addCover(placementSide, cover);
 
-            cover.readInitialSyncData(buf);
-            ISyncedTileEntity.checkInitialData(buf, cover);
+            AdvancedPacketBuffer b = buf.readSubBuffer();
+            cover.readInitialSyncData(b);
+            ISyncedTileEntity.checkInitialData(b, cover);
+            buf.closeSubBuffer();
         }
         coverHolder.scheduleRenderUpdate();
     }

src/main/java/gregtech/api/cover/CoverableView.java

@@ -1,7 +1,8 @@
 package gregtech.api.cover;
 
+import gregtech.api.network.AdvancedPacketBuffer;
+
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.PacketBuffer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
@@ -87,7 +88,7 @@ default boolean hasCover(@NotNull EnumFacing side) {
      */
     int getInputRedstoneSignal(@NotNull EnumFacing side, boolean ignoreCover);
 
-    void writeCoverData(@NotNull Cover cover, int discriminator, @NotNull Consumer<@NotNull PacketBuffer> buf);
+    void writeCoverData(@NotNull Cover cover, int discriminator, @NotNull Consumer<@NotNull AdvancedPacketBuffer> buf);
 
     /**
      * @return an ItemStack representation of the CoverableView, or {@link ItemStack#EMPTY} if not possible.