From 8118ef4f3f1a9e899f4771e7de56b0431eb29a05 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 24 Aug 2016 15:41:16 +0200 Subject: [PATCH] map block/item color mappers --- .../net/minecraft/client/GlHandler.mapping | 7 ++ .../net/minecraft/client/Minecraft.mapping | 7 ++ .../{util => render}/FontRenderer.mapping | 15 +++- .../client/render/ItemRenderer.mapping | 2 + .../client/render/block/BlockColorMap.mapping | 72 +++++++++++++++++++ .../render/block/IBlockColorMapper.mapping | 5 ++ .../render/item/IItemColorMapper.mapping | 3 + .../client/render/item/ItemColorMap.mapping | 36 ++++++++++ mappings/none/bov.mapping | 9 +++ 9 files changed, 155 insertions(+), 1 deletion(-) rename mappings/net/minecraft/client/{util => render}/FontRenderer.mapping (58%) create mode 100644 mappings/net/minecraft/client/render/block/BlockColorMap.mapping create mode 100644 mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping create mode 100644 mappings/net/minecraft/client/render/item/IItemColorMapper.mapping create mode 100644 mappings/net/minecraft/client/render/item/ItemColorMap.mapping create mode 100644 mappings/none/bov.mapping diff --git a/mappings/net/minecraft/client/GlHandler.mapping b/mappings/net/minecraft/client/GlHandler.mapping index 4fa048fc76..d2b19b45bb 100644 --- a/mappings/net/minecraft/client/GlHandler.mapping +++ b/mappings/net/minecraft/client/GlHandler.mapping @@ -235,6 +235,10 @@ CLASS none/bos net/minecraft/client/GlHandler METHOD c fogEnd (F)V METHOD c translate (FFF)V METHOD c color (FFFF)V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha METHOD c depthFunc (I)V METHOD c fog (II)V METHOD c getTexLevelParameter (III)I @@ -245,6 +249,9 @@ CLASS none/bos net/minecraft/client/GlHandler METHOD d disableAlphaTest ()V METHOD d lineWidth (F)V METHOD d color (FFF)V + ARG 0 red + ARG 1 green + ARG 2 blue METHOD d blendEquation (I)V METHOD d polygonMode (II)V METHOD d vertexPointer (IIII)V diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index 52ff5a0041..b8dba6e344 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -9,12 +9,16 @@ CLASS none/bdo net/minecraft/client/Minecraft FIELD Z snooper Lnone/rj; FIELD aB defaultResourcePacks Ljava/util/List; FIELD aC mcResourcePack Lnone/bxr; + FIELD aF blockColorMap Lnone/bdx; + FIELD aG itemColorMap Lnone/bea; FIELD aI spriteAtlas Lnone/bxa; FIELD aM sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService; FIELD aP thread Ljava/lang/Thread; + FIELD ab itemRenderer Lnone/bto; FIELD aj server Lnone/caj; FIELD an netProxy Ljava/net/Proxy; FIELD av isDemo Z + FIELD az resourceManager Lnone/bxy; FIELD d width I FIELD e height I FIELD f world Lnone/bme; @@ -32,6 +36,7 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD I getCurrentTimeMillis ()J METHOD M getNetworkProxy ()Ljava/net/Proxy; METHOD N getTextureManager ()Lnone/bxc; + METHOD O getResourceManager ()Lnone/bya; METHOD R getSpriteAtlas ()Lnone/bxa; METHOD X getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD Z isSnooperEnabled ()Z @@ -43,6 +48,8 @@ CLASS none/bdo net/minecraft/client/Minecraft METHOD aB handleMouseEvents ()V METHOD aC doItemPick ()V METHOD aE isMainThread ()Z + METHOD ad getItemRenderer ()Lnone/bto; + METHOD ak getBlockColorMap ()Lnone/bdx; METHOD aw doAttack ()V METHOD ax doItemUse ()V METHOD az handleKeyboardEvents ()V diff --git a/mappings/net/minecraft/client/util/FontRenderer.mapping b/mappings/net/minecraft/client/render/FontRenderer.mapping similarity index 58% rename from mappings/net/minecraft/client/util/FontRenderer.mapping rename to mappings/net/minecraft/client/render/FontRenderer.mapping index 6148497c59..3caca8db2c 100644 --- a/mappings/net/minecraft/client/util/FontRenderer.mapping +++ b/mappings/net/minecraft/client/render/FontRenderer.mapping @@ -1,7 +1,17 @@ -CLASS none/bec net/minecraft/client/util/FontRenderer +CLASS none/bec net/minecraft/client/render/FontRenderer FIELD a FONT_HEIGHT I FIELD b rand Ljava/util/Random; + FIELD f chatColors [I + FIELD g fontTextureLoc Lnone/kp; + FIELD h textureManager Lnone/bxc; + FIELD m colorRed F + FIELD n colorGreen F + FIELD o colorBlue F + FIELD p colorAlpha F METHOD (Lnone/bdq;Lnone/kp;Lnone/bxc;Z)V + ARG 0 settings + ARG 1 fontTextureLoc + ARG 2 textureManager METHOD a getStringWidth (Ljava/lang/String;)I METHOD a drawString (Ljava/lang/String;FFI)I ARG 0 str @@ -21,3 +31,6 @@ CLASS none/bec net/minecraft/client/util/FontRenderer ARG 3 color METHOD a onResourceReload (Lnone/bya;)V ARG 0 container + METHOD b getChatColor (C)I + ARG 0 chr + METHOD c reloadFontTexture ()V diff --git a/mappings/net/minecraft/client/render/ItemRenderer.mapping b/mappings/net/minecraft/client/render/ItemRenderer.mapping index 6671565d1d..2b4f9cd037 100644 --- a/mappings/net/minecraft/client/render/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/ItemRenderer.mapping @@ -16,8 +16,10 @@ CLASS none/bto net/minecraft/client/render/ItemRenderer ARG 0 stasck FIELD b ENCHANTMENT_GLINT_TEX Lnone/kp; FIELD e textureManager Lnone/bxc; + FIELD f itemColorMap Lnone/bea; METHOD (Lnone/bxc;Lnone/bzn;Lnone/bea;)V ARG 0 textureManager + ARG 2 itemColorMap METHOD a registerItemModel (Lnone/aeo;ILjava/lang/String;)V ARG 0 item ARG 1 metadata diff --git a/mappings/net/minecraft/client/render/block/BlockColorMap.mapping b/mappings/net/minecraft/client/render/block/BlockColorMap.mapping new file mode 100644 index 0000000000..fdc3dad97d --- /dev/null +++ b/mappings/net/minecraft/client/render/block/BlockColorMap.mapping @@ -0,0 +1,72 @@ +CLASS none/bdx net/minecraft/client/render/block/BlockColorMap + CLASS none/bdx$1 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$2 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$3 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$4 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$5 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$6 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$7 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$8 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$9 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$10 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$11 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + CLASS none/bdx$12 + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + FIELD a mappers Lnone/cx; + METHOD a create ()Lnone/bdx; + METHOD a getMapColor (Lnone/asj;)I + ARG 0 state + METHOD a getRenderColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + METHOD a register (Lnone/bdw;[Lnone/akw;)V + ARG 0 mapper + ARG 1 blocks diff --git a/mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping b/mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping new file mode 100644 index 0000000000..d0b8cd6b14 --- /dev/null +++ b/mappings/net/minecraft/client/render/block/IBlockColorMapper.mapping @@ -0,0 +1,5 @@ +CLASS none/bdw net/minecraft/client/render/block/IBlockColorMapper + METHOD a getColor (Lnone/asj;Lnone/aiy;Lnone/cn;I)I + ARG 0 state + ARG 1 view + ARG 2 pos diff --git a/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping b/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping new file mode 100644 index 0000000000..0dd041adfc --- /dev/null +++ b/mappings/net/minecraft/client/render/item/IItemColorMapper.mapping @@ -0,0 +1,3 @@ +CLASS none/bdz net/minecraft/client/render/item/IItemColorMapper + METHOD a getColor (Lnone/aeq;I)I + ARG 0 stack diff --git a/mappings/net/minecraft/client/render/item/ItemColorMap.mapping b/mappings/net/minecraft/client/render/item/ItemColorMap.mapping new file mode 100644 index 0000000000..cfc7ca2417 --- /dev/null +++ b/mappings/net/minecraft/client/render/item/ItemColorMap.mapping @@ -0,0 +1,36 @@ +CLASS none/bea net/minecraft/client/render/item/ItemColorMap + CLASS none/bea$1 + METHOD a getColor (Lnone/aeq;I)I + ARG 0 stack + CLASS none/bea$2 + METHOD a getColor (Lnone/aeq;I)I + ARG 0 stack + CLASS none/bea$3 + METHOD a getColor (Lnone/aeq;I)I + ARG 0 stack + CLASS none/bea$4 + METHOD a getColor (Lnone/aeq;I)I + ARG 0 stack + CLASS none/bea$5 + METHOD a getColor (Lnone/aeq;I)I + ARG 0 stack + CLASS none/bea$6 + METHOD a getColor (Lnone/aeq;I)I + ARG 0 stack + CLASS none/bea$7 + METHOD a getColor (Lnone/aeq;I)I + ARG 0 stack + CLASS none/bea$8 + METHOD a getColor (Lnone/aeq;I)I + ARG 0 stack + FIELD a mappers Lnone/cx; + METHOD a getRenderColor (Lnone/aeq;I)I + ARG 0 stack + METHOD a create (Lnone/bdx;)Lnone/bea; + ARG 0 blockColors + METHOD a register (Lnone/bdz;[Lnone/aeo;)V + ARG 0 mapper + ARG 1 items + METHOD a register (Lnone/bdz;[Lnone/akw;)V + ARG 0 mapper + ARG 1 blocks diff --git a/mappings/none/bov.mapping b/mappings/none/bov.mapping new file mode 100644 index 0000000000..9f3f2f7991 --- /dev/null +++ b/mappings/none/bov.mapping @@ -0,0 +1,9 @@ +CLASS none/bov + METHOD b (Lnone/aeo;I)Lnone/bzj; + ARG 0 item + ARG 1 metadata + METHOD b getMetadata (Lnone/aeq;)I + ARG 0 stack + METHOD c getItemMetaPair (Lnone/aeo;I)I + ARG 0 item + ARG 1 metadata