From 607197f5d9a41ed4b4f3c2ec58463bf64bfdf797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=ADSollace?= Date: Fri, 1 May 2020 15:55:34 +0200 Subject: [PATCH] Rcon (#1313) * RconServer -> RconListener (Mojang name) * Mapped some missing names and params in Rcon --- .../server/dedicated/DedicatedServer.mapping | 1 + .../minecraft/server/rcon/RconBase.mapping | 24 ++----------------- .../minecraft/server/rcon/RconClient.mapping | 10 ++++++++ ...conServer.mapping => RconListener.mapping} | 7 ++++-- 4 files changed, 18 insertions(+), 24 deletions(-) rename mappings/net/minecraft/server/rcon/{RconServer.mapping => RconListener.mapping} (54%) diff --git a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping index 618d4cf994..f90ee45d70 100644 --- a/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/mappings/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2994 net/minecraft/server/dedicated/DedicatedServer METHOD method_12929 getHostname ()Ljava/lang/String; METHOD method_12930 getMotd ()Ljava/lang/String; METHOD method_12934 executeRconCommand (Ljava/lang/String;)Ljava/lang/String; + ARG 1 command METHOD method_16705 getProperties ()Lnet/minecraft/class_3806; METHOD method_3788 getCurrentPlayerCount ()I METHOD method_3802 getMaxPlayerCount ()I diff --git a/mappings/net/minecraft/server/rcon/RconBase.mapping b/mappings/net/minecraft/server/rcon/RconBase.mapping index c0e25a673a..bf5133ed48 100644 --- a/mappings/net/minecraft/server/rcon/RconBase.mapping +++ b/mappings/net/minecraft/server/rcon/RconBase.mapping @@ -1,31 +1,11 @@ CLASS net/minecraft/class_3359 net/minecraft/server/rcon/RconBase FIELD field_14423 thread Ljava/lang/Thread; FIELD field_14424 description Ljava/lang/String; - FIELD field_14425 server Lnet/minecraft/class_2994; - FIELD field_14426 sockets Ljava/util/List; FIELD field_14428 THREAD_COUNTER Ljava/util/concurrent/atomic/AtomicInteger; - FIELD field_14429 serverSockets Ljava/util/List; FIELD field_14430 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_14431 running Z - METHOD (Lnet/minecraft/class_2994;Ljava/lang/String;)V - ARG 1 server - ARG 2 description - METHOD method_14721 closeSocket (Ljava/net/ServerSocket;)Z - ARG 1 socket - METHOD method_14722 log (Ljava/lang/String;)V - METHOD method_14723 registerSocket (Ljava/net/DatagramSocket;)V - METHOD method_14724 getCurrentPlayerCount ()I - METHOD method_14725 forceClose (Z)V - METHOD method_14726 logError (Ljava/lang/String;)V - METHOD method_14727 warn (Ljava/lang/String;)V + METHOD (Ljava/lang/String;)V + ARG 1 description METHOD method_14728 start ()V - METHOD method_14729 info (Ljava/lang/String;)V - METHOD method_14730 closeSocket (Ljava/net/ServerSocket;Z)Z - ARG 1 socket - ARG 2 remove METHOD method_14731 isRunning ()Z - METHOD method_14732 closeSocket (Ljava/net/DatagramSocket;Z)Z - ARG 1 socket - ARG 2 remove - METHOD method_14733 forceClose ()V METHOD method_18050 stop ()V diff --git a/mappings/net/minecraft/server/rcon/RconClient.mapping b/mappings/net/minecraft/server/rcon/RconClient.mapping index 55abdf1dc4..5e4a59c6ca 100644 --- a/mappings/net/minecraft/server/rcon/RconClient.mapping +++ b/mappings/net/minecraft/server/rcon/RconClient.mapping @@ -4,7 +4,17 @@ CLASS net/minecraft/class_3389 net/minecraft/server/rcon/RconClient FIELD field_14490 packetBuffer [B FIELD field_14491 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_14492 password Ljava/lang/String; + FIELD field_23965 server Lnet/minecraft/class_2994; METHOD (Lnet/minecraft/class_2994;Ljava/lang/String;Ljava/net/Socket;)V ARG 1 server ARG 2 password + ARG 3 socket + METHOD method_14787 fail ()V METHOD method_14788 close ()V + METHOD method_14789 respond (ILjava/lang/String;)V + ARG 1 sessionToken + ARG 2 message + METHOD method_14790 respond (IILjava/lang/String;)V + ARG 1 sessionToken + ARG 2 responseType + ARG 3 message diff --git a/mappings/net/minecraft/server/rcon/RconServer.mapping b/mappings/net/minecraft/server/rcon/RconListener.mapping similarity index 54% rename from mappings/net/minecraft/server/rcon/RconServer.mapping rename to mappings/net/minecraft/server/rcon/RconListener.mapping index 5342fcef2b..819aaf9f48 100644 --- a/mappings/net/minecraft/server/rcon/RconServer.mapping +++ b/mappings/net/minecraft/server/rcon/RconListener.mapping @@ -1,10 +1,13 @@ -CLASS net/minecraft/class_3408 net/minecraft/server/rcon/RconServer +CLASS net/minecraft/class_3408 net/minecraft/server/rcon/RconListener FIELD field_14510 port I FIELD field_14511 listener Ljava/net/ServerSocket; FIELD field_14512 password Ljava/lang/String; FIELD field_14513 hostname Ljava/lang/String; FIELD field_14514 clients Ljava/util/List; + FIELD field_23966 SERVER_LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_23967 server Lnet/minecraft/class_2994; METHOD (Lnet/minecraft/class_2994;)V ARG 1 server - METHOD method_14819 cleanClientList ()V METHOD method_14820 removeStoppedClients ()V + METHOD method_27176 closeSocket (Ljava/net/ServerSocket;)V + ARG 1 socket