From 2315523716630d3dc9161d21a04373e2b5e4801d Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 25 Aug 2016 11:56:41 +0200 Subject: [PATCH] minor mapping work in Minecraft --- mappings/net/minecraft/client/Minecraft.mapping | 12 ++++++++++-- .../net/minecraft/client/gui/hud/GuiInGame.mapping | 5 +++++ mappings/net/minecraft/client/main/Main.mapping | 7 +++++++ .../client/render/FoliageColorHandler.mapping | 5 +++++ .../client/render/GrassColorHandler.mapping | 5 +++++ .../resource/ResourceLoaderFoliageColormap.mapping | 4 ++++ .../resource/ResourceLoaderGrassColormap.mapping | 4 ++++ .../net/minecraft/client/util/TextureUtils.mapping | 10 ++++++++++ mappings/none/bdv.mapping | 10 ++++++++++ mappings/none/bjk.mapping | 8 ++++++++ mappings/none/bxe.mapping | 2 -- mappings/none/bxw.mapping | 3 --- mappings/none/bxx.mapping | 3 --- 13 files changed, 68 insertions(+), 10 deletions(-) create mode 100644 mappings/net/minecraft/client/main/Main.mapping create mode 100644 mappings/net/minecraft/client/render/FoliageColorHandler.mapping create mode 100644 mappings/net/minecraft/client/render/GrassColorHandler.mapping create mode 100644 mappings/net/minecraft/client/resource/ResourceLoaderFoliageColormap.mapping create mode 100644 mappings/net/minecraft/client/resource/ResourceLoaderGrassColormap.mapping create mode 100644 mappings/net/minecraft/client/util/TextureUtils.mapping create mode 100644 mappings/none/bdv.mapping delete mode 100644 mappings/none/bxe.mapping delete mode 100644 mappings/none/bxw.mapping delete mode 100644 mappings/none/bxx.mapping diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index 5734049ae0..05b01817e7 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -13,12 +13,16 @@ CLASS none/bdo net/minecraft/client/Minecraft FIELD aF blockColorMap Lnone/bdx; FIELD aG itemColorMap Lnone/bea; FIELD aI spriteAtlas Lnone/bxa; + FIELD aJ soundLoader Lnone/cau; + FIELD aK musicTracker Lnone/car; FIELD aM sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD aP thread Ljava/lang/Thread; + FIELD aQ blockModelManager Lnone/bzn; FIELD ab itemRenderer Lnone/bto; FIELD aj server Lnone/caj; FIELD an netProxy Ljava/net/Proxy; FIELD ap fps I + FIELD au is64Bit Z FIELD av isDemo Z FIELD az resourceManager Lnone/bxy; FIELD d width I @@ -40,13 +44,16 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD N getTextureManager ()Lnone/bxc; METHOD O getResourceManager ()Lnone/bya; METHOD R getSpriteAtlas ()Lnone/bxa; + METHOD S is64Bit ()Z + METHOD U getSoundLoader ()Lnone/cau; + METHOD V getMusicType ()Lnone/car$a; METHOD X getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD Z isSnooperEnabled ()Z METHOD a start ()V METHOD a swizzle (Ljava/io/InputStream;)Ljava/nio/ByteBuffer; ARG 0 stream METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; - METHOD a checkGLError (Ljava/lang/String;)V + METHOD a checkGlError (Ljava/lang/String;)V ARG 0 title METHOD a setGuiScreen (Lnone/bgk;)V ARG 0 screen @@ -61,7 +68,7 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD ap createDisplay ()V METHOD aq setDisplayMode ()V METHOD ar setIcons ()V - METHOD as is64Bit ()Z + METHOD as checkIs64Bit ()Z METHOD at startTimerHackThread ()V METHOD au ()V METHOD aw doAttack ()V @@ -71,6 +78,7 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD k getMaxFps ()I METHOD l limitFramerate ()Z METHOD r toggleFullscreen ()V + METHOD s getMusicTracker ()Lnone/car; METHOD u isDemo ()Z METHOD v getNetworkHandler ()Lnone/bmc; METHOD x isFancyGraphicsEnabled ()Z diff --git a/mappings/net/minecraft/client/gui/hud/GuiInGame.mapping b/mappings/net/minecraft/client/gui/hud/GuiInGame.mapping index a98546538d..be04ffd85e 100644 --- a/mappings/net/minecraft/client/gui/hud/GuiInGame.mapping +++ b/mappings/net/minecraft/client/gui/hud/GuiInGame.mapping @@ -7,8 +7,13 @@ CLASS none/bed net/minecraft/client/gui/hud/GuiInGame FIELD l guiChat Lnone/bej; FIELD r currentStack Lnone/aeq; FIELD s guiDebugPie Lnone/bel; + FIELD t guiSubtitles Lnone/bfb; + FIELD u guiSpectator Lnone/bfd; FIELD v guiScoreboard Lnone/bey; FIELD w guiBossBar Lnone/beh; METHOD (Lnone/bdo;)V ARG 0 mc METHOD d getChatWidget ()Lnone/bej; + METHOD g getSpectatorWidget ()Lnone/bfd; + METHOD h getScoreboardWidget ()Lnone/bey; + METHOD j getBossBarWidget ()Lnone/beh; diff --git a/mappings/net/minecraft/client/main/Main.mapping b/mappings/net/minecraft/client/main/Main.mapping new file mode 100644 index 0000000000..8e03ab1670 --- /dev/null +++ b/mappings/net/minecraft/client/main/Main.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/client/main/Main net/minecraft/client/main/Main + CLASS net/minecraft/client/main/Main$1 + METHOD getPasswordAuthentication getPasswordAuthentication ()Ljava/net/PasswordAuthentication; + CLASS net/minecraft/client/main/Main$2 + METHOD run run ()V + METHOD main main ([Ljava/lang/String;)V + ARG 0 args diff --git a/mappings/net/minecraft/client/render/FoliageColorHandler.mapping b/mappings/net/minecraft/client/render/FoliageColorHandler.mapping new file mode 100644 index 0000000000..a54ea1574c --- /dev/null +++ b/mappings/net/minecraft/client/render/FoliageColorHandler.mapping @@ -0,0 +1,5 @@ +CLASS none/aiq net/minecraft/client/render/FoliageColorHandler + FIELD a colorMap [I + METHOD a getColor (DD)I + METHOD a setColorMap ([I)V + ARG 0 pixels diff --git a/mappings/net/minecraft/client/render/GrassColorHandler.mapping b/mappings/net/minecraft/client/render/GrassColorHandler.mapping new file mode 100644 index 0000000000..b24ca16306 --- /dev/null +++ b/mappings/net/minecraft/client/render/GrassColorHandler.mapping @@ -0,0 +1,5 @@ +CLASS none/ait net/minecraft/client/render/GrassColorHandler + FIELD a colorMap [I + METHOD a getColor (DD)I + METHOD a setColorMap ([I)V + ARG 0 map diff --git a/mappings/net/minecraft/client/resource/ResourceLoaderFoliageColormap.mapping b/mappings/net/minecraft/client/resource/ResourceLoaderFoliageColormap.mapping new file mode 100644 index 0000000000..ca160f7bfc --- /dev/null +++ b/mappings/net/minecraft/client/resource/ResourceLoaderFoliageColormap.mapping @@ -0,0 +1,4 @@ +CLASS none/bxw net/minecraft/client/resource/ResourceLoaderFoliageColormap + FIELD a FOLIAGE_COLORMAP_LOC Lnone/kp; + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/net/minecraft/client/resource/ResourceLoaderGrassColormap.mapping b/mappings/net/minecraft/client/resource/ResourceLoaderGrassColormap.mapping new file mode 100644 index 0000000000..a6b8fb8e47 --- /dev/null +++ b/mappings/net/minecraft/client/resource/ResourceLoaderGrassColormap.mapping @@ -0,0 +1,4 @@ +CLASS none/bxx net/minecraft/client/resource/ResourceLoaderGrassColormap + FIELD a GRASS_COLORMAP_LOC Lnone/kp; + METHOD a onResourceReload (Lnone/bya;)V + ARG 0 container diff --git a/mappings/net/minecraft/client/util/TextureUtils.mapping b/mappings/net/minecraft/client/util/TextureUtils.mapping new file mode 100644 index 0000000000..970b942ecd --- /dev/null +++ b/mappings/net/minecraft/client/util/TextureUtils.mapping @@ -0,0 +1,10 @@ +CLASS none/bxe net/minecraft/client/util/TextureUtils + FIELD c LOGGER Lorg/apache/logging/log4j/Logger; + METHOD a ()I + METHOD a getBufferedImage (Ljava/io/InputStream;)Ljava/awt/image/BufferedImage; + ARG 0 stream + METHOD a getImagePixels (Lnone/bya;Lnone/kp;)[I + ARG 0 resourceContainer + ARG 1 location + METHOD b bindTexture (I)V + ARG 0 texId diff --git a/mappings/none/bdv.mapping b/mappings/none/bdv.mapping new file mode 100644 index 0000000000..618681c031 --- /dev/null +++ b/mappings/none/bdv.mapping @@ -0,0 +1,10 @@ +CLASS none/bdv + CLASS none/bdv$a AccountType + FIELD a LEGACY Lnone/bdv$a; + FIELD b MOJANG Lnone/bdv$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/bdv$a; + ARG 0 name diff --git a/mappings/none/bjk.mapping b/mappings/none/bjk.mapping index 95c6f42e67..921178d48b 100644 --- a/mappings/none/bjk.mapping +++ b/mappings/none/bjk.mapping @@ -1,3 +1,11 @@ CLASS none/bjk + CLASS none/bjk$a + FIELD a displayWidth I + FIELD b displayHeight I + FIELD c fullscreen Z + CLASS none/bjk$b + FIELD a runDirectory Ljava/io/File; CLASS none/bjk$c FIELD a isDemo Z + CLASS none/bjk$e + FIELD d netProxy Ljava/net/Proxy; diff --git a/mappings/none/bxe.mapping b/mappings/none/bxe.mapping deleted file mode 100644 index b4479dfe6e..0000000000 --- a/mappings/none/bxe.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/bxe - METHOD b bindTexture (I)V diff --git a/mappings/none/bxw.mapping b/mappings/none/bxw.mapping deleted file mode 100644 index bbbfcb1da4..0000000000 --- a/mappings/none/bxw.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bxw - METHOD a onResourceReload (Lnone/bya;)V - ARG 0 container diff --git a/mappings/none/bxx.mapping b/mappings/none/bxx.mapping deleted file mode 100644 index b6e5a8d394..0000000000 --- a/mappings/none/bxx.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS none/bxx - METHOD a onResourceReload (Lnone/bya;)V - ARG 0 container