From ce7bd3f1749c1f14be3d1057c072d573d8aee0d6 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 12:25:24 +1200 Subject: [PATCH 01/12] Texture and ITexture fully mapped --- .../net/minecraft/client/texture/ITexture.mapping | 4 ++++ mappings/net/minecraft/client/texture/Texture.mapping | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/mappings/net/minecraft/client/texture/ITexture.mapping b/mappings/net/minecraft/client/texture/ITexture.mapping index 8bd1e297c6..3319137d33 100644 --- a/mappings/net/minecraft/client/texture/ITexture.mapping +++ b/mappings/net/minecraft/client/texture/ITexture.mapping @@ -1,4 +1,8 @@ CLASS none/bxf net/minecraft/client/texture/ITexture + METHOD a popFilter ()V METHOD a load (Lnone/byc;)V ARG 0 resourceContainer METHOD b getGlId ()I + METHOD b pushFilter (ZZ)V + ARG 0 bilinear + ARG 1 mipmap diff --git a/mappings/net/minecraft/client/texture/Texture.mapping b/mappings/net/minecraft/client/texture/Texture.mapping index 8b15863ea1..5bacd6b6de 100644 --- a/mappings/net/minecraft/client/texture/Texture.mapping +++ b/mappings/net/minecraft/client/texture/Texture.mapping @@ -1,4 +1,15 @@ CLASS none/bws net/minecraft/client/texture/Texture FIELD a glId I + FIELD b bilinear Z + FIELD c mipmap Z + FIELD d oldBilinear Z + FIELD e oldMipmap Z + METHOD a popFilter ()V + METHOD a setFilter (ZZ)V + ARG 0 bilinear + ARG 1 mipmap METHOD b getGlId ()I + METHOD b pushFilter (ZZ)V + ARG 0 bilinear + ARG 1 mipmap METHOD c clearGlId ()V From b58fd3ff6ed8ef4492b41e3895f806be1ad3b3d6 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 12:34:52 +1200 Subject: [PATCH 02/12] DefaultSkinUtils fully mapped --- .../net/minecraft/client/util/DefaultSkinUtils.mapping | 10 ++++++++++ mappings/none/bwu.mapping | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 mappings/net/minecraft/client/util/DefaultSkinUtils.mapping diff --git a/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping b/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping new file mode 100644 index 0000000000..282b41f6c7 --- /dev/null +++ b/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping @@ -0,0 +1,10 @@ +CLASS none/bxs net/minecraft/client/util/DefaultSkinUtils + FIELD a STEVE Lnone/kp; + FIELD b ALEX Lnone/kp; + METHOD a getSteveIdentifier ()Lnone/kp; + METHOD a getIdentifier (Ljava/util/UUID;)Lnone/kp; + ARG 0 uuid + METHOD b getModel (Ljava/util/UUID;)Ljava/lang/String; + ARG 0 uuid + METHOD c useAlex (Ljava/util/UUID;)Z + ARG 0 uuid diff --git a/mappings/none/bwu.mapping b/mappings/none/bwu.mapping index 7a9a0ef14d..99ddb9ed54 100644 --- a/mappings/none/bwu.mapping +++ b/mappings/none/bwu.mapping @@ -1,4 +1,11 @@ CLASS none/bwu + CLASS none/bwu$1 + METHOD run run ()V + FIELD g LOGGER Lorg/apache/logging/log4j/Logger; + FIELD m DOWNLOADER Ljava/lang/Thread; + METHOD (Ljava/io/File;Ljava/lang/String;Lnone/kp;Lnone/bov;)V + ARG 1 url METHOD a load (Lnone/byc;)V ARG 0 resourceContainer METHOD b getGlId ()I + METHOD d startTextureDownloader ()V From 7ab32e40ece2fb073c06567680f9866b04aad4c3 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 12:47:28 +1200 Subject: [PATCH 03/12] bwu -> TexturePlayerSkin (mostly mapped) --- .../client/texture/TexturePlayerSkin.mapping | 21 +++++++++++++++++++ mappings/none/bwu.mapping | 11 ---------- 2 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping delete mode 100644 mappings/none/bwu.mapping diff --git a/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping b/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping new file mode 100644 index 0000000000..5b4916e0c9 --- /dev/null +++ b/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping @@ -0,0 +1,21 @@ +CLASS none/bwu net/minecraft/client/texture/TexturePlayerSkin + CLASS none/bwu$1 + METHOD run run ()V + FIELD g LOGGER Lorg/apache/logging/log4j/Logger; + FIELD h DOWNLOAD_THREAD_COUNTER Ljava/util/concurrent/atomic/AtomicInteger; + FIELD i cacheFile Ljava/io/File; + FIELD j url Ljava/lang/String; + FIELD l image Ljava/awt/image/BufferedImage; + FIELD m DOWNLOADER Ljava/lang/Thread; + FIELD n playerSkinUploaded Z + METHOD (Ljava/io/File;Ljava/lang/String;Lnone/kp;Lnone/bov;)V + ARG 0 cacheFile + ARG 1 url + ARG 2 fallbackSkin + METHOD a updateImage (Ljava/awt/image/BufferedImage;)V + ARG 0 image + METHOD a load (Lnone/byc;)V + ARG 0 resourceContainer + METHOD b getGlId ()I + METHOD d startTextureDownload ()V + METHOD g checkForTextureUpdate ()V diff --git a/mappings/none/bwu.mapping b/mappings/none/bwu.mapping deleted file mode 100644 index 99ddb9ed54..0000000000 --- a/mappings/none/bwu.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS none/bwu - CLASS none/bwu$1 - METHOD run run ()V - FIELD g LOGGER Lorg/apache/logging/log4j/Logger; - FIELD m DOWNLOADER Ljava/lang/Thread; - METHOD (Ljava/io/File;Ljava/lang/String;Lnone/kp;Lnone/bov;)V - ARG 1 url - METHOD a load (Lnone/byc;)V - ARG 0 resourceContainer - METHOD b getGlId ()I - METHOD d startTextureDownloader ()V From 3eec79843c713856125cd1d1773a2601342fd397 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 12:54:00 +1200 Subject: [PATCH 04/12] bov -> ImageFilter --- mappings/net/minecraft/client/texture/ImageFilter.mapping | 3 +++ .../net/minecraft/client/texture/TexturePlayerSkin.mapping | 2 ++ mappings/none/bpb.mapping | 3 +++ mappings/none/byk.mapping | 4 ++++ 4 files changed, 12 insertions(+) create mode 100644 mappings/net/minecraft/client/texture/ImageFilter.mapping create mode 100644 mappings/none/bpb.mapping create mode 100644 mappings/none/byk.mapping diff --git a/mappings/net/minecraft/client/texture/ImageFilter.mapping b/mappings/net/minecraft/client/texture/ImageFilter.mapping new file mode 100644 index 0000000000..47367fd47e --- /dev/null +++ b/mappings/net/minecraft/client/texture/ImageFilter.mapping @@ -0,0 +1,3 @@ +CLASS none/bov net/minecraft/client/texture/ImageFilter + METHOD a filterImage (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; + ARG 0 image diff --git a/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping b/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping index 5b4916e0c9..0eed534461 100644 --- a/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping +++ b/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping @@ -5,6 +5,7 @@ CLASS none/bwu net/minecraft/client/texture/TexturePlayerSkin FIELD h DOWNLOAD_THREAD_COUNTER Ljava/util/concurrent/atomic/AtomicInteger; FIELD i cacheFile Ljava/io/File; FIELD j url Ljava/lang/String; + FIELD k filter Lnone/bov; FIELD l image Ljava/awt/image/BufferedImage; FIELD m DOWNLOADER Ljava/lang/Thread; FIELD n playerSkinUploaded Z @@ -12,6 +13,7 @@ CLASS none/bwu net/minecraft/client/texture/TexturePlayerSkin ARG 0 cacheFile ARG 1 url ARG 2 fallbackSkin + ARG 3 filter METHOD a updateImage (Ljava/awt/image/BufferedImage;)V ARG 0 image METHOD a load (Lnone/byc;)V diff --git a/mappings/none/bpb.mapping b/mappings/none/bpb.mapping new file mode 100644 index 0000000000..740a7202d4 --- /dev/null +++ b/mappings/none/bpb.mapping @@ -0,0 +1,3 @@ +CLASS none/bpb + METHOD a filterImage (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; + ARG 0 image diff --git a/mappings/none/byk.mapping b/mappings/none/byk.mapping new file mode 100644 index 0000000000..903ee91dc7 --- /dev/null +++ b/mappings/none/byk.mapping @@ -0,0 +1,4 @@ +CLASS none/byk + CLASS none/byk$2 + METHOD a filterImage (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; + ARG 0 image From 992cf97d8a51b3fc4c0d091e0ab390e05730f95c Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 13:01:44 +1200 Subject: [PATCH 05/12] bpb -> ImageFilterSkinRemapper (mostly remapped) what the hell mojang the skin format is terrible --- .../texture/ImageFilterSkinRemapper.mapping | 16 ++++++++++++++++ mappings/none/bpb.mapping | 3 --- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/client/texture/ImageFilterSkinRemapper.mapping delete mode 100644 mappings/none/bpb.mapping diff --git a/mappings/net/minecraft/client/texture/ImageFilterSkinRemapper.mapping b/mappings/net/minecraft/client/texture/ImageFilterSkinRemapper.mapping new file mode 100644 index 0000000000..f7d724d5f5 --- /dev/null +++ b/mappings/net/minecraft/client/texture/ImageFilterSkinRemapper.mapping @@ -0,0 +1,16 @@ +CLASS none/bpb net/minecraft/client/texture/ImageFilterSkinRemapper + FIELD a imageData [I + FIELD b width I + FIELD c height I + METHOD a markTransparentIfFullyOpaque (IIII)V + ARG 0 x1 + ARG 1 y1 + ARG 2 x2 + ARG 3 y2 + METHOD a filterImage (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; + ARG 0 image + METHOD b markOpaque (IIII)V + ARG 0 x1 + ARG 1 y1 + ARG 2 x2 + ARG 3 y2 diff --git a/mappings/none/bpb.mapping b/mappings/none/bpb.mapping deleted file mode 100644 index 740a7202d4..0000000000 --- a/mappings/none/bpb.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bpb - METHOD a filterImage (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; - ARG 0 image From c9b6c1d1139807292e8d4bb38e81ad17a04a4d22 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 14:52:55 +1200 Subject: [PATCH 06/12] BannerCache+TextureBanner fully mapped --- .../client/texture/BannerCache.mapping | 22 +++++++++++++++++++ .../client/texture/TextureBanner.mapping | 11 ++++++++++ mappings/none/bww.mapping | 3 --- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/client/texture/BannerCache.mapping create mode 100644 mappings/net/minecraft/client/texture/TextureBanner.mapping delete mode 100644 mappings/none/bww.mapping diff --git a/mappings/net/minecraft/client/texture/BannerCache.mapping b/mappings/net/minecraft/client/texture/BannerCache.mapping new file mode 100644 index 0000000000..8858650d87 --- /dev/null +++ b/mappings/net/minecraft/client/texture/BannerCache.mapping @@ -0,0 +1,22 @@ +CLASS none/bpk net/minecraft/client/texture/BannerCache + CLASS none/bpk$a Manager + FIELD a cacheMap Ljava/util/Map; + FIELD b filename Lnone/kp; + FIELD c baseDir Ljava/lang/String; + FIELD d id Ljava/lang/String; + METHOD (Ljava/lang/String;Lnone/kp;Ljava/lang/String;)V + ARG 0 id + ARG 1 filename + ARG 2 baseDir + METHOD a removeOldEntries ()Z + METHOD a get (Ljava/lang/String;Ljava/util/List;Ljava/util/List;)Lnone/kp; + ARG 0 variant + ARG 1 patterns + ARG 2 dyes + CLASS none/bpk$b Entry + FIELD a lastRequestedMillis J + FIELD b filename Lnone/kp; + FIELD a BANNERS Lnone/bpk$a; + FIELD b SHIELDS Lnone/bpk$a; + FIELD c DEFAULT_SHIELD Lnone/kp; + FIELD d DEFAULT_BANNER Lnone/kp; diff --git a/mappings/net/minecraft/client/texture/TextureBanner.mapping b/mappings/net/minecraft/client/texture/TextureBanner.mapping new file mode 100644 index 0000000000..dbeba71a74 --- /dev/null +++ b/mappings/net/minecraft/client/texture/TextureBanner.mapping @@ -0,0 +1,11 @@ +CLASS none/bww net/minecraft/client/texture/TextureBanner + FIELD f LOGGER Lorg/apache/logging/log4j/Logger; + FIELD g filename Lnone/kp; + FIELD h patternNames Ljava/util/List; + FIELD i dyes Ljava/util/List; + METHOD (Lnone/kp;Ljava/util/List;Ljava/util/List;)V + ARG 0 filename + ARG 1 patternNames + ARG 2 dyes + METHOD a load (Lnone/byc;)V + ARG 0 resourceContainer diff --git a/mappings/none/bww.mapping b/mappings/none/bww.mapping deleted file mode 100644 index d55c0eaf83..0000000000 --- a/mappings/none/bww.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bww - METHOD a load (Lnone/byc;)V - ARG 0 resourceContainer From 53bf2f710f4bb8532bc765a0f702e48691ebebb9 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 14:55:59 +1200 Subject: [PATCH 07/12] tie off loose ends for banner stuff --- mappings/net/minecraft/client/texture/TextureManager.mapping | 5 ++++- mappings/net/minecraft/util/math/MathUtils.mapping | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index 6701256ffe..985cec5a17 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -16,8 +16,11 @@ CLASS none/bxe net/minecraft/client/texture/TextureManager METHOD a registerTexture (Lnone/kp;Lnone/bxf;)Z ARG 0 id ARG 1 texture - METHOD a (Lnone/kp;Lnone/bxi;)Z + METHOD a registerTextureUpdateable (Lnone/kp;Lnone/bxi;)Z ARG 0 id + ARG 1 texture METHOD b getTexture (Lnone/kp;)Lnone/bxf; ARG 0 id + METHOD c destroyTexture (Lnone/kp;)V + ARG 0 id METHOD e updateTexture ()V diff --git a/mappings/net/minecraft/util/math/MathUtils.mapping b/mappings/net/minecraft/util/math/MathUtils.mapping index f3641c3929..859432c0b9 100644 --- a/mappings/net/minecraft/util/math/MathUtils.mapping +++ b/mappings/net/minecraft/util/math/MathUtils.mapping @@ -87,6 +87,9 @@ CLASS none/or net/minecraft/util/math/MathUtils ARG 0 value METHOD d (I)I ARG 0 value + METHOD d multiplyColors (II)I + ARG 0 c0 + ARG 1 c1 METHOD e absFloor (D)I ARG 0 value METHOD e abs (F)F From a1858764e68eb5be7590ccfea575945afcc8bd4c Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 15:17:00 +1200 Subject: [PATCH 08/12] fill in a few more MathUtils methods --- .../net/minecraft/util/math/MathUtils.mapping | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/util/math/MathUtils.mapping b/mappings/net/minecraft/util/math/MathUtils.mapping index 859432c0b9..3ac0dbb625 100644 --- a/mappings/net/minecraft/util/math/MathUtils.mapping +++ b/mappings/net/minecraft/util/math/MathUtils.mapping @@ -17,6 +17,9 @@ CLASS none/or net/minecraft/util/math/MathUtils ARG 2 max METHOD a sin (F)F ARG 0 value + METHOD a equalsApproximate (FF)Z + ARG 0 x + ARG 1 y METHOD a clamp (FFF)F ARG 0 value ARG 1 min @@ -24,6 +27,8 @@ CLASS none/or net/minecraft/util/math/MathUtils METHOD a abs (I)I ARG 0 value METHOD a intFloorDiv (II)I + ARG 0 num + ARG 1 denom METHOD a clamp (III)I ARG 0 value ARG 1 min @@ -60,14 +65,37 @@ CLASS none/or net/minecraft/util/math/MathUtils ARG 0 values METHOD b fastFloor (D)I ARG 0 value + METHOD b modFloor (DD)D + ARG 0 num + ARG 1 denom METHOD b clampedLerp (DDD)D + ARG 0 v0 + ARG 1 v1 + ARG 2 time METHOD b cos (F)F ARG 0 value + METHOD b modFloor (FF)F + ARG 0 num + ARG 1 denom + METHOD b packRgbFloats (FFF)I + ARG 0 r + ARG 1 g + ARG 2 b METHOD b wrapDegrees (I)I ARG 0 value - METHOD b (II)I + METHOD b modFloor (II)I + ARG 0 num + ARG 1 denom + METHOD b packRgbInts (III)I + ARG 0 r + ARG 1 g + ARG 2 b METHOD c floor (D)I ARG 0 value + METHOD c lerp (DDD)D + ARG 0 time + ARG 1 v0 + ARG 2 v1 METHOD c sqrt (F)F ARG 0 value METHOD c hsvToRgb (FFF)I From 9cfba5aac2e8a249dcfd747ab5045c0bea9ec527 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 15:18:30 +1200 Subject: [PATCH 09/12] The algorithm known as WHAT THE FUCK --- mappings/net/minecraft/util/math/MathUtils.mapping | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mappings/net/minecraft/util/math/MathUtils.mapping b/mappings/net/minecraft/util/math/MathUtils.mapping index 3ac0dbb625..84b75bee5f 100644 --- a/mappings/net/minecraft/util/math/MathUtils.mapping +++ b/mappings/net/minecraft/util/math/MathUtils.mapping @@ -138,3 +138,5 @@ CLASS none/or net/minecraft/util/math/MathUtils ARG 0 value METHOD h getFractionalPart (D)D ARG 0 value + METHOD i fastInverseSqrt (D)D + ARG 0 value From 25d67cd049e32d12171dc389f6b9fa8a5bb6f8e3 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 15:26:51 +1200 Subject: [PATCH 10/12] what the fuck? Also known as Fast Inverse Square Root. MC uses the double-precision version. The magic number is one more than Robertson's constant. It is used for atan2, which has also been mapped here. --- mappings/net/minecraft/util/math/MathUtils.mapping | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mappings/net/minecraft/util/math/MathUtils.mapping b/mappings/net/minecraft/util/math/MathUtils.mapping index 84b75bee5f..53146cd1ac 100644 --- a/mappings/net/minecraft/util/math/MathUtils.mapping +++ b/mappings/net/minecraft/util/math/MathUtils.mapping @@ -3,6 +3,7 @@ CLASS none/or net/minecraft/util/math/MathUtils FIELD b sinTable [F FIELD c rand Ljava/util/Random; FIELD d MULTIPLY_DE_BRUIJN_BIT_POSITION [I + FIELD e SMALLEST_FRACTION_FREE_DOUBLE D FIELD f asinTable [D FIELD g cosTable [D METHOD a generateRandomUuid ()Ljava/util/UUID; @@ -92,6 +93,9 @@ CLASS none/or net/minecraft/util/math/MathUtils ARG 2 b METHOD c floor (D)I ARG 0 value + METHOD c atan2 (DD)D + ARG 0 y + ARG 1 x METHOD c lerp (DDD)D ARG 0 time ARG 1 v0 From 98c6cefca45188a81318bbe2cf09c485681ccfa1 Mon Sep 17 00:00:00 2001 From: Ben Russell Date: Tue, 20 Sep 2016 19:45:11 +1200 Subject: [PATCH 11/12] review round 1 --- mappings/net/minecraft/client/texture/BannerCache.mapping | 2 +- mappings/net/minecraft/client/util/DefaultSkinUtils.mapping | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/client/texture/BannerCache.mapping b/mappings/net/minecraft/client/texture/BannerCache.mapping index 8858650d87..e17f7d2b0a 100644 --- a/mappings/net/minecraft/client/texture/BannerCache.mapping +++ b/mappings/net/minecraft/client/texture/BannerCache.mapping @@ -14,7 +14,7 @@ CLASS none/bpk net/minecraft/client/texture/BannerCache ARG 1 patterns ARG 2 dyes CLASS none/bpk$b Entry - FIELD a lastRequestedMillis J + FIELD a lastRequestTimeMillis J FIELD b filename Lnone/kp; FIELD a BANNERS Lnone/bpk$a; FIELD b SHIELDS Lnone/bpk$a; diff --git a/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping b/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping index 282b41f6c7..e73af15dc8 100644 --- a/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping +++ b/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping @@ -6,5 +6,5 @@ CLASS none/bxs net/minecraft/client/util/DefaultSkinUtils ARG 0 uuid METHOD b getModel (Ljava/util/UUID;)Ljava/lang/String; ARG 0 uuid - METHOD c useAlex (Ljava/util/UUID;)Z + METHOD c shouldUseAlex (Ljava/util/UUID;)Z ARG 0 uuid From be5a5773652bd436cbf3a3d0ca2bffe124a7ec0d Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 20 Sep 2016 16:38:09 +0200 Subject: [PATCH 12/12] fixes --- .../{ImageFilter.mapping => IImageFilter.mapping} | 2 +- .../minecraft/client/texture/TexturePlayerSkin.mapping | 2 +- .../minecraft/client/util/DefaultSkinHelper.mapping | 10 ++++++++++ .../net/minecraft/client/util/DefaultSkinUtils.mapping | 10 ---------- 4 files changed, 12 insertions(+), 12 deletions(-) rename mappings/net/minecraft/client/texture/{ImageFilter.mapping => IImageFilter.mapping} (63%) create mode 100644 mappings/net/minecraft/client/util/DefaultSkinHelper.mapping delete mode 100644 mappings/net/minecraft/client/util/DefaultSkinUtils.mapping diff --git a/mappings/net/minecraft/client/texture/ImageFilter.mapping b/mappings/net/minecraft/client/texture/IImageFilter.mapping similarity index 63% rename from mappings/net/minecraft/client/texture/ImageFilter.mapping rename to mappings/net/minecraft/client/texture/IImageFilter.mapping index 47367fd47e..3485fc9574 100644 --- a/mappings/net/minecraft/client/texture/ImageFilter.mapping +++ b/mappings/net/minecraft/client/texture/IImageFilter.mapping @@ -1,3 +1,3 @@ -CLASS none/bov net/minecraft/client/texture/ImageFilter +CLASS none/bov net/minecraft/client/texture/IImageFilter METHOD a filterImage (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; ARG 0 image diff --git a/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping b/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping index 0eed534461..6242804b8f 100644 --- a/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping +++ b/mappings/net/minecraft/client/texture/TexturePlayerSkin.mapping @@ -7,7 +7,7 @@ CLASS none/bwu net/minecraft/client/texture/TexturePlayerSkin FIELD j url Ljava/lang/String; FIELD k filter Lnone/bov; FIELD l image Ljava/awt/image/BufferedImage; - FIELD m DOWNLOADER Ljava/lang/Thread; + FIELD m downloadThread Ljava/lang/Thread; FIELD n playerSkinUploaded Z METHOD (Ljava/io/File;Ljava/lang/String;Lnone/kp;Lnone/bov;)V ARG 0 cacheFile diff --git a/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping b/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping new file mode 100644 index 0000000000..aa6471eff3 --- /dev/null +++ b/mappings/net/minecraft/client/util/DefaultSkinHelper.mapping @@ -0,0 +1,10 @@ +CLASS none/bxs net/minecraft/client/util/DefaultSkinHelper + FIELD a STEVE_TEX Lnone/kp; + FIELD b ALEX_TEX Lnone/kp; + METHOD a getTexture ()Lnone/kp; + METHOD a getTexture (Ljava/util/UUID;)Lnone/kp; + ARG 0 uuid + METHOD b getModel (Ljava/util/UUID;)Ljava/lang/String; + ARG 0 uuid + METHOD c shouldUseSlimModel (Ljava/util/UUID;)Z + ARG 0 uuid diff --git a/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping b/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping deleted file mode 100644 index e73af15dc8..0000000000 --- a/mappings/net/minecraft/client/util/DefaultSkinUtils.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS none/bxs net/minecraft/client/util/DefaultSkinUtils - FIELD a STEVE Lnone/kp; - FIELD b ALEX Lnone/kp; - METHOD a getSteveIdentifier ()Lnone/kp; - METHOD a getIdentifier (Ljava/util/UUID;)Lnone/kp; - ARG 0 uuid - METHOD b getModel (Ljava/util/UUID;)Ljava/lang/String; - ARG 0 uuid - METHOD c shouldUseAlex (Ljava/util/UUID;)Z - ARG 0 uuid