diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/NetHandlerSpaghettiServer.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/NetHandlerSpaghettiServer.java
index 0c8e1cab6..d0b2b4384 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/common/util/NetHandlerSpaghettiServer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/common/util/NetHandlerSpaghettiServer.java
@@ -1,50 +1,30 @@
 package de.ellpeck.actuallyadditions.common.util;
 
-import java.util.Set;
-
-import net.minecraft.network.EnumPacketDirection;
-import net.minecraft.network.NetHandlerPlayServer;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import net.minecraft.network.IPacket;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.Packet;
+import net.minecraft.network.PacketDirection;
 import net.minecraft.network.play.ServerPlayNetHandler;
-import net.minecraft.network.play.client.CPacketAnimation;
-import net.minecraft.network.play.client.CPacketChatMessage;
-import net.minecraft.network.play.client.CPacketClickWindow;
-import net.minecraft.network.play.client.CPacketClientSettings;
-import net.minecraft.network.play.client.CPacketClientStatus;
-import net.minecraft.network.play.client.CPacketCloseWindow;
-import net.minecraft.network.play.client.CPacketConfirmTeleport;
-import net.minecraft.network.play.client.CPacketConfirmTransaction;
-import net.minecraft.network.play.client.CPacketCreativeInventoryAction;
-import net.minecraft.network.play.client.CPacketCustomPayload;
-import net.minecraft.network.play.client.CPacketEnchantItem;
-import net.minecraft.network.play.client.CPacketEntityAction;
-import net.minecraft.network.play.client.CPacketHeldItemChange;
-import net.minecraft.network.play.client.CPacketInput;
-import net.minecraft.network.play.client.CPacketKeepAlive;
-import net.minecraft.network.play.client.CPacketPlaceRecipe;
-import net.minecraft.network.play.client.CPacketPlayer;
-import net.minecraft.network.play.client.CPacketPlayerAbilities;
-import net.minecraft.network.play.client.CPacketPlayerDigging;
-import net.minecraft.network.play.client.CPacketPlayerTryUseItem;
-import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock;
-import net.minecraft.network.play.client.CPacketRecipeInfo;
-import net.minecraft.network.play.client.CPacketResourcePackStatus;
-import net.minecraft.network.play.client.CPacketSeenAdvancements;
-import net.minecraft.network.play.client.CPacketSpectate;
-import net.minecraft.network.play.client.CPacketSteerBoat;
-import net.minecraft.network.play.client.CPacketTabComplete;
-import net.minecraft.network.play.client.CPacketUpdateSign;
-import net.minecraft.network.play.client.CPacketUseEntity;
-import net.minecraft.network.play.client.CPacketVehicleMove;
-import net.minecraft.network.play.server.SPacketPlayerPosLook.EnumFlags;
+import net.minecraft.network.play.client.*;
+import net.minecraft.network.play.server.SPlayerPositionLookPacket;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.common.util.FakePlayer;
 
-public class NetHandlerSpaghettiServer extends ServerPlayNetHandler {
+import javax.annotation.Nullable;
+import java.util.Set;
 
+public class NetHandlerSpaghettiServer extends ServerPlayNetHandler {
     public NetHandlerSpaghettiServer(FakePlayer player) {
-        super(null, new NetworkManager(EnumPacketDirection.CLIENTBOUND), player);
+        super(null, new NetworkManager(PacketDirection.CLIENTBOUND), player);
+    }
+
+    @Override
+    public void tick() {
+    }
+
+    @Override
+    public void captureCurrentPosition() {
     }
 
     @Override
@@ -52,131 +32,75 @@ public class NetHandlerSpaghettiServer extends ServerPlayNetHandler {
     }
 
     @Override
-    public void func_194308_a(CPacketPlaceRecipe p_194308_1_) {
+    public void processInput(CInputPacket packetIn) {
     }
 
     @Override
-    public void handleAnimation(CPacketAnimation packetIn) {
+    public void processVehicleMove(CMoveVehiclePacket packetIn) {
     }
 
     @Override
-    public void handleRecipeBookUpdate(CPacketRecipeInfo p_191984_1_) {
+    public void processConfirmTeleport(CConfirmTeleportPacket packetIn) {
     }
 
     @Override
-    public void handleResourcePackStatus(CPacketResourcePackStatus packetIn) {
+    public void handleRecipeBookUpdate(CRecipeInfoPacket packetIn) {
     }
 
     @Override
-    public void handleSeenAdvancements(CPacketSeenAdvancements p_194027_1_) {
+    public void handleSeenAdvancements(CSeenAdvancementsPacket packetIn) {
     }
 
     @Override
-    public void handleSpectate(CPacketSpectate packetIn) {
+    public void processTabComplete(CTabCompletePacket packetIn) {
     }
 
     @Override
-    public void onDisconnect(ITextComponent reason) {
+    public void processUpdateCommandBlock(CUpdateCommandBlockPacket packetIn) {
     }
 
     @Override
-    public void processChatMessage(CPacketChatMessage packetIn) {
+    public void processUpdateCommandMinecart(CUpdateMinecartCommandBlockPacket packetIn) {
     }
 
     @Override
-    public void processClickWindow(CPacketClickWindow packetIn) {
+    public void processPickItem(CPickItemPacket packetIn) {
     }
 
     @Override
-    public void processClientSettings(CPacketClientSettings packetIn) {
+    public void processRenameItem(CRenameItemPacket packetIn) {
     }
 
     @Override
-    public void processClientStatus(CPacketClientStatus packetIn) {
+    public void processUpdateBeacon(CUpdateBeaconPacket packetIn) {
     }
 
     @Override
-    public void processCloseWindow(CPacketCloseWindow packetIn) {
+    public void processUpdateStructureBlock(CUpdateStructureBlockPacket packetIn) {
     }
 
     @Override
-    public void processConfirmTeleport(CPacketConfirmTeleport packetIn) {
+    public void func_217262_a(CUpdateJigsawBlockPacket p_217262_1_) {
     }
 
     @Override
-    public void processConfirmTransaction(CPacketConfirmTransaction packetIn) {
+    public void processSelectTrade(CSelectTradePacket packetIn) {
     }
 
     @Override
-    public void processCreativeInventoryAction(CPacketCreativeInventoryAction packetIn) {
+    public void processEditBook(CEditBookPacket packetIn) {
     }
 
     @Override
-    public void processCustomPayload(CPacketCustomPayload packetIn) {
+    public void processNBTQueryEntity(CQueryEntityNBTPacket packetIn) {
     }
 
     @Override
-    public void processEnchantItem(CPacketEnchantItem packetIn) {
+    public void processNBTQueryBlockEntity(CQueryTileEntityNBTPacket packetIn) {
     }
 
     @Override
-    public void processEntityAction(CPacketEntityAction packetIn) {
-    }
-
-    @Override
-    public void processHeldItemChange(CPacketHeldItemChange packetIn) {
-    }
-
-    @Override
-    public void processInput(CPacketInput packetIn) {
-    }
-
-    @Override
-    public void processKeepAlive(CPacketKeepAlive packetIn) {
-    }
-
-    @Override
-    public void processPlayer(CPacketPlayer packetIn) {
-    }
-
-    @Override
-    public void processPlayerAbilities(CPacketPlayerAbilities packetIn) {
-    }
-
-    @Override
-    public void processPlayerDigging(CPacketPlayerDigging packetIn) {
-    }
-
-    @Override
-    public void processSteerBoat(CPacketSteerBoat packetIn) {
-    }
-
-    @Override
-    public void processTabComplete(CPacketTabComplete packetIn) {
-    }
-
-    @Override
-    public void processTryUseItem(CPacketPlayerTryUseItem packetIn) {
-    }
-
-    @Override
-    public void processTryUseItemOnBlock(CPacketPlayerTryUseItemOnBlock packetIn) {
-    }
-
-    @Override
-    public void processUpdateSign(CPacketUpdateSign packetIn) {
-    }
-
-    @Override
-    public void processUseEntity(CPacketUseEntity packetIn) {
-    }
-
-    @Override
-    public void processVehicleMove(CPacketVehicleMove packetIn) {
-    }
-
-    @Override
-    public void sendPacket(Packet<?> packetIn) {
+    public void processPlayer(CPlayerPacket packetIn) {
     }
 
     @Override
@@ -184,8 +108,118 @@ public class NetHandlerSpaghettiServer extends ServerPlayNetHandler {
     }
 
     @Override
-    public void setPlayerLocation(double x, double y, double z, float yaw, float pitch, Set<EnumFlags> relativeSet) {
-
+    public void setPlayerLocation(double x, double y, double z, float yaw, float pitch, Set<SPlayerPositionLookPacket.Flags> relativeSet) {
     }
 
+    @Override
+    public void processPlayerDigging(CPlayerDiggingPacket packetIn) {
+    }
+
+    @Override
+    public void processTryUseItemOnBlock(CPlayerTryUseItemOnBlockPacket packetIn) {
+    }
+
+    @Override
+    public void processTryUseItem(CPlayerTryUseItemPacket packetIn) {
+    }
+
+    @Override
+    public void handleSpectate(CSpectatePacket packetIn) {
+    }
+
+    @Override
+    public void handleResourcePackStatus(CResourcePackStatusPacket packetIn) {
+    }
+
+    @Override
+    public void processSteerBoat(CSteerBoatPacket packetIn) {
+    }
+
+    @Override
+    public void onDisconnect(ITextComponent reason) {
+    }
+
+    @Override
+    public void sendPacket(IPacket<?> packetIn) {
+    }
+
+    @Override
+    public void sendPacket(IPacket<?> packetIn, @Nullable GenericFutureListener<? extends Future<? super Void>> futureListeners) {
+    }
+
+    @Override
+    public void processHeldItemChange(CHeldItemChangePacket packetIn) {
+    }
+
+    @Override
+    public void processChatMessage(CChatMessagePacket packetIn) {
+    }
+
+    @Override
+    public void handleAnimation(CAnimateHandPacket packetIn) {
+    }
+
+    @Override
+    public void processEntityAction(CEntityActionPacket packetIn) {
+    }
+
+    @Override
+    public void processUseEntity(CUseEntityPacket packetIn) {
+    }
+
+    @Override
+    public void processClientStatus(CClientStatusPacket packetIn) {
+    }
+
+    @Override
+    public void processCloseWindow(CCloseWindowPacket packetIn) {
+    }
+
+    @Override
+    public void processClickWindow(CClickWindowPacket packetIn) {
+    }
+
+    @Override
+    public void processPlaceRecipe(CPlaceRecipePacket packetIn) {
+    }
+
+    @Override
+    public void processEnchantItem(CEnchantItemPacket packetIn) {
+    }
+
+    @Override
+    public void processCreativeInventoryAction(CCreativeInventoryActionPacket packetIn) {
+    }
+
+    @Override
+    public void processConfirmTransaction(CConfirmTransactionPacket packetIn) {
+    }
+
+    @Override
+    public void processUpdateSign(CUpdateSignPacket packetIn) {
+    }
+
+    @Override
+    public void processKeepAlive(CKeepAlivePacket packetIn) {
+    }
+
+    @Override
+    public void processPlayerAbilities(CPlayerAbilitiesPacket packetIn) {
+    }
+
+    @Override
+    public void processClientSettings(CClientSettingsPacket packetIn) {
+    }
+
+    @Override
+    public void processCustomPayload(CCustomPayloadPacket packetIn) {
+    }
+
+    @Override
+    public void func_217263_a(CSetDifficultyPacket p_217263_1_) {
+    }
+
+    @Override
+    public void func_217261_a(CLockDifficultyPacket p_217261_1_) {
+    }
 }