From 4f53a9df5b183bd36d29eb7372eec16f28ca44fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 14 Sep 2016 14:51:09 +0200 Subject: [PATCH] Fixed RCON mappings (#72) * Fixed RCON mappings * Applied some suggestions, Session mappings --- .../net/minecraft/client/Minecraft.mapping | 2 + .../dedicated/QueryResponseHandler.mapping | 10 --- .../minecraft/server/gui/PlayerList.mapping | 6 ++ .../minecraft/server/gui/ServerGui.mapping | 1 + .../server/rcon/BufferHelper.mapping | 17 +++++ .../server/rcon/DataStreamHelper.mapping | 15 ++++ .../server/rcon/QueryResponseHandler.mapping | 21 ++++++ .../minecraft/server/rcon/RconBase.mapping | 34 ++++++++++ .../minecraft/server/rcon/RconClient.mapping | 10 +++ .../minecraft/server/rcon/RconServer.mapping | 12 ++++ .../sortme/ClientWorldListener.mapping} | 4 +- .../ServerResourcePackDownloader.mapping | 6 ++ mappings/net/minecraft/sortme/Session.mapping | 23 +++++++ .../net/minecraft/util/math/MathUtils.mapping | 68 +++++++++++++------ mappings/none/bdx.mapping | 10 --- mappings/none/lj.mapping | 2 - mappings/none/nh.mapping | 2 - 17 files changed, 198 insertions(+), 45 deletions(-) delete mode 100644 mappings/net/minecraft/server/dedicated/QueryResponseHandler.mapping create mode 100644 mappings/net/minecraft/server/gui/PlayerList.mapping create mode 100644 mappings/net/minecraft/server/rcon/BufferHelper.mapping create mode 100644 mappings/net/minecraft/server/rcon/DataStreamHelper.mapping create mode 100644 mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping create mode 100644 mappings/net/minecraft/server/rcon/RconBase.mapping create mode 100644 mappings/net/minecraft/server/rcon/RconClient.mapping create mode 100644 mappings/net/minecraft/server/rcon/RconServer.mapping rename mappings/{none/bpa.mapping => net/minecraft/sortme/ClientWorldListener.mapping} (88%) create mode 100644 mappings/net/minecraft/sortme/ServerResourcePackDownloader.mapping create mode 100644 mappings/net/minecraft/sortme/Session.mapping delete mode 100644 mappings/none/bdx.mapping delete mode 100644 mappings/none/lj.mapping delete mode 100644 mappings/none/nh.mapping diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index 320a1d7b61..ddebddd0b5 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -26,6 +26,7 @@ CLASS none/bdq net/minecraft/client/Minecraft FIELD aa entityRenderManager Lnone/btc; FIELD ab itemRenderer Lnone/btq; FIELD ad cameraEntity Lnone/sf; + FIELD ae session Lnone/bdx; FIELD aj server Lnone/cal; FIELD al gameVersion Ljava/lang/String; FIELD an netProxy Ljava/net/Proxy; @@ -56,6 +57,7 @@ CLASS none/bdq net/minecraft/client/Minecraft METHOD H getSnooper ()Lnone/rk; METHOD I getCurrentTimeMillis ()J METHOD J isFullscreen ()Z + METHOD K getSession ()Lnone/bdx; METHOD M getNetworkProxy ()Ljava/net/Proxy; METHOD N getTextureManager ()Lnone/bxe; METHOD O getResourceManager ()Lnone/byc; diff --git a/mappings/net/minecraft/server/dedicated/QueryResponseHandler.mapping b/mappings/net/minecraft/server/dedicated/QueryResponseHandler.mapping deleted file mode 100644 index 9b0536775c..0000000000 --- a/mappings/net/minecraft/server/dedicated/QueryResponseHandler.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS none/ng net/minecraft/server/dedicated/QueryResponseHandler - FIELD i queryPort I - FIELD j port I - FIELD k maxPlayerCount I - FIELD l motd Ljava/lang/String; - FIELD m worldName Ljava/lang/String; - FIELD r ipAddress Ljava/lang/String; - FIELD s hostname Ljava/lang/String; - METHOD (Lnone/la;)V - ARG 0 server diff --git a/mappings/net/minecraft/server/gui/PlayerList.mapping b/mappings/net/minecraft/server/gui/PlayerList.mapping new file mode 100644 index 0000000000..174663be69 --- /dev/null +++ b/mappings/net/minecraft/server/gui/PlayerList.mapping @@ -0,0 +1,6 @@ +CLASS none/lj net/minecraft/server/gui/PlayerList + FIELD a server Lnet/minecraft/server/MinecraftServer; + FIELD b tickCounter I + METHOD (Lnet/minecraft/server/MinecraftServer;)V + ARG 0 server + METHOD D_ update ()V diff --git a/mappings/net/minecraft/server/gui/ServerGui.mapping b/mappings/net/minecraft/server/gui/ServerGui.mapping index 2f14f466f6..41f4c954f1 100644 --- a/mappings/net/minecraft/server/gui/ServerGui.mapping +++ b/mappings/net/minecraft/server/gui/ServerGui.mapping @@ -6,3 +6,4 @@ CLASS none/li net/minecraft/server/gui/ServerGui ARG 0 server METHOD a createWindow (Lnone/lf;)V ARG 0 server + METHOD b getPlayerListComponent ()Ljavax/swing/JComponent; diff --git a/mappings/net/minecraft/server/rcon/BufferHelper.mapping b/mappings/net/minecraft/server/rcon/BufferHelper.mapping new file mode 100644 index 0000000000..379a6de30f --- /dev/null +++ b/mappings/net/minecraft/server/rcon/BufferHelper.mapping @@ -0,0 +1,17 @@ +CLASS none/nc net/minecraft/server/rcon/BufferHelper + FIELD a HEX_CHARS_LOOKUP [C + METHOD a toHex (B)Ljava/lang/String; + ARG 0 b + METHOD a getString ([BII)Ljava/lang/String; + ARG 0 buf + METHOD b getIntLE ([BI)I + ARG 0 buf + ARG 1 start + METHOD b gutIntLE ([BII)I + ARG 0 buf + ARG 1 start + ARG 2 limit + METHOD c getIntBE ([BII)I + ARG 0 buf + ARG 1 start + ARG 2 limit diff --git a/mappings/net/minecraft/server/rcon/DataStreamHelper.mapping b/mappings/net/minecraft/server/rcon/DataStreamHelper.mapping new file mode 100644 index 0000000000..c647fb681f --- /dev/null +++ b/mappings/net/minecraft/server/rcon/DataStreamHelper.mapping @@ -0,0 +1,15 @@ +CLASS none/nb net/minecraft/server/rcon/DataStreamHelper + FIELD a byteArrayOutputStream Ljava/io/ByteArrayOutputStream; + FIELD b dataOutputStream Ljava/io/DataOutputStream; + METHOD (I)V + ARG 0 bufferSize + METHOD a bytes ()[B + METHOD a write (I)V + ARG 0 i + METHOD a writeBytes (Ljava/lang/String;)V + ARG 0 s + METHOD a writeShort (S)V + ARG 0 s + METHOD a write ([B)V + ARG 0 buf + METHOD b reset ()V diff --git a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping new file mode 100644 index 0000000000..d57255c34a --- /dev/null +++ b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping @@ -0,0 +1,21 @@ +CLASS none/ng net/minecraft/server/rcon/QueryResponseHandler + FIELD i queryPort I + FIELD j port I + FIELD k maxPlayerCount I + FIELD l motd Ljava/lang/String; + FIELD m worldName Ljava/lang/String; + FIELD n socket Ljava/net/DatagramSocket; + FIELD o packetBuffer [B + FIELD p currentPacket Ljava/net/DatagramPacket; + FIELD r ipAddress Ljava/lang/String; + FIELD s hostname Ljava/lang/String; + FIELD v streamHelper Lnone/nb; + METHOD (Lnone/la;)V + ARG 0 server + METHOD a start ()V + METHOD a (Ljava/net/DatagramPacket;)Z + ARG 0 packet + METHOD a reply ([BLjava/net/DatagramPacket;)V + ARG 0 buf + METHOD d (Ljava/net/DatagramPacket;)V + ARG 0 packet diff --git a/mappings/net/minecraft/server/rcon/RconBase.mapping b/mappings/net/minecraft/server/rcon/RconBase.mapping new file mode 100644 index 0000000000..f6ec5cc594 --- /dev/null +++ b/mappings/net/minecraft/server/rcon/RconBase.mapping @@ -0,0 +1,34 @@ +CLASS none/nf net/minecraft/server/rcon/RconBase + FIELD a running Z + FIELD b server Lnone/la; + FIELD c description Ljava/lang/String; + FIELD d thread Ljava/lang/Thread; + FIELD f sockets Ljava/util/List; + FIELD g serverSockets Ljava/util/List; + METHOD (Lnone/la;Ljava/lang/String;)V + ARG 0 server + ARG 1 description + METHOD a start ()V + METHOD a log (Ljava/lang/String;)V + ARG 0 msg + METHOD a registerSocket (Ljava/net/DatagramSocket;)V + ARG 0 socket + METHOD a closeSocket (Ljava/net/DatagramSocket;Z)Z + ARG 0 socket + ARG 1 unregister + METHOD a closeSocket (Ljava/net/ServerSocket;Z)Z + ARG 0 socket + ARG 1 unregister + METHOD a forceClose (Z)V + ARG 0 emitWarn + METHOD b info (Ljava/lang/String;)V + ARG 0 msg + METHOD b closeSocket (Ljava/net/ServerSocket;)Z + ARG 0 socket + METHOD c isRunning ()Z + METHOD c warn (Ljava/lang/String;)V + ARG 0 msg + METHOD d getCurrentPlayerCount ()I + METHOD d logError (Ljava/lang/String;)V + ARG 0 msg + METHOD e forceClose ()V diff --git a/mappings/net/minecraft/server/rcon/RconClient.mapping b/mappings/net/minecraft/server/rcon/RconClient.mapping new file mode 100644 index 0000000000..8d277e09f9 --- /dev/null +++ b/mappings/net/minecraft/server/rcon/RconClient.mapping @@ -0,0 +1,10 @@ +CLASS none/nh net/minecraft/server/rcon/RconClient + FIELD h LOGGER Lorg/apache/logging/log4j/Logger; + FIELD i authenticated Z + FIELD j socket Ljava/net/Socket; + FIELD k packetBuffer [B + FIELD l password Ljava/lang/String; + METHOD (Lnone/la;Ljava/net/Socket;)V + ARG 0 server + ARG 1 socket + METHOD g close ()V diff --git a/mappings/net/minecraft/server/rcon/RconServer.mapping b/mappings/net/minecraft/server/rcon/RconServer.mapping new file mode 100644 index 0000000000..f71770efe0 --- /dev/null +++ b/mappings/net/minecraft/server/rcon/RconServer.mapping @@ -0,0 +1,12 @@ +CLASS none/ni net/minecraft/server/rcon/RconServer + FIELD h port I + FIELD i serverPort I + FIELD j serverHostname Ljava/lang/String; + FIELD k listener Ljava/net/ServerSocket; + FIELD l password Ljava/lang/String; + FIELD m clients Ljava/util/Map; + METHOD (Lnone/la;)V + ARG 0 server + METHOD a start ()V + METHOD f cleanClientList ()V + METHOD g removeStoppedClients ()V diff --git a/mappings/none/bpa.mapping b/mappings/net/minecraft/sortme/ClientWorldListener.mapping similarity index 88% rename from mappings/none/bpa.mapping rename to mappings/net/minecraft/sortme/ClientWorldListener.mapping index 81cc4d5e5a..3ccdab7f64 100644 --- a/mappings/none/bpa.mapping +++ b/mappings/net/minecraft/sortme/ClientWorldListener.mapping @@ -1,4 +1,4 @@ -CLASS none/bpa +CLASS none/bpa net/minecraft/sortme/ClientWorldListener FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c MOON_PHASES_TEX Lnone/kp; FIELD d SUN_TEX Lnone/kp; @@ -7,6 +7,8 @@ CLASS none/bpa FIELD g FORCEFIELD_TEX Lnone/kp; FIELD h mc Lnone/bdq; FIELD z destroyStages [Lnone/bxd; + METHOD (Lnone/bdq;)V + ARG 0 mc METHOD a onSpawnParticle (IZDDDDDD[I)V ARG 0 typeId ARG 1 ignoreRange diff --git a/mappings/net/minecraft/sortme/ServerResourcePackDownloader.mapping b/mappings/net/minecraft/sortme/ServerResourcePackDownloader.mapping new file mode 100644 index 0000000000..165e1e9370 --- /dev/null +++ b/mappings/net/minecraft/sortme/ServerResourcePackDownloader.mapping @@ -0,0 +1,6 @@ +CLASS none/byh net/minecraft/sortme/ServerResourcePackDownloader + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + FIELD h serverResourcePacksDir Ljava/io/File; + METHOD (Ljava/io/File;Ljava/io/File;Lnone/bye;Lnone/byt;Lnone/bds;)V + ARG 1 serverResourcePacksDir + ARG 4 settings diff --git a/mappings/net/minecraft/sortme/Session.mapping b/mappings/net/minecraft/sortme/Session.mapping new file mode 100644 index 0000000000..a6fa9603a9 --- /dev/null +++ b/mappings/net/minecraft/sortme/Session.mapping @@ -0,0 +1,23 @@ +CLASS none/bdx net/minecraft/sortme/Session + CLASS none/bdx$a AccountType + FIELD a LEGACY Lnone/bdx$a; + FIELD b MOJANG Lnone/bdx$a; + FIELD c byNameMap Ljava/util/Map; + FIELD d name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 0 name + METHOD a byName (Ljava/lang/String;)Lnone/bdx$a; + ARG 0 name + FIELD a username Ljava/lang/String; + FIELD b uuid Ljava/lang/String; + FIELD c accessToken Ljava/lang/String; + FIELD d accountType Lnone/bdx$a; + METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + ARG 0 username + ARG 1 uuid + ARG 2 accessToken + ARG 3 accountType + METHOD a getSessionId ()Ljava/lang/String; + METHOD b getUuid ()Ljava/lang/String; + METHOD c getUsernme ()Ljava/lang/String; + METHOD d getAccessToken ()Ljava/lang/String; diff --git a/mappings/net/minecraft/util/math/MathUtils.mapping b/mappings/net/minecraft/util/math/MathUtils.mapping index c641ec99ad..614b30d08a 100644 --- a/mappings/net/minecraft/util/math/MathUtils.mapping +++ b/mappings/net/minecraft/util/math/MathUtils.mapping @@ -2,74 +2,102 @@ CLASS none/or net/minecraft/util/math/MathUtils FIELD a SQUARE_ROOT_2 F FIELD b sinTable [F FIELD c rand Ljava/util/Random; + FIELD d MULTIPLY_DE_BRUIJN_BIT_POSITION [I FIELD f asinTable [D FIELD g cosTable [D METHOD a generateRandomUuid ()Ljava/util/UUID; METHOD a sqrt (D)F - ARG 0 d + ARG 0 value METHOD a absMax (DD)D + ARG 0 firstValue + ARG 1 secondValue METHOD a clamp (DDD)D ARG 0 value ARG 1 min ARG 2 max METHOD a sin (F)F - ARG 0 f + ARG 0 value METHOD a clamp (FFF)F ARG 0 value ARG 1 min ARG 2 max METHOD a abs (I)I - ARG 0 i + ARG 0 value METHOD a intFloorDiv (II)I METHOD a clamp (III)I ARG 0 value ARG 1 min ARG 2 max METHOD a getDouble (Ljava/lang/String;D)D - METHOD a getDouble (Ljava/lang/String;DD)D - METHOD a getInt (Ljava/lang/String;I)I - ARG 0 string + ARG 0 value ARG 1 defaultValue - METHOD a (Ljava/lang/String;II)I + METHOD a getDouble (Ljava/lang/String;DD)D + ARG 0 firstValue + ARG 1 firstValueDefault + ARG 2 secondValue + METHOD a getInt (Ljava/lang/String;I)I + ARG 0 value + ARG 1 defaultValue + METHOD a getInt (Ljava/lang/String;II)I + ARG 0 firstValue + ARG 1 firstValueDefault + ARG 2 secondValue METHOD a generateRandomUuid (Ljava/util/Random;)Ljava/util/UUID; ARG 0 rand METHOD a nextDouble (Ljava/util/Random;DD)D + ARG 0 rand + ARG 1 min + ARG 2 max METHOD a nextFloat (Ljava/util/Random;FF)F + ARG 0 rand + ARG 1 min + ARG 2 max METHOD a nextInt (Ljava/util/Random;II)I + ARG 0 rand METHOD a average ([J)D ARG 0 values METHOD b fastFloor (D)I - ARG 0 d + ARG 0 value METHOD b clampedLerp (DDD)D METHOD b cos (F)F - ARG 0 f + ARG 0 value METHOD b wrapDegrees (I)I - ARG 0 val + ARG 0 value METHOD b (II)I METHOD c floor (D)I - ARG 0 d + ARG 0 value METHOD c sqrt (F)F - ARG 0 f + ARG 0 value + METHOD c hsvToRgb (FFF)I + ARG 0 hue + ARG 1 saturation + ARG 2 value METHOD c smallestEncompassingPowerOfTwo (I)I + ARG 0 value METHOD c roundUp (II)I METHOD d lfloor (D)J - ARG 0 d + ARG 0 value METHOD d floor (F)I - ARG 0 f + ARG 0 value + METHOD d (I)I + ARG 0 value METHOD e absFloor (D)I - ARG 0 d + ARG 0 value METHOD e abs (F)F - ARG 0 f + ARG 0 value METHOD e log2 (I)I + ARG 0 value METHOD f ceil (D)I - ARG 0 d + ARG 0 value METHOD f ceil (F)I - ARG 0 f + ARG 0 value METHOD f finishMurmurHash (I)I ARG 0 value METHOD g wrapDegrees (D)D - ARG 0 val + ARG 0 value METHOD g wrapDegrees (F)F - ARG 0 val + ARG 0 value + METHOD g isPowerOfTwo (I)Z + ARG 0 value METHOD h getFractionalPart (D)D ARG 0 value diff --git a/mappings/none/bdx.mapping b/mappings/none/bdx.mapping deleted file mode 100644 index a1508b75fe..0000000000 --- a/mappings/none/bdx.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS none/bdx - CLASS none/bdx$a AccountType - FIELD a LEGACY Lnone/bdx$a; - FIELD b MOJANG Lnone/bdx$a; - FIELD c byNameMap Ljava/util/Map; - FIELD d name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 0 name - METHOD a byName (Ljava/lang/String;)Lnone/bdx$a; - ARG 0 name diff --git a/mappings/none/lj.mapping b/mappings/none/lj.mapping deleted file mode 100644 index 905ceb2aa5..0000000000 --- a/mappings/none/lj.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/lj - METHOD D_ update ()V diff --git a/mappings/none/nh.mapping b/mappings/none/nh.mapping deleted file mode 100644 index be62869bb8..0000000000 --- a/mappings/none/nh.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/nh - FIELD h LOGGER Lorg/apache/logging/log4j/Logger;