From f48822e1eb3b552633c47c1e2ee43555d97d67d8 Mon Sep 17 00:00:00 2001
From: Adrian Siekierka <kontakt@asie.pl>
Date: Thu, 1 Nov 2018 20:25:43 +0100
Subject: [PATCH] fix DedicatedServer unmapping itself

---
 .../minecraft/server/MinecraftServer.mapping  |  2 +
 .../dedicated/DedicatedServerWatchdog.mapping |  4 ++
 .../MinecraftDedicatedServer.mapping          | 55 +++++++++++++++++++
 .../minecraft/util/ThreadTaskQueue.mapping    |  4 +-
 .../util/UncaughtExceptionHandler.mapping     |  2 +
 5 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping
 create mode 100644 mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping
 create mode 100644 mappings/net/minecraft/util/UncaughtExceptionHandler.mapping

diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index 29b5767ec1..d1d40bc4ee 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -184,6 +184,8 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
 	METHOD n getServerIp ()Ljava/lang/String;
 	METHOD o isRunning ()Z
 	METHOD p stop ()V
+	METHOD q getTaskQueueSize ()I
+	METHOD r executeQueuedTask ()Z
 	METHOD s hasIconFile ()Z
 	METHOD t getIconFile ()Ljava/io/File;
 	METHOD u getRunDirectory ()Ljava/io/File;
diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping
new file mode 100644
index 0000000000..afbec13be3
--- /dev/null
+++ b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping
@@ -0,0 +1,4 @@
+CLASS tj net/minecraft/server/dedicated/DedicatedServerWatchdog
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b server Lti;
+	FIELD c maxTickTime J
diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping
new file mode 100644
index 0000000000..c9aad5c063
--- /dev/null
+++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping
@@ -0,0 +1,55 @@
+CLASS ti net/minecraft/server/dedicated/MinecraftDedicatedServer
+	FIELD g LOGGER_DEDICATED Lorg/apache/logging/log4j/Logger;
+	FIELD l rconServer Lwu;
+	FIELD m properties Lqk;
+	FIELD n eulaReader Lqc;
+	FIELD o generateStructures Z
+	FIELD p defaultGameMode Lazq;
+	FIELD q hasGui Z
+	METHOD C_ shouldBroadcastConsoleToOps ()Z
+	METHOD N isMonsterSpawningEnabled ()Z
+	METHOD S isSnooperEnabled ()Z
+	METHOD T isDedicated ()Z
+	METHOD Y isUsingNativeTransport ()Z
+	METHOD a addSnooperInfo (Laey;)V
+		ARG 0 snooper
+	METHOD a setDefaultGameMode (Lazq;)V
+		ARG 0 gameMode
+	METHOD a getInteger (Ljava/lang/String;I)I
+		ARG 0 key
+		ARG 1 defaultValue
+	METHOD a put (Ljava/lang/String;Ljava/lang/Object;)V
+		ARG 0 key
+		ARG 1 value
+	METHOD a getString (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+		ARG 0 key
+		ARG 1 defaultValue
+	METHOD a getBoolean (Ljava/lang/String;Z)Z
+	METHOD aA getNetworkCompressionThreshold ()I
+	METHOD ab areCommandBlocksEnabled ()Z
+	METHOD af getConfigurationManager ()Lwd;
+	METHOD ag isRemote ()Z
+	METHOD aj hasGui ()Z
+	METHOD ao getSpawnProtectionRadius ()I
+	METHOD ax getMaxWorldBorderRadius ()I
+	METHOD b addServerInfoToCrashReport (Lb;)Lb;
+		ARG 0 report
+	METHOD ba getConfigurationManager ()Lth;
+	METHOD bb createGui ()V
+	METHOD bd getMaxTickTime ()J
+	METHOD c setPlayerIdleTimeout (I)V
+		ARG 0 value
+	METHOD d setupServer ()Z
+	METHOD d_ saveProperties ()V
+	METHOD e getHostname ()Ljava/lang/String;
+	METHOD e_ getPropertiesFilename ()Ljava/lang/String;
+	METHOD f shouldGenerateStructures ()Z
+	METHOD f_ getPort ()I
+	METHOD g getDefaultGameMode ()Lazq;
+	METHOD h getDefaultDifficulty ()Laem;
+	METHOD i isHardcore ()Z
+	METHOD j getOpPermissionLevel ()I
+	METHOD k shouldBroadcastRconToOps ()Z
+	METHOD m getMotd ()Ljava/lang/String;
+	METHOD v exit ()V
+	METHOD w isNetherAllowed ()Z
diff --git a/mappings/net/minecraft/util/ThreadTaskQueue.mapping b/mappings/net/minecraft/util/ThreadTaskQueue.mapping
index b45d744157..162b096d19 100644
--- a/mappings/net/minecraft/util/ThreadTaskQueue.mapping
+++ b/mappings/net/minecraft/util/ThreadTaskQueue.mapping
@@ -5,4 +5,6 @@ CLASS aeb net/minecraft/util/ThreadTaskQueue
 	METHOD a executeFuture (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;
 	METHOD ay isOffThread ()Z
 	METHOD az isMainThread ()Z
-	METHOD bf executeQueuedTasks ()V
+	METHOD bf executeTaskQueue ()V
+	METHOD q getTaskQueueSize ()I
+	METHOD r executeQueuedTask ()Z
diff --git a/mappings/net/minecraft/util/UncaughtExceptionHandler.mapping b/mappings/net/minecraft/util/UncaughtExceptionHandler.mapping
new file mode 100644
index 0000000000..a07926c0e2
--- /dev/null
+++ b/mappings/net/minecraft/util/UncaughtExceptionHandler.mapping
@@ -0,0 +1,2 @@
+CLASS f net/minecraft/util/UncaughtExceptionHandler
+	FIELD a logger Lorg/apache/logging/log4j/Logger;