diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping
index ae9b8bde55..0f563d5fc5 100644
--- a/mappings/net/minecraft/network/ClientConnection.mapping
+++ b/mappings/net/minecraft/network/ClientConnection.mapping
@@ -17,10 +17,12 @@ CLASS none/eq net/minecraft/network/ClientConnection
 		ARG 0 address
 		ARG 1 port
 	METHOD a connect (Ljava/net/SocketAddress;)Lnone/eq;
+	METHOD a setState (Lnone/er;)V
 	METHOD a setPacketListener (Lnone/ev;)V
 		ARG 0 packetListener
 	METHOD a disconnect (Lnone/fa;)V
 		ARG 0 reason
+	METHOD a sendPacket (Lnone/fl;)V
 	METHOD b getAddress ()Ljava/net/SocketAddress;
 	METHOD c isLocal ()Z
 	METHOD channelActive channelActive (Lio/netty/channel/ChannelHandlerContext;)V
diff --git a/mappings/net/minecraft/network/handler/IConnectionFilter.mapping b/mappings/net/minecraft/network/handler/IConnectionFilter.mapping
new file mode 100644
index 0000000000..51aa1b16b6
--- /dev/null
+++ b/mappings/net/minecraft/network/handler/IConnectionFilter.mapping
@@ -0,0 +1,3 @@
+CLASS none/jp net/minecraft/network/handler/IConnectionFilter
+	METHOD a handlePacket (Lnone/jo;)V
+		ARG 0 handshake
diff --git a/mappings/net/minecraft/server/DummyConnectionFilter.mapping b/mappings/net/minecraft/server/DummyConnectionFilter.mapping
new file mode 100644
index 0000000000..bc73c82e12
--- /dev/null
+++ b/mappings/net/minecraft/server/DummyConnectionFilter.mapping
@@ -0,0 +1,10 @@
+CLASS none/me net/minecraft/server/DummyConnectionFilter
+	FIELD a server Lnet/minecraft/server/MinecraftServer;
+	FIELD b connection Lnone/eq;
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnone/eq;)V
+		ARG 0 server
+		ARG 1 connection
+	METHOD a onConnectionLost (Lnone/fa;)V
+		ARG 0 reason
+	METHOD a handlePacket (Lnone/jo;)V
+		ARG 0 handshake
diff --git a/mappings/net/minecraft/server/VersionConnectionFilter.mapping b/mappings/net/minecraft/server/VersionConnectionFilter.mapping
new file mode 100644
index 0000000000..cabbb51118
--- /dev/null
+++ b/mappings/net/minecraft/server/VersionConnectionFilter.mapping
@@ -0,0 +1,10 @@
+CLASS none/mh net/minecraft/server/VersionConnectionFilter
+	FIELD a server Lnet/minecraft/server/MinecraftServer;
+	FIELD b connection Lnone/eq;
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnone/eq;)V
+		ARG 0 server
+		ARG 1 connection
+	METHOD a onConnectionLost (Lnone/fa;)V
+		ARG 0 reason
+	METHOD a handlePacket (Lnone/jo;)V
+		ARG 0 handshake
diff --git a/mappings/net/minecraft/text/TranslateException.mapping b/mappings/net/minecraft/text/TranslateException.mapping
new file mode 100644
index 0000000000..c100f590c3
--- /dev/null
+++ b/mappings/net/minecraft/text/TranslateException.mapping
@@ -0,0 +1,10 @@
+CLASS none/fi net/minecraft/text/TranslateException
+	METHOD <init> (Lnone/fh;I)V
+		ARG 0 component
+		ARG 1 value
+	METHOD <init> (Lnone/fh;Ljava/lang/String;)V
+		ARG 0 component
+		ARG 1 value
+	METHOD <init> (Lnone/fh;Ljava/lang/Throwable;)V
+		ARG 0 component
+		ARG 1 value
diff --git a/mappings/none/me.mapping b/mappings/none/me.mapping
deleted file mode 100644
index 976e99db32..0000000000
--- a/mappings/none/me.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS none/me
-	METHOD a onConnectionLost (Lnone/fa;)V
-		ARG 0 reason
diff --git a/mappings/none/mh.mapping b/mappings/none/mh.mapping
deleted file mode 100644
index d3f265b7d5..0000000000
--- a/mappings/none/mh.mapping
+++ /dev/null
@@ -1,3 +0,0 @@
-CLASS none/mh
-	METHOD a onConnectionLost (Lnone/fa;)V
-		ARG 0 reason