From febccc547744bfe31226a6d8dda2c7cd07601816 Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Mon, 19 Jul 2021 16:30:41 +0300 Subject: [PATCH] Color provider improvements (#2553) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../client/color/block/BlockColorProvider.mapping | 2 ++ .../net/minecraft/client/color/block/BlockColors.mapping | 9 +++++++-- .../client/color/item/ItemColorProvider.mapping | 2 ++ .../net/minecraft/client/color/item/ItemColors.mapping | 5 +++-- .../client/render/block/BlockModelRenderer.mapping | 4 ++-- .../minecraft/client/render/item/ItemRenderer.mapping | 4 ++-- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/mappings/net/minecraft/client/color/block/BlockColorProvider.mapping b/mappings/net/minecraft/client/color/block/BlockColorProvider.mapping index dbf37e4ec6..ae65aa1e9b 100644 --- a/mappings/net/minecraft/client/color/block/BlockColorProvider.mapping +++ b/mappings/net/minecraft/client/color/block/BlockColorProvider.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_322 net/minecraft/client/color/block/BlockColorProvider METHOD getColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I + COMMENT {@return the color of the block state for the specified tint index, + COMMENT or -1 if not tinted} ARG 1 state ARG 2 world ARG 3 pos diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping index 2fa4bd4890..e233446a30 100644 --- a/mappings/net/minecraft/client/color/block/BlockColors.mapping +++ b/mappings/net/minecraft/client/color/block/BlockColors.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors FIELD field_1995 providers Lnet/minecraft/class_2361; FIELD field_20271 properties Ljava/util/Map; + FIELD field_32163 NO_COLOR I METHOD method_1684 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I ARG 0 state ARG 1 world @@ -30,7 +31,11 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors METHOD method_1690 registerColorProvider (Lnet/minecraft/class_322;[Lnet/minecraft/class_2248;)V ARG 1 provider ARG 2 blocks - METHOD method_1691 getColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I + METHOD method_1691 getParticleColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I + COMMENT {@return the particle color of the block state} + COMMENT + COMMENT @implSpec If there's no color provider for the specified block, + COMMENT falls back to its map color. ARG 1 state ARG 2 world ARG 3 pos @@ -63,7 +68,7 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors ARG 1 state ARG 2 world ARG 3 pos - ARG 4 tint + ARG 4 tintIndex METHOD method_1698 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping b/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping index e0aa2d5c42..4c54d8a3ad 100644 --- a/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping +++ b/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_326 net/minecraft/client/color/item/ItemColorProvider METHOD getColor (Lnet/minecraft/class_1799;I)I + COMMENT {@return the color of the item stack for the specified tint index, + COMMENT or -1 if not tinted} ARG 1 stack ARG 2 tintIndex diff --git a/mappings/net/minecraft/client/color/item/ItemColors.mapping b/mappings/net/minecraft/client/color/item/ItemColors.mapping index c8672c2c12..a69c120800 100644 --- a/mappings/net/minecraft/client/color/item/ItemColors.mapping +++ b/mappings/net/minecraft/client/color/item/ItemColors.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_325 net/minecraft/client/color/item/ItemColors FIELD field_1996 providers Lnet/minecraft/class_2361; + FIELD field_32165 NO_COLOR I METHOD method_1699 (Lnet/minecraft/class_1826;Lnet/minecraft/class_1799;I)I ARG 1 stack ARG 2 tintIndex @@ -15,7 +16,7 @@ CLASS net/minecraft/class_325 net/minecraft/client/color/item/ItemColors METHOD method_1703 (Lnet/minecraft/class_1799;I)I ARG 0 stack ARG 1 tintIndex - METHOD method_1704 getColorMultiplier (Lnet/minecraft/class_1799;I)I + METHOD method_1704 getColor (Lnet/minecraft/class_1799;I)I ARG 1 item ARG 2 tintIndex METHOD method_1705 (Lnet/minecraft/class_1799;I)I @@ -27,7 +28,7 @@ CLASS net/minecraft/class_325 net/minecraft/client/color/item/ItemColors ARG 0 stack ARG 1 tintIndex METHOD method_1708 register (Lnet/minecraft/class_326;[Lnet/minecraft/class_1935;)V - ARG 1 mapper + ARG 1 provider ARG 2 items METHOD method_1709 (Lnet/minecraft/class_1799;I)I ARG 0 stack diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 8617155299..5c1ad78d62 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRenderer FIELD field_27743 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_32784 BRIGHTNESS_CACHE_MAX_SIZE I - FIELD field_4178 colorMap Lnet/minecraft/class_324; + FIELD field_4178 colors Lnet/minecraft/class_324; FIELD field_4179 brightnessCache Ljava/lang/ThreadLocal; METHOD (Lnet/minecraft/class_324;)V - ARG 1 colorMap + ARG 1 colors METHOD method_20544 enableBrightnessCache ()V METHOD method_20545 disableBrightnessCache ()V METHOD method_23073 renderQuad (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4588;Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_777;FFFFIIIII)V diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index b50426efa6..11c5de9ec5 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -7,11 +7,11 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer FIELD field_4729 textureManager Lnet/minecraft/class_1060; FIELD field_4730 zOffset F FIELD field_4732 models Lnet/minecraft/class_763; - FIELD field_4733 colorMap Lnet/minecraft/class_325; + FIELD field_4733 colors Lnet/minecraft/class_325; METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_1092;Lnet/minecraft/class_325;Lnet/minecraft/class_756;)V ARG 1 manager ARG 2 bakery - ARG 3 colorMap + ARG 3 colors ARG 4 builtinModelItemRenderer METHOD method_23177 renderItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;Lnet/minecraft/class_809$class_811;ZLnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1937;III)V ARG 1 entity