From ca79a51a1a1ea534659028b4218b8907eec3037c Mon Sep 17 00:00:00 2001 From: Deximus-Maximus Date: Fri, 15 May 2020 11:39:10 -0400 Subject: [PATCH] Material Name Improvements (#1190) * Begin refactor work: Sand -> Aggregate Underwater Plant -> Aquatic Plant Bamboo Sapling -> Bamboo Shoot Part -> Decoration Packed Ice -> Dense Ice Organic -> Fodder Pumpkin -> Gourd Clay -> Mob Derived Anvil -> Repair Station Seagrass -> Replaceable Aquatic Plant Snow -> Snow Layer Earth -> Topsoil * Undo Sapling -> Shoot * AQUATIC -> UNDERWATER to account for lily pad being under PLANT * Add javadocs for material names * Update javadoc based on comments * Update JD based on feedback Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Update JD based on feedback Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Update JD based on feedback Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Update JD based on feedback Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Remove errant comment Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Add missing punctuation Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Fix errant JD Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Remove unneeded javadoc Added previous name to javadoc * Remove old names JD * Remove missed old name Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Fix link format Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Implement feedback * FODDER -> SOLID_ORGANIC * update JD * Fix JD typo Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * SUB -> Partial Update stone JD * Fix outdated JD * Fix JD link for ICE Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Add missing punctuation Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Explicitly state block in JD 1 Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Explicitly state block in JD Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Add skulls to JD for PARTIAL_BLOCK Co-Authored-By: Yanis48 * Update JD names on NETHER_WOOD Adds hyphae Co-Authored-By: Yanis48 * MOB_DERIVED -> ORGANIC_PRODUCT * PARTIAL_BLOCK -> SUPPORTED * TOPSOIL -> SOIL * Simplify organic product JD Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: Yanis48 --- mappings/net/minecraft/block/Material.mapping | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index 16bed4d80e..f0819382dc 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -3,54 +3,76 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material FIELD field_15912 breakByHand Z FIELD field_15913 COBWEB Lnet/minecraft/class_3614; FIELD field_15914 STONE Lnet/minecraft/class_3614; + COMMENT Material for blocks that are stone or made from it, and generally prefer to be broken by a pickaxe. FIELD field_15915 BUBBLE_COLUMN Lnet/minecraft/class_3614; - FIELD field_15916 SAND Lnet/minecraft/class_3614; + FIELD field_15916 AGGREGATE Lnet/minecraft/class_3614; + COMMENT A material or structure formed from a loosely compacted mass of fragments or particles. FIELD field_15917 SPONGE Lnet/minecraft/class_3614; FIELD field_15918 REDSTONE_LAMP Lnet/minecraft/class_3614; 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_15922 LAVA Lnet/minecraft/class_3614; FIELD field_15923 LEAVES Lnet/minecraft/class_3614; - FIELD field_15924 PART Lnet/minecraft/class_3614; + FIELD field_15924 SUPPORTED Lnet/minecraft/class_3614; + COMMENT Material for blocks that require a supporting block such as redstone components, torches, flower pots, and skulls. FIELD field_15925 CACTUS Lnet/minecraft/class_3614; - FIELD field_15926 SEAGRASS Lnet/minecraft/class_3614; + FIELD field_15926 REPLACEABLE_UNDERWATER_PLANT Lnet/minecraft/class_3614; FIELD field_15927 STRUCTURE_VOID Lnet/minecraft/class_3614; - FIELD field_15928 PACKED_ICE Lnet/minecraft/class_3614; + COMMENT Material for structure void block. + FIELD field_15928 DENSE_ICE Lnet/minecraft/class_3614; + COMMENT Material for ice blocks that do not melt. See {@link #ICE} for meltable ice. FIELD field_15929 liquid Z FIELD field_15930 EGG Lnet/minecraft/class_3614; + COMMENT Material for egg blocks, such as dragon and turtle eggs. FIELD field_15931 WOOL Lnet/minecraft/class_3614; + COMMENT Material for wool and bed blocks. FIELD field_15932 WOOD Lnet/minecraft/class_3614; + COMMENT Material for wood logs, and things crafted from them. FIELD field_15933 PISTON Lnet/minecraft/class_3614; FIELD field_15934 SNOW_BLOCK Lnet/minecraft/class_3614; + COMMENT Material for full sized snow blocks. FIELD field_15935 PLANT Lnet/minecraft/class_3614; - FIELD field_15936 CLAY Lnet/minecraft/class_3614; + COMMENT Material for plants such as flowers and crops + FIELD field_15936 ORGANIC_PRODUCT Lnet/minecraft/class_3614; + COMMENT Material for blocks that come from mobs such as honey, slime, or infested blocks. Includes clay but not bone blocks. FIELD field_15937 CAKE Lnet/minecraft/class_3614; FIELD field_15938 BAMBOO_SAPLING Lnet/minecraft/class_3614; FIELD field_15939 blocksLight Z FIELD field_15940 blocksMovement Z - FIELD field_15941 EARTH Lnet/minecraft/class_3614; + FIELD field_15941 SOIL Lnet/minecraft/class_3614; + COMMENT Material for the top layer of soil. Path, dirt, podzol, soul soil, farmland and similar. FIELD field_15942 GLASS Lnet/minecraft/class_3614; + COMMENT Material for glass and glass-like blocks (includes sea lanterns and conduits). FIELD field_15943 FIRE Lnet/minecraft/class_3614; FIELD field_15944 color Lnet/minecraft/class_3620; - FIELD field_15945 ORGANIC Lnet/minecraft/class_3614; + FIELD field_15945 SOLID_ORGANIC Lnet/minecraft/class_3614; + COMMENT Organic blocks that are solid, including hay, target, and grass blocks. FIELD field_15946 BAMBOO Lnet/minecraft/class_3614; FIELD field_15947 UNDERWATER_PLANT Lnet/minecraft/class_3614; - FIELD field_15948 SNOW Lnet/minecraft/class_3614; - FIELD field_15949 ANVIL Lnet/minecraft/class_3614; + COMMENT Material for underwater plants without the replaceable property. + FIELD field_15948 SNOW_LAYER Lnet/minecraft/class_3614; + COMMENT Material for non-full blocks of snow. Has the replaceable property. + FIELD field_15949 REPAIR_STATION Lnet/minecraft/class_3614; + COMMENT Material for blocks that can repair tools, including grindstone and anvils. FIELD field_15950 replaceable Z FIELD field_15951 burnable Z FIELD field_15952 BARRIER Lnet/minecraft/class_3614; FIELD field_15953 METAL Lnet/minecraft/class_3614; - FIELD field_15954 PUMPKIN Lnet/minecraft/class_3614; + FIELD field_15954 GOURD Lnet/minecraft/class_3614; + COMMENT Material for gourds. Includes the carved pumpkin and jack o' lantern. FIELD field_15955 TNT Lnet/minecraft/class_3614; FIELD field_15956 REPLACEABLE_PLANT Lnet/minecraft/class_3614; FIELD field_15957 CARPET Lnet/minecraft/class_3614; FIELD field_15958 ICE Lnet/minecraft/class_3614; + COMMENT Material for ice that can melt. See {@link #DENSE_ICE} for unmeltable ice. FIELD field_15959 AIR Lnet/minecraft/class_3614; FIELD field_15960 pistonBehavior Lnet/minecraft/class_3619; FIELD field_17008 SHULKER_BOX Lnet/minecraft/class_3614; FIELD field_22223 NETHER_WOOD Lnet/minecraft/class_3614; + COMMENT Material for blocks crafted from Nether stems and hyphae. METHOD (Lnet/minecraft/class_3620;ZZZZZZZLnet/minecraft/class_3619;)V ARG 1 color ARG 2 liquid