From 412a4678f01a776b2cf2768170372b589cd8a819 Mon Sep 17 00:00:00 2001 From: Chloe Dawn Date: Sun, 5 May 2019 23:24:22 +0100 Subject: [PATCH] Refactor color classes (#664) --- .../color/block/BlockColorProvider.mapping | 6 ++ .../client/color/block/BlockColors.mapping | 70 +++++++++++++++++++ .../color/item/ItemColorProvider.mapping | 4 ++ .../client/color/item/ItemColors.mapping | 34 +++++++++ .../client/color/world/BiomeColors.mapping | 28 ++++++++ .../world/FoliageColors.mapping} | 3 +- .../world/GrassColors.mapping} | 3 +- .../client/render/block/BiomeColors.mapping | 10 --- .../client/render/block/BlockColorMap.mapping | 9 --- .../render/block/BlockColorMapper.mapping | 5 -- .../client/render/item/ItemColorMap.mapping | 7 -- .../render/item/ItemColorMapper.mapping | 3 - 12 files changed, 146 insertions(+), 36 deletions(-) create mode 100644 mappings/net/minecraft/client/color/block/BlockColorProvider.mapping create mode 100644 mappings/net/minecraft/client/color/block/BlockColors.mapping create mode 100644 mappings/net/minecraft/client/color/item/ItemColorProvider.mapping create mode 100644 mappings/net/minecraft/client/color/item/ItemColors.mapping create mode 100644 mappings/net/minecraft/client/color/world/BiomeColors.mapping rename mappings/net/minecraft/client/{render/block/FoliageColorHandler.mapping => color/world/FoliageColors.mapping} (72%) rename mappings/net/minecraft/client/{render/block/GrassColorHandler.mapping => color/world/GrassColors.mapping} (59%) delete mode 100644 mappings/net/minecraft/client/render/block/BiomeColors.mapping delete mode 100644 mappings/net/minecraft/client/render/block/BlockColorMap.mapping delete mode 100644 mappings/net/minecraft/client/render/block/BlockColorMapper.mapping delete mode 100644 mappings/net/minecraft/client/render/item/ItemColorMap.mapping delete mode 100644 mappings/net/minecraft/client/render/item/ItemColorMapper.mapping diff --git a/mappings/net/minecraft/client/color/block/BlockColorProvider.mapping b/mappings/net/minecraft/client/color/block/BlockColorProvider.mapping new file mode 100644 index 0000000000..54043f630d --- /dev/null +++ b/mappings/net/minecraft/client/color/block/BlockColorProvider.mapping @@ -0,0 +1,6 @@ +CLASS cvu net/minecraft/client/color/block/BlockColorProvider + METHOD getColor (Lbvj;Lbgp;Lev;I)I + ARG 1 state + ARG 2 view + ARG 3 pos + ARG 4 tintIndex diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping new file mode 100644 index 0000000000..4bb2cc12b9 --- /dev/null +++ b/mappings/net/minecraft/client/color/block/BlockColors.mapping @@ -0,0 +1,70 @@ +CLASS cvv net/minecraft/client/color/block/BlockColors + FIELD a providers Lfe; + METHOD a create ()Lcvv; + METHOD a getColorMultiplier (Lbvj;Lbgp;Lev;I)I + ARG 1 state + ARG 2 view + ARG 3 pos + ARG 4 tint + METHOD a getColor (Lbvj;Lbhh;Lev;)I + ARG 1 state + ARG 2 world + ARG 3 pos + METHOD a register (Lcvu;[Lbml;)V + ARG 1 provider + ARG 2 blocks + METHOD b (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD c (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD d (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD e (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD f (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD g (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD h (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD i (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD j (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD k (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex + METHOD l (Lbvj;Lbgp;Lev;I)I + ARG 0 state + ARG 1 view + ARG 2 pos + ARG 3 tintIndex diff --git a/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping b/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping new file mode 100644 index 0000000000..339d3e005e --- /dev/null +++ b/mappings/net/minecraft/client/color/item/ItemColorProvider.mapping @@ -0,0 +1,4 @@ +CLASS cvx net/minecraft/client/color/item/ItemColorProvider + METHOD getColor (Lbca;I)I + 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 new file mode 100644 index 0000000000..6d4bbb4a8e --- /dev/null +++ b/mappings/net/minecraft/client/color/item/ItemColors.mapping @@ -0,0 +1,34 @@ +CLASS cvy net/minecraft/client/color/item/ItemColors + FIELD a providers Lfe; + METHOD a getColorMultiplier (Lbca;I)I + ARG 1 item + ARG 2 tintIndex + METHOD a (Lbcy;Lbca;I)I + ARG 1 stack + ARG 2 tintIndex + METHOD a create (Lcvv;)Lcvy; + ARG 0 blockColors + METHOD a (Lcvv;Lbca;I)I + ARG 1 stack + ARG 2 tintIndex + METHOD a register (Lcvx;[Lbhg;)V + ARG 1 mapper + ARG 2 items + METHOD b (Lbca;I)I + ARG 0 stack + ARG 1 tintIndex + METHOD c (Lbca;I)I + ARG 0 stack + ARG 1 tintIndex + METHOD d (Lbca;I)I + ARG 0 stack + ARG 1 tintIndex + METHOD e (Lbca;I)I + ARG 0 stack + ARG 1 tintIndex + METHOD f (Lbca;I)I + ARG 0 stack + ARG 1 tintIndex + METHOD g (Lbca;I)I + ARG 0 stack + ARG 1 tintIndex diff --git a/mappings/net/minecraft/client/color/world/BiomeColors.mapping b/mappings/net/minecraft/client/color/world/BiomeColors.mapping new file mode 100644 index 0000000000..d1e770d063 --- /dev/null +++ b/mappings/net/minecraft/client/color/world/BiomeColors.mapping @@ -0,0 +1,28 @@ +CLASS dka net/minecraft/client/color/world/BiomeColors + CLASS dka$a Provider + METHOD getColor (Lbie;Lev;)I + ARG 1 biome + ARG 2 pos + FIELD a GRASS_COLOR Ldka$a; + FIELD b FOLIAGE_COLOR Ldka$a; + FIELD c WATER_COLOR Ldka$a; + FIELD d WATER_FOG_COLOR Ldka$a; + METHOD a getGrassColor (Lbgp;Lev;)I + ARG 0 view + ARG 1 pos + METHOD a getColor (Lbgp;Lev;Ldka$a;)I + ARG 0 view + ARG 1 pos + ARG 2 provider + METHOD a (Lbie;Lev;)I + ARG 0 biome + ARG 1 pos + METHOD b getFoliageColor (Lbgp;Lev;)I + ARG 0 view + ARG 1 pos + METHOD b (Lbie;Lev;)I + ARG 0 biome + ARG 1 pos + METHOD c getWaterColor (Lbgp;Lev;)I + ARG 0 view + ARG 1 pos diff --git a/mappings/net/minecraft/client/render/block/FoliageColorHandler.mapping b/mappings/net/minecraft/client/color/world/FoliageColors.mapping similarity index 72% rename from mappings/net/minecraft/client/render/block/FoliageColorHandler.mapping rename to mappings/net/minecraft/client/color/world/FoliageColors.mapping index d66717286b..d095b8a04a 100644 --- a/mappings/net/minecraft/client/render/block/FoliageColorHandler.mapping +++ b/mappings/net/minecraft/client/color/world/FoliageColors.mapping @@ -1,8 +1,9 @@ -CLASS bhb net/minecraft/client/render/block/FoliageColorHandler +CLASS bhb net/minecraft/client/color/world/FoliageColors FIELD a colorMap [I METHOD a getSpruceColor ()I METHOD a getColor (DD)I ARG 0 temperature + ARG 2 humidity METHOD a setColorMap ([I)V ARG 0 pixels METHOD b getBirchColor ()I diff --git a/mappings/net/minecraft/client/render/block/GrassColorHandler.mapping b/mappings/net/minecraft/client/color/world/GrassColors.mapping similarity index 59% rename from mappings/net/minecraft/client/render/block/GrassColorHandler.mapping rename to mappings/net/minecraft/client/color/world/GrassColors.mapping index d386b06697..aae1abbc38 100644 --- a/mappings/net/minecraft/client/render/block/GrassColorHandler.mapping +++ b/mappings/net/minecraft/client/color/world/GrassColors.mapping @@ -1,6 +1,7 @@ -CLASS bhf net/minecraft/client/render/block/GrassColorHandler +CLASS bhf net/minecraft/client/color/world/GrassColors FIELD a colorMap [I METHOD a getColor (DD)I ARG 0 temperature + ARG 2 humidity METHOD a setColorMap ([I)V ARG 0 map diff --git a/mappings/net/minecraft/client/render/block/BiomeColors.mapping b/mappings/net/minecraft/client/render/block/BiomeColors.mapping deleted file mode 100644 index f06d5e5f58..0000000000 --- a/mappings/net/minecraft/client/render/block/BiomeColors.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS dka net/minecraft/client/render/block/BiomeColors - CLASS dka$a Proxy - FIELD a GRASS_COLOR Ldka$a; - FIELD b FOLIAGE_COLOR Ldka$a; - FIELD c WATER_COLOR Ldka$a; - FIELD d WATER_FOG_COLOR Ldka$a; - METHOD a grassColorAt (Lbgp;Lev;)I - METHOD a colorAt (Lbgp;Lev;Ldka$a;)I - METHOD b foliageColorAt (Lbgp;Lev;)I - METHOD c waterColorAt (Lbgp;Lev;)I diff --git a/mappings/net/minecraft/client/render/block/BlockColorMap.mapping b/mappings/net/minecraft/client/render/block/BlockColorMap.mapping deleted file mode 100644 index 8c3f5d9b79..0000000000 --- a/mappings/net/minecraft/client/render/block/BlockColorMap.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS cvv net/minecraft/client/render/block/BlockColorMap - FIELD a mappers Lfe; - METHOD a create ()Lcvv; - METHOD a getRenderColor (Lbvj;Lbgp;Lev;I)I - ARG 1 state - ARG 2 view - ARG 3 pos - METHOD a register (Lcvu;[Lbml;)V - ARG 1 mapper diff --git a/mappings/net/minecraft/client/render/block/BlockColorMapper.mapping b/mappings/net/minecraft/client/render/block/BlockColorMapper.mapping deleted file mode 100644 index e9e96436d6..0000000000 --- a/mappings/net/minecraft/client/render/block/BlockColorMapper.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS cvu net/minecraft/client/render/block/BlockColorMapper - METHOD getColor (Lbvj;Lbgp;Lev;I)I - ARG 1 state - ARG 2 view - ARG 3 pos diff --git a/mappings/net/minecraft/client/render/item/ItemColorMap.mapping b/mappings/net/minecraft/client/render/item/ItemColorMap.mapping deleted file mode 100644 index 97003bf462..0000000000 --- a/mappings/net/minecraft/client/render/item/ItemColorMap.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS cvy net/minecraft/client/render/item/ItemColorMap - FIELD a mappers Lfe; - METHOD a getRenderColor (Lbca;I)I - ARG 1 item - METHOD a create (Lcvv;)Lcvy; - METHOD a register (Lcvx;[Lbhg;)V - ARG 1 mapper diff --git a/mappings/net/minecraft/client/render/item/ItemColorMapper.mapping b/mappings/net/minecraft/client/render/item/ItemColorMapper.mapping deleted file mode 100644 index e18b60f0cb..0000000000 --- a/mappings/net/minecraft/client/render/item/ItemColorMapper.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS cvx net/minecraft/client/render/item/ItemColorMapper - METHOD getColor (Lbca;I)I - ARG 1 stack