From b80c72911d34c9f76e3fe86cc74f3c51d4b0b825 Mon Sep 17 00:00:00 2001 From: Deximus-Maximus Date: Sun, 3 Jan 2021 12:54:52 -0800 Subject: [PATCH] Update MapColor field names (#1849) * Update MapColor field names * Update mappings/net/minecraft/block/MapColor.mapping Co-authored-by: i509VCB * Update mappings/net/minecraft/block/MapColor.mapping Co-authored-by: YanisBft * Update mappings/net/minecraft/block/MapColor.mapping Co-authored-by: YanisBft * Update mappings/net/minecraft/block/MapColor.mapping Co-authored-by: YanisBft * Update mappings/net/minecraft/block/MapColor.mapping Co-authored-by: YanisBft * Update mappings/net/minecraft/block/MapColor.mapping Co-authored-by: YanisBft * Update mappings/net/minecraft/block/MapColor.mapping Co-authored-by: YanisBft * Update MapColor.mapping * Update MapColor.mapping Co-authored-by: Kevin Eastridge Co-authored-by: i509VCB Co-authored-by: YanisBft --- mappings/net/minecraft/block/MapColor.mapping | 84 ++++++++++--------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/mappings/net/minecraft/block/MapColor.mapping b/mappings/net/minecraft/block/MapColor.mapping index 2ddfdcd791..139fe72ded 100644 --- a/mappings/net/minecraft/block/MapColor.mapping +++ b/mappings/net/minecraft/block/MapColor.mapping @@ -1,67 +1,69 @@ CLASS net/minecraft/class_3620 net/minecraft/block/MapColor COMMENT Represents the surface color of a block when rendered from the {@link net.minecraft.client.gui.MapRenderer}. - FIELD field_15976 CLAY Lnet/minecraft/class_3620; + COMMENT Color names refer to a material or an object which refers to their vanilla Minecraft textures, not their real-world counterparts, eg. "emerald green". + COMMENT Names are in the form of either blockReference_baseColor or color. + FIELD field_15976 LIGHT_BLUE_GRAY Lnet/minecraft/class_3620; FIELD field_15977 BROWN Lnet/minecraft/class_3620; FIELD field_15978 GRAY Lnet/minecraft/class_3620; - FIELD field_15979 WEB Lnet/minecraft/class_3620; - FIELD field_15980 LAPIS Lnet/minecraft/class_3620; - FIELD field_15981 ORANGE_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15982 RED_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15983 DIAMOND Lnet/minecraft/class_3620; + FIELD field_15979 WHITE_GRAY Lnet/minecraft/class_3620; + FIELD field_15980 LAPIS_BLUE Lnet/minecraft/class_3620; + FIELD field_15981 TERRACOTTA_ORANGE Lnet/minecraft/class_3620; + FIELD field_15982 TERRACOTTA_RED Lnet/minecraft/class_3620; + FIELD field_15983 DIAMOND_BLUE Lnet/minecraft/class_3620; FIELD field_15984 BLUE Lnet/minecraft/class_3620; - FIELD field_15985 MAGENTA_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15986 SAND Lnet/minecraft/class_3620; + FIELD field_15985 TERRACOTTA_MAGENTA Lnet/minecraft/class_3620; + FIELD field_15986 PALE_YELLOW Lnet/minecraft/class_3620; FIELD field_15987 ORANGE Lnet/minecraft/class_3620; - FIELD field_15988 LIGHT_GRAY_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15989 PINK_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15990 CYAN_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15991 LIGHT_BLUE_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_15992 BROWN_TERRACOTTA Lnet/minecraft/class_3620; + FIELD field_15988 TERRACOTTA_LIGHT_GRAY Lnet/minecraft/class_3620; + FIELD field_15989 TERRACOTTA_PINK Lnet/minecraft/class_3620; + FIELD field_15990 TERRACOTTA_CYAN Lnet/minecraft/class_3620; + FIELD field_15991 TERRACOTTA_LIGHT_BLUE Lnet/minecraft/class_3620; + FIELD field_15992 TERRACOTTA_BROWN Lnet/minecraft/class_3620; FIELD field_15993 LIGHT_GRAY Lnet/minecraft/class_3620; FIELD field_15994 GOLD Lnet/minecraft/class_3620; FIELD field_15995 GREEN Lnet/minecraft/class_3620; - FIELD field_15996 WOOD Lnet/minecraft/class_3620; + FIELD field_15996 OAK_TAN Lnet/minecraft/class_3620; FIELD field_15997 LIME Lnet/minecraft/class_3620; FIELD field_15998 MAGENTA Lnet/minecraft/class_3620; - FIELD field_15999 GRASS Lnet/minecraft/class_3620; - FIELD field_16000 DIRT Lnet/minecraft/class_3620; - FIELD field_16001 EMERALD Lnet/minecraft/class_3620; - FIELD field_16002 LAVA Lnet/minecraft/class_3620; - FIELD field_16003 WHITE_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16004 FOLIAGE Lnet/minecraft/class_3620; - FIELD field_16005 IRON Lnet/minecraft/class_3620; + FIELD field_15999 PALE_GREEN Lnet/minecraft/class_3620; + FIELD field_16000 DIRT_BROWN Lnet/minecraft/class_3620; + FIELD field_16001 EMERALD_GREEN Lnet/minecraft/class_3620; + FIELD field_16002 BRIGHT_RED Lnet/minecraft/class_3620; + FIELD field_16003 TERRACOTTA_WHITE Lnet/minecraft/class_3620; + FIELD field_16004 DARK_GREEN Lnet/minecraft/class_3620; + FIELD field_16005 IRON_GRAY Lnet/minecraft/class_3620; FIELD field_16006 COLORS [Lnet/minecraft/class_3620; - FIELD field_16007 BLACK_TERRACOTTA Lnet/minecraft/class_3620; + FIELD field_16007 TERRACOTTA_BLACK Lnet/minecraft/class_3620; FIELD field_16008 CLEAR Lnet/minecraft/class_3620; FIELD field_16009 BLACK Lnet/minecraft/class_3620; FIELD field_16010 YELLOW Lnet/minecraft/class_3620; FIELD field_16011 color I - FIELD field_16012 NETHER Lnet/minecraft/class_3620; - FIELD field_16013 YELLOW_TERRACOTTA Lnet/minecraft/class_3620; + FIELD field_16012 DARK_RED Lnet/minecraft/class_3620; + FIELD field_16013 TERRACOTTA_YELLOW Lnet/minecraft/class_3620; FIELD field_16014 PURPLE Lnet/minecraft/class_3620; - FIELD field_16015 BLUE_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16016 ICE Lnet/minecraft/class_3620; - FIELD field_16017 SPRUCE Lnet/minecraft/class_3620; - FIELD field_16018 LIME_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16019 WATER Lnet/minecraft/class_3620; + FIELD field_16015 TERRACOTTA_BLUE Lnet/minecraft/class_3620; + FIELD field_16016 PALE_PURPLE Lnet/minecraft/class_3620; + FIELD field_16017 SPRUCE_BROWN Lnet/minecraft/class_3620; + FIELD field_16018 TERRACOTTA_LIME Lnet/minecraft/class_3620; + FIELD field_16019 WATER_BLUE Lnet/minecraft/class_3620; FIELD field_16020 RED Lnet/minecraft/class_3620; FIELD field_16021 id I FIELD field_16022 WHITE Lnet/minecraft/class_3620; - FIELD field_16023 STONE Lnet/minecraft/class_3620; + FIELD field_16023 STONE_GRAY Lnet/minecraft/class_3620; FIELD field_16024 LIGHT_BLUE Lnet/minecraft/class_3620; - FIELD field_16025 QUARTZ Lnet/minecraft/class_3620; + FIELD field_16025 OFF_WHITE Lnet/minecraft/class_3620; FIELD field_16026 CYAN Lnet/minecraft/class_3620; - FIELD field_16027 GRAY_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16028 GREEN_TERRACOTTA Lnet/minecraft/class_3620; - FIELD field_16029 PURPLE_TERRACOTTA Lnet/minecraft/class_3620; + FIELD field_16027 TERRACOTTA_GRAY Lnet/minecraft/class_3620; + FIELD field_16028 TERRACOTTA_GREEN Lnet/minecraft/class_3620; + FIELD field_16029 TERRACOTTA_PURPLE Lnet/minecraft/class_3620; FIELD field_16030 PINK Lnet/minecraft/class_3620; - FIELD field_25702 CRIMSON_NYLIUM Lnet/minecraft/class_3620; - FIELD field_25703 CRIMSON_STEM Lnet/minecraft/class_3620; - FIELD field_25704 CRIMSON_HYPHAE Lnet/minecraft/class_3620; - FIELD field_25705 WARPED_NYLIUM Lnet/minecraft/class_3620; - FIELD field_25706 WARPED_STEM Lnet/minecraft/class_3620; - FIELD field_25707 WARPED_HYPHAE Lnet/minecraft/class_3620; - FIELD field_25708 WARPED_WART Lnet/minecraft/class_3620; + FIELD field_25702 DULL_RED Lnet/minecraft/class_3620; + FIELD field_25703 DULL_PINK Lnet/minecraft/class_3620; + FIELD field_25704 DARK_CRIMSON Lnet/minecraft/class_3620; + FIELD field_25705 TEAL Lnet/minecraft/class_3620; + FIELD field_25706 DARK_AQUA Lnet/minecraft/class_3620; + FIELD field_25707 DARK_DULL_PINK Lnet/minecraft/class_3620; + FIELD field_25708 BRIGHT_TEAL Lnet/minecraft/class_3620; METHOD (II)V ARG 1 id ARG 2 color