diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping
index 632d3f848b..71b75685f9 100644
--- a/mappings/net/minecraft/server/IntegratedServer.mapping
+++ b/mappings/net/minecraft/server/IntegratedServer.mapping
@@ -4,4 +4,5 @@ CLASS none/caj net/minecraft/server/IntegratedServer
 	METHOD A getRunDirectory ()Ljava/io/File;
 	METHOD aa isDedicated ()Z
 	METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b;
-	METHOD u stop ()V
+	METHOD u shutdown ()V
+	METHOD x stop ()V
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index a62dbb790a..1d3266cf8b 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -8,9 +8,11 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	FIELD T forceGamemode Z
 	FIELD a userCacheFile Ljava/io/File;
 	FIELD c profiler Lnone/os;
+	FIELD d worlds [Lnone/lu;
 	FIELD k LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD t serverIp Ljava/lang/String;
 	FIELD u serverPort I
+	FIELD w running Z
 	FIELD z onlineMode Z
 	METHOD A getRunDirectory ()Ljava/io/File;
 	METHOD G getVersion ()Ljava/lang/String;
@@ -55,6 +57,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD l setMotd (Ljava/lang/String;)V
 		ARG 0 value
 	METHOD run run ()V
-	METHOD u stop ()V
+	METHOD u shutdown ()V
 	METHOD v getServerIp ()Ljava/lang/String;
+	METHOD w isRunning ()Z
+	METHOD x stop ()V
 	METHOD z getIconFile ()Ljava/io/File;
diff --git a/mappings/net/minecraft/server/ServerNetwork.mapping b/mappings/net/minecraft/server/ServerNetwork.mapping
new file mode 100644
index 0000000000..f92feed599
--- /dev/null
+++ b/mappings/net/minecraft/server/ServerNetwork.mapping
@@ -0,0 +1,9 @@
+CLASS none/mf net/minecraft/server/ServerNetwork
+	FIELD d running Z
+	FIELD e LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD f server Lnet/minecraft/server/MinecraftServer;
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;)V
+		ARG 0 server
+	METHOD b stop ()V
+	METHOD b getServer (Lnone/mf;)Lnet/minecraft/server/MinecraftServer;
+	METHOD d getServer ()Lnet/minecraft/server/MinecraftServer;
diff --git a/mappings/net/minecraft/server/gui/ServerGui.mapping b/mappings/net/minecraft/server/gui/ServerGui.mapping
new file mode 100644
index 0000000000..2f14f466f6
--- /dev/null
+++ b/mappings/net/minecraft/server/gui/ServerGui.mapping
@@ -0,0 +1,8 @@
+CLASS none/li net/minecraft/server/gui/ServerGui
+	FIELD a FONT Ljava/awt/Font;
+	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD c server Lnone/lf;
+	METHOD <init> (Lnone/lf;)V
+		ARG 0 server
+	METHOD a createWindow (Lnone/lf;)V
+		ARG 0 server
diff --git a/mappings/net/minecraft/server/gui/StatComponent.mapping b/mappings/net/minecraft/server/gui/StatComponent.mapping
new file mode 100644
index 0000000000..cd235dd6b0
--- /dev/null
+++ b/mappings/net/minecraft/server/gui/StatComponent.mapping
@@ -0,0 +1,5 @@
+CLASS none/lk net/minecraft/server/gui/StatComponent
+	FIELD d text [Ljava/lang/String;
+	FIELD e server Lnet/minecraft/server/MinecraftServer;
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;)V
+		ARG 0 server
diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping
index 5cc73924fb..136126ac62 100644
--- a/mappings/net/minecraft/world/WorldServer.mapping
+++ b/mappings/net/minecraft/world/WorldServer.mapping
@@ -5,3 +5,4 @@ CLASS none/lu net/minecraft/world/WorldServer
 	METHOD a createEntity (Lnone/se;)Z
 	METHOD aE isMainThread ()Z
 	METHOD k updateEntities ()V
+	METHOD r getServerChunkProvider ()Lnone/lt;