diff --git a/mappings/1.12-pre3-1409#1.12-pre4.tinydiff b/mappings/1.12-pre3-1409#1.12-pre4.tinydiff index 044f21af2..0f181b091 100644 --- a/mappings/1.12-pre3-1409#1.12-pre4.tinydiff +++ b/mappings/1.12-pre3-1409#1.12-pre4.tinydiff @@ -69,9 +69,9 @@ c net/minecraft/unmapped/C_1184371 p 2 p_2 p 3 p_3 c net/minecraft/unmapped/C_1241852 - m (Lnet/minecraft/unmapped/C_2441996;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMaterialColor + m (Lnet/minecraft/unmapped/C_2441996;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMapColor p 1 state - m (Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_8030141;Lnet/minecraft/unmapped/C_3674802;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMaterialColor + m (Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_8030141;Lnet/minecraft/unmapped/C_3674802;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMapColor p 1 state p 2 world p 3 pos diff --git a/mappings/1.3-pre-07261249.tiny b/mappings/1.3-pre-07261249.tiny index 276b6727e..5800b7748 100644 --- a/mappings/1.3-pre-07261249.tiny +++ b/mappings/1.3-pre-07261249.tiny @@ -32095,7 +32095,7 @@ c net/minecraft/unmapped/C_9330273 net/minecraft/client/gui/screen/menu/AddServe p 1 p_1 p 2 p_2 p 3 p_3 -c net/minecraft/unmapped/C_9335057 net/minecraft/block/material/MaterialColor +c net/minecraft/unmapped/C_9335057 net/minecraft/block/material/MapColor f [Lnet/minecraft/unmapped/C_9335057; f_2746235 BY_ID f Lnet/minecraft/unmapped/C_9335057; f_8898614 AIR f Lnet/minecraft/unmapped/C_9335057; f_8295641 GRASS diff --git a/mappings/1.8#1.8.1-pre1.tinydiff b/mappings/1.8#1.8.1-pre1.tinydiff index d35e2a93d..1d7352d59 100644 --- a/mappings/1.8#1.8.1-pre1.tinydiff +++ b/mappings/1.8#1.8.1-pre1.tinydiff @@ -122,16 +122,16 @@ c net/minecraft/unmapped/C_1184371 m (Lnet/minecraft/unmapped/C_2441996;)Lnet/minecraft/unmapped/C_9335057; m_3247759 m_3247759 p 1 p_1 c net/minecraft/unmapped/C_1241852 - f Lnet/minecraft/unmapped/C_9335057; f_5430725 materialColor + f Lnet/minecraft/unmapped/C_9335057; f_5430725 mapColor m (Lnet/minecraft/unmapped/C_8048208;Lnet/minecraft/unmapped/C_9335057;)V p 1 material - p 2 materialColor + p 2 mapColor m ()Ljava/lang/String; toString toString c net/minecraft/unmapped/C_1250582 m (Lnet/minecraft/unmapped/C_8048208;ZLnet/minecraft/unmapped/C_9335057;)V p 1 material p 2 sideVisible - p 3 color + p 3 mapColor c net/minecraft/unmapped/C_1308258 f Lnet/minecraft/unmapped/C_9335057; f_7679164 color m (Ljava/lang/String;IILjava/lang/String;)V @@ -168,7 +168,7 @@ c net/minecraft/unmapped/C_1420217 p 2 plant m (Lnet/minecraft/unmapped/C_8048208;Lnet/minecraft/unmapped/C_9335057;Lnet/minecraft/unmapped/C_1241852;)V p 1 material - p 2 color + p 2 mapColor p 3 plant m (Lnet/minecraft/unmapped/C_2441996;)Lnet/minecraft/unmapped/C_9335057; m_3247759 m_3247759 p 1 p_1 @@ -308,7 +308,7 @@ c net/minecraft/unmapped/C_2363721 m ()D m_7168636 m_7168636 c net/minecraft/unmapped/C_2367183 m (Lnet/minecraft/unmapped/C_9335057;)V - p 1 color + p 1 mapColor c net/minecraft/unmapped/C_2590170 m ()Ljava/lang/String; m_6124997 m_6124997 m (Lnet/minecraft/unmapped/C_2441996;)Lnet/minecraft/unmapped/C_9335057; m_3247759 m_3247759 diff --git a/mappings/13w41b-1523#13w42a.tinydiff b/mappings/13w41b-1523#13w42a.tinydiff index f7fba61cd..f67aac509 100644 --- a/mappings/13w41b-1523#13w42a.tinydiff +++ b/mappings/13w41b-1523#13w42a.tinydiff @@ -43,7 +43,7 @@ c net/minecraft/unmapped/C_0979881 p 0 min p 1 mag c net/minecraft/unmapped/C_1241852 - m (I)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMaterialColor + m (I)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMapColor p 1 metadata c net/minecraft/unmapped/C_1250058 m (Ljava/lang/String;DDDFFLnet/minecraft/unmapped/C_7541710;)V m_7675868 playSound diff --git a/mappings/14w11b#14w17a.tinydiff b/mappings/14w11b#14w17a.tinydiff index e6a5098ef..a07a8fbd9 100644 --- a/mappings/14w11b#14w17a.tinydiff +++ b/mappings/14w11b#14w17a.tinydiff @@ -2616,7 +2616,7 @@ c net/minecraft/unmapped/C_5291991 net/minecraft/item/DyeColor f I f_4462965 metadata f Ljava/lang/String; f_9296720 key f Ljava/lang/String; f_2263976 name - f Lnet/minecraft/unmapped/C_9335057; f_5934790 materialColor + f Lnet/minecraft/unmapped/C_9335057; f_5934790 mapColor f [Lnet/minecraft/unmapped/C_5291991; f_5282530 f_5282530 m ()[Lnet/minecraft/unmapped/C_5291991; values values m (Ljava/lang/String;)Lnet/minecraft/unmapped/C_5291991; valueOf valueOf @@ -2633,7 +2633,7 @@ c net/minecraft/unmapped/C_5291991 net/minecraft/item/DyeColor m ()I m_4341363 getMetadata m ()Ljava/lang/String; m_2184706 getKey m ()Ljava/lang/String; m_4912815 getName - m ()Lnet/minecraft/unmapped/C_9335057; m_3991275 getMaterialColor + m ()Lnet/minecraft/unmapped/C_9335057; m_3991275 getMapColor m (I)Lnet/minecraft/unmapped/C_5291991; m_3218730 byMetadata p 0 metadata m (I)Lnet/minecraft/unmapped/C_5291991; m_0483794 byId diff --git a/mappings/14w21b#14w25a.tinydiff b/mappings/14w21b#14w25a.tinydiff index 6684eabd8..d3cadb3c6 100644 --- a/mappings/14w21b#14w25a.tinydiff +++ b/mappings/14w21b#14w25a.tinydiff @@ -1017,7 +1017,7 @@ c net/minecraft/unmapped/C_1241852 f Z f_4597922 f_4597922 f Lnet/minecraft/unmapped/C_5307437; f_9229557 sprite f Lnet/minecraft/unmapped/C_1033240; f_7235510 REGISTRY - m (I)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMaterialColor + m (I)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMapColor p 1 metadata m (Lnet/minecraft/unmapped/C_8030141;Lnet/minecraft/unmapped/C_3674802;Lnet/minecraft/unmapped/C_3544601;)Lnet/minecraft/unmapped/C_5307437; m_6805487 getModelSprite p 1 world @@ -1165,7 +1165,7 @@ c net/minecraft/unmapped/C_1241852 p 1 loader m (Ljava/lang/String;)Ljava/util/List; m_3077591 getItemModelDefinitions p 1 definition - m (Lnet/minecraft/unmapped/C_2441996;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMaterialColor + m (Lnet/minecraft/unmapped/C_2441996;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMapColor p 1 state m ()Ljava/util/List; m_9547120 getModelDefinitions m (Lnet/minecraft/unmapped/C_5553933;Lnet/minecraft/unmapped/C_3674802;Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_5577922;Ljava/util/List;Lnet/minecraft/unmapped/C_0539808;)V m_6210370 addCollisions diff --git a/mappings/14w29b#14w30a.tinydiff b/mappings/14w29b#14w30a.tinydiff index 5b9094e50..f99e4fa1d 100644 --- a/mappings/14w29b#14w30a.tinydiff +++ b/mappings/14w29b#14w30a.tinydiff @@ -317,7 +317,7 @@ c net/minecraft/unmapped/C_5291991 p 4 metadata p 5 key p 6 name - p 7 materialColor + p 7 mapColor p 8 formatting c net/minecraft/unmapped/C_5362195 m ()Z m_6319368 m_6319368 diff --git a/mappings/17w17b#17w18a.tinydiff b/mappings/17w17b#17w18a.tinydiff index 3f4ed694e..0fc02a96b 100644 --- a/mappings/17w17b#17w18a.tinydiff +++ b/mappings/17w17b#17w18a.tinydiff @@ -341,7 +341,7 @@ c net/minecraft/unmapped/C_5286840 p 4 stateNbt m ()V c net/minecraft/unmapped/C_5291991 - f Lnet/minecraft/unmapped/C_9335057; f_5934790 materialColor + f Lnet/minecraft/unmapped/C_9335057; f_5934790 mapColor f I f_5934790 textureDiffuseColor m (Ljava/lang/String;IIILjava/lang/String;Ljava/lang/String;Lnet/minecraft/unmapped/C_9335057;Lnet/minecraft/unmapped/C_1945050;)V p 1 p_1 @@ -350,9 +350,9 @@ c net/minecraft/unmapped/C_5291991 p 4 metadata p 5 key p 6 name - p 7 materialColor + p 7 mapColor p 8 formatting - m ()Lnet/minecraft/unmapped/C_9335057; m_3991275 getMaterialColor + m ()Lnet/minecraft/unmapped/C_9335057; m_3991275 getMapColor m (Ljava/lang/String;IIILjava/lang/String;Ljava/lang/String;ILnet/minecraft/unmapped/C_1945050;)V p 1 p_1 p 2 p_2 diff --git a/mappings/17w49b#17w50a.tinydiff b/mappings/17w49b#17w50a.tinydiff index cef29649c..e669a33e9 100644 --- a/mappings/17w49b#17w50a.tinydiff +++ b/mappings/17w49b#17w50a.tinydiff @@ -84,7 +84,7 @@ c net/minecraft/unmapped/C_1250582 m (Lnet/minecraft/unmapped/C_8048208;ZLnet/minecraft/unmapped/C_9335057;)V p 1 material p 2 sideVisible - p 3 color + p 3 mapColor m (Lnet/minecraft/unmapped/C_8048208;)V p 1 p_1 m (Lnet/minecraft/unmapped/C_8048208;Lnet/minecraft/unmapped/C_9335057;)V diff --git a/mappings/18w01a#18w02a.tinydiff b/mappings/18w01a#18w02a.tinydiff index 6b76e8a71..4145f3dda 100644 --- a/mappings/18w01a#18w02a.tinydiff +++ b/mappings/18w01a#18w02a.tinydiff @@ -484,7 +484,7 @@ c net/minecraft/unmapped/C_1241852 f Z f_0168619 stats m (Lnet/minecraft/unmapped/C_8048208;Lnet/minecraft/unmapped/C_9335057;)V p 1 material - p 2 materialColor + p 2 mapColor m (Lnet/minecraft/unmapped/C_8048208;Lnet/minecraft/unmapped/C_9335057;Z)V p 1 material p 2 materialColor @@ -648,7 +648,7 @@ c net/minecraft/unmapped/C_1400640 c net/minecraft/unmapped/C_1420217 m (Lnet/minecraft/unmapped/C_8048208;Lnet/minecraft/unmapped/C_9335057;Lnet/minecraft/unmapped/C_1241852;)V p 1 material - p 2 color + p 2 mapColor p 3 plant m (Lnet/minecraft/unmapped/C_1241852;Lnet/minecraft/unmapped/C_1241852$C_6799794;)V p 1 plant @@ -915,7 +915,7 @@ c net/minecraft/unmapped/C_2363721 c net/minecraft/unmapped/C_2367183 m ()V m (Lnet/minecraft/unmapped/C_9335057;)V - p 1 color + p 1 mapColor m (Lnet/minecraft/unmapped/C_1241852$C_6799794;)V p 1 p_1 c net/minecraft/unmapped/C_2394761 diff --git a/mappings/18w15a#18w16a.tinydiff b/mappings/18w15a#18w16a.tinydiff index 99def4203..61fee700a 100644 --- a/mappings/18w15a#18w16a.tinydiff +++ b/mappings/18w15a#18w16a.tinydiff @@ -692,7 +692,7 @@ c net/minecraft/unmapped/C_1203332 p 2 p_2 p 3 p_3 c net/minecraft/unmapped/C_1241852 - m (Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_8030141;Lnet/minecraft/unmapped/C_3674802;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMaterialColor + m (Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_8030141;Lnet/minecraft/unmapped/C_3674802;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMapColor p 1 state p 2 world p 3 pos @@ -771,7 +771,7 @@ c net/minecraft/unmapped/C_1241852 p 2 world p 3 tooltip p 4 flag - m (Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_5250955;Lnet/minecraft/unmapped/C_3674802;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMaterialColor + m (Lnet/minecraft/unmapped/C_2441996;Lnet/minecraft/unmapped/C_5250955;Lnet/minecraft/unmapped/C_3674802;)Lnet/minecraft/unmapped/C_9335057; m_3247759 getMapColor p 1 state p 2 world p 3 pos diff --git a/mappings/b1.6-pre-trailer-server#b1.5_02-server.tinydiff b/mappings/b1.6-pre-trailer-server#b1.5_02-server.tinydiff index 387a6aa8d..8e41ae5c0 100644 --- a/mappings/b1.6-pre-trailer-server#b1.5_02-server.tinydiff +++ b/mappings/b1.6-pre-trailer-server#b1.5_02-server.tinydiff @@ -758,7 +758,7 @@ c net/minecraft/unmapped/C_8922447 p 3 p_3 p 4 p_4 p 5 p_5 -c net/minecraft/unmapped/C_9335057 net/minecraft/block/material/MaterialColor +c net/minecraft/unmapped/C_9335057 net/minecraft/block/material/MapColor f [Lnet/minecraft/unmapped/C_9335057; f_2746235 BY_ID f Lnet/minecraft/unmapped/C_9335057; f_8898614 AIR f Lnet/minecraft/unmapped/C_9335057; f_8295641 GRASS diff --git a/mappings/b1.6-tb3-client#b1.5_01-client.tinydiff b/mappings/b1.6-tb3-client#b1.5_01-client.tinydiff index e685083a5..85460596f 100644 --- a/mappings/b1.6-tb3-client#b1.5_01-client.tinydiff +++ b/mappings/b1.6-tb3-client#b1.5_01-client.tinydiff @@ -910,7 +910,7 @@ c net/minecraft/unmapped/C_8941619 c net/minecraft/unmapped/C_9236886 m (I)V m_1450705 m_1450705 p 0 p_0 -c net/minecraft/unmapped/C_9335057 net/minecraft/block/material/MaterialColor +c net/minecraft/unmapped/C_9335057 net/minecraft/block/material/MapColor f [Lnet/minecraft/unmapped/C_9335057; f_2746235 BY_ID f Lnet/minecraft/unmapped/C_9335057; f_8898614 AIR f Lnet/minecraft/unmapped/C_9335057; f_8295641 GRASS