From 2c87b2a5fdc754a34783a0489afb2c533f619220 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Wed, 30 Jan 2019 18:02:04 +0100 Subject: [PATCH] Introduce ServerConfigHandler (#433) --- .../minecraft/server/PlayerManager.mapping | 2 +- ...edIpsList.mapping => BannedIpList.mapping} | 2 +- ...sList.mapping => BannedPlayerList.mapping} | 2 +- .../{OpsList.mapping => OperatorList.mapping} | 2 +- .../server/config/ServerConfigHandler.mapping | 129 ++++++++++++++++++ mappings/wx.mapping | 6 - 6 files changed, 133 insertions(+), 10 deletions(-) rename mappings/net/minecraft/server/config/{BannedIpsList.mapping => BannedIpList.mapping} (76%) rename mappings/net/minecraft/server/config/{BannedProfilesList.mapping => BannedPlayerList.mapping} (70%) rename mappings/net/minecraft/server/config/{OpsList.mapping => OperatorList.mapping} (70%) create mode 100644 mappings/net/minecraft/server/config/ServerConfigHandler.mapping delete mode 100644 mappings/wx.mapping diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index d6a6847a7b..f28975ae66 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -6,7 +6,7 @@ CLASS wy net/minecraft/server/PlayerManager ARG 4 newSize FIELD a BANNED_PLAYERS_FILE Ljava/io/File; FIELD b BANNED_IPS_FILE Ljava/io/File; - FIELD c OPS_FILE Ljava/io/File; + FIELD c OPERATORS_FILE Ljava/io/File; FIELD d WHITELIST_FILE Ljava/io/File; FIELD e maxPlayers I FIELD f LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/server/config/BannedIpsList.mapping b/mappings/net/minecraft/server/config/BannedIpList.mapping similarity index 76% rename from mappings/net/minecraft/server/config/BannedIpsList.mapping rename to mappings/net/minecraft/server/config/BannedIpList.mapping index 36c059a021..6bc3fb4da2 100644 --- a/mappings/net/minecraft/server/config/BannedIpsList.mapping +++ b/mappings/net/minecraft/server/config/BannedIpList.mapping @@ -1,4 +1,4 @@ -CLASS wv net/minecraft/server/config/BannedIpsList +CLASS wv net/minecraft/server/config/BannedIpList METHOD a contains (Ljava/net/SocketAddress;)Z METHOD b get (Ljava/net/SocketAddress;)Lww; METHOD c stringifyAddress (Ljava/net/SocketAddress;)Ljava/lang/String; diff --git a/mappings/net/minecraft/server/config/BannedProfilesList.mapping b/mappings/net/minecraft/server/config/BannedPlayerList.mapping similarity index 70% rename from mappings/net/minecraft/server/config/BannedProfilesList.mapping rename to mappings/net/minecraft/server/config/BannedPlayerList.mapping index d49912326a..dffa5df0d2 100644 --- a/mappings/net/minecraft/server/config/BannedProfilesList.mapping +++ b/mappings/net/minecraft/server/config/BannedPlayerList.mapping @@ -1,3 +1,3 @@ -CLASS xd net/minecraft/server/config/BannedProfilesList +CLASS xd net/minecraft/server/config/BannedPlayerList METHOD a contains (Lcom/mojang/authlib/GameProfile;)Z METHOD b getStringKey (Lcom/mojang/authlib/GameProfile;)Ljava/lang/String; diff --git a/mappings/net/minecraft/server/config/OpsList.mapping b/mappings/net/minecraft/server/config/OperatorList.mapping similarity index 70% rename from mappings/net/minecraft/server/config/OpsList.mapping rename to mappings/net/minecraft/server/config/OperatorList.mapping index b59eb7f8ad..ba5413fd03 100644 --- a/mappings/net/minecraft/server/config/OpsList.mapping +++ b/mappings/net/minecraft/server/config/OperatorList.mapping @@ -1,3 +1,3 @@ -CLASS wz net/minecraft/server/config/OpsList +CLASS wz net/minecraft/server/config/OperatorList METHOD b isOp (Lcom/mojang/authlib/GameProfile;)Z METHOD c getId (Lcom/mojang/authlib/GameProfile;)Ljava/lang/String; diff --git a/mappings/net/minecraft/server/config/ServerConfigHandler.mapping b/mappings/net/minecraft/server/config/ServerConfigHandler.mapping new file mode 100644 index 0000000000..bdf3de4608 --- /dev/null +++ b/mappings/net/minecraft/server/config/ServerConfigHandler.mapping @@ -0,0 +1,129 @@ +CLASS wx net/minecraft/server/config/ServerConfigHandler + CLASS wx$1 + METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V + ARG 1 profile + ARG 2 exception + METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile + ARG 3 created + ARG 4 source + ARG 5 expiry + ARG 6 reason + CLASS wx$2 + METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V + ARG 1 profile + ARG 2 exception + METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile + CLASS wx$3 + METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V + ARG 1 profile + ARG 2 exception + METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile + CLASS wx$4 + METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V + ARG 1 profile + ARG 2 exception + METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile + CLASS wx$5 + METHOD a getPlayerFileName (Lcom/mojang/authlib/GameProfile;)Ljava/lang/String; + ARG 1 profile + ARG 2 fileName + METHOD a convertPlayerFile (Ljava/io/File;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 playerDataFolder + ARG 2 fileName + ARG 3 uuid + ARG 4 playerFile + ARG 5 playerDataFile + METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V + ARG 1 profile + ARG 2 exception + ARG 3 fileName + METHOD onProfileLookupSucceeded (Lcom/mojang/authlib/GameProfile;)V + ARG 1 profile + ARG 2 uuid + CLASS wx$a ServerConfigException + METHOD (Ljava/lang/String;)V + ARG 1 title + METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V + ARG 1 title + ARG 2 other + FIELD a BANNED_IPS_FILE Ljava/io/File; + FIELD b BANNED_PLAYERS_FILE Ljava/io/File; + FIELD c OPERATORS_FILE Ljava/io/File; + FIELD d WHITE_LIST_FILE Ljava/io/File; + FIELD e LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a processSimpleListFile (Ljava/io/File;Ljava/util/Map;)Ljava/util/List; + ARG 0 file + ARG 1 valueMap + ARG 2 lines + METHOD a convertBannedPlayers (Lnet/minecraft/server/MinecraftServer;)Z + ARG 0 minecraftServer + ARG 1 bannedPlayers + ARG 2 bannedMap + ARG 3 callback + METHOD a getPlayerUuidByName (Lnet/minecraft/server/MinecraftServer;Ljava/lang/String;)Ljava/lang/String; + ARG 0 minecraftServer + ARG 1 name + ARG 2 profile + ARG 3 profiles + ARG 4 callback + METHOD a lookupProfile (Lnet/minecraft/server/MinecraftServer;Ljava/util/Collection;Lcom/mojang/authlib/ProfileLookupCallback;)V + ARG 0 minecraftServer + ARG 1 bannedPlayers + ARG 2 callback + ARG 8 uuid + ARG 9 profile + METHOD a convertPlayerFiles (Ltt;)Z + ARG 0 minecraftServer + ARG 1 playersFolder + ARG 2 playerDataFolder + ARG 3 unknownPlayersFile + ARG 5 playerUuids + ARG 7 callback + ARG 10 playerFileName + ARG 11 playerUuid + METHOD b checkListConversionSuccess ()Z + ARG 0 bannedPlayersSuccess + ARG 1 bannedIpsSuccess + ARG 2 operatorsSuccess + ARG 3 whitelistSuccess + METHOD b createDirectory (Ljava/io/File;)V + ARG 0 directory + METHOD b stringToDate (Ljava/lang/String;Ljava/util/Date;)Ljava/util/Date; + ARG 0 string + ARG 1 fallback + ARG 2 date + METHOD b convertBannedIps (Lnet/minecraft/server/MinecraftServer;)Z + ARG 0 minecraftServer + ARG 1 bannedIps + ARG 2 bannedMap + ARG 6 created + ARG 7 source + ARG 8 expiry + ARG 9 reason + METHOD c markFileConverted (Ljava/io/File;)V + ARG 0 file + ARG 1 newFile + METHOD c convertOperators (Lnet/minecraft/server/MinecraftServer;)Z + ARG 0 minecraftServer + ARG 1 operators + ARG 2 lines + ARG 3 callback + METHOD d convertWhitelist (Lnet/minecraft/server/MinecraftServer;)Z + ARG 0 minecraftServer + ARG 1 whitelist + ARG 2 lines + ARG 3 callback + METHOD e checkSuccess (Lnet/minecraft/server/MinecraftServer;)Z + ARG 0 minecraftServer + ARG 1 success + METHOD f checkPlayerConversionSuccess (Lnet/minecraft/server/MinecraftServer;)Z + ARG 0 minecraftServer + ARG 1 playersFolder + METHOD g getLevelPlayersFolder (Lnet/minecraft/server/MinecraftServer;)Ljava/io/File; + ARG 0 minecraftServer + ARG 1 levelName + ARG 2 levelFile diff --git a/mappings/wx.mapping b/mappings/wx.mapping deleted file mode 100644 index a722c56059..0000000000 --- a/mappings/wx.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS wx - FIELD a BANNED_IPS_FILE Ljava/io/File; - FIELD b BANNED_PLAYERS_FILE Ljava/io/File; - FIELD c OPS_FILE Ljava/io/File; - FIELD d WHITE_LIST_FILE Ljava/io/File; - FIELD e LOGGER Lorg/apache/logging/log4j/Logger;