From 157fa799b8d6f7ca8526761c179e26bd0de96b8c Mon Sep 17 00:00:00 2001 From: Redd Date: Thu, 1 Apr 2021 11:53:21 -0700 Subject: [PATCH] renamed BlockSoundGroup and Material related to Moss blocks (#2234) * renamed UNUSED_PLANT to MOSS as the block moss now uses the material * Update mappings/net/minecraft/block/Material.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Renamed to MOSS_BLOCK since moss carpets exist and dont use it * remove refrence to color * yes Co-authored-by: Deximus-Maximus * fix block sound group for moss blocks being called just "MOSS" similar to things like SNOW_BLOCK and MOSS_CARPET etc * undo saving for new pr * redo, was told this was fine so back to being good Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: Deximus-Maximus --- mappings/net/minecraft/block/Material.mapping | 4 ++-- mappings/net/minecraft/sound/BlockSoundGroup.mapping | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index 5a63c35ed2..5cfdf97ae3 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -11,8 +11,8 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material FIELD field_15919 PORTAL Lnet/minecraft/class_3614; COMMENT Material for the various portal blocks. FIELD field_15920 WATER Lnet/minecraft/class_3614; - FIELD field_15921 UNUSED_PLANT Lnet/minecraft/class_3614; - COMMENT Not in use, but has foliage color. + FIELD field_15921 MOSS_BLOCK Lnet/minecraft/class_3614; + COMMENT Material for full sized moss blocks. FIELD field_15922 LAVA Lnet/minecraft/class_3614; FIELD field_15923 LEAVES Lnet/minecraft/class_3614; FIELD field_15924 DECORATION Lnet/minecraft/class_3614; diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index 76f41f8d16..2f758391b5 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -72,7 +72,7 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup FIELD field_28694 AZALEA Lnet/minecraft/class_2498; FIELD field_28695 FLOWERING_AZALEA Lnet/minecraft/class_2498; FIELD field_28696 MOSS_CARPET Lnet/minecraft/class_2498; - FIELD field_28697 MOSS Lnet/minecraft/class_2498; + FIELD field_28697 MOSS_BLOCK Lnet/minecraft/class_2498; FIELD field_28698 BIG_DRIPLEAF Lnet/minecraft/class_2498; FIELD field_28699 SMALL_DRIPLEAF Lnet/minecraft/class_2498; FIELD field_28700 ROOTED_DIRT Lnet/minecraft/class_2498;