From 9a2d73ab02d12d372214ee12bf3b8173236040ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Wed, 14 Sep 2016 14:42:40 +0200 Subject: [PATCH] Applied some suggestions, Session mappings --- .../net/minecraft/client/Minecraft.mapping | 2 + .../server/rcon/BufferHelper.mapping | 2 +- .../minecraft/server/rcon/RconBase.mapping | 2 +- .../ServerResourcePackDownloader.mapping | 6 ++ mappings/net/minecraft/sortme/Session.mapping | 23 ++++++ .../net/minecraft/util/math/MathUtils.mapping | 70 ++++++++++--------- mappings/none/bdx.mapping | 10 --- 7 files changed, 71 insertions(+), 44 deletions(-) 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 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/rcon/BufferHelper.mapping b/mappings/net/minecraft/server/rcon/BufferHelper.mapping index ea3c55a5dd..379a6de30f 100644 --- a/mappings/net/minecraft/server/rcon/BufferHelper.mapping +++ b/mappings/net/minecraft/server/rcon/BufferHelper.mapping @@ -1,5 +1,5 @@ CLASS none/nc net/minecraft/server/rcon/BufferHelper - FIELD a HEX_CHARS [C + FIELD a HEX_CHARS_LOOKUP [C METHOD a toHex (B)Ljava/lang/String; ARG 0 b METHOD a getString ([BII)Ljava/lang/String; diff --git a/mappings/net/minecraft/server/rcon/RconBase.mapping b/mappings/net/minecraft/server/rcon/RconBase.mapping index 84016e55d3..f6ec5cc594 100644 --- a/mappings/net/minecraft/server/rcon/RconBase.mapping +++ b/mappings/net/minecraft/server/rcon/RconBase.mapping @@ -12,7 +12,7 @@ CLASS none/nf net/minecraft/server/rcon/RconBase METHOD a log (Ljava/lang/String;)V ARG 0 msg METHOD a registerSocket (Ljava/net/DatagramSocket;)V - ARG 0 secket + ARG 0 socket METHOD a closeSocket (Ljava/net/DatagramSocket;Z)Z ARG 0 socket ARG 1 unregister 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 a0d0607449..614b30d08a 100644 --- a/mappings/net/minecraft/util/math/MathUtils.mapping +++ b/mappings/net/minecraft/util/math/MathUtils.mapping @@ -7,91 +7,97 @@ CLASS none/or net/minecraft/util/math/MathUtils 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 d1 - ARG 1 d2 + 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 - ARG 0 string + ARG 0 value ARG 1 defaultValue METHOD a getDouble (Ljava/lang/String;DD)D - ARG 0 string - ARG 1 defaultValue - ARG 2 d + ARG 0 firstValue + ARG 1 firstValueDefault + ARG 2 secondValue METHOD a getInt (Ljava/lang/String;I)I - ARG 0 string + ARG 0 value ARG 1 defaultValue METHOD a getInt (Ljava/lang/String;II)I - ARG 0 string - ARG 1 defaultValue - ARG 2 d + 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 h - ARG 1 s - ARG 2 v + ARG 0 hue + ARG 1 saturation + ARG 2 value METHOD c smallestEncompassingPowerOfTwo (I)I - ARG 0 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 n + 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 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