diff --git a/mappings/net/minecraft/client/sortme/ServerEntryNetworkPart.mapping b/mappings/net/minecraft/client/sortme/ServerEntryNetworkPart.mapping index 786fa341ba..a05dbc5bfe 100644 --- a/mappings/net/minecraft/client/sortme/ServerEntryNetworkPart.mapping +++ b/mappings/net/minecraft/client/sortme/ServerEntryNetworkPart.mapping @@ -1,7 +1,11 @@ CLASS dho net/minecraft/client/sortme/ServerEntryNetworkPart + CLASS net/minecraft/client/sortme/ServerEntryNetworkPart$1 + FIELD e completed Z FIELD a ZERO_SPLITTER Lcom/google/common/base/Splitter; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c clientConnections Ljava/util/List; + METHOD a (Ldhm;)V + ARG 1 entry METHOD b ping (Ldhm;)V METHOD c getLogger ()Lorg/apache/logging/log4j/Logger; METHOD d getZeroSplitter ()Lcom/google/common/base/Splitter; diff --git a/mappings/net/minecraft/server/BannedIpList.mapping b/mappings/net/minecraft/server/BannedIpList.mapping index c6c5d43090..55fc7f9a59 100644 --- a/mappings/net/minecraft/server/BannedIpList.mapping +++ b/mappings/net/minecraft/server/BannedIpList.mapping @@ -1,4 +1,7 @@ CLASS xm net/minecraft/server/BannedIpList - METHOD a contains (Ljava/net/SocketAddress;)Z + METHOD a isBanned (Ljava/lang/String;)Z + ARG 1 ip + METHOD a isBanned (Ljava/net/SocketAddress;)Z + ARG 1 ip METHOD b get (Ljava/net/SocketAddress;)Lxn; METHOD c stringifyAddress (Ljava/net/SocketAddress;)Ljava/lang/String; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 07e8c413fe..cda7b40e39 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -94,6 +94,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD a getWorld (Lbyb;)Lvf; METHOD a createWorlds (Lcnz;Lcny;Lbhj;Lvo;)V METHOD a getPermissionLevel (Lcom/mojang/authlib/GameProfile;)I + ARG 1 profile METHOD a setCrashReport (Ld;)V METHOD a upgradeWorld (Ljava/lang/String;)V METHOD a setResourcePack (Ljava/lang/String;Ljava/lang/String;)V @@ -146,6 +147,8 @@ CLASS net/minecraft/server/MinecraftServer METHOD az getServerStartTime ()J METHOD b setWorldHeight (I)V METHOD b reloadDataPacks (Lcny;)V + 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 setServerIp (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index c3748a9f7a..d8b3fd4ce5 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -15,6 +15,7 @@ CLASS xp net/minecraft/server/PlayerManager FIELD n whitelist Lxw; FIELD o statisticsMap Ljava/util/Map; FIELD p advancementManagerMap Ljava/util/Map; + FIELD q saveHandler Lcoe; FIELD r whitelistEnabled Z FIELD s viewDistance I FIELD t gameMode Lbhc; @@ -44,27 +45,48 @@ CLASS xp net/minecraft/server/PlayerManager METHOD a sendToAll (Lka;)V METHOD a sendToDimension (Lka;Lbyb;)V ARG 1 packet + METHOD a sendScoreboard (Lrg;Lvg;)V + ARG 1 scoreboard + ARG 2 player + METHOD a setMainWorld (Lvf;)V + ARG 1 world + METHOD a loadPlayerData (Lvg;)Lib; + ARG 1 player METHOD a sendCommandTree (Lvg;I)V ARG 1 player ARG 2 permissionLevel METHOD a respawnPlayer (Lvg;Lbyb;Z)Lvg; ARG 3 alive + METHOD a sendWorldInfo (Lvg;Lvf;)V + ARG 1 player + ARG 2 world + METHOD a setGameMode (Lvg;Lvg;Lbhg;)V + ARG 1 player + ARG 2 oldPlayer + ARG 3 world METHOD a setWhitelistEnabled (Z)V METHOD b sendToOtherTeams (Lavw;Ljm;)V ARG 1 source METHOD b removeFromOperators (Lcom/mojang/authlib/GameProfile;)V METHOD b getPlayersByIp (Ljava/lang/String;)Ljava/util/List; METHOD b savePlayerData (Lvg;)V + ARG 1 player METHOD c getServer ()Lnet/minecraft/server/MinecraftServer; + METHOD c remove (Lvg;)V + ARG 1 player METHOD c setCheatsAllowed (Z)V METHOD d updatePlayerLatency ()V METHOD d sendCommandTree (Lvg;)V ARG 1 player METHOD e getPlayerNames ()[Ljava/lang/String; METHOD e isWhitelisted (Lcom/mojang/authlib/GameProfile;)Z + METHOD e (Lvg;)V + ARG 1 player METHOD f canBypassPlayerLimit (Lcom/mojang/authlib/GameProfile;)Z METHOD f getAdvancementManager (Lvg;)Lrb; METHOD g getUserBanList ()Lxu; + METHOD g createPlayer (Lcom/mojang/authlib/GameProfile;)Lvg; + ARG 1 profile METHOD h getIpBanList ()Lxm; METHOD h isOperator (Lcom/mojang/authlib/GameProfile;)Z METHOD i saveAllPlayerData ()V diff --git a/mappings/net/minecraft/server/ServerNetworkIo.mapping b/mappings/net/minecraft/server/ServerNetworkIo.mapping index f48de38615..020c93834f 100644 --- a/mappings/net/minecraft/server/ServerNetworkIo.mapping +++ b/mappings/net/minecraft/server/ServerNetworkIo.mapping @@ -1,4 +1,6 @@ CLASS vw net/minecraft/server/ServerNetworkIo + CLASS net/minecraft/server/ServerNetworkIo$1 + CLASS net/minecraft/server/ServerNetworkIo$2 FIELD a DEFAULT_CHANNEL Lzo; FIELD b EPOLL_CHANNEL Lzo; FIELD c active Z @@ -6,6 +8,7 @@ CLASS vw net/minecraft/server/ServerNetworkIo FIELD e server Lnet/minecraft/server/MinecraftServer; FIELD f channels Ljava/util/List; FIELD g connections Ljava/util/List; + METHOD a bindLocal ()Ljava/net/SocketAddress; METHOD a bind (Ljava/net/InetAddress;I)V ARG 1 address ARG 2 port diff --git a/mappings/net/minecraft/server/Whitelist.mapping b/mappings/net/minecraft/server/Whitelist.mapping new file mode 100644 index 0000000000..a8b839fe64 --- /dev/null +++ b/mappings/net/minecraft/server/Whitelist.mapping @@ -0,0 +1,3 @@ +CLASS xw net/minecraft/server/Whitelist + METHOD a isAllowed (Lcom/mojang/authlib/GameProfile;)Z + ARG 1 profile diff --git a/mappings/net/minecraft/server/WhitelistEntry.mapping b/mappings/net/minecraft/server/WhitelistEntry.mapping index 25bbd659a2..41f4c9b36f 100644 --- a/mappings/net/minecraft/server/WhitelistEntry.mapping +++ b/mappings/net/minecraft/server/WhitelistEntry.mapping @@ -1 +1,3 @@ CLASS xx net/minecraft/server/WhitelistEntry + METHOD b deserializeProfile (Lcom/google/gson/JsonObject;)Lcom/mojang/authlib/GameProfile; + ARG 0 json diff --git a/mappings/net/minecraft/server/WhitelistList.mapping b/mappings/net/minecraft/server/WhitelistList.mapping deleted file mode 100644 index d3b240198d..0000000000 --- a/mappings/net/minecraft/server/WhitelistList.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS xw net/minecraft/server/WhitelistList diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping index 6b61727663..1864683952 100644 --- a/mappings/net/minecraft/server/command/CommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -8,6 +8,11 @@ CLASS ce net/minecraft/server/command/CommandManager METHOD a execute (Lcd;Ljava/lang/String;)I ARG 1 commandSource METHOD a getCommandValidator (Lce$a;)Ljava/util/function/Predicate; + METHOD a makeTreeForSource (Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/tree/CommandNode;Lcd;Ljava/util/Map;)V + ARG 1 tree + ARG 2 result + ARG 3 source + ARG 4 resultNodes METHOD a literal (Ljava/lang/String;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; METHOD a argument (Ljava/lang/String;Lcom/mojang/brigadier/arguments/ArgumentType;)Lcom/mojang/brigadier/builder/RequiredArgumentBuilder; ARG 0 name diff --git a/mappings/net/minecraft/server/command/CommandSource.mapping b/mappings/net/minecraft/server/command/CommandSource.mapping index 7f8eb905a6..1111621c04 100644 --- a/mappings/net/minecraft/server/command/CommandSource.mapping +++ b/mappings/net/minecraft/server/command/CommandSource.mapping @@ -31,7 +31,7 @@ CLASS cf net/minecraft/server/command/CommandSource ARG 0 candidates ARG 2 identifier ARG 3 action - METHOD a (Ljava/lang/String;Ljava/util/Collection;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Predicate;)Ljava/util/concurrent/CompletableFuture; + METHOD a suggestPositions (Ljava/lang/String;Ljava/util/Collection;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Predicate;)Ljava/util/concurrent/CompletableFuture; ARG 1 candidates METHOD a suggestIdentifiers (Ljava/util/stream/Stream;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; METHOD a suggestFromIdentifier (Ljava/util/stream/Stream;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Function;Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; @@ -41,6 +41,7 @@ CLASS cf net/minecraft/server/command/CommandSource ARG 3 tooltip METHOD a suggestMatching ([Ljava/lang/String;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; METHOD b suggestMatching (Ljava/lang/Iterable;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD b suggestColumnPositions (Ljava/lang/String;Ljava/util/Collection;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Predicate;)Ljava/util/concurrent/CompletableFuture; METHOD b suggestMatching (Ljava/util/stream/Stream;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; METHOD c hasPermissionLevel (I)Z ARG 1 level diff --git a/mappings/net/minecraft/server/command/TeleportCommand.mapping b/mappings/net/minecraft/server/command/TeleportCommand.mapping index 5eb020e812..b03bb3d4c2 100644 --- a/mappings/net/minecraft/server/command/TeleportCommand.mapping +++ b/mappings/net/minecraft/server/command/TeleportCommand.mapping @@ -1,4 +1,13 @@ CLASS tr net/minecraft/server/command/TeleportCommand + CLASS net/minecraft/server/command/TeleportCommand$a LookTarget + FIELD a lookPosition Lcrt; + FIELD b lookEntity Laie; + FIELD c lookEntityAnchor Lck$a; + METHOD (Laie;Lck$a;)V + ARG 1 lookEntity + METHOD a look (Lcd;Laie;)V + ARG 1 source + ARG 2 entity METHOD a teleport (Lcd;Laie;Lvf;DDDLjava/util/Set;FFLtr$a;)V ARG 0 source ARG 1 target diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index b54ab3eb23..2d515b42a3 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -12,5 +12,6 @@ CLASS rf net/minecraft/server/dedicated/DedicatedServer METHOD f_ getMotd ()Ljava/lang/String; METHOD g logError (Ljava/lang/String;)V METHOD h log (Ljava/lang/String;)V + METHOD n getPlugins ()Ljava/lang/String; METHOD y getVersion ()Ljava/lang/String; METHOD z getCurrentPlayerCount ()I diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping index 5314d44a2b..cb4d9bee60 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServerWatchdog.mapping @@ -2,3 +2,4 @@ CLASS uj net/minecraft/server/dedicated/DedicatedServerWatchdog FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b server Lug; FIELD c maxTickTime J + METHOD a shutdown ()V diff --git a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping index dc6f39d202..b01c64b9b7 100644 --- a/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/MinecraftDedicatedServer.mapping @@ -1,7 +1,8 @@ CLASS ug net/minecraft/server/dedicated/MinecraftDedicatedServer - FIELD i LOGGER_DEDICATED Lorg/apache/logging/log4j/Logger; + FIELD i LOGGER Lorg/apache/logging/log4j/Logger; FIELD j SHA1_PATTERN Ljava/util/regex/Pattern; FIELD k commandQueue Ljava/util/List; + FIELD l queryResponseHandler Lye; FIELD m rconCommandOutput Lyb; FIELD n rconServer Lyg; FIELD o propertiesLoader Lui; @@ -9,7 +10,9 @@ CLASS ug net/minecraft/server/dedicated/MinecraftDedicatedServer FIELD q gui Lum; METHOD a enqueueCommand (Ljava/lang/String;Lcd;)V METHOD aV createResourcePackHash ()Ljava/lang/String; + METHOD aW executeQueuedCommands ()V METHOD aY createGui ()V + METHOD aZ convertData ()Z METHOD ba getMaxTickTime ()J METHOD bh sleepFiveSeconds ()V METHOD o setUseWhitelist (Z)V diff --git a/mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping b/mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping index f17ca34754..f9fe19c584 100644 --- a/mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerCommandOutput.mapping @@ -5,3 +5,4 @@ CLASS yb net/minecraft/server/dedicated/ServerCommandOutput ARG 1 server METHOD d clear ()V METHOD e asString ()Ljava/lang/String; + METHOD f createReconCommandSource ()Lcd; diff --git a/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping b/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping index b8102c0305..e007d5b7d9 100644 --- a/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping +++ b/mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping @@ -1,3 +1,4 @@ CLASS un net/minecraft/server/dedicated/gui/PlayerListGui FIELD a server Lnet/minecraft/server/MinecraftServer; FIELD b tick I + METHOD a tick ()V diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 70017bb1f4..b62c57a2a0 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -14,7 +14,7 @@ CLASS re net/minecraft/server/function/CommandFunctionManager FIELD h chain Ljava/util/ArrayDeque; FIELD j tags Lzb; FIELD k tickFunctions Ljava/util/List; - FIELD l justLoaded Z + FIELD l needToRunLoadFunctions Z METHOD a getServer ()Lnet/minecraft/server/MinecraftServer; METHOD a execute (Lca;Lcd;)I METHOD a load (Lca;Ljava/lang/Throwable;Lqs;)Lca; @@ -25,5 +25,6 @@ CLASS re net/minecraft/server/function/CommandFunctionManager METHOD b getMaxCommandChainLength ()I METHOD c getFunctions ()Ljava/util/Map; METHOD d getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; + METHOD e tick ()V METHOD f getFunctionCommandSource ()Lcd; METHOD g getTags ()Lzb; diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index 9464bfc11f..ea49af3d56 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -4,6 +4,7 @@ CLASS dxf net/minecraft/server/integrated/IntegratedServer FIELD j levelInfo Lbhj; FIELD l lanPort I FIELD m lanPinger Ldxi; + FIELD n localPlayerUuid Ljava/util/UUID; METHOD (Lcvg;Ljava/lang/String;Ljava/lang/String;Lbhj;Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lxl;Lvp;)V ARG 1 client ARG 2 levelName @@ -12,3 +13,5 @@ CLASS dxf net/minecraft/server/integrated/IntegratedServer ARG 5 authService ARG 6 sessionService ARG 7 profileRepo + METHOD b setLocalPlayerUuid (Ljava/util/UUID;)V + ARG 1 localPlayerUuid diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index f9641c95b2..77fa4d2e36 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -52,3 +52,4 @@ CLASS vx net/minecraft/server/network/ServerPlayNetworkHandler METHOD b validateVehicleMove (Lok;)Z METHOD c syncWithPlayerPosition ()V METHOD c executeCommand (Ljava/lang/String;)V + METHOD d isServerOwner ()Z diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 27076a8edb..498e20ecaa 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -26,6 +26,8 @@ CLASS vg net/minecraft/server/network/ServerPlayerEntity METHOD L getAdvancementManager ()Lrb; METHOD M getCameraPosition ()Lfo; METHOD a setExperiencePoints (I)V + METHOD a openContainer (Laya;)V + ARG 1 container METHOD a sendUnloadChunkPacket (Lbgs;)V METHOD a sendInitialChunkPackets (Lbgs;Lka;Lka;)V METHOD a sendBlockEntityUpdate (Lbtk;)V diff --git a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping index 2a6c2b45f8..3a10772d7c 100644 --- a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping +++ b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping @@ -1,8 +1,25 @@ CLASS ye net/minecraft/server/rcon/QueryResponseHandler + FIELD h lastQueryTime J FIELD i queryPort I + FIELD j port I + FIELD k maxPlayerCount I + FIELD l motd Ljava/lang/String; + FIELD m levelName Ljava/lang/String; FIELD n socket Ljava/net/DatagramSocket; FIELD o packetBuffer [B FIELD p currentPacket Ljava/net/DatagramPacket; + FIELD r ip Ljava/lang/String; FIELD s hostname Ljava/lang/String; + FIELD v data Lxz; + METHOD (Lrf;)V + ARG 1 server + METHOD a handleIoException (Ljava/lang/Exception;)V + ARG 1 e + METHOD a handle (Ljava/net/DatagramPacket;)Z + ARG 1 packet METHOD a reply ([BLjava/net/DatagramPacket;)V ARG 1 buf + METHOD b createRulesReply (Ljava/net/DatagramPacket;)[B + ARG 1 packet + METHOD c (Ljava/net/DatagramPacket;)Ljava/lang/Boolean; + METHOD g initialize ()Z diff --git a/mappings/net/minecraft/server/rcon/RconBase.mapping b/mappings/net/minecraft/server/rcon/RconBase.mapping index 7cbe11f548..799d2b154c 100644 --- a/mappings/net/minecraft/server/rcon/RconBase.mapping +++ b/mappings/net/minecraft/server/rcon/RconBase.mapping @@ -1,5 +1,6 @@ CLASS yd net/minecraft/server/rcon/RconBase FIELD a running Z + FIELD b server Lrf; FIELD c description Ljava/lang/String; FIELD d thread Ljava/lang/Thread; FIELD f sockets Ljava/util/List; @@ -12,6 +13,7 @@ CLASS yd net/minecraft/server/rcon/RconBase METHOD a closeSocket (Ljava/net/ServerSocket;Z)Z ARG 1 socket METHOD a forceClose (Z)V + METHOD b stop ()V METHOD b info (Ljava/lang/String;)V METHOD b closeSocket (Ljava/net/ServerSocket;)Z METHOD c isRunning ()Z