From 39b54d09e26698949d5a22461791791044573d24 Mon Sep 17 00:00:00 2001 From: Deximus-Maximus Date: Thu, 5 Nov 2020 15:53:41 -0800 Subject: [PATCH] MaterialColor -> MapColor (#1397) * MaterialColor -> MapColor * MaterialColor -> MapColor * revert accidental rename * clarify hashmap vs item map * Update mappings/net/minecraft/block/MapColor.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/block/MapColor.mapping Co-authored-by: Chloe Dawn * change method names * Fix capitalization errors * implement feedback Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: Chloe Dawn --- mappings/net/minecraft/block/AbstractBlock.mapping | 14 +++++++------- .../{MaterialColor.mapping => MapColor.mapping} | 3 ++- mappings/net/minecraft/util/DyeColor.mapping | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) rename mappings/net/minecraft/block/{MaterialColor.mapping => MapColor.mapping} (94%) diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 408f6821fd..1a1108e7ae 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -37,7 +37,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 4 context METHOD method_26160 asBlock ()Lnet/minecraft/class_2248; METHOD method_26162 getLootTableId ()Lnet/minecraft/class_2960; - METHOD method_26403 getDefaultMaterialColor ()Lnet/minecraft/class_3620; + METHOD method_26403 getDefaultMapColor ()Lnet/minecraft/class_3620; METHOD method_8389 asItem ()Lnet/minecraft/class_1792; METHOD method_9498 hasComparatorOutput (Lnet/minecraft/class_2680;)Z ARG 1 state @@ -213,7 +213,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock CLASS class_2251 Settings FIELD field_10660 resistance F FIELD field_10661 randomTicks Z - FIELD field_10662 materialColorFactory Ljava/util/function/Function; + FIELD field_10662 mapColorProvider Ljava/util/function/Function; FIELD field_10663 luminance Ljava/util/function/ToIntFunction; FIELD field_10664 collidable Z FIELD field_10665 soundGroup Lnet/minecraft/class_2498; @@ -235,10 +235,10 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_25185 toolRequired Z METHOD (Lnet/minecraft/class_3614;Ljava/util/function/Function;)V ARG 1 material - ARG 2 materialColorFactory + ARG 2 mapColorProvider METHOD (Lnet/minecraft/class_3614;Lnet/minecraft/class_3620;)V ARG 1 material - ARG 2 materialColorFactory + ARG 2 mapColorProvider METHOD method_16228 dropsLike (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4970$class_2251; COMMENT Specifies that a block should drop the same items as a provided block. ARG 1 source @@ -270,7 +270,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 3 type METHOD method_26240 of (Lnet/minecraft/class_3614;Ljava/util/function/Function;)Lnet/minecraft/class_4970$class_2251; ARG 0 material - ARG 1 materialColor + ARG 1 mapColor METHOD method_26241 (Lnet/minecraft/class_3620;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3620; ARG 1 state METHOD method_26243 suffocates (Lnet/minecraft/class_4970$class_4973;)Lnet/minecraft/class_4970$class_2251; @@ -336,7 +336,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock FIELD field_23168 hasSidedTransparency Z FIELD field_23169 isAir Z FIELD field_23170 material Lnet/minecraft/class_3614; - FIELD field_23171 materialColor Lnet/minecraft/class_3620; + FIELD field_23171 mapColor Lnet/minecraft/class_3620; FIELD field_23172 hardness F FIELD field_23173 opaque Z FIELD field_23174 solidBlockPredicate Lnet/minecraft/class_4970$class_4973; @@ -495,7 +495,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 2 pos ARG 3 direction METHOD method_26204 getBlock ()Lnet/minecraft/class_2248; - METHOD method_26205 getTopMaterialColor (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3620; + METHOD method_26205 getMapColor (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3620; ARG 1 world ARG 2 pos METHOD method_26206 isSideSolidFullSquare (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/block/MaterialColor.mapping b/mappings/net/minecraft/block/MapColor.mapping similarity index 94% rename from mappings/net/minecraft/block/MaterialColor.mapping rename to mappings/net/minecraft/block/MapColor.mapping index fcf8e2ce9f..b3055bf4f2 100644 --- a/mappings/net/minecraft/block/MaterialColor.mapping +++ b/mappings/net/minecraft/block/MapColor.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_3620 net/minecraft/block/MaterialColor +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; FIELD field_15977 BROWN Lnet/minecraft/class_3620; FIELD field_15978 GRAY Lnet/minecraft/class_3620; diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 8e02d60afc..04b3c5665f 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor FIELD field_7948 name Ljava/lang/String; FIELD field_7949 color I FIELD field_7950 BY_FIREWORK_COLOR Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap; - FIELD field_7956 materialColor Lnet/minecraft/class_3620; + FIELD field_7956 mapColor Lnet/minecraft/class_3620; FIELD field_7959 VALUES [Lnet/minecraft/class_1767; FIELD field_7960 fireworkColor I FIELD field_7962 colorSwapped I @@ -13,7 +13,7 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor ARG 3 woolId ARG 4 name ARG 5 color - ARG 6 materialColor + ARG 6 mapColor ARG 7 fireworkColor ARG 8 signColor METHOD method_16357 getSignColor ()I @@ -28,4 +28,4 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor METHOD method_7793 byName (Ljava/lang/String;Lnet/minecraft/class_1767;)Lnet/minecraft/class_1767; ARG 0 name ARG 1 defaultColor - METHOD method_7794 getMaterialColor ()Lnet/minecraft/class_3620; + METHOD method_7794 getMapColor ()Lnet/minecraft/class_3620;