From cd46a92b095ef9cb055f07389aa0bf9441994fc4 Mon Sep 17 00:00:00 2001 From: Benjamin K Date: Thu, 25 Aug 2016 00:50:47 -0700 Subject: [PATCH] Fix some namings as well as add some names to MinecraftServer and related classes. (#36) * Redo the PR so I don't have conflicts. Also map IGameThread (feedback on that name is welcome) * This makes a bit more sense. --- .../minecraft/server/IntegratedServer.mapping | 4 ++++ .../minecraft/server/MinecraftServer.mapping | 18 +++++++++++++++++- .../server/dedicated/DedicatedServer.mapping | 1 + .../sortme/IMultiThreadedObject.mapping} | 2 +- .../minecraft/world/WorldServerDemo.mapping | 2 ++ .../world/provider/DimensionProvider.mapping | 1 + .../provider/impl/DimensionProviderEnd.mapping | 1 + .../impl/DimensionProviderNether.mapping | 1 + .../impl/DimensionProviderOverworld.mapping | 1 + 9 files changed, 29 insertions(+), 2 deletions(-) rename mappings/{none/qp.mapping => net/minecraft/sortme/IMultiThreadedObject.mapping} (72%) create mode 100644 mappings/net/minecraft/world/WorldServerDemo.mapping diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index e192739118..676aa0b6a0 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -3,10 +3,14 @@ CLASS none/caj net/minecraft/server/IntegratedServer FIELD l mc Lnone/bdo; METHOD A getRunDirectory ()Ljava/io/File; METHOD Z isSnooperEnabled ()Z + METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/aiz;Ljava/lang/String;)V METHOD a (Lnone/qx;)V + METHOD a saveWorlds (Z)V + ARG 0 dontLog METHOD aa isDedicated ()Z METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b; METHOD i createCommandManager ()Lnone/bc; + METHOD j ()Z METHOD n getGameMode ()Lnone/ais; METHOD o getDifficulty ()Lnone/qx; METHOD u shutdown ()V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index d34d311469..efec661dd7 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 H keyPair Ljava/security/KeyPair; FIELD L demo Z FIELD M bonusChest Z + FIELD R currentTaskName Ljava/lang/String; FIELD T forceGameMode Z FIELD Z serverThread Ljava/lang/Thread; - FIELD a userCacheFile Ljava/io/File; + FIELD a USER_CACHE_FILE Ljava/io/File; + FIELD aa serverStartTime J FIELD b commandManager Lnone/m; FIELD c profiler Lnone/os; FIELD d worlds [Lnone/lu; @@ -19,7 +21,9 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD p networkManager Lnone/mf; FIELD q metadata Lnone/ke; FIELD r rand Ljava/util/Random; + FIELD t serverIp Ljava/lang/String; FIELD u serverPort I + FIELD v serverConfigManager Lnone/mr; FIELD w running Z FIELD z onlineMode Z METHOD A getRunDirectory ()Ljava/io/File; @@ -33,12 +37,16 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD a getWorld (I)Lnone/lu; ARG 0 dimensionId METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; + METHOD a convertSave (Ljava/lang/String;)V + METHOD a loadSave (Ljava/lang/String;Ljava/lang/String;JLnone/aiz;Ljava/lang/String;)V METHOD a setKeyPair (Ljava/security/KeyPair;)V ARG 0 value METHOD a loadServerIcon (Lnone/ke;)V METHOD a getSpawnRadius (Lnone/lu;)I ARG 0 world METHOD a (Lnone/qx;)V + METHOD a saveWorlds (Z)V + ARG 0 dontLog METHOD aE isMainThread ()Z METHOD aH getMainThread ()Ljava/lang/Thread; METHOD aJ getLogger ()Lorg/apache/logging/log4j/Logger; @@ -56,12 +64,15 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD aw getPlayerIdleTimeout ()I METHOD b setServerPort (I)V ARG 0 port + METHOD b setCurrentTaskName (Ljava/lang/String;)V + ARG 0 taskName METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b; ARG 0 report METHOD b setDemo (Z)V ARG 0 value METHOD c getBlockPos ()Lnone/cn; METHOD c setServerIp (Ljava/lang/String;)V + ARG 0 serverIp METHOD c setBonusChest (Z)V ARG 0 value METHOD d getPos ()Lnone/bcs; @@ -92,8 +103,13 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD i setForceGameMode (Z)V ARG 0 value METHOD i_ getNameComponent ()Lnone/fa; + METHOD j ()Z + METHOD k getCurrentTaskName ()Ljava/lang/String; + METHOD l generateTerrain ()V METHOD l setMotd (Ljava/lang/String;)V ARG 0 value + METHOD main ([Ljava/lang/String;)V + ARG 0 args METHOD n getGameMode ()Lnone/ais; METHOD o getDifficulty ()Lnone/qx; METHOD run run ()V diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 1b5a9d8bf1..7be32e5155 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -3,5 +3,6 @@ CLASS none/lf net/minecraft/server/dedicated/DedicatedServer METHOD Z isSnooperEnabled ()Z METHOD aa isDedicated ()Z METHOD d setPlayerIdleTimeout (I)V + METHOD j ()Z METHOD n getGameMode ()Lnone/ais; METHOD o getDifficulty ()Lnone/qx; diff --git a/mappings/none/qp.mapping b/mappings/net/minecraft/sortme/IMultiThreadedObject.mapping similarity index 72% rename from mappings/none/qp.mapping rename to mappings/net/minecraft/sortme/IMultiThreadedObject.mapping index 1233e6ce1b..7c43440b43 100644 --- a/mappings/none/qp.mapping +++ b/mappings/net/minecraft/sortme/IMultiThreadedObject.mapping @@ -1,4 +1,4 @@ -CLASS none/qp +CLASS none/qp net/minecraft/sortme/IMultiThreadedObject METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; ARG 0 task METHOD aE isMainThread ()Z diff --git a/mappings/net/minecraft/world/WorldServerDemo.mapping b/mappings/net/minecraft/world/WorldServerDemo.mapping new file mode 100644 index 0000000000..0f7a0ef1e8 --- /dev/null +++ b/mappings/net/minecraft/world/WorldServerDemo.mapping @@ -0,0 +1,2 @@ +CLASS none/lo net/minecraft/world/WorldServerDemo + FIELD I SEED J diff --git a/mappings/net/minecraft/world/provider/DimensionProvider.mapping b/mappings/net/minecraft/world/provider/DimensionProvider.mapping index 477c7054b0..e3295756cb 100644 --- a/mappings/net/minecraft/world/provider/DimensionProvider.mapping +++ b/mappings/net/minecraft/world/provider/DimensionProvider.mapping @@ -1 +1,2 @@ CLASS none/auc net/minecraft/world/provider/DimensionProvider + METHOD p getDimensionType ()Lnone/aud; diff --git a/mappings/net/minecraft/world/provider/impl/DimensionProviderEnd.mapping b/mappings/net/minecraft/world/provider/impl/DimensionProviderEnd.mapping index 1e72c06fa9..c14274679a 100644 --- a/mappings/net/minecraft/world/provider/impl/DimensionProviderEnd.mapping +++ b/mappings/net/minecraft/world/provider/impl/DimensionProviderEnd.mapping @@ -1 +1,2 @@ CLASS none/aui net/minecraft/world/provider/impl/DimensionProviderEnd + METHOD p getDimensionType ()Lnone/aud; diff --git a/mappings/net/minecraft/world/provider/impl/DimensionProviderNether.mapping b/mappings/net/minecraft/world/provider/impl/DimensionProviderNether.mapping index 7ec1716324..07bbed4a89 100644 --- a/mappings/net/minecraft/world/provider/impl/DimensionProviderNether.mapping +++ b/mappings/net/minecraft/world/provider/impl/DimensionProviderNether.mapping @@ -2,3 +2,4 @@ CLASS none/aue net/minecraft/world/provider/impl/DimensionProviderNether CLASS none/aue$1 METHOD f getCenterX ()D METHOD g getCenterZ ()D + METHOD p getDimensionType ()Lnone/aud; diff --git a/mappings/net/minecraft/world/provider/impl/DimensionProviderOverworld.mapping b/mappings/net/minecraft/world/provider/impl/DimensionProviderOverworld.mapping index eebd34c19f..7075776c54 100644 --- a/mappings/net/minecraft/world/provider/impl/DimensionProviderOverworld.mapping +++ b/mappings/net/minecraft/world/provider/impl/DimensionProviderOverworld.mapping @@ -1 +1,2 @@ CLASS none/auf net/minecraft/world/provider/impl/DimensionProviderOverworld + METHOD p getDimensionType ()Lnone/aud;