From 1ba948957647ecbb084ee14373be5d4959b8881c Mon Sep 17 00:00:00 2001 From: Runemoro Date: Sat, 20 Apr 2019 17:17:07 -0400 Subject: [PATCH] A few server mappings (#642) --- .../minecraft/server/MinecraftServer.mapping | 50 +++++++++++++++++-- .../server/command/CommandOutput.mapping | 2 +- .../server/command/TeleportCommand.mapping | 7 +++ .../dedicated/command/BanListCommand.mapping | 3 ++ .../command/SetIdleTimeoutCommand.mapping | 3 ++ .../command/WhitelistCommand.mapping | 14 ++++++ ...DemoServerPlayerInteractionManager.mapping | 2 + .../network/ServerLoginNetworkHandler.mapping | 1 + .../network/ServerPlayNetworkHandler.mapping | 1 + .../packet/BookUpdateC2SPacket.mapping | 12 +++-- .../network/packet/LoginKeyC2SPacket.mapping | 2 + .../world/level/storage/LevelStorage.mapping | 9 ++++ .../world/updater/WorldUpdater.mapping | 3 ++ 13 files changed, 102 insertions(+), 7 deletions(-) diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 743cc9927b..f3ab3a564e 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -17,15 +17,20 @@ CLASS net/minecraft/server/MinecraftServer FIELD N bonusChest Z FIELD O resourcePackUrl Ljava/lang/String; FIELD P resourcePackHash Ljava/lang/String; + FIELD Q loading Z + FIELD S loadingStage Ljm; + FIELD T profilerStartQueued Z FIELD U forceGameMode Z FIELD V authService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService; FIELD W sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD X gameProfileRepo Lcom/mojang/authlib/GameProfileRepository; FIELD Y userCache Lxm; + FIELD Z lastPlayerSampleUpdate J FIELD aa timeReference J FIELD ad iconFilePresent Z FIELD ae dataManager Lxc; FIELD af resourcePackContainerManager Lwt; + FIELD ag dataPackCreator Lwr; FIELD ah commandManager Lce; FIELD ai recipeManager Lbej; FIELD aj tagManager Lzd; @@ -35,9 +40,12 @@ CLASS net/minecraft/server/MinecraftServer FIELD an advancementManager Lrd; FIELD ao commandFunctionManager Lre; FIELD ap metricsData Lzl; + FIELD aq whitelistEnabled Z FIELD ar forceWorldUpgrade Z + FIELD as eraseCache Z FIELD at tickTime F FIELD au workerExecutor Ljava/util/concurrent/Executor; + FIELD av serverId Ljava/lang/String; FIELD b USER_CACHE_FILE Ljava/io/File; FIELD c WORLD_INFO Lbhl; FIELD d worldGenerationProgressListenerFactory Lvq; @@ -47,7 +55,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD j levelStorage Lcod; FIELD k snooper Lahh; FIELD l gameDir Ljava/io/File; - FIELD m tickables Ljava/util/List; + FIELD m serverGuiTickables Ljava/util/List; FIELD n profiler Laga; FIELD o networkIo Lvx; FIELD p metadata Lqc; @@ -92,17 +100,38 @@ CLASS net/minecraft/server/MinecraftServer ARG 3 port METHOD a isSpawnProtected (Lbhh;Lev;Lavx;)Z METHOD a getWorld (Lbyd;)Lvg; + METHOD a kickNonWhitelistedPlayers (Lcd;)V + ARG 1 source + METHOD a initScoreboard (Lcnz;)V + ARG 1 persistentStateManager + METHOD a setToDebugWorldProperties (Lcoa;)V + ARG 1 properties METHOD a createWorlds (Lcob;Lcoa;Lbhl;Lvp;)V + ARG 2 properties METHOD a getPermissionLevel (Lcom/mojang/authlib/GameProfile;)I ARG 1 profile METHOD a setCrashReport (Ld;)V + METHOD a loadWorldDataPacks (Ljava/io/File;Lcoa;)V + ARG 1 worldDir METHOD a upgradeWorld (Ljava/lang/String;)V + METHOD a loadWorldResourcePack (Ljava/lang/String;Lcob;)V + ARG 1 worldName + ARG 2 worldSaveHandler METHOD a setResourcePack (Ljava/lang/String;Ljava/lang/String;)V ARG 1 url + METHOD a loadWorld (Ljava/lang/String;Ljava/lang/String;JLbho;Lcom/google/gson/JsonElement;)V + ARG 1 name + ARG 2 serverName + ARG 3 seed + ARG 5 generatorType + ARG 6 generatorSettings METHOD a setKeyPair (Ljava/security/KeyPair;)V + METHOD a tick (Ljava/util/function/BooleanSupplier;)V METHOD a setFavicon (Lqc;)V ARG 1 metadata METHOD a getSpawnRadius (Lvg;)I + METHOD a sendDifficulty (Lvh;)V + ARG 1 player METHOD a prepareStartRegion (Lvp;)V METHOD a setPlayerManager (Lxq;)V METHOD a stop (Z)V @@ -121,6 +150,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD aM getLootManager ()Lcor; METHOD aN getGameRules ()Lbhd; METHOD aO getBossBarManager ()Lrj; + METHOD aP isWhitelistEnabled ()Z METHOD aQ getTickTime ()F METHOD aR getMetricsData ()Lzl; METHOD aS getProfiler ()Laga; @@ -132,8 +162,10 @@ CLASS net/minecraft/server/MinecraftServer METHOD ad getPlayerManager ()Lxq; METHOD ae isRemote ()Z METHOD af getNetworkIo ()Lvx; + METHOD ag isLoading ()Z METHOD ah hasGui ()Z METHOD ai getTicks ()I + METHOD aj enableProfiler ()V METHOD ak getSnooper ()Lahh; METHOD am getSpawnProtectionRadius ()I METHOD an shouldForceGameMode ()Z @@ -142,6 +174,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD ar getGameProfileRepo ()Lcom/mojang/authlib/GameProfileRepository; METHOD as getUserCache ()Lxm; METHOD at getServerMetadata ()Lqc; + METHOD au forcePlayerSampleUpdate ()V METHOD av getMaxWorldBorderRadius ()I METHOD ay getNetworkCompressionThreshold ()I METHOD az getServerStartTime ()J @@ -150,14 +183,23 @@ CLASS net/minecraft/server/MinecraftServer METHOD b isOwner (Lcom/mojang/authlib/GameProfile;)Z ARG 1 profile METHOD b populateCrashReport (Ld;)Ld; - METHOD b registerTickable (Ljava/lang/Runnable;)V + METHOD b addServerGuiTickable (Ljava/lang/Runnable;)V + ARG 1 tickable METHOD b setServerIp (Ljava/lang/String;)V - METHOD b tick (Ljava/util/function/BooleanSupplier;)V + METHOD b tickWorlds (Ljava/util/function/BooleanSupplier;)V + METHOD b setLoadingStage (Ljm;)V + ARG 1 loadingStage METHOD b setForceWorldUpgrade (Z)V METHOD ba isMainThread ()Z METHOD c setPlayerIdleTimeout (I)V + METHOD c setServerId (Ljava/lang/String;)V + ARG 1 serverId + METHOD c setEraseCache (Z)V + ARG 1 eraseCache METHOD d setupServer ()Z METHOD d getFile (Ljava/lang/String;)Ljava/io/File; + METHOD d setDifficultyLocked (Z)V + ARG 1 locked METHOD e info (Ljava/lang/String;)V METHOD e setDemo (Z)V METHOD f shouldGenerateStructures ()Z @@ -185,6 +227,8 @@ CLASS net/minecraft/server/MinecraftServer METHOD m setForceGameMode (Z)V METHOD main ([Ljava/lang/String;)V ARG 0 args + METHOD n setWhitelistEnabled (Z)V + ARG 1 whitelistEnabled METHOD q hasIconFile ()Z METHOD r getIconFile ()Ljava/io/File; METHOD s getRunDirectory ()Ljava/io/File; diff --git a/mappings/net/minecraft/server/command/CommandOutput.mapping b/mappings/net/minecraft/server/command/CommandOutput.mapping index b2780cf6a1..c628280d16 100644 --- a/mappings/net/minecraft/server/command/CommandOutput.mapping +++ b/mappings/net/minecraft/server/command/CommandOutput.mapping @@ -2,6 +2,6 @@ CLASS cc net/minecraft/server/command/CommandOutput FIELD a_ DUMMY Lcc; METHOD H_ shouldBroadcastConsoleToOps ()Z METHOD a sendCommandFeedback ()Z - METHOD a appendCommandFeedback (Ljm;)V + METHOD a sendMessage (Ljm;)V ARG 1 message METHOD b shouldTrackOutput ()Z diff --git a/mappings/net/minecraft/server/command/TeleportCommand.mapping b/mappings/net/minecraft/server/command/TeleportCommand.mapping index 3e70f389cc..5b4bb43900 100644 --- a/mappings/net/minecraft/server/command/TeleportCommand.mapping +++ b/mappings/net/minecraft/server/command/TeleportCommand.mapping @@ -1,4 +1,11 @@ CLASS tr net/minecraft/server/command/TeleportCommand + CLASS tr$a LookTarget + FIELD a targetPos Lcrv; + FIELD b targetEntity Laif; + FIELD c targetEntityAnchor Lck$a; + METHOD a look (Lcd;Laif;)V + ARG 1 source + ARG 2 entity METHOD a teleport (Lcd;Laif;Lvg;DDDLjava/util/Set;FFLtr$a;)V ARG 0 source ARG 1 target diff --git a/mappings/net/minecraft/server/dedicated/command/BanListCommand.mapping b/mappings/net/minecraft/server/dedicated/command/BanListCommand.mapping index 5983988d48..432b74afb4 100644 --- a/mappings/net/minecraft/server/dedicated/command/BanListCommand.mapping +++ b/mappings/net/minecraft/server/dedicated/command/BanListCommand.mapping @@ -1,2 +1,5 @@ CLASS rn net/minecraft/server/dedicated/command/BanListCommand + METHOD a execute (Lcd;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/dedicated/command/SetIdleTimeoutCommand.mapping b/mappings/net/minecraft/server/dedicated/command/SetIdleTimeoutCommand.mapping index bb148a6be9..0f1475d09f 100644 --- a/mappings/net/minecraft/server/dedicated/command/SetIdleTimeoutCommand.mapping +++ b/mappings/net/minecraft/server/dedicated/command/SetIdleTimeoutCommand.mapping @@ -1,2 +1,5 @@ CLASS th net/minecraft/server/dedicated/command/SetIdleTimeoutCommand + METHOD a execute (Lcd;I)I + ARG 0 source + ARG 1 minutes METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V diff --git a/mappings/net/minecraft/server/dedicated/command/WhitelistCommand.mapping b/mappings/net/minecraft/server/dedicated/command/WhitelistCommand.mapping index ccaa4e22fb..dc30f1516e 100644 --- a/mappings/net/minecraft/server/dedicated/command/WhitelistCommand.mapping +++ b/mappings/net/minecraft/server/dedicated/command/WhitelistCommand.mapping @@ -3,4 +3,18 @@ CLASS tx net/minecraft/server/dedicated/command/WhitelistCommand FIELD b ALREADY_OFF_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD c ADD_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD d REMOVE_FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD a executeReload (Lcd;)I + ARG 0 source + METHOD a executeAdd (Lcd;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets METHOD a register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD b executeOn (Lcd;)I + ARG 0 source + METHOD b executeRemove (Lcd;Ljava/util/Collection;)I + ARG 0 source + ARG 1 targets + METHOD c executeOff (Lcd;)I + ARG 0 source + METHOD d executeList (Lcd;)I + ARG 0 source diff --git a/mappings/net/minecraft/server/network/DemoServerPlayerInteractionManager.mapping b/mappings/net/minecraft/server/network/DemoServerPlayerInteractionManager.mapping index 8d4bb0b292..305ae2119e 100644 --- a/mappings/net/minecraft/server/network/DemoServerPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/server/network/DemoServerPlayerInteractionManager.mapping @@ -1 +1,3 @@ CLASS ux net/minecraft/server/network/DemoServerPlayerInteractionManager + FIELD d demoEnded Z + METHOD f sendDemoReminder ()V diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index c421c1deae..1a23c07a6a 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -12,5 +12,6 @@ CLASS wa net/minecraft/server/network/ServerLoginNetworkHandler FIELD k secretKey Ljavax/crypto/SecretKey; FIELD l clientEntity Lvh; METHOD a toOfflineProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; + METHOD b tick ()V METHOD b disconnect (Ljm;)V ARG 1 reason diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index d95882278a..0c3ed30d23 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -47,6 +47,7 @@ CLASS vy net/minecraft/server/network/ServerPlayNetworkHandler ARG 8 pitch METHOD a sendPacket (Lka;)V METHOD a sendPacket (Lka;Lio/netty/util/concurrent/GenericFutureListener;)V + METHOD b tick ()V METHOD b disconnect (Ljm;)V METHOD b validatePlayerMove (Loj;)Z METHOD b validateVehicleMove (Lok;)Z diff --git a/mappings/net/minecraft/server/network/packet/BookUpdateC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/BookUpdateC2SPacket.mapping index 63ee9ef98c..f77d47b546 100644 --- a/mappings/net/minecraft/server/network/packet/BookUpdateC2SPacket.mapping +++ b/mappings/net/minecraft/server/network/packet/BookUpdateC2SPacket.mapping @@ -1,5 +1,11 @@ CLASS oe net/minecraft/server/network/packet/BookUpdateC2SPacket - FIELD a stack Lbca; + FIELD a book Lbca; + FIELD b signed Z FIELD c hand Lagz; - METHOD b stack ()Lbca; - METHOD d hand ()Lagz; + METHOD (Lbca;ZLagz;)V + ARG 1 book + ARG 2 signed + ARG 3 hand + METHOD b getBook ()Lbca; + METHOD c wasSigned ()Z + METHOD d getHand ()Lagz; diff --git a/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping index 1e274e1760..aa0a46a034 100644 --- a/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping +++ b/mappings/net/minecraft/server/network/packet/LoginKeyC2SPacket.mapping @@ -3,3 +3,5 @@ CLASS pw net/minecraft/server/network/packet/LoginKeyC2SPacket FIELD b encryptedNonce [B METHOD a decryptSecretKey (Ljava/security/PrivateKey;)Ljavax/crypto/SecretKey; ARG 1 privateKey + METHOD b decryptNonce (Ljava/security/PrivateKey;)[B + ARG 1 privateKey diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index e6be138c23..40ce77e980 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -17,6 +17,9 @@ CLASS cod net/minecraft/world/level/storage/LevelStorage METHOD a renameLevel (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name ARG 2 newName + METHOD a createSaveHandler (Ljava/lang/String;Lnet/minecraft/server/MinecraftServer;)Lcob; + ARG 1 name + ARG 2 server METHOD a convertLevel (Ljava/lang/String;Lzt;)Z ARG 1 name ARG 2 progressListener @@ -24,11 +27,17 @@ CLASS cod net/minecraft/world/level/storage/LevelStorage ARG 0 savesDirectory ARG 1 dataFixer ARG 2 name + METHOD a createSaveHandler (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Ljava/lang/String;Lnet/minecraft/server/MinecraftServer;)Lcob; + ARG 0 savesDirectory + ARG 1 dataFixer + ARG 2 name + ARG 3 server METHOD a deleteFilesRecursively ([Ljava/io/File;)Z ARG 0 files METHOD b getLevelList ()Ljava/util/List; METHOD b getLevelProperties (Ljava/lang/String;)Lcoa; METHOD b resolveFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; + METHOD c getSavesDirectory ()Ljava/nio/file/Path; METHOD c isLevelNameValid (Ljava/lang/String;)Z METHOD d getBackupsDirectory ()Ljava/nio/file/Path; METHOD d deleteLevel (Ljava/lang/String;)Z diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index cedf43afe8..111a398cd2 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -2,6 +2,7 @@ CLASS ago net/minecraft/world/updater/WorldUpdater FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory; FIELD c levelName Ljava/lang/String; + FIELD d eraseCache Z FIELD e worldSaveHandler Lcob; FIELD f updateThread Ljava/lang/Thread; FIELD g worldDirectory Ljava/io/File; @@ -15,6 +16,8 @@ CLASS ago net/minecraft/world/updater/WorldUpdater FIELD o status Ljm; FIELD p REGION_FILE_PATTERN Ljava/util/regex/Pattern; FIELD q persistentStateManager Lcnz; + METHOD (Ljava/lang/String;Lcod;Lcoa;Z)V + ARG 4 eraseCache METHOD a cancel ()V METHOD a getProgress (Lbyd;)F METHOD b isDone ()Z