2 files changed, 31 insertions, 30 deletions
diff --git a/src/main/java/me/shedaniel/network/CheatPacket.java b/src/main/java/me/shedaniel/network/CheatPacket.java
index 8a8582686..ceeb9674f 100755
--- a/src/main/java/me/shedaniel/network/CheatPacket.java
+++ b/src/main/java/me/shedaniel/network/CheatPacket.java
@@ -1,19 +1,18 @@
 package me.shedaniel.network;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.Packet;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.PacketByteBuf;
 
 import java.io.IOException;
 
 /**
  * Created by James on 7/29/2018.
  */
-public class CheatPacket implements Packet<INetHandlerPlayServer> {
+public class CheatPacket implements Packet<ServerPlayNetworkHandler> {
     
     private ItemStack stack;
     
@@ -25,21 +24,22 @@ public class CheatPacket implements Packet<INetHandlerPlayServer> {
     }
     
     @Override
-    public void readPacketData(PacketBuffer packetBuffer) throws IOException {
-        stack = ItemStack.read(packetBuffer.readCompoundTag());
+    public void read(PacketByteBuf packetBuffer) throws IOException {
+        stack = ItemStack.fromTag(packetBuffer.readCompoundTag());
     }
     
     @Override
-    public void writePacketData(PacketBuffer packetBuffer) throws IOException {
-        NBTTagCompound tag = new NBTTagCompound();
-        stack.write(tag);
+    public void write(PacketByteBuf packetBuffer) throws IOException {
+        CompoundTag tag = new CompoundTag();
+        stack.setTag(tag);
         packetBuffer.writeCompoundTag(tag);
     }
     
     @Override
-    public void processPacket(INetHandlerPlayServer iNetHandlerPlayServer) {
-        NetHandlerPlayServer server = (NetHandlerPlayServer) iNetHandlerPlayServer;
-        EntityPlayerMP player = server.player;
-        player.inventory.addItemStackToInventory(stack);
+    public void apply(ServerPlayNetworkHandler iNetHandlerPlayServer) {
+        ServerPlayNetworkHandler server = (ServerPlayNetworkHandler) iNetHandlerPlayServer;
+        ServerPlayerEntity player = server.player;
+        player.inventory.addPickBlock(stack);
     }
+    
 }
diff --git a/src/main/java/me/shedaniel/network/DeletePacket.java b/src/main/java/me/shedaniel/network/DeletePacket.java
index 89e42dfbf..3fb02a763 100755
--- a/src/main/java/me/shedaniel/network/DeletePacket.java
+++ b/src/main/java/me/shedaniel/network/DeletePacket.java
@@ -1,32 +1,33 @@
 package me.shedaniel.network;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.Packet;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.INetHandlerPlayServer;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.PacketByteBuf;
 
 import java.io.IOException;
 
-public class DeletePacket implements Packet<INetHandlerPlayServer> {
-    @Override
-    public void readPacketData(PacketBuffer packetBuffer) throws IOException {
+public class DeletePacket implements Packet<ServerPlayNetworkHandler> {
     
+    @Override
+    public void apply(ServerPlayNetworkHandler iNetHandlerPlayServer) {
+        ServerPlayNetworkHandler server = (ServerPlayNetworkHandler) iNetHandlerPlayServer;
+        ServerPlayerEntity player = server.player;
+        
+        if (!player.inventory.getCursorStack().isEmpty()) {
+            player.inventory.setCursorStack(ItemStack.EMPTY);
+        }
     }
     
     @Override
-    public void writePacketData(PacketBuffer packetBuffer) throws IOException {
+    public void read(PacketByteBuf packetByteBuf) throws IOException {
     
     }
     
     @Override
-    public void processPacket(INetHandlerPlayServer iNetHandlerPlayServer) {
-        NetHandlerPlayServer server = (NetHandlerPlayServer) iNetHandlerPlayServer;
-        EntityPlayerMP player = server.player;
-        
-        if (!player.inventory.getItemStack().isEmpty()) {
-            player.inventory.setItemStack(ItemStack.EMPTY);
-        }
+    public void write(PacketByteBuf packetByteBuf) throws IOException {
+    
     }
+    
 }