Upgrade to 1.14.2

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / common / messages / PayloadBuilder.java

diff --git a/src/main/java/com/irtimaled/bbor/common/messages/PayloadBuilder.java b/src/main/java/com/irtimaled/bbor/common/messages/PayloadBuilder.java
index d40cc235d8ee2d7285b26e7d8e24556a2c3b9910..173dfbef5e9728eae89c3c94c50828ffc11a5f0e 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/messages/PayloadBuilder.java
+++ b/src/main/java/com/irtimaled/bbor/common/messages/PayloadBuilder.java
@@ -2,10 +2,10 @@ package com.irtimaled.bbor.common.messages;
 
 import com.irtimaled.bbor.common.models.Coords;
 import io.netty.buffer.Unpooled;
-import net.minecraft.network.Packet;
+import net.minecraft.network.IPacket;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.client.CPacketCustomPayload;
-import net.minecraft.network.play.server.SPacketCustomPayload;
+import net.minecraft.network.play.client.CCustomPayloadPacket;
+import net.minecraft.network.play.server.SCustomPayloadPlayPacket;
 import net.minecraft.util.ResourceLocation;
 
 import java.util.HashMap;
@@ -16,26 +16,26 @@ public class PayloadBuilder {
     private static final Map<String, ResourceLocation> packetNames = new HashMap<>();
 
     static PayloadBuilder clientBound(String name) {
-        return new PayloadBuilder(packetNames.computeIfAbsent(name, ResourceLocation::new), SPacketCustomPayload::new);
+        return new PayloadBuilder(packetNames.computeIfAbsent(name, ResourceLocation::new), SCustomPayloadPlayPacket::new);
     }
 
     static PayloadBuilder serverBound(String name) {
-        return new PayloadBuilder(packetNames.computeIfAbsent(name, ResourceLocation::new), CPacketCustomPayload::new);
+        return new PayloadBuilder(packetNames.computeIfAbsent(name, ResourceLocation::new), CCustomPayloadPacket::new);
     }
 
     private final ResourceLocation name;
-    private final BiFunction<ResourceLocation, PacketBuffer, Packet<?>> packetBuilder;
+    private final BiFunction<ResourceLocation, PacketBuffer, IPacket<?>> packetBuilder;
     private final PacketBuffer buffer;
 
-    private PayloadBuilder(ResourceLocation name, BiFunction<ResourceLocation, PacketBuffer, Packet<?>> packetBuilder) {
+    private PayloadBuilder(ResourceLocation name, BiFunction<ResourceLocation, PacketBuffer, IPacket<?>> packetBuilder) {
         this.name = name;
         this.buffer = new PacketBuffer(Unpooled.buffer());
         this.packetBuilder = packetBuilder;
     }
 
-    private Packet<?> packet;
+    private IPacket<?> packet;
 
-    public Packet<?> build() {
+    public IPacket<?> build() {
         if (packet == null)
             packet = packetBuilder.apply(name, buffer);
         return packet;
@@ -65,12 +65,6 @@ public class PayloadBuilder {
         return this;
     }
 
-    PayloadBuilder writeBoolean(boolean value) {
-        buffer.writeBoolean(value);
-        packet = null;
-        return this;
-    }
-
     PayloadBuilder writeCoords(Coords coords) {
         return writeVarInt(coords.getX())
                 .writeVarInt(coords.getY())