Skip to content

Commit

Permalink
fix AbstractFurnaceBlockEntity regression
Browse files Browse the repository at this point in the history
  • Loading branch information
maloryware authored Feb 16, 2025
1 parent ec69570 commit 078b2e4
Showing 1 changed file with 3 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@ CLASS net/minecraft/unmapped/C_dlxbwxyf net/minecraft/block/entity/AbstractFurna
FIELD f_nqwyvoxy TOTAL_COOK_TIME_DATA I
FIELD f_rhexgeen recipeCache Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;
FIELD f_ruznenwn INPUT_SLOT I
FIELD f_tkkblcco cookTime I
FIELD f_uunwympm BURN_TIME_DATA I
FIELD f_vmpcjcui recipesUsed Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;
FIELD f_vnrsgghy COOK_TIME_DATA I
FIELD f_xyumtyfp DATA_VALUES I
FIELD f_ymhvwhvo inventory Lnet/minecraft/unmapped/C_rnrfftze;
FIELD f_ysaxjtrm fuelTime I
FIELD f_zhglmnwy burnTime I
METHOD <init> (Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rhnqznys;)V
ARG 1 blockEntityType
ARG 2 pos
Expand Down

3 comments on commit 078b2e4

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 078b2e4, 14 file(s) were updated with 735 line(s) added and 1045 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):
diff -bur namedTargetSrc/net/minecraft/block/AbstractBlock.java namedSrc/net/minecraft/block/AbstractBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBlock.java	2025-02-16 23:42:20.183439350 +0000
+++ namedSrc/net/minecraft/block/AbstractBlock.java	2025-02-16 23:41:16.208076664 +0000
@@ -54,7 +54,6 @@
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.State;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_vhpmxtfv;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -717,10 +716,10 @@
 
    /**
     * @mapping {@literal hashed m_ixssdaxe Lnet/minecraft/unmapped/C_triydqro;m_ixssdaxe()Lnet/minecraft/unmapped/C_vhpmxtfv;}
-    * @mapping {@literal named getDefaultMapColor Lnet/minecraft/block/AbstractBlock;getDefaultMapColor()Lnet/minecraft/unmapped/C_vhpmxtfv;}
+    * @mapping {@literal named getDefaultMapColor Lnet/minecraft/block/AbstractBlock;getDefaultMapColor()Lnet/minecraft/block/MapColor;}
     */
-   public C_vhpmxtfv getDefaultMapColor() {
-      return (C_vhpmxtfv)this.settings.mapColorGetter.apply(this.asBlock().getDefaultState());
+   public MapColor getDefaultMapColor() {
+      return (MapColor)this.settings.mapColorGetter.apply(this.asBlock().getDefaultState());
    }
 
    /**
@@ -794,9 +793,9 @@
       private final PistonBehavior pistonBehavior;
       /**
        * @mapping {@literal hashed f_zpvdfobl Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_zpvdfobl:Lnet/minecraft/unmapped/C_vhpmxtfv;}
-       * @mapping {@literal named mapColor Lnet/minecraft/block/AbstractBlock$AbstractBlockState;mapColor:Lnet/minecraft/unmapped/C_vhpmxtfv;}
+       * @mapping {@literal named mapColor Lnet/minecraft/block/AbstractBlock$AbstractBlockState;mapColor:Lnet/minecraft/block/MapColor;}
        */
-      private final C_vhpmxtfv mapColor;
+      private final MapColor mapColor;
       /**
        * @mapping {@literal hashed f_jnxtuzdb Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;f_jnxtuzdb:F}
        * @mapping {@literal named hardness Lnet/minecraft/block/AbstractBlock$AbstractBlockState;hardness:F}
@@ -913,7 +912,7 @@
          this.lavaIgnitable = lv.lavaIgnitable;
          this.liquid = lv.liquid;
          this.pistonBehavior = lv.pistonBehavior;
-         this.mapColor = (C_vhpmxtfv)lv.mapColorGetter.apply(this.asBlockState());
+         this.mapColor = (MapColor)lv.mapColorGetter.apply(this.asBlockState());
          this.hardness = lv.hardness;
          this.toolRequired = lv.toolRequired;
          this.opaque = lv.opaque;
@@ -1108,9 +1107,9 @@
 
       /**
        * @mapping {@literal hashed m_wdjjfoyp Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;m_wdjjfoyp(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_vhpmxtfv;}
-       * @mapping {@literal named getMapColor Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getMapColor(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/unmapped/C_vhpmxtfv;}
+       * @mapping {@literal named getMapColor Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getMapColor(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/MapColor;}
        */
-      public C_vhpmxtfv getMapColor(BlockView world, BlockPos pos) {
+      public MapColor getMapColor(BlockView world, BlockPos pos) {
          return this.mapColor;
       }
 
@@ -1929,7 +1928,7 @@
        * @mapping {@literal hashed f_hzpexiar Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_hzpexiar:Ljava/util/function/Function;}
        * @mapping {@literal named mapColorGetter Lnet/minecraft/block/AbstractBlock$Settings;mapColorGetter:Ljava/util/function/Function;}
        */
-      Function<BlockState, C_vhpmxtfv> mapColorGetter = state -> C_vhpmxtfv.f_xztmrrjg;
+      Function<BlockState, MapColor> mapColorGetter = state -> MapColor.NONE;
       /**
        * @mapping {@literal hashed f_wlanwnet Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;f_wlanwnet:Z}
        * @mapping {@literal named collidable Lnet/minecraft/block/AbstractBlock$Settings;collidable:Z}
@@ -2177,9 +2176,9 @@
 
       /**
        * @mapping {@literal hashed m_mylnzrvw Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_mylnzrvw(Lnet/minecraft/unmapped/C_vhpmxtfv;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
-       * @mapping {@literal named mapColor Lnet/minecraft/block/AbstractBlock$Settings;mapColor(Lnet/minecraft/unmapped/C_vhpmxtfv;)Lnet/minecraft/block/AbstractBlock$Settings;}
+       * @mapping {@literal named mapColor Lnet/minecraft/block/AbstractBlock$Settings;mapColor(Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/AbstractBlock$Settings;}
        */
-      public AbstractBlock.Settings mapColor(C_vhpmxtfv arg) {
+      public AbstractBlock.Settings mapColor(MapColor arg) {
          this.mapColorGetter = state -> arg;
          return this;
       }
@@ -2188,7 +2187,7 @@
        * @mapping {@literal hashed m_uggztwlf Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;m_uggztwlf(Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;}
        * @mapping {@literal named mapColor Lnet/minecraft/block/AbstractBlock$Settings;mapColor(Ljava/util/function/Function;)Lnet/minecraft/block/AbstractBlock$Settings;}
        */
-      public AbstractBlock.Settings mapColor(Function<BlockState, C_vhpmxtfv> mapColorGetter) {
+      public AbstractBlock.Settings mapColor(Function<BlockState, MapColor> mapColorGetter) {
          this.mapColorGetter = mapColorGetter;
          return this;
       }
diff -bur namedTargetSrc/net/minecraft/block/AnvilBlock.java namedSrc/net/minecraft/block/AnvilBlock.java
--- namedTargetSrc/net/minecraft/block/AnvilBlock.java	2025-02-16 23:42:20.136439107 +0000
+++ namedSrc/net/minecraft/block/AnvilBlock.java	2025-02-16 23:41:16.162076375 +0000
@@ -241,6 +241,6 @@
     */
    @Override
    public int getColor(BlockState state, BlockView world, BlockPos pos) {
-      return state.getMapColor(world, pos).f_yizzvhmb;
+      return state.getMapColor(world, pos).color;
    }
 }

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3):
Continuation of the last diff...
          .toolRequired()
          .strength(3.0F, 6.0F)
@@ -1922,7 +1835,7 @@
    public static final Block IRON_BLOCK = m_pddyceds(
       "iron_block",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwvfejlz)
+         .mapColor(MapColor.METAL)
          .instrument(NoteBlockInstrument.IRON_XYLOPHONE)
          .toolRequired()
          .strength(5.0F, 6.0F)
@@ -1933,7 +1846,7 @@
     * @mapping {@literal named BRICKS Lnet/minecraft/block/Blocks;BRICKS:Lnet/minecraft/block/Block;}
     */
    public static final Block BRICKS = m_pddyceds(
-      "bricks", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_lfadxhyj).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F)
+      "bricks", AbstractBlock.Settings.create().mapColor(MapColor.RED).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_mgkqhmjt Lnet/minecraft/unmapped/C_jricjyva;f_mgkqhmjt:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1942,12 +1855,7 @@
    public static final Block TNT = m_sfaglezr(
       "tnt",
       TntBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwoawcrh)
-         .breakInstantly()
-         .sounds(BlockSoundGroup.GRASS)
-         .lavaIgnitable()
-         .solidBlock(Blocks::nonSolid)
+      AbstractBlock.Settings.create().mapColor(MapColor.FIRE).breakInstantly().sounds(BlockSoundGroup.GRASS).lavaIgnitable().solidBlock(Blocks::nonSolid)
    );
    /**
     * @mapping {@literal hashed f_wxjdyars Lnet/minecraft/unmapped/C_jricjyva;f_wxjdyars:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1955,12 +1863,7 @@
     */
    public static final Block BOOKSHELF = m_pddyceds(
       "bookshelf",
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(1.5F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(1.5F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_azwquurv Lnet/minecraft/unmapped/C_jricjyva;f_azwquurv:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1970,7 +1873,7 @@
       "chiseled_bookshelf",
       ChiseledBookshelfBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
+         .mapColor(MapColor.WOOD)
          .instrument(NoteBlockInstrument.BASS)
          .strength(1.5F)
          .sounds(BlockSoundGroup.CHISELED_BOOKSHELF)
@@ -1982,15 +1885,14 @@
     */
    public static final Block MOSSY_COBBLESTONE = m_pddyceds(
       "mossy_cobblestone",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_vcordhgx Lnet/minecraft/unmapped/C_jricjyva;f_vcordhgx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named OBSIDIAN Lnet/minecraft/block/Blocks;OBSIDIAN:Lnet/minecraft/block/Block;}
     */
    public static final Block OBSIDIAN = m_pddyceds(
-      "obsidian",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_hmzpcgsp).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(50.0F, 1200.0F)
+      "obsidian", AbstractBlock.Settings.create().mapColor(MapColor.BLACK).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(50.0F, 1200.0F)
    );
    /**
     * @mapping {@literal hashed f_hwtlreeh Lnet/minecraft/unmapped/C_jricjyva;f_hwtlreeh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2018,7 +1920,7 @@
       "fire",
       FireBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwoawcrh)
+         .mapColor(MapColor.FIRE)
          .replaceable()
          .noCollision()
          .breakInstantly()
@@ -2034,7 +1936,7 @@
       "soul_fire",
       SoulFireBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jmtdcopl)
+         .mapColor(MapColor.LIGHT_BLUE)
          .replaceable()
          .noCollision()
          .breakInstantly()
@@ -2050,7 +1952,7 @@
       "spawner",
       SpawnerBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_aizqsezc)
+         .mapColor(MapColor.STONE)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(5.0F)
@@ -2065,7 +1967,7 @@
       "creaking_heart",
       C_qnrzjsej::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_gkbjpdny)
+         .mapColor(MapColor.ORANGE)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .strength(10.0F)
          .sounds(BlockSoundGroup.BLOCK_CREAKING_HEART_BREAK)
@@ -2082,12 +1984,7 @@
    public static final Block CHEST = m_sfaglezr(
       "chest",
       settings -> new ChestBlock(() -> BlockEntityType.CHEST, settings),
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.5F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.5F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_hghvywwk Lnet/minecraft/unmapped/C_jricjyva;f_hghvywwk:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2103,7 +2000,7 @@
    public static final Block DIAMOND_ORE = m_sfaglezr(
       "diamond_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
    );
    /**
     * @mapping {@literal hashed f_qaboihwg Lnet/minecraft/unmapped/C_jricjyva;f_qaboihwg:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2112,14 +2009,14 @@
    public static final Block DEEPSLATE_DIAMOND_ORE = m_sfaglezr(
       "deepslate_diamond_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), settings),
-      AbstractBlock.Settings.variantOf(DIAMOND_ORE).mapColor(C_vhpmxtfv.f_scyluqag).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
+      AbstractBlock.Settings.variantOf(DIAMOND_ORE).mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
    );
    /**
     * @mapping {@literal hashed f_cohbrwax Lnet/minecraft/unmapped/C_jricjyva;f_cohbrwax:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named DIAMOND_BLOCK Lnet/minecraft/block/Blocks;DIAMOND_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block DIAMOND_BLOCK = m_pddyceds(
-      "diamond_block", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_urbqfdkv).toolRequired().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL)
+      "diamond_block", AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND).toolRequired().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL)
    );
    /**
     * @mapping {@literal hashed f_yrfqvwpt Lnet/minecraft/unmapped/C_jricjyva;f_yrfqvwpt:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2128,12 +2025,7 @@
    public static final Block CRAFTING_TABLE = m_sfaglezr(
       "crafting_table",
       CraftingTableBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.5F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.5F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_vclhadbc Lnet/minecraft/unmapped/C_jricjyva;f_vclhadbc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2143,7 +2035,7 @@
       "wheat",
       CropBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(state -> state.getOrThrow(CropBlock.AGE) >= 6 ? C_vhpmxtfv.f_crmswdpe : C_vhpmxtfv.f_librttps)
+         .mapColor(state -> state.getOrThrow(CropBlock.AGE) >= 6 ? MapColor.YELLOW : MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -2158,7 +2050,7 @@
       "farmland",
       FarmlandBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_fnpmdvjp)
+         .mapColor(MapColor.DIRT)
          .ticksRandomly()
          .strength(0.6F)
          .sounds(BlockSoundGroup.GRAVEL)
@@ -2173,7 +2065,7 @@
       "furnace",
       FurnaceBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_aizqsezc)
+         .mapColor(MapColor.STONE)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(3.5F)
@@ -2186,7 +2078,7 @@
    public static final Block OAK_SIGN = m_sfaglezr(
       "oak_sign",
       settings -> new SignBlock(WoodType.OAK, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_euiziiwx).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOD).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_antoxykq Lnet/minecraft/unmapped/C_jricjyva;f_antoxykq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2210,7 +2102,7 @@
    public static final Block BIRCH_SIGN = m_sfaglezr(
       "birch_sign",
       settings -> new SignBlock(WoodType.BIRCH, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_ffusurqd).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.SAND).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_plwderik Lnet/minecraft/unmapped/C_jricjyva;f_plwderik:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2219,7 +2111,7 @@
    public static final Block ACACIA_SIGN = m_sfaglezr(
       "acacia_sign",
       settings -> new SignBlock(WoodType.ACACIA, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_gkbjpdny).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_omzouxxt Lnet/minecraft/unmapped/C_jricjyva;f_omzouxxt:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2354,7 +2246,7 @@
    public static final Block OAK_WALL_SIGN = m_sfaglezr(
       "oak_wall_sign",
       settings -> new WallSignBlock(WoodType.OAK, settings),
-      m_sttguhre(OAK_SIGN, true).mapColor(C_vhpmxtfv.f_euiziiwx).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      m_sttguhre(OAK_SIGN, true).mapColor(MapColor.WOOD).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_viftuaqj Lnet/minecraft/unmapped/C_jricjyva;f_viftuaqj:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2378,7 +2270,7 @@
    public static final Block BIRCH_WALL_SIGN = m_sfaglezr(
       "birch_wall_sign",
       settings -> new WallSignBlock(WoodType.BIRCH, settings),
-      m_sttguhre(BIRCH_SIGN, true).mapColor(C_vhpmxtfv.f_ffusurqd).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      m_sttguhre(BIRCH_SIGN, true).mapColor(MapColor.SAND).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_pwttrtgi Lnet/minecraft/unmapped/C_jricjyva;f_pwttrtgi:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2387,7 +2279,7 @@
    public static final Block ACACIA_WALL_SIGN = m_sfaglezr(
       "acacia_wall_sign",
       settings -> new WallSignBlock(WoodType.ACACIA, settings),
-      m_sttguhre(ACACIA_SIGN, true).mapColor(C_vhpmxtfv.f_gkbjpdny).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      m_sttguhre(ACACIA_SIGN, true).mapColor(MapColor.ORANGE).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_ewayfqsq Lnet/minecraft/unmapped/C_jricjyva;f_ewayfqsq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2516,7 +2408,7 @@
    public static final Block BIRCH_HANGING_SIGN = m_sfaglezr(
       "birch_hanging_sign",
       settings -> new CeilingHangingSignBlock(WoodType.BIRCH, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_ffusurqd).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.SAND).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_xuxfdxkn Lnet/minecraft/unmapped/C_jricjyva;f_xuxfdxkn:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2525,7 +2417,7 @@
    public static final Block ACACIA_HANGING_SIGN = m_sfaglezr(
       "acacia_hanging_sign",
       settings -> new CeilingHangingSignBlock(WoodType.ACACIA, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_gkbjpdny).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_oeowripb Lnet/minecraft/unmapped/C_jricjyva;f_oeowripb:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2534,7 +2426,13 @@
    public static final Block CHERRY_HANGING_SIGN = m_sfaglezr(
       "cherry_hanging_sign",
       settings -> new CeilingHangingSignBlock(WoodType.CHERRY, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jxjskblr).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      AbstractBlock.Settings.create()
+         .mapColor(MapColor.PINK_TERRACOTTA)
+         .solid()
+         .instrument(NoteBlockInstrument.BASS)
+         .noCollision()
+         .strength(1.0F)
+         .lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_yikcrgpk Lnet/minecraft/unmapped/C_jricjyva;f_yikcrgpk:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2588,7 +2486,7 @@
    public static final Block CRIMSON_HANGING_SIGN = m_sfaglezr(
       "crimson_hanging_sign",
       settings -> new CeilingHangingSignBlock(WoodType.CRIMSON, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jcrqxqqx).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.CRIMSON_STEM).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
    );
    /**
     * @mapping {@literal hashed f_kffdviwe Lnet/minecraft/unmapped/C_jricjyva;f_kffdviwe:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2597,7 +2495,7 @@
    public static final Block WARPED_HANGING_SIGN = m_sfaglezr(
       "warped_hanging_sign",
       settings -> new CeilingHangingSignBlock(WoodType.WARPED, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_usqdwxal).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.WARPED_STEM).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
    );
    /**
     * @mapping {@literal hashed f_owgfbyta Lnet/minecraft/unmapped/C_jricjyva;f_owgfbyta:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2621,7 +2519,7 @@
    public static final Block BAMBOO_HANGING_SIGN = m_sfaglezr(
       "bamboo_hanging_sign",
       settings -> new CeilingHangingSignBlock(WoodType.BAMBOO, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_crmswdpe).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_fabsyezb Lnet/minecraft/unmapped/C_jricjyva;f_fabsyezb:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2645,13 +2543,7 @@
    public static final Block SPRUCE_WALL_HANGING_SIGN = m_sfaglezr(
       "spruce_wall_hanging_sign",
       settings -> new WallHangingSignBlock(WoodType.SPRUCE, settings),
-      m_sttguhre(SPRUCE_HANGING_SIGN, true)
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
-         .solid()
-         .instrument(NoteBlockInstrument.BASS)
-         .noCollision()
-         .strength(1.0F)
-         .lavaIgnitable()
+      m_sttguhre(SPRUCE_HANGING_SIGN, true).mapColor(MapColor.WOOD).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_uxvakxao Lnet/minecraft/unmapped/C_jricjyva;f_uxvakxao:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2660,13 +2552,7 @@
    public static final Block BIRCH_WALL_HANGING_SIGN = m_sfaglezr(
       "birch_wall_hanging_sign",
       settings -> new WallHangingSignBlock(WoodType.BIRCH, settings),
-      m_sttguhre(BIRCH_HANGING_SIGN, true)
-         .mapColor(C_vhpmxtfv.f_ffusurqd)
-         .solid()
-         .instrument(NoteBlockInstrument.BASS)
-         .noCollision()
-         .strength(1.0F)
-         .lavaIgnitable()
+      m_sttguhre(BIRCH_HANGING_SIGN, true).mapColor(MapColor.SAND).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_jludptym Lnet/minecraft/unmapped/C_jricjyva;f_jludptym:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2675,13 +2561,7 @@
    public static final Block ACACIA_WALL_HANGING_SIGN = m_sfaglezr(
       "acacia_wall_hanging_sign",
       settings -> new WallHangingSignBlock(WoodType.ACACIA, settings),
-      m_sttguhre(ACACIA_HANGING_SIGN, true)
-         .mapColor(C_vhpmxtfv.f_gkbjpdny)
-         .solid()
-         .instrument(NoteBlockInstrument.BASS)
-         .noCollision()
-         .strength(1.0F)
-         .lavaIgnitable()
+      m_sttguhre(ACACIA_HANGING_SIGN, true).mapColor(MapColor.ORANGE).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_dcavkccc Lnet/minecraft/unmapped/C_jricjyva;f_dcavkccc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2691,7 +2571,7 @@
       "cherry_wall_hanging_sign",
       settings -> new WallHangingSignBlock(WoodType.CHERRY, settings),
       m_sttguhre(CHERRY_HANGING_SIGN, true)
-         .mapColor(C_vhpmxtfv.f_jxjskblr)
+         .mapColor(MapColor.PINK_TERRACOTTA)
          .solid()
          .instrument(NoteBlockInstrument.BASS)
          .noCollision()
@@ -2765,7 +2645,7 @@
    public static final Block CRIMSON_WALL_HANGING_SIGN = m_sfaglezr(
       "crimson_wall_hanging_sign",
       settings -> new WallHangingSignBlock(WoodType.CRIMSON, settings),
-      m_sttguhre(CRIMSON_HANGING_SIGN, true).mapColor(C_vhpmxtfv.f_jcrqxqqx).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
+      m_sttguhre(CRIMSON_HANGING_SIGN, true).mapColor(MapColor.CRIMSON_STEM).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
    );
    /**
     * @mapping {@literal hashed f_oiagchca Lnet/minecraft/unmapped/C_jricjyva;f_oiagchca:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2774,7 +2654,7 @@
    public static final Block WARPED_WALL_HANGING_SIGN = m_sfaglezr(
       "warped_wall_hanging_sign",
       settings -> new WallHangingSignBlock(WoodType.WARPED, settings),
-      m_sttguhre(WARPED_HANGING_SIGN, true).mapColor(C_vhpmxtfv.f_usqdwxal).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
+      m_sttguhre(WARPED_HANGING_SIGN, true).mapColor(MapColor.WARPED_STEM).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
    );
    /**
     * @mapping {@literal hashed f_oakejpeg Lnet/minecraft/unmapped/C_jricjyva;f_oakejpeg:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2783,13 +2663,7 @@
    public static final Block BAMBOO_WALL_HANGING_SIGN = m_sfaglezr(
       "bamboo_wall_hanging_sign",
       settings -> new WallHangingSignBlock(WoodType.BAMBOO, settings),
-      m_sttguhre(BAMBOO_HANGING_SIGN, true)
-         .mapColor(C_vhpmxtfv.f_crmswdpe)
-         .solid()
-         .instrument(NoteBlockInstrument.BASS)
-         .noCollision()
-         .strength(1.0F)
-         .lavaIgnitable()
+      m_sttguhre(BAMBOO_HANGING_SIGN, true).mapColor(MapColor.YELLOW).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_uijhgnik Lnet/minecraft/unmapped/C_jricjyva;f_uijhgnik:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2808,7 +2682,7 @@
       "stone_pressure_plate",
       settings -> new PressurePlateBlock(BlockSetType.STONE, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_aizqsezc)
+         .mapColor(MapColor.STONE)
          .solid()
          .instrument(NoteBlockInstrument.BASEDRUM)
          .noCollision()
@@ -2822,7 +2696,7 @@
    public static final Block IRON_DOOR = m_sfaglezr(
       "iron_door",
       settings -> new DoorBlock(BlockSetType.IRON, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jwvfejlz).strength(5.0F).nonOpaque().pistonBehavior(PistonBehavior.DESTROY)
+      AbstractBlock.Settings.create().mapColor(MapColor.METAL).strength(5.0F).nonOpaque().pistonBehavior(PistonBehavior.DESTROY)
    );
    /**
     * @mapping {@literal hashed f_wknjdndw Lnet/minecraft/unmapped/C_jricjyva;f_wknjdndw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -2992,7 +2866,7 @@
       "redstone_ore",
       RedstoneOreBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_aizqsezc)
+         .mapColor(MapColor.STONE)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .ticksRandomly()
@@ -3006,7 +2880,7 @@
    public static final Block DEEPSLATE_REDSTONE_ORE = m_sfaglezr(
       "deepslate_redstone_ore",
       RedstoneOreBlock::new,
-      AbstractBlock.Settings.variantOf(REDSTONE_ORE).mapColor(C_vhpmxtfv.f_scyluqag).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
+      AbstractBlock.Settings.variantOf(REDSTONE_ORE).mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
    );
    /**
     * @mapping {@literal hashed f_uowvghma Lnet/minecraft/unmapped/C_jricjyva;f_uowvghma:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3049,7 +2923,7 @@
       "snow",
       SnowBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_alpcltxq)
+         .mapColor(MapColor.SNOW)
          .replaceable()
          .nonSolid()
          .ticksRandomly()
@@ -3067,7 +2941,7 @@
       "ice",
       IceBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_qhzygzdq)
+         .mapColor(MapColor.ICE)
          .slipperiness(0.98F)
          .ticksRandomly()
          .strength(0.5F)
@@ -3081,7 +2955,7 @@
     * @mapping {@literal named SNOW_BLOCK Lnet/minecraft/block/Blocks;SNOW_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block SNOW_BLOCK = m_pddyceds(
-      "snow_block", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_alpcltxq).toolRequired().strength(0.2F).sounds(BlockSoundGroup.SNOW)
+      "snow_block", AbstractBlock.Settings.create().mapColor(MapColor.SNOW).toolRequired().strength(0.2F).sounds(BlockSoundGroup.SNOW)
    );
    /**
     * @mapping {@literal hashed f_yuuovhej Lnet/minecraft/unmapped/C_jricjyva;f_yuuovhej:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3091,7 +2965,7 @@
       "cactus",
       CactusBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .ticksRandomly()
          .strength(0.4F)
          .sounds(BlockSoundGroup.WOOL)
@@ -3102,8 +2976,7 @@
     * @mapping {@literal named CLAY Lnet/minecraft/block/Blocks;CLAY:Lnet/minecraft/block/Block;}
     */
    public static final Block CLAY = m_pddyceds(
-      "clay",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_svlzilkq).instrument(NoteBlockInstrument.FLUTE).strength(0.6F).sounds(BlockSoundGroup.GRAVEL)
+      "clay", AbstractBlock.Settings.create().mapColor(MapColor.CLAY).instrument(NoteBlockInstrument.FLUTE).strength(0.6F).sounds(BlockSoundGroup.GRAVEL)
    );
    /**
     * @mapping {@literal hashed f_kvvabrus Lnet/minecraft/unmapped/C_jricjyva;f_kvvabrus:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3113,7 +2986,7 @@
       "sugar_cane",
       SugarCaneBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -3128,7 +3001,7 @@
       "jukebox",
       JukeboxBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_fnpmdvjp)
+         .mapColor(MapColor.DIRT)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 6.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -3157,7 +3030,7 @@
       "netherrack",
       NetherrackBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_vmmrnpkh)
+         .mapColor(MapColor.NETHER)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(0.4F)
@@ -3171,7 +3044,7 @@
       "soul_sand",
       SoulSandBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_glauclrj)
+         .mapColor(MapColor.BROWN)
          .instrument(NoteBlockInstrument.COW_BELL)
          .strength(0.5F)
          .velocityMultiplier(0.4F)
@@ -3186,7 +3059,7 @@
     * @mapping {@literal named SOUL_SOIL Lnet/minecraft/block/Blocks;SOUL_SOIL:Lnet/minecraft/block/Block;}
     */
    public static final Block SOUL_SOIL = m_pddyceds(
-      "soul_soil", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_glauclrj).strength(0.5F).sounds(BlockSoundGroup.SOUL_SOIL)
+      "soul_soil", AbstractBlock.Settings.create().mapColor(MapColor.BROWN).strength(0.5F).sounds(BlockSoundGroup.SOUL_SOIL)
    );
    /**
     * @mapping {@literal hashed f_rhmfhzcl Lnet/minecraft/unmapped/C_jricjyva;f_rhmfhzcl:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3196,7 +3069,7 @@
       "basalt",
       PillarBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hmzpcgsp)
+         .mapColor(MapColor.BLACK)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(1.25F, 4.2F)
@@ -3210,7 +3083,7 @@
       "polished_basalt",
       PillarBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hmzpcgsp)
+         .mapColor(MapColor.BLACK)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(1.25F, 4.2F)
@@ -3241,7 +3114,7 @@
    public static final Block GLOWSTONE = m_pddyceds(
       "glowstone",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ffusurqd)
+         .mapColor(MapColor.SAND)
          .instrument(NoteBlockInstrument.PLING)
          .strength(0.3F)
          .sounds(BlockSoundGroup.GLASS)
@@ -3271,7 +3144,7 @@
       "carved_pumpkin",
       CarvedPumpkinBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_gkbjpdny)
+         .mapColor(MapColor.ORANGE)
          .strength(1.0F)
          .sounds(BlockSoundGroup.WOOD)
          .allowsSpawning(Blocks::spawnable)
@@ -3285,7 +3158,7 @@
       "jack_o_lantern",
       CarvedPumpkinBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_gkbjpdny)
+         .mapColor(MapColor.ORANGE)
          .strength(1.0F)
          .sounds(BlockSoundGroup.WOOD)
          .luminance(state -> 15)
@@ -3394,7 +3267,7 @@
       "oak_trapdoor",
       settings -> new TrapdoorBlock(BlockSetType.OAK, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
+         .mapColor(MapColor.WOOD)
          .instrument(NoteBlockInstrument.BASS)
          .strength(3.0F)
          .nonOpaque()
@@ -3409,7 +3282,7 @@
       "spruce_trapdoor",
       settings -> new TrapdoorBlock(BlockSetType.SPRUCE, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jtgbxwmj)
+         .mapColor(MapColor.PODZOL)
          .instrument(NoteBlockInstrument.BASS)
          .strength(3.0F)
          .nonOpaque()
@@ -3424,7 +3297,7 @@
       "birch_trapdoor",
       settings -> new TrapdoorBlock(BlockSetType.BIRCH, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ffusurqd)
+         .mapColor(MapColor.SAND)
          .instrument(NoteBlockInstrument.BASS)
          .strength(3.0F)
          .nonOpaque()
@@ -3439,7 +3312,7 @@
       "jungle_trapdoor",
       settings -> new TrapdoorBlock(BlockSetType.JUNGLE, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_fnpmdvjp)
+         .mapColor(MapColor.DIRT)
          .instrument(NoteBlockInstrument.BASS)
          .strength(3.0F)
          .nonOpaque()
@@ -3454,7 +3327,7 @@
       "acacia_trapdoor",
       settings -> new TrapdoorBlock(BlockSetType.ACACIA, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_gkbjpdny)
+         .mapColor(MapColor.ORANGE)
          .instrument(NoteBlockInstrument.BASS)
          .strength(3.0F)
          .nonOpaque()
@@ -3469,7 +3342,7 @@
       "cherry_trapdoor",
       settings -> new TrapdoorBlock(BlockSetType.CHERRY, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ytfwvurw)
+         .mapColor(MapColor.WHITE_TERRACOTTA)
          .instrument(NoteBlockInstrument.BASS)
          .strength(3.0F)
          .nonOpaque()
@@ -3484,7 +3357,7 @@
       "dark_oak_trapdoor",
       settings -> new TrapdoorBlock(BlockSetType.DARK_OAK, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_glauclrj)
+         .mapColor(MapColor.BROWN)
          .instrument(NoteBlockInstrument.BASS)
          .strength(3.0F)
          .nonOpaque()
@@ -3514,7 +3387,7 @@
       "mangrove_trapdoor",
       settings -> new TrapdoorBlock(BlockSetType.MANGROVE, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_lfadxhyj)
+         .mapColor(MapColor.RED)
          .instrument(NoteBlockInstrument.BASS)
          .strength(3.0F)
          .nonOpaque()
@@ -3529,7 +3402,7 @@
       "bamboo_trapdoor",
       settings -> new TrapdoorBlock(BlockSetType.BAMBOO, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_crmswdpe)
+         .mapColor(MapColor.YELLOW)
          .instrument(NoteBlockInstrument.BASS)
          .strength(3.0F)
          .nonOpaque()
@@ -3541,8 +3414,7 @@
     * @mapping {@literal named STONE_BRICKS Lnet/minecraft/block/Blocks;STONE_BRICKS:Lnet/minecraft/block/Block;}
     */
    public static final Block STONE_BRICKS = m_pddyceds(
-      "stone_bricks",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      "stone_bricks", AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_japwelwp Lnet/minecraft/unmapped/C_jricjyva;f_japwelwp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3550,7 +3422,7 @@
     */
    public static final Block MOSSY_STONE_BRICKS = m_pddyceds(
       "mossy_stone_bricks",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_lilezriy Lnet/minecraft/unmapped/C_jricjyva;f_lilezriy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3558,7 +3430,7 @@
     */
    public static final Block CRACKED_STONE_BRICKS = m_pddyceds(
       "cracked_stone_bricks",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_lpplonqh Lnet/minecraft/unmapped/C_jricjyva;f_lpplonqh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3566,7 +3438,7 @@
     */
    public static final Block CHISELED_STONE_BRICKS = m_pddyceds(
       "chiseled_stone_bricks",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_rpydnzuf Lnet/minecraft/unmapped/C_jricjyva;f_rpydnzuf:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3582,7 +3454,7 @@
    public static final Block MUD_BRICKS = m_pddyceds(
       "mud_bricks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_raylnqwa)
+         .mapColor(MapColor.LIGHT_GRAY_TERRACOTTA)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(1.5F, 3.0F)
@@ -3593,48 +3465,42 @@
     * @mapping {@literal named INFESTED_STONE Lnet/minecraft/block/Blocks;INFESTED_STONE:Lnet/minecraft/block/Block;}
     */
    public static final Block INFESTED_STONE = m_sfaglezr(
-      "infested_stone", settings -> new InfestedBlock(STONE, settings), AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_svlzilkq)
+      "infested_stone", settings -> new InfestedBlock(STONE, settings), AbstractBlock.Settings.create().mapColor(MapColor.CLAY)
    );
    /**
     * @mapping {@literal hashed f_swmccbvo Lnet/minecraft/unmapped/C_jricjyva;f_swmccbvo:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named INFESTED_COBBLESTONE Lnet/minecraft/block/Blocks;INFESTED_COBBLESTONE:Lnet/minecraft/block/Block;}
     */
    public static final Block INFESTED_COBBLESTONE = m_sfaglezr(
-      "infested_cobblestone", settings -> new InfestedBlock(COBBLESTONE, settings), AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_svlzilkq)
+      "infested_cobblestone", settings -> new InfestedBlock(COBBLESTONE, settings), AbstractBlock.Settings.create().mapColor(MapColor.CLAY)
    );
    /**
     * @mapping {@literal hashed f_owrwtoyh Lnet/minecraft/unmapped/C_jricjyva;f_owrwtoyh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named INFESTED_STONE_BRICKS Lnet/minecraft/block/Blocks;INFESTED_STONE_BRICKS:Lnet/minecraft/block/Block;}
     */
    public static final Block INFESTED_STONE_BRICKS = m_sfaglezr(
-      "infested_stone_bricks", settings -> new InfestedBlock(STONE_BRICKS, settings), AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_svlzilkq)
+      "infested_stone_bricks", settings -> new InfestedBlock(STONE_BRICKS, settings), AbstractBlock.Settings.create().mapColor(MapColor.CLAY)
    );
    /**
     * @mapping {@literal hashed f_bltslbsh Lnet/minecraft/unmapped/C_jricjyva;f_bltslbsh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named INFESTED_MOSSY_STONE_BRICKS Lnet/minecraft/block/Blocks;INFESTED_MOSSY_STONE_BRICKS:Lnet/minecraft/block/Block;}
     */
    public static final Block INFESTED_MOSSY_STONE_BRICKS = m_sfaglezr(
-      "infested_mossy_stone_bricks",
-      settings -> new InfestedBlock(MOSSY_STONE_BRICKS, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_svlzilkq)
+      "infested_mossy_stone_bricks", settings -> new InfestedBlock(MOSSY_STONE_BRICKS, settings), AbstractBlock.Settings.create().mapColor(MapColor.CLAY)
    );
    /**
     * @mapping {@literal hashed f_jnajfjve Lnet/minecraft/unmapped/C_jricjyva;f_jnajfjve:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named INFESTED_CRACKED_STONE_BRICKS Lnet/minecraft/block/Blocks;INFESTED_CRACKED_STONE_BRICKS:Lnet/minecraft/block/Block;}
     */
    public static final Block INFESTED_CRACKED_STONE_BRICKS = m_sfaglezr(
-      "infested_cracked_stone_bricks",
-      settings -> new InfestedBlock(CRACKED_STONE_BRICKS, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_svlzilkq)
+      "infested_cracked_stone_bricks", settings -> new InfestedBlock(CRACKED_STONE_BRICKS, settings), AbstractBlock.Settings.create().mapColor(MapColor.CLAY)
    );
    /**
     * @mapping {@literal hashed f_bxbkgqkz Lnet/minecraft/unmapped/C_jricjyva;f_bxbkgqkz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named INFESTED_CHISELED_STONE_BRICKS Lnet/minecraft/block/Blocks;INFESTED_CHISELED_STONE_BRICKS:Lnet/minecraft/block/Block;}
     */
    public static final Block INFESTED_CHISELED_STONE_BRICKS = m_sfaglezr(
-      "infested_chiseled_stone_bricks",
-      settings -> new InfestedBlock(CHISELED_STONE_BRICKS, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_svlzilkq)
+      "infested_chiseled_stone_bricks", settings -> new InfestedBlock(CHISELED_STONE_BRICKS, settings), AbstractBlock.Settings.create().mapColor(MapColor.CLAY)
    );
    /**
     * @mapping {@literal hashed f_wdrczzoe Lnet/minecraft/unmapped/C_jricjyva;f_wdrczzoe:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3643,12 +3509,7 @@
    public static final Block BROWN_MUSHROOM_BLOCK = m_sfaglezr(
       "brown_mushroom_block",
       MushroomBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_fnpmdvjp)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(0.2F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASS).strength(0.2F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_nppmzjkw Lnet/minecraft/unmapped/C_jricjyva;f_nppmzjkw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3657,12 +3518,7 @@
    public static final Block RED_MUSHROOM_BLOCK = m_sfaglezr(
       "red_mushroom_block",
       MushroomBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_lfadxhyj)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(0.2F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.RED).instrument(NoteBlockInstrument.BASS).strength(0.2F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_novpbwiv Lnet/minecraft/unmapped/C_jricjyva;f_novpbwiv:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3671,12 +3527,7 @@
    public static final Block MUSHROOM_STEM = m_sfaglezr(
       "mushroom_stem",
       MushroomBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_bwngrngh)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(0.2F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOL).instrument(NoteBlockInstrument.BASS).strength(0.2F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_vrovpzvm Lnet/minecraft/unmapped/C_jricjyva;f_vrovpzvm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3709,7 +3560,7 @@
       BlockRegistryKeys.PUMPKIN,
       PumpkinBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_gkbjpdny)
+         .mapColor(MapColor.ORANGE)
          .instrument(NoteBlockInstrument.DIDGERIDOO)
          .strength(1.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -3721,7 +3572,7 @@
     */
    public static final Block MELON = register(
       BlockRegistryKeys.MELON,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_cnvcslfe).strength(1.0F).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.DESTROY)
+      AbstractBlock.Settings.create().mapColor(MapColor.LIME).strength(1.0F).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.DESTROY)
    );
    /**
     * @mapping {@literal hashed f_ryluqxrm Lnet/minecraft/unmapped/C_jricjyva;f_ryluqxrm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3731,7 +3582,7 @@
       BlockRegistryKeys.ATTACHED_PUMPKIN_STEM,
       settings -> new AttachedStemBlock(BlockRegistryKeys.PUMPKIN_STEM, BlockRegistryKeys.PUMPKIN, ItemKeys.PUMPKIN_SEEDS, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.WOOD)
@@ -3745,7 +3596,7 @@
       BlockRegistryKeys.ATTACHED_MELON_STEM,
       settings -> new AttachedStemBlock(BlockRegistryKeys.MELON_STEM, BlockRegistryKeys.MELON, ItemKeys.MELON_SEEDS, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.WOOD)
@@ -3759,7 +3610,7 @@
       BlockRegistryKeys.PUMPKIN_STEM,
       settings -> new StemBlock(BlockRegistryKeys.PUMPKIN, BlockRegistryKeys.ATTACHED_PUMPKIN_STEM, ItemKeys.PUMPKIN_SEEDS, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -3774,7 +3625,7 @@
       BlockRegistryKeys.MELON_STEM,
       settings -> new StemBlock(BlockRegistryKeys.MELON, BlockRegistryKeys.ATTACHED_MELON_STEM, ItemKeys.MELON_SEEDS, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -3789,7 +3640,7 @@
       "vine",
       VineBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .replaceable()
          .noCollision()
          .ticksRandomly()
@@ -3806,7 +3657,7 @@
       "glow_lichen",
       GlowLichenBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_krwcnqdu)
+         .mapColor(MapColor.GLOW_LICHEN)
          .replaceable()
          .noCollision()
          .strength(0.2F)
@@ -3823,7 +3674,7 @@
       "resin_clump",
       AbstractLichenBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hnivhujq)
+         .mapColor(MapColor.ORANGE_TERRACOTTA)
          .replaceable()
          .noCollision()
          .sounds(BlockSoundGroup.BLOCK_RESIN_BREAK)
@@ -3864,9 +3715,7 @@
     * @mapping {@literal named MYCELIUM Lnet/minecraft/block/Blocks;MYCELIUM:Lnet/minecraft/block/Block;}
     */
    public static final Block MYCELIUM = m_sfaglezr(
-      "mycelium",
-      MyceliumBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_miwsejow).ticksRandomly().strength(0.6F).sounds(BlockSoundGroup.GRASS)
+      "mycelium", MyceliumBlock::new, AbstractBlock.Settings.create().mapColor(MapColor.PURPLE).ticksRandomly().strength(0.6F).sounds(BlockSoundGroup.GRASS)
    );
    /**
     * @mapping {@literal hashed f_gjgkbidb Lnet/minecraft/unmapped/C_jricjyva;f_gjgkbidb:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3876,7 +3725,7 @@
       "lily_pad",
       LilyPadBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .breakInstantly()
          .sounds(BlockSoundGroup.LILY_PAD)
          .nonOpaque()
@@ -3888,7 +3737,7 @@
     */
    public static final Block RESIN_BLOCK = m_pddyceds(
       "resin_block",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_hnivhujq).instrument(NoteBlockInstrument.BASEDRUM).sounds(BlockSoundGroup.BLOCK_RESIN_BREAK)
+      AbstractBlock.Settings.create().mapColor(MapColor.ORANGE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).sounds(BlockSoundGroup.BLOCK_RESIN_BREAK)
    );
    /**
     * @mapping {@literal hashed f_nznytgju Lnet/minecraft/unmapped/C_jricjyva;f_nznytgju:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3897,7 +3746,7 @@
    public static final Block RESIN_BRICKS = m_pddyceds(
       "resin_bricks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hnivhujq)
+         .mapColor(MapColor.ORANGE_TERRACOTTA)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .sounds(BlockSoundGroup.BLOCK_RESIN_BRICKS_BREAK)
@@ -3916,7 +3765,7 @@
       "resin_brick_slab",
       settings -> new SlabBlock(settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hnivhujq)
+         .mapColor(MapColor.ORANGE_TERRACOTTA)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .sounds(BlockSoundGroup.BLOCK_RESIN_BRICKS_BREAK)
@@ -3930,7 +3779,7 @@
       "resin_brick_wall",
       settings -> new WallBlock(settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hnivhujq)
+         .mapColor(MapColor.ORANGE_TERRACOTTA)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .sounds(BlockSoundGroup.BLOCK_RESIN_BRICKS_BREAK)
@@ -3943,7 +3792,7 @@
    public static final Block CHISELED_RESIN_BRICKS = m_pddyceds(
       "chiseled_resin_bricks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hnivhujq)
+         .mapColor(MapColor.ORANGE_TERRACOTTA)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .sounds(BlockSoundGroup.BLOCK_RESIN_BRICKS_BREAK)
@@ -3956,7 +3805,7 @@
    public static final Block NETHER_BRICKS = m_pddyceds(
       "nether_bricks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_vmmrnpkh)
+         .mapColor(MapColor.NETHER)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(2.0F, 6.0F)
@@ -3970,7 +3819,7 @@
       "nether_brick_fence",
       FenceBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_vmmrnpkh)
+         .mapColor(MapColor.NETHER)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(2.0F, 6.0F)
@@ -3989,7 +3838,7 @@
       "nether_wart",
       NetherWartBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_lfadxhyj)
+         .mapColor(MapColor.RED)
          .noCollision()
          .ticksRandomly()
          .sounds(BlockSoundGroup.NETHER_WART)
@@ -4003,7 +3852,7 @@
       "enchanting_table",
       C_dicxqeuf::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_lfadxhyj)
+         .mapColor(MapColor.RED)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .luminance(state -> 7)
@@ -4014,14 +3863,14 @@
     * @mapping {@literal named BREWING_STAND Lnet/minecraft/block/Blocks;BREWING_STAND:Lnet/minecraft/block/Block;}
     */
    public static final Block BREWING_STAND = m_sfaglezr(
-      "brewing_stand", BrewingStandBlock::new, AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jwvfejlz).strength(0.5F).luminance(state -> 1).nonOpaque()
+      "brewing_stand", BrewingStandBlock::new, AbstractBlock.Settings.create().mapColor(MapColor.METAL).strength(0.5F).luminance(state -> 1).nonOpaque()
    );
    /**
     * @mapping {@literal hashed f_plzzioia Lnet/minecraft/unmapped/C_jricjyva;f_plzzioia:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named CAULDRON Lnet/minecraft/block/Blocks;CAULDRON:Lnet/minecraft/block/Block;}
     */
    public static final Block CAULDRON = m_sfaglezr(
-      "cauldron", CauldronBlock::new, AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).toolRequired().strength(2.0F).nonOpaque()
+      "cauldron", CauldronBlock::new, AbstractBlock.Settings.create().mapColor(MapColor.STONE).toolRequired().strength(2.0F).nonOpaque()
    );
    /**
     * @mapping {@literal hashed f_kyhtklyc Lnet/minecraft/unmapped/C_jricjyva;f_kyhtklyc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4056,7 +3905,7 @@
       "end_portal",
       EndPortalBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hmzpcgsp)
+         .mapColor(MapColor.BLACK)
          .noCollision()
          .luminance(state -> 15)
          .strength(-1.0F, 3600000.0F)
@@ -4071,7 +3920,7 @@
       "end_portal_frame",
       EndPortalFrameBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_tnwxiwcj)
+         .mapColor(MapColor.GREEN)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .sounds(BlockSoundGroup.GLASS)
          .luminance(state -> 1)
@@ -4083,7 +3932,7 @@
     * @mapping {@literal named END_STONE Lnet/minecraft/block/Blocks;END_STONE:Lnet/minecraft/block/Block;}
     */
    public static final Block END_STONE = m_pddyceds(
-      "end_stone", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_ffusurqd).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 9.0F)
+      "end_stone", AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 9.0F)
    );
    /**
     * @mapping {@literal hashed f_wfzjhgom Lnet/minecraft/unmapped/C_jricjyva;f_wfzjhgom:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4092,12 +3941,7 @@
    public static final Block DRAGON_EGG = m_sfaglezr(
       "dragon_egg",
       DragonEggBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hmzpcgsp)
-         .strength(3.0F, 9.0F)
-         .luminance(state -> 1)
-         .nonOpaque()
-         .pistonBehavior(PistonBehavior.DESTROY)
+      AbstractBlock.Settings.create().mapColor(MapColor.BLACK).strength(3.0F, 9.0F).luminance(state -> 1).nonOpaque().pistonBehavior(PistonBehavior.DESTROY)
    );
    /**
     * @mapping {@literal hashed f_iewybbcg Lnet/minecraft/unmapped/C_jricjyva;f_iewybbcg:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4107,7 +3951,7 @@
       "redstone_lamp",
       RedstoneLampBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hnivhujq)
+         .mapColor(MapColor.ORANGE_TERRACOTTA)
          .luminance(luminanceOf(15))
          .strength(0.3F)
          .sounds(BlockSoundGroup.GLASS)
@@ -4121,7 +3965,7 @@
       "cocoa",
       CocoaBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .ticksRandomly()
          .strength(0.2F, 3.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -4140,7 +3984,7 @@
    public static final Block EMERALD_ORE = m_sfaglezr(
       "emerald_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
    );
    /**
     * @mapping {@literal hashed f_jldxvahy Lnet/minecraft/unmapped/C_jricjyva;f_jldxvahy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4149,7 +3993,7 @@
    public static final Block DEEPSLATE_EMERALD_ORE = m_sfaglezr(
       "deepslate_emerald_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), settings),
-      AbstractBlock.Settings.variantOf(EMERALD_ORE).mapColor(C_vhpmxtfv.f_scyluqag).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
+      AbstractBlock.Settings.variantOf(EMERALD_ORE).mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
    );
    /**
     * @mapping {@literal hashed f_lzuxwhnz Lnet/minecraft/unmapped/C_jricjyva;f_lzuxwhnz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4158,7 +4002,7 @@
    public static final Block ENDER_CHEST = m_sfaglezr(
       "ender_chest",
       EnderChestBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).strength(22.5F, 600.0F).luminance(state -> 7)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(22.5F, 600.0F).luminance(state -> 7)
    );
    /**
     * @mapping {@literal hashed f_cxvjnoaw Lnet/minecraft/unmapped/C_jricjyva;f_cxvjnoaw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4183,7 +4027,7 @@
    public static final Block EMERALD_BLOCK = m_pddyceds(
       "emerald_block",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_cijaxihw)
+         .mapColor(MapColor.EMERALD)
          .instrument(NoteBlockInstrument.BIT)
          .toolRequired()
          .strength(5.0F, 6.0F)
@@ -4211,7 +4055,7 @@
    public static final Block COMMAND_BLOCK = m_sfaglezr(
       "command_block",
       settings -> new CommandBlock(false, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_glauclrj).toolRequired().strength(-1.0F, 3600000.0F).dropsNothing()
+      AbstractBlock.Settings.create().mapColor(MapColor.BROWN).toolRequired().strength(-1.0F, 3600000.0F).dropsNothing()
    );
    /**
     * @mapping {@literal hashed f_tjpthtoh Lnet/minecraft/unmapped/C_jricjyva;f_tjpthtoh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4221,7 +4065,7 @@
       "beacon",
       BeaconBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_urbqfdkv)
+         .mapColor(MapColor.DIAMOND)
          .instrument(NoteBlockInstrument.HAT)
          .strength(3.0F)
          .luminance(state -> 15)
@@ -4401,7 +4245,7 @@
       "carrots",
       CarrotsBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -4416,7 +4260,7 @@
       "potatoes",
       PotatoesBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -4603,7 +4447,7 @@
       "anvil",
       AnvilBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwvfejlz)
+         .mapColor(MapColor.METAL)
          .toolRequired()
          .strength(5.0F, 1200.0F)
          .sounds(BlockSoundGroup.ANVIL)
@@ -4617,7 +4461,7 @@
       "chipped_anvil",
       AnvilBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwvfejlz)
+         .mapColor(MapColor.METAL)
          .toolRequired()
          .strength(5.0F, 1200.0F)
          .sounds(BlockSoundGroup.ANVIL)
@@ -4631,7 +4475,7 @@
       "damaged_anvil",
       AnvilBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwvfejlz)
+         .mapColor(MapColor.METAL)
          .toolRequired()
          .strength(5.0F, 1200.0F)
          .sounds(BlockSoundGroup.ANVIL)
@@ -4644,12 +4488,7 @@
    public static final Block TRAPPED_CHEST = m_sfaglezr(
       "trapped_chest",
       TrappedChestBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.5F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.5F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_uwiqpsqt Lnet/minecraft/unmapped/C_jricjyva;f_uwiqpsqt:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4658,7 +4497,7 @@
    public static final Block LIGHT_WEIGHTED_PRESSURE_PLATE = m_sfaglezr(
       "light_weighted_pressure_plate",
       settings -> new WeightedPressurePlateBlock(15, BlockSetType.GOLD, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_rzfkujer).solid().noCollision().strength(0.5F).pistonBehavior(PistonBehavior.DESTROY)
+      AbstractBlock.Settings.create().mapColor(MapColor.GOLD).solid().noCollision().strength(0.5F).pistonBehavior(PistonBehavior.DESTROY)
    );
    /**
     * @mapping {@literal hashed f_omngadht Lnet/minecraft/unmapped/C_jricjyva;f_omngadht:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4667,7 +4506,7 @@
    public static final Block HEAVY_WEIGHTED_PRESSURE_PLATE = m_sfaglezr(
       "heavy_weighted_pressure_plate",
       settings -> new WeightedPressurePlateBlock(150, BlockSetType.IRON, settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jwvfejlz).solid().noCollision().strength(0.5F).pistonBehavior(PistonBehavior.DESTROY)
+      AbstractBlock.Settings.create().mapColor(MapColor.METAL).solid().noCollision().strength(0.5F).pistonBehavior(PistonBehavior.DESTROY)
    );
    /**
     * @mapping {@literal hashed f_dupietke Lnet/minecraft/unmapped/C_jricjyva;f_dupietke:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4683,12 +4522,7 @@
    public static final Block DAYLIGHT_DETECTOR = m_sfaglezr(
       "daylight_detector",
       DaylightDetectorBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(0.2F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(0.2F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_oozfpiju Lnet/minecraft/unmapped/C_jricjyva;f_oozfpiju:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4697,12 +4531,7 @@
    public static final Block REDSTONE_BLOCK = m_sfaglezr(
       "redstone_block",
       RedstoneBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwoawcrh)
-         .toolRequired()
-         .strength(5.0F, 6.0F)
-         .sounds(BlockSoundGroup.METAL)
-         .solidBlock(Blocks::nonSolid)
+      AbstractBlock.Settings.create().mapColor(MapColor.FIRE).toolRequired().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).solidBlock(Blocks::nonSolid)
    );
    /**
     * @mapping {@literal hashed f_zyfjggci Lnet/minecraft/unmapped/C_jricjyva;f_zyfjggci:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4712,7 +4541,7 @@
       "nether_quartz_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(2, 5), settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_vmmrnpkh)
+         .mapColor(MapColor.NETHER)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(3.0F, 3.0F)
@@ -4725,22 +4554,21 @@
    public static final Block HOPPER = m_sfaglezr(
       "hopper",
       HopperBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).toolRequired().strength(3.0F, 4.8F).sounds(BlockSoundGroup.METAL).nonOpaque()
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).toolRequired().strength(3.0F, 4.8F).sounds(BlockSoundGroup.METAL).nonOpaque()
    );
    /**
     * @mapping {@literal hashed f_finfloqz Lnet/minecraft/unmapped/C_jricjyva;f_finfloqz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named QUARTZ_BLOCK Lnet/minecraft/block/Blocks;QUARTZ_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block QUARTZ_BLOCK = m_pddyceds(
-      "quartz_block", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jwcnmjgk).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
+      "quartz_block", AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
    );
    /**
     * @mapping {@literal hashed f_mgxzrskp Lnet/minecraft/unmapped/C_jricjyva;f_mgxzrskp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named CHISELED_QUARTZ_BLOCK Lnet/minecraft/block/Blocks;CHISELED_QUARTZ_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block CHISELED_QUARTZ_BLOCK = m_pddyceds(
-      "chiseled_quartz_block",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jwcnmjgk).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
+      "chiseled_quartz_block", AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
    );
    /**
     * @mapping {@literal hashed f_ymromsah Lnet/minecraft/unmapped/C_jricjyva;f_ymromsah:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4749,7 +4577,7 @@
    public static final Block QUARTZ_PILLAR = m_sfaglezr(
       "quartz_pillar",
       PillarBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jwcnmjgk).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
+      AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
    );
    /**
     * @mapping {@literal hashed f_naiixubt Lnet/minecraft/unmapped/C_jricjyva;f_naiixubt:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4770,7 +4598,7 @@
    public static final Block DROPPER = m_sfaglezr(
       "dropper",
       DropperBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.5F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.5F)
    );
    /**
     * @mapping {@literal hashed f_mwxtaqcx Lnet/minecraft/unmapped/C_jricjyva;f_mwxtaqcx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4778,7 +4606,7 @@
     */
    public static final Block WHITE_TERRACOTTA = m_pddyceds(
       "white_terracotta",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_ytfwvurw).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
+      AbstractBlock.Settings.create().mapColor(MapColor.WHITE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
    );
    /**
     * @mapping {@literal hashed f_dqkdzeqp Lnet/minecraft/unmapped/C_jricjyva;f_dqkdzeqp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4786,7 +4614,7 @@
     */
    public static final Block ORANGE_TERRACOTTA = m_pddyceds(
       "orange_terracotta",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_hnivhujq).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
+      AbstractBlock.Settings.create().mapColor(MapColor.ORANGE_TERRACOTTA).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)
    );
    /**
     * @mapping {@literal hashed f_fswulhdh Lnet/minecraft/unmapped/C_jricjyva;f_fswulhdh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -4794,7 +4622,7 @@
     */
    public static final Block MAGENTA_TERRACOTTA = m_pddyceds(
       "magenta_terracotta",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_detzeinz).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.25F, 4.2F)

The diff for this file is not complete!

The remaining diff is too long!

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3):
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2025-02-16 23:42:20.235439620 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2025-02-16 23:41:16.264077016 +0000
@@ -48,7 +48,6 @@
 import net.minecraft.unmapped.C_gdxifluw;
 import net.minecraft.unmapped.C_qnrzjsej;
 import net.minecraft.unmapped.C_ujcipsff;
-import net.minecraft.unmapped.C_vhpmxtfv;
 import net.minecraft.util.Color;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
@@ -88,29 +87,28 @@
     * @mapping {@literal named STONE Lnet/minecraft/block/Blocks;STONE:Lnet/minecraft/block/Block;}
     */
    public static final Block STONE = m_pddyceds(
-      "stone", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      "stone", AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_olptsozb Lnet/minecraft/unmapped/C_jricjyva;f_olptsozb:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named GRANITE Lnet/minecraft/block/Blocks;GRANITE:Lnet/minecraft/block/Block;}
     */
    public static final Block GRANITE = m_pddyceds(
-      "granite", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_fnpmdvjp).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      "granite", AbstractBlock.Settings.create().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_sicwklru Lnet/minecraft/unmapped/C_jricjyva;f_sicwklru:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named POLISHED_GRANITE Lnet/minecraft/block/Blocks;POLISHED_GRANITE:Lnet/minecraft/block/Block;}
     */
    public static final Block POLISHED_GRANITE = m_pddyceds(
-      "polished_granite",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_fnpmdvjp).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      "polished_granite", AbstractBlock.Settings.create().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_ixxcaedz Lnet/minecraft/unmapped/C_jricjyva;f_ixxcaedz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named DIORITE Lnet/minecraft/block/Blocks;DIORITE:Lnet/minecraft/block/Block;}
     */
    public static final Block DIORITE = m_pddyceds(
-      "diorite", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jwcnmjgk).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      "diorite", AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_rqkjaazm Lnet/minecraft/unmapped/C_jricjyva;f_rqkjaazm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -118,14 +116,14 @@
     */
    public static final Block POLISHED_DIORITE = m_pddyceds(
       "polished_diorite",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jwcnmjgk).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.QUARTZ).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_miaaekio Lnet/minecraft/unmapped/C_jricjyva;f_miaaekio:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named ANDESITE Lnet/minecraft/block/Blocks;ANDESITE:Lnet/minecraft/block/Block;}
     */
    public static final Block ANDESITE = m_pddyceds(
-      "andesite", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      "andesite", AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_jlcriwlw Lnet/minecraft/unmapped/C_jricjyva;f_jlcriwlw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -133,45 +131,40 @@
     */
    public static final Block POLISHED_ANDESITE = m_pddyceds(
       "polished_andesite",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(1.5F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_cjtfedqw Lnet/minecraft/unmapped/C_jricjyva;f_cjtfedqw:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named GRASS_BLOCK Lnet/minecraft/block/Blocks;GRASS_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block GRASS_BLOCK = m_sfaglezr(
-      "grass_block",
-      GrassBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_irfhhwbl).ticksRandomly().strength(0.6F).sounds(BlockSoundGroup.GRASS)
+      "grass_block", GrassBlock::new, AbstractBlock.Settings.create().mapColor(MapColor.GRASS).ticksRandomly().strength(0.6F).sounds(BlockSoundGroup.GRASS)
    );
    /**
     * @mapping {@literal hashed f_esqarths Lnet/minecraft/unmapped/C_jricjyva;f_esqarths:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named DIRT Lnet/minecraft/block/Blocks;DIRT:Lnet/minecraft/block/Block;}
     */
-   public static final Block DIRT = m_pddyceds(
-      "dirt", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_fnpmdvjp).strength(0.5F).sounds(BlockSoundGroup.GRAVEL)
-   );
+   public static final Block DIRT = m_pddyceds("dirt", AbstractBlock.Settings.create().mapColor(MapColor.DIRT).strength(0.5F).sounds(BlockSoundGroup.GRAVEL));
    /**
     * @mapping {@literal hashed f_snvnbzhj Lnet/minecraft/unmapped/C_jricjyva;f_snvnbzhj:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named COARSE_DIRT Lnet/minecraft/block/Blocks;COARSE_DIRT:Lnet/minecraft/block/Block;}
     */
    public static final Block COARSE_DIRT = m_pddyceds(
-      "coarse_dirt", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_fnpmdvjp).strength(0.5F).sounds(BlockSoundGroup.GRAVEL)
+      "coarse_dirt", AbstractBlock.Settings.create().mapColor(MapColor.DIRT).strength(0.5F).sounds(BlockSoundGroup.GRAVEL)
    );
    /**
     * @mapping {@literal hashed f_hoeapvcx Lnet/minecraft/unmapped/C_jricjyva;f_hoeapvcx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named PODZOL Lnet/minecraft/block/Blocks;PODZOL:Lnet/minecraft/block/Block;}
     */
    public static final Block PODZOL = m_sfaglezr(
-      "podzol", SnowyBlock::new, AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jtgbxwmj).strength(0.5F).sounds(BlockSoundGroup.GRAVEL)
+      "podzol", SnowyBlock::new, AbstractBlock.Settings.create().mapColor(MapColor.PODZOL).strength(0.5F).sounds(BlockSoundGroup.GRAVEL)
    );
    /**
     * @mapping {@literal hashed f_odpmvrzo Lnet/minecraft/unmapped/C_jricjyva;f_odpmvrzo:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named COBBLESTONE Lnet/minecraft/block/Blocks;COBBLESTONE:Lnet/minecraft/block/Block;}
     */
    public static final Block COBBLESTONE = m_pddyceds(
-      "cobblestone",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F)
+      "cobblestone", AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(2.0F, 6.0F)
    );
    /**
     * @mapping {@literal hashed f_iesajtma Lnet/minecraft/unmapped/C_jricjyva;f_iesajtma:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -180,7 +173,7 @@
    public static final Block OAK_PLANKS = m_pddyceds(
       "oak_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
+         .mapColor(MapColor.WOOD)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -193,7 +186,7 @@
    public static final Block SPRUCE_PLANKS = m_pddyceds(
       "spruce_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jtgbxwmj)
+         .mapColor(MapColor.PODZOL)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -206,7 +199,7 @@
    public static final Block BIRCH_PLANKS = m_pddyceds(
       "birch_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ffusurqd)
+         .mapColor(MapColor.SAND)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -219,7 +212,7 @@
    public static final Block JUNGLE_PLANKS = m_pddyceds(
       "jungle_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_fnpmdvjp)
+         .mapColor(MapColor.DIRT)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -232,7 +225,7 @@
    public static final Block ACACIA_PLANKS = m_pddyceds(
       "acacia_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_gkbjpdny)
+         .mapColor(MapColor.ORANGE)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -245,7 +238,7 @@
    public static final Block CHERRY_PLANKS = m_pddyceds(
       "cherry_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ytfwvurw)
+         .mapColor(MapColor.WHITE_TERRACOTTA)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.CHERRY_WOOD)
@@ -258,7 +251,7 @@
    public static final Block DARK_OAK_PLANKS = m_pddyceds(
       "dark_oak_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_glauclrj)
+         .mapColor(MapColor.BROWN)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -271,12 +264,7 @@
    public static final Block PALE_OAK_WOOD = m_sfaglezr(
       "pale_oak_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_aizqsezc)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_htqcerrg Lnet/minecraft/unmapped/C_jricjyva;f_htqcerrg:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -285,7 +273,7 @@
    public static final Block PALE_OAK_PLANKS = m_pddyceds(
       "pale_oak_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwcnmjgk)
+         .mapColor(MapColor.QUARTZ)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -298,7 +286,7 @@
    public static final Block MANGROVE_PLANKS = m_pddyceds(
       "mangrove_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_lfadxhyj)
+         .mapColor(MapColor.RED)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -311,7 +299,7 @@
    public static final Block BAMBOO_PLANKS = m_pddyceds(
       "bamboo_planks",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_crmswdpe)
+         .mapColor(MapColor.YELLOW)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.BAMBOO_WOOD)
@@ -324,7 +312,7 @@
    public static final Block BAMBOO_MOSAIC = m_pddyceds(
       "bamboo_mosaic",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_crmswdpe)
+         .mapColor(MapColor.YELLOW)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F, 3.0F)
          .sounds(BlockSoundGroup.BAMBOO_WOOD)
@@ -338,7 +326,7 @@
       "oak_sapling",
       settings -> new SaplingBlock(TreeGrower.OAK, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -353,7 +341,7 @@
       "spruce_sapling",
       settings -> new SaplingBlock(TreeGrower.SPRUCE, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -368,7 +356,7 @@
       "birch_sapling",
       settings -> new SaplingBlock(TreeGrower.BIRCH, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -383,7 +371,7 @@
       "jungle_sapling",
       settings -> new SaplingBlock(TreeGrower.JUNGLE, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -398,7 +386,7 @@
       "acacia_sapling",
       settings -> new SaplingBlock(TreeGrower.ACACIA, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -413,7 +401,7 @@
       "cherry_sapling",
       settings -> new SaplingBlock(TreeGrower.CHERRY, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_uzvlkknv)
+         .mapColor(MapColor.PINK)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -428,7 +416,7 @@
       "dark_oak_sapling",
       settings -> new SaplingBlock(TreeGrower.DARK_OAK, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -443,7 +431,7 @@
       "pale_oak_sapling",
       settings -> new SaplingBlock(TreeGrower.PALE_OAK, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwcnmjgk)
+         .mapColor(MapColor.QUARTZ)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -458,7 +446,7 @@
       "mangrove_propagule",
       settings -> new MangrovePropaguleBlock(TreeGrower.MANGROVE, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -473,7 +461,7 @@
    public static final Block BEDROCK = m_pddyceds(
       "bedrock",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_aizqsezc)
+         .mapColor(MapColor.STONE)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .strength(-1.0F, 3600000.0F)
          .dropsNothing()
@@ -487,7 +475,7 @@
       "water",
       settings -> new FluidBlock(Fluids.WATER, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ktlkonve)
+         .mapColor(MapColor.WATER)
          .replaceable()
          .noCollision()
          .strength(100.0F)
@@ -504,7 +492,7 @@
       "lava",
       settings -> new FluidBlock(Fluids.LAVA, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jwoawcrh)
+         .mapColor(MapColor.FIRE)
          .replaceable()
          .noCollision()
          .ticksRandomly()
@@ -522,7 +510,7 @@
    public static final Block SAND = m_sfaglezr(
       "sand",
       settings -> new GravelBlock(new Color(14406560), settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_ffusurqd).instrument(NoteBlockInstrument.SNARE).strength(0.5F).sounds(BlockSoundGroup.SAND)
+      AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.SNARE).strength(0.5F).sounds(BlockSoundGroup.SAND)
    );
    /**
     * @mapping {@literal hashed f_qjlbwlqh Lnet/minecraft/unmapped/C_jricjyva;f_qjlbwlqh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -532,7 +520,7 @@
       "suspicious_sand",
       settings -> new BrushableBlock(SAND, SoundEvents.ITEM_BRUSH_BRUSHING_SAND, SoundEvents.ITEM_BRUSH_BRUSHING_SAND, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ffusurqd)
+         .mapColor(MapColor.SAND)
          .instrument(NoteBlockInstrument.SNARE)
          .strength(0.25F)
          .sounds(BlockSoundGroup.SUSPICIOUS_SAND)
@@ -545,7 +533,7 @@
    public static final Block RED_SAND = m_sfaglezr(
       "red_sand",
       settings -> new GravelBlock(new Color(11098145), settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_gkbjpdny).instrument(NoteBlockInstrument.SNARE).strength(0.5F).sounds(BlockSoundGroup.SAND)
+      AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).instrument(NoteBlockInstrument.SNARE).strength(0.5F).sounds(BlockSoundGroup.SAND)
    );
    /**
     * @mapping {@literal hashed f_jlyquqqo Lnet/minecraft/unmapped/C_jricjyva;f_jlyquqqo:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -554,7 +542,7 @@
    public static final Block GRAVEL = m_sfaglezr(
       "gravel",
       settings -> new GravelBlock(new Color(-8356741), settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.SNARE).strength(0.6F).sounds(BlockSoundGroup.GRAVEL)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.SNARE).strength(0.6F).sounds(BlockSoundGroup.GRAVEL)
    );
    /**
     * @mapping {@literal hashed f_kigosslq Lnet/minecraft/unmapped/C_jricjyva;f_kigosslq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -564,7 +552,7 @@
       "suspicious_gravel",
       settings -> new BrushableBlock(GRAVEL, SoundEvents.ITEM_BRUSH_BRUSHING_GRAVEL, SoundEvents.ITEM_BRUSH_BRUSHING_GRAVEL, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_aizqsezc)
+         .mapColor(MapColor.STONE)
          .instrument(NoteBlockInstrument.SNARE)
          .strength(0.25F)
          .sounds(BlockSoundGroup.SUSPICIOUS_GRAVEL)
@@ -577,7 +565,7 @@
    public static final Block GOLD_ORE = m_sfaglezr(
       "gold_ore",
       settings -> new ExperienceDroppingBlock(ConstantIntProvider.create(0), settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
    );
    /**
     * @mapping {@literal hashed f_qrcarpky Lnet/minecraft/unmapped/C_jricjyva;f_qrcarpky:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -586,7 +574,7 @@
    public static final Block DEEPSLATE_GOLD_ORE = m_sfaglezr(
       "deepslate_gold_ore",
       settings -> new ExperienceDroppingBlock(ConstantIntProvider.create(0), settings),
-      AbstractBlock.Settings.variantOf(GOLD_ORE).mapColor(C_vhpmxtfv.f_scyluqag).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
+      AbstractBlock.Settings.variantOf(GOLD_ORE).mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
    );
    /**
     * @mapping {@literal hashed f_qrhoafnv Lnet/minecraft/unmapped/C_jricjyva;f_qrhoafnv:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -595,7 +583,7 @@
    public static final Block IRON_ORE = m_sfaglezr(
       "iron_ore",
       settings -> new ExperienceDroppingBlock(ConstantIntProvider.create(0), settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
    );
    /**
     * @mapping {@literal hashed f_cjvumcto Lnet/minecraft/unmapped/C_jricjyva;f_cjvumcto:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -604,7 +592,7 @@
    public static final Block DEEPSLATE_IRON_ORE = m_sfaglezr(
       "deepslate_iron_ore",
       settings -> new ExperienceDroppingBlock(ConstantIntProvider.create(0), settings),
-      AbstractBlock.Settings.variantOf(IRON_ORE).mapColor(C_vhpmxtfv.f_scyluqag).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
+      AbstractBlock.Settings.variantOf(IRON_ORE).mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
    );
    /**
     * @mapping {@literal hashed f_nqrhowym Lnet/minecraft/unmapped/C_jricjyva;f_nqrhowym:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -613,7 +601,7 @@
    public static final Block COAL_ORE = m_sfaglezr(
       "coal_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
    );
    /**
     * @mapping {@literal hashed f_cuyxurhy Lnet/minecraft/unmapped/C_jricjyva;f_cuyxurhy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -622,7 +610,7 @@
    public static final Block DEEPSLATE_COAL_ORE = m_sfaglezr(
       "deepslate_coal_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), settings),
-      AbstractBlock.Settings.variantOf(COAL_ORE).mapColor(C_vhpmxtfv.f_scyluqag).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
+      AbstractBlock.Settings.variantOf(COAL_ORE).mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
    );
    /**
     * @mapping {@literal hashed f_xtyixcid Lnet/minecraft/unmapped/C_jricjyva;f_xtyixcid:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -632,7 +620,7 @@
       "nether_gold_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(0, 1), settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_vmmrnpkh)
+         .mapColor(MapColor.NETHER)
          .instrument(NoteBlockInstrument.BASEDRUM)
          .toolRequired()
          .strength(3.0F, 3.0F)
@@ -642,49 +630,39 @@
     * @mapping {@literal hashed f_bcurrimy Lnet/minecraft/unmapped/C_jricjyva;f_bcurrimy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named OAK_LOG Lnet/minecraft/block/Blocks;OAK_LOG:Lnet/minecraft/block/Block;}
     */
-   public static final Block OAK_LOG = m_sfaglezr("oak_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_euiziiwx, C_vhpmxtfv.f_jtgbxwmj, BlockSoundGroup.WOOD));
+   public static final Block OAK_LOG = m_sfaglezr("oak_log", PillarBlock::new, m_zclwojlu(MapColor.WOOD, MapColor.PODZOL, BlockSoundGroup.WOOD));
    /**
     * @mapping {@literal hashed f_jlshdpob Lnet/minecraft/unmapped/C_jricjyva;f_jlshdpob:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named SPRUCE_LOG Lnet/minecraft/block/Blocks;SPRUCE_LOG:Lnet/minecraft/block/Block;}
     */
-   public static final Block SPRUCE_LOG = m_sfaglezr(
-      "spruce_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_jtgbxwmj, C_vhpmxtfv.f_glauclrj, BlockSoundGroup.WOOD)
-   );
+   public static final Block SPRUCE_LOG = m_sfaglezr("spruce_log", PillarBlock::new, m_zclwojlu(MapColor.PODZOL, MapColor.BROWN, BlockSoundGroup.WOOD));
    /**
     * @mapping {@literal hashed f_sweuyjsf Lnet/minecraft/unmapped/C_jricjyva;f_sweuyjsf:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named BIRCH_LOG Lnet/minecraft/block/Blocks;BIRCH_LOG:Lnet/minecraft/block/Block;}
     */
-   public static final Block BIRCH_LOG = m_sfaglezr(
-      "birch_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_ffusurqd, C_vhpmxtfv.f_jwcnmjgk, BlockSoundGroup.WOOD)
-   );
+   public static final Block BIRCH_LOG = m_sfaglezr("birch_log", PillarBlock::new, m_zclwojlu(MapColor.SAND, MapColor.QUARTZ, BlockSoundGroup.WOOD));
    /**
     * @mapping {@literal hashed f_aqjgxlrm Lnet/minecraft/unmapped/C_jricjyva;f_aqjgxlrm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named JUNGLE_LOG Lnet/minecraft/block/Blocks;JUNGLE_LOG:Lnet/minecraft/block/Block;}
     */
-   public static final Block JUNGLE_LOG = m_sfaglezr(
-      "jungle_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_fnpmdvjp, C_vhpmxtfv.f_jtgbxwmj, BlockSoundGroup.WOOD)
-   );
+   public static final Block JUNGLE_LOG = m_sfaglezr("jungle_log", PillarBlock::new, m_zclwojlu(MapColor.DIRT, MapColor.PODZOL, BlockSoundGroup.WOOD));
    /**
     * @mapping {@literal hashed f_ewhnerto Lnet/minecraft/unmapped/C_jricjyva;f_ewhnerto:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named ACACIA_LOG Lnet/minecraft/block/Blocks;ACACIA_LOG:Lnet/minecraft/block/Block;}
     */
-   public static final Block ACACIA_LOG = m_sfaglezr(
-      "acacia_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_gkbjpdny, C_vhpmxtfv.f_aizqsezc, BlockSoundGroup.WOOD)
-   );
+   public static final Block ACACIA_LOG = m_sfaglezr("acacia_log", PillarBlock::new, m_zclwojlu(MapColor.ORANGE, MapColor.STONE, BlockSoundGroup.WOOD));
    /**
     * @mapping {@literal hashed f_fvhabbhr Lnet/minecraft/unmapped/C_jricjyva;f_fvhabbhr:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named CHERRY_LOG Lnet/minecraft/block/Blocks;CHERRY_LOG:Lnet/minecraft/block/Block;}
     */
    public static final Block CHERRY_LOG = m_sfaglezr(
-      "cherry_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_ytfwvurw, C_vhpmxtfv.f_qwcqojfw, BlockSoundGroup.CHERRY_WOOD)
+      "cherry_log", PillarBlock::new, m_zclwojlu(MapColor.WHITE_TERRACOTTA, MapColor.GRAY_TERRACOTTA, BlockSoundGroup.CHERRY_WOOD)
    );
    /**
     * @mapping {@literal hashed f_olfymprn Lnet/minecraft/unmapped/C_jricjyva;f_olfymprn:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named DARK_OAK_LOG Lnet/minecraft/block/Blocks;DARK_OAK_LOG:Lnet/minecraft/block/Block;}
     */
-   public static final Block DARK_OAK_LOG = m_sfaglezr(
-      "dark_oak_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_glauclrj, C_vhpmxtfv.f_glauclrj, BlockSoundGroup.WOOD)
-   );
+   public static final Block DARK_OAK_LOG = m_sfaglezr("dark_oak_log", PillarBlock::new, m_zclwojlu(MapColor.BROWN, MapColor.BROWN, BlockSoundGroup.WOOD));
    /**
     * @mapping {@literal hashed f_tthpqihn Lnet/minecraft/unmapped/C_jricjyva;f_tthpqihn:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named PALE_OAK_LOG Lnet/minecraft/block/Blocks;PALE_OAK_LOG:Lnet/minecraft/block/Block;}
@@ -696,9 +674,7 @@
     * @mapping {@literal hashed f_vfparczn Lnet/minecraft/unmapped/C_jricjyva;f_vfparczn:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named MANGROVE_LOG Lnet/minecraft/block/Blocks;MANGROVE_LOG:Lnet/minecraft/block/Block;}
     */
-   public static final Block MANGROVE_LOG = m_sfaglezr(
-      "mangrove_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_lfadxhyj, C_vhpmxtfv.f_jtgbxwmj, BlockSoundGroup.WOOD)
-   );
+   public static final Block MANGROVE_LOG = m_sfaglezr("mangrove_log", PillarBlock::new, m_zclwojlu(MapColor.RED, MapColor.PODZOL, BlockSoundGroup.WOOD));
    /**
     * @mapping {@literal hashed f_jghnzpoo Lnet/minecraft/unmapped/C_jricjyva;f_jghnzpoo:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named MANGROVE_ROOTS Lnet/minecraft/block/Blocks;MANGROVE_ROOTS:Lnet/minecraft/block/Block;}
@@ -707,7 +683,7 @@
       "mangrove_roots",
       MangroveRootsBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jtgbxwmj)
+         .mapColor(MapColor.PODZOL)
          .instrument(NoteBlockInstrument.BASS)
          .strength(0.7F)
          .sounds(BlockSoundGroup.MANGROVE_ROOTS)
@@ -724,56 +700,56 @@
    public static final Block MUDDY_MANGROVE_ROOTS = m_sfaglezr(
       "muddy_mangrove_roots",
       PillarBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_jtgbxwmj).strength(0.7F).sounds(BlockSoundGroup.MUDDY_MANGROVE_ROOTS)
+      AbstractBlock.Settings.create().mapColor(MapColor.PODZOL).strength(0.7F).sounds(BlockSoundGroup.MUDDY_MANGROVE_ROOTS)
    );
    /**
     * @mapping {@literal hashed f_ccnkgwju Lnet/minecraft/unmapped/C_jricjyva;f_ccnkgwju:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named BAMBOO_BLOCK Lnet/minecraft/block/Blocks;BAMBOO_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block BAMBOO_BLOCK = m_sfaglezr(
-      "bamboo_block", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_crmswdpe, C_vhpmxtfv.f_librttps, BlockSoundGroup.BAMBOO_WOOD)
+      "bamboo_block", PillarBlock::new, m_zclwojlu(MapColor.YELLOW, MapColor.PLANT, BlockSoundGroup.BAMBOO_WOOD)
    );
    /**
     * @mapping {@literal hashed f_bgggmxjb Lnet/minecraft/unmapped/C_jricjyva;f_bgggmxjb:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named STRIPPED_SPRUCE_LOG Lnet/minecraft/block/Blocks;STRIPPED_SPRUCE_LOG:Lnet/minecraft/block/Block;}
     */
    public static final Block STRIPPED_SPRUCE_LOG = m_sfaglezr(
-      "stripped_spruce_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_jtgbxwmj, C_vhpmxtfv.f_jtgbxwmj, BlockSoundGroup.WOOD)
+      "stripped_spruce_log", PillarBlock::new, m_zclwojlu(MapColor.PODZOL, MapColor.PODZOL, BlockSoundGroup.WOOD)
    );
    /**
     * @mapping {@literal hashed f_suqiqtta Lnet/minecraft/unmapped/C_jricjyva;f_suqiqtta:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named STRIPPED_BIRCH_LOG Lnet/minecraft/block/Blocks;STRIPPED_BIRCH_LOG:Lnet/minecraft/block/Block;}
     */
    public static final Block STRIPPED_BIRCH_LOG = m_sfaglezr(
-      "stripped_birch_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_ffusurqd, C_vhpmxtfv.f_ffusurqd, BlockSoundGroup.WOOD)
+      "stripped_birch_log", PillarBlock::new, m_zclwojlu(MapColor.SAND, MapColor.SAND, BlockSoundGroup.WOOD)
    );
    /**
     * @mapping {@literal hashed f_gnpwpiay Lnet/minecraft/unmapped/C_jricjyva;f_gnpwpiay:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named STRIPPED_JUNGLE_LOG Lnet/minecraft/block/Blocks;STRIPPED_JUNGLE_LOG:Lnet/minecraft/block/Block;}
     */
    public static final Block STRIPPED_JUNGLE_LOG = m_sfaglezr(
-      "stripped_jungle_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_fnpmdvjp, C_vhpmxtfv.f_fnpmdvjp, BlockSoundGroup.WOOD)
+      "stripped_jungle_log", PillarBlock::new, m_zclwojlu(MapColor.DIRT, MapColor.DIRT, BlockSoundGroup.WOOD)
    );
    /**
     * @mapping {@literal hashed f_jlkpyhin Lnet/minecraft/unmapped/C_jricjyva;f_jlkpyhin:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named STRIPPED_ACACIA_LOG Lnet/minecraft/block/Blocks;STRIPPED_ACACIA_LOG:Lnet/minecraft/block/Block;}
     */
    public static final Block STRIPPED_ACACIA_LOG = m_sfaglezr(
-      "stripped_acacia_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_gkbjpdny, C_vhpmxtfv.f_gkbjpdny, BlockSoundGroup.WOOD)
+      "stripped_acacia_log", PillarBlock::new, m_zclwojlu(MapColor.ORANGE, MapColor.ORANGE, BlockSoundGroup.WOOD)
    );
    /**
     * @mapping {@literal hashed f_psqcqeii Lnet/minecraft/unmapped/C_jricjyva;f_psqcqeii:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named STRIPPED_CHERRY_LOG Lnet/minecraft/block/Blocks;STRIPPED_CHERRY_LOG:Lnet/minecraft/block/Block;}
     */
    public static final Block STRIPPED_CHERRY_LOG = m_sfaglezr(
-      "stripped_cherry_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_ytfwvurw, C_vhpmxtfv.f_jxjskblr, BlockSoundGroup.CHERRY_WOOD)
+      "stripped_cherry_log", PillarBlock::new, m_zclwojlu(MapColor.WHITE_TERRACOTTA, MapColor.PINK_TERRACOTTA, BlockSoundGroup.CHERRY_WOOD)
    );
    /**
     * @mapping {@literal hashed f_zvshavbx Lnet/minecraft/unmapped/C_jricjyva;f_zvshavbx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named STRIPPED_DARK_OAK_LOG Lnet/minecraft/block/Blocks;STRIPPED_DARK_OAK_LOG:Lnet/minecraft/block/Block;}
     */
    public static final Block STRIPPED_DARK_OAK_LOG = m_sfaglezr(
-      "stripped_dark_oak_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_glauclrj, C_vhpmxtfv.f_glauclrj, BlockSoundGroup.WOOD)
+      "stripped_dark_oak_log", PillarBlock::new, m_zclwojlu(MapColor.BROWN, MapColor.BROWN, BlockSoundGroup.WOOD)
    );
    /**
     * @mapping {@literal hashed f_bndwoayp Lnet/minecraft/unmapped/C_jricjyva;f_bndwoayp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -786,22 +762,20 @@
     * @mapping {@literal hashed f_fdkoyodn Lnet/minecraft/unmapped/C_jricjyva;f_fdkoyodn:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named STRIPPED_OAK_LOG Lnet/minecraft/block/Blocks;STRIPPED_OAK_LOG:Lnet/minecraft/block/Block;}
     */
-   public static final Block STRIPPED_OAK_LOG = m_sfaglezr(
-      "stripped_oak_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_euiziiwx, C_vhpmxtfv.f_euiziiwx, BlockSoundGroup.WOOD)
-   );
+   public static final Block STRIPPED_OAK_LOG = m_sfaglezr("stripped_oak_log", PillarBlock::new, m_zclwojlu(MapColor.WOOD, MapColor.WOOD, BlockSoundGroup.WOOD));
    /**
     * @mapping {@literal hashed f_vpvanuoy Lnet/minecraft/unmapped/C_jricjyva;f_vpvanuoy:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named STRIPPED_MANGROVE_LOG Lnet/minecraft/block/Blocks;STRIPPED_MANGROVE_LOG:Lnet/minecraft/block/Block;}
     */
    public static final Block STRIPPED_MANGROVE_LOG = m_sfaglezr(
-      "stripped_mangrove_log", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_lfadxhyj, C_vhpmxtfv.f_lfadxhyj, BlockSoundGroup.WOOD)
+      "stripped_mangrove_log", PillarBlock::new, m_zclwojlu(MapColor.RED, MapColor.RED, BlockSoundGroup.WOOD)
    );
    /**
     * @mapping {@literal hashed f_npedtjne Lnet/minecraft/unmapped/C_jricjyva;f_npedtjne:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named STRIPPED_BAMBOO_BLOCK Lnet/minecraft/block/Blocks;STRIPPED_BAMBOO_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block STRIPPED_BAMBOO_BLOCK = m_sfaglezr(
-      "stripped_bamboo_block", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_crmswdpe, C_vhpmxtfv.f_crmswdpe, BlockSoundGroup.BAMBOO_WOOD)
+      "stripped_bamboo_block", PillarBlock::new, m_zclwojlu(MapColor.YELLOW, MapColor.YELLOW, BlockSoundGroup.BAMBOO_WOOD)
    );
    /**
     * @mapping {@literal hashed f_nnujulpm Lnet/minecraft/unmapped/C_jricjyva;f_nnujulpm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -810,12 +784,7 @@
    public static final Block OAK_WOOD = m_sfaglezr(
       "oak_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_bzmekqoc Lnet/minecraft/unmapped/C_jricjyva;f_bzmekqoc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -825,7 +794,7 @@
       "spruce_wood",
       PillarBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jtgbxwmj)
+         .mapColor(MapColor.PODZOL)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -838,12 +807,7 @@
    public static final Block BIRCH_WOOD = m_sfaglezr(
       "birch_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ffusurqd)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_fharjosr Lnet/minecraft/unmapped/C_jricjyva;f_fharjosr:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -852,12 +816,7 @@
    public static final Block JUNGLE_WOOD = m_sfaglezr(
       "jungle_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_fnpmdvjp)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_bidwmisg Lnet/minecraft/unmapped/C_jricjyva;f_bidwmisg:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -866,12 +825,7 @@
    public static final Block ACACIA_WOOD = m_sfaglezr(
       "acacia_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_sqdaeqju)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.GRAY).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_wxksrtvx Lnet/minecraft/unmapped/C_jricjyva;f_wxksrtvx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -881,7 +835,7 @@
       "cherry_wood",
       PillarBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_qwcqojfw)
+         .mapColor(MapColor.GRAY_TERRACOTTA)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F)
          .sounds(BlockSoundGroup.CHERRY_WOOD)
@@ -894,12 +848,7 @@
    public static final Block DARK_OAK_WOOD = m_sfaglezr(
       "dark_oak_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_glauclrj)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.BROWN).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_aegtqfdq Lnet/minecraft/unmapped/C_jricjyva;f_aegtqfdq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -908,12 +857,7 @@
    public static final Block MANGROVE_WOOD = m_sfaglezr(
       "mangrove_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_lfadxhyj)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.RED).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_enbguolq Lnet/minecraft/unmapped/C_jricjyva;f_enbguolq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -922,12 +866,7 @@
    public static final Block STRIPPED_OAK_WOOD = m_sfaglezr(
       "stripped_oak_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_mxcxprmv Lnet/minecraft/unmapped/C_jricjyva;f_mxcxprmv:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -937,7 +876,7 @@
       "stripped_spruce_wood",
       PillarBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jtgbxwmj)
+         .mapColor(MapColor.PODZOL)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -950,12 +889,7 @@
    public static final Block STRIPPED_BIRCH_WOOD = m_sfaglezr(
       "stripped_birch_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ffusurqd)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_dfvbajwk Lnet/minecraft/unmapped/C_jricjyva;f_dfvbajwk:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -964,12 +898,7 @@
    public static final Block STRIPPED_JUNGLE_WOOD = m_sfaglezr(
       "stripped_jungle_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_fnpmdvjp)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_lwevqoox Lnet/minecraft/unmapped/C_jricjyva;f_lwevqoox:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -979,7 +908,7 @@
       "stripped_acacia_wood",
       PillarBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_gkbjpdny)
+         .mapColor(MapColor.ORANGE)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F)
          .sounds(BlockSoundGroup.WOOD)
@@ -993,7 +922,7 @@
       "stripped_cherry_wood",
       PillarBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jxjskblr)
+         .mapColor(MapColor.PINK_TERRACOTTA)
          .instrument(NoteBlockInstrument.BASS)
          .strength(2.0F)
          .sounds(BlockSoundGroup.CHERRY_WOOD)
@@ -1006,12 +935,7 @@
    public static final Block STRIPPED_DARK_OAK_WOOD = m_sfaglezr(
       "stripped_dark_oak_wood",
       PillarBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_glauclrj)
-         .instrument(NoteBlockInstrument.BASS)
-         .strength(2.0F)
-         .sounds(BlockSoundGroup.WOOD)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.BROWN).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_zbhirmet Lnet/minecraft/unmapped/C_jricjyva;f_zbhirmet:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1032,7 +956,7 @@
     * @mapping {@literal named STRIPPED_MANGROVE_WOOD Lnet/minecraft/block/Blocks;STRIPPED_MANGROVE_WOOD:Lnet/minecraft/block/Block;}
     */
    public static final Block STRIPPED_MANGROVE_WOOD = m_sfaglezr(
-      "stripped_mangrove_wood", PillarBlock::new, m_zclwojlu(C_vhpmxtfv.f_lfadxhyj, C_vhpmxtfv.f_lfadxhyj, BlockSoundGroup.WOOD)
+      "stripped_mangrove_wood", PillarBlock::new, m_zclwojlu(MapColor.RED, MapColor.RED, BlockSoundGroup.WOOD)
    );
    /**
     * @mapping {@literal hashed f_ylpthxnp Lnet/minecraft/unmapped/C_jricjyva;f_ylpthxnp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1067,7 +991,7 @@
       "cherry_leaves",
       settings -> new C_gdxifluw(10, ParticleTypes.CHERRY_LEAVES, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_uzvlkknv)
+         .mapColor(MapColor.PINK)
          .strength(0.2F)
          .ticksRandomly()
          .sounds(BlockSoundGroup.CHERRY_LEAVES)
@@ -1092,7 +1016,7 @@
       "pale_oak_leaves",
       settings -> new C_gdxifluw(50, ParticleTypes.PALE_OAK_LEAVES, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_vzsmjjjk)
+         .mapColor(MapColor.GREEN_TERRACOTTA)
          .strength(0.2F)
          .ticksRandomly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1124,7 +1048,7 @@
     * @mapping {@literal named SPONGE Lnet/minecraft/block/Blocks;SPONGE:Lnet/minecraft/block/Block;}
     */
    public static final Block SPONGE = m_sfaglezr(
-      "sponge", SpongeBlock::new, AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_crmswdpe).strength(0.6F).sounds(BlockSoundGroup.BLOCK_SPONGE_BREAK)
+      "sponge", SpongeBlock::new, AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).strength(0.6F).sounds(BlockSoundGroup.BLOCK_SPONGE_BREAK)
    );
    /**
     * @mapping {@literal hashed f_jfwcczyc Lnet/minecraft/unmapped/C_jricjyva;f_jfwcczyc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1133,7 +1057,7 @@
    public static final Block WET_SPONGE = m_sfaglezr(
       "wet_sponge",
       WetSpongeBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_crmswdpe).strength(0.6F).sounds(BlockSoundGroup.BLOCK_WET_SPONGE_BREAK)
+      AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).strength(0.6F).sounds(BlockSoundGroup.BLOCK_WET_SPONGE_BREAK)
    );
    /**
     * @mapping {@literal hashed f_chdxuwwk Lnet/minecraft/unmapped/C_jricjyva;f_chdxuwwk:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1159,7 +1083,7 @@
    public static final Block LAPIS_ORE = m_sfaglezr(
       "lapis_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(2, 5), settings),
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.0F, 3.0F)
    );
    /**
     * @mapping {@literal hashed f_byvyxowv Lnet/minecraft/unmapped/C_jricjyva;f_byvyxowv:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1168,14 +1092,14 @@
    public static final Block DEEPSLATE_LAPIS_ORE = m_sfaglezr(
       "deepslate_lapis_ore",
       settings -> new ExperienceDroppingBlock(UniformIntProvider.create(2, 5), settings),
-      AbstractBlock.Settings.variantOf(LAPIS_ORE).mapColor(C_vhpmxtfv.f_scyluqag).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
+      AbstractBlock.Settings.variantOf(LAPIS_ORE).mapColor(MapColor.DEEPSLATE).strength(4.5F, 3.0F).sounds(BlockSoundGroup.DEEPSLATE)
    );
    /**
     * @mapping {@literal hashed f_tnbfbejv Lnet/minecraft/unmapped/C_jricjyva;f_tnbfbejv:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named LAPIS_BLOCK Lnet/minecraft/block/Blocks;LAPIS_BLOCK:Lnet/minecraft/block/Block;}
     */
    public static final Block LAPIS_BLOCK = m_pddyceds(
-      "lapis_block", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_uxhejfdj).toolRequired().strength(3.0F, 3.0F)
+      "lapis_block", AbstractBlock.Settings.create().mapColor(MapColor.LAPIS).toolRequired().strength(3.0F, 3.0F)
    );
    /**
     * @mapping {@literal hashed f_lhdoydbp Lnet/minecraft/unmapped/C_jricjyva;f_lhdoydbp:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1184,29 +1108,28 @@
    public static final Block DISPENSER = m_sfaglezr(
       "dispenser",
       DispenserBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.5F)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(3.5F)
    );
    /**
     * @mapping {@literal hashed f_pwbenjav Lnet/minecraft/unmapped/C_jricjyva;f_pwbenjav:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named SANDSTONE Lnet/minecraft/block/Blocks;SANDSTONE:Lnet/minecraft/block/Block;}
     */
    public static final Block SANDSTONE = m_pddyceds(
-      "sandstone", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_ffusurqd).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
+      "sandstone", AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
    );
    /**
     * @mapping {@literal hashed f_xwlekcgq Lnet/minecraft/unmapped/C_jricjyva;f_xwlekcgq:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named CHISELED_SANDSTONE Lnet/minecraft/block/Blocks;CHISELED_SANDSTONE:Lnet/minecraft/block/Block;}
     */
    public static final Block CHISELED_SANDSTONE = m_pddyceds(
-      "chiseled_sandstone",
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_ffusurqd).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
+      "chiseled_sandstone", AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
    );
    /**
     * @mapping {@literal hashed f_htsjxxsu Lnet/minecraft/unmapped/C_jricjyva;f_htsjxxsu:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named CUT_SANDSTONE Lnet/minecraft/block/Blocks;CUT_SANDSTONE:Lnet/minecraft/block/Block;}
     */
    public static final Block CUT_SANDSTONE = m_pddyceds(
-      "cut_sandstone", AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_ffusurqd).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
+      "cut_sandstone", AbstractBlock.Settings.create().mapColor(MapColor.SAND).instrument(NoteBlockInstrument.BASEDRUM).toolRequired().strength(0.8F)
    );
    /**
     * @mapping {@literal hashed f_sevbmkqm Lnet/minecraft/unmapped/C_jricjyva;f_sevbmkqm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1215,12 +1138,7 @@
    public static final Block NOTE_BLOCK = m_sfaglezr(
       "note_block",
       NoteBlock::new,
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
-         .instrument(NoteBlockInstrument.BASS)
-         .sounds(BlockSoundGroup.WOOD)
-         .strength(0.8F)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.WOOD).instrument(NoteBlockInstrument.BASS).sounds(BlockSoundGroup.WOOD).strength(0.8F).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_ytwhzoev Lnet/minecraft/unmapped/C_jricjyva;f_ytwhzoev:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1329,7 +1247,7 @@
       "cobweb",
       CobwebBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_bwngrngh)
+         .mapColor(MapColor.WOOL)
          .sounds(BlockSoundGroup.BLOCK_COBWEB_BREAK)
          .solid()
          .noCollision()
@@ -1345,7 +1263,7 @@
       "short_grass",
       PlantBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .replaceable()
          .noCollision()
          .breakInstantly()
@@ -1362,7 +1280,7 @@
       "fern",
       PlantBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .replaceable()
          .noCollision()
          .breakInstantly()
@@ -1379,7 +1297,7 @@
       "dead_bush",
       DeadBushBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_euiziiwx)
+         .mapColor(MapColor.WOOD)
          .replaceable()
          .noCollision()
          .breakInstantly()
@@ -1395,7 +1313,7 @@
       "seagrass",
       SeagrassBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ktlkonve)
+         .mapColor(MapColor.WATER)
          .replaceable()
          .noCollision()
          .breakInstantly()
@@ -1410,7 +1328,7 @@
       "tall_seagrass",
       TallSeagrassBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_ktlkonve)
+         .mapColor(MapColor.WATER)
          .replaceable()
          .noCollision()
          .breakInstantly()
@@ -1430,7 +1348,7 @@
    public static final Block PISTON_HEAD = m_sfaglezr(
       "piston_head",
       PistonHeadBlock::new,
-      AbstractBlock.Settings.create().mapColor(C_vhpmxtfv.f_aizqsezc).strength(1.5F).dropsNothing().pistonBehavior(PistonBehavior.BLOCK)
+      AbstractBlock.Settings.create().mapColor(MapColor.STONE).strength(1.5F).dropsNothing().pistonBehavior(PistonBehavior.BLOCK)
    );
    /**
     * @mapping {@literal hashed f_yfxcrehf Lnet/minecraft/unmapped/C_jricjyva;f_yfxcrehf:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1439,7 +1357,7 @@
    public static final Block WHITE_WOOL = m_pddyceds(
       "white_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_alpcltxq)
+         .mapColor(MapColor.SNOW)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1452,7 +1370,7 @@
    public static final Block ORANGE_WOOL = m_pddyceds(
       "orange_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_gkbjpdny)
+         .mapColor(MapColor.ORANGE)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1465,7 +1383,7 @@
    public static final Block MAGENTA_WOOL = m_pddyceds(
       "magenta_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_gvosgpop)
+         .mapColor(MapColor.MAGENTA)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1478,7 +1396,7 @@
    public static final Block LIGHT_BLUE_WOOL = m_pddyceds(
       "light_blue_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_jmtdcopl)
+         .mapColor(MapColor.LIGHT_BLUE)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1491,7 +1409,7 @@
    public static final Block YELLOW_WOOL = m_pddyceds(
       "yellow_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_crmswdpe)
+         .mapColor(MapColor.YELLOW)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1504,7 +1422,7 @@
    public static final Block LIME_WOOL = m_pddyceds(
       "lime_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_cnvcslfe)
+         .mapColor(MapColor.LIME)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1517,7 +1435,7 @@
    public static final Block PINK_WOOL = m_pddyceds(
       "pink_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_uzvlkknv)
+         .mapColor(MapColor.PINK)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1530,7 +1448,7 @@
    public static final Block GRAY_WOOL = m_pddyceds(
       "gray_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_sqdaeqju)
+         .mapColor(MapColor.GRAY)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1543,7 +1461,7 @@
    public static final Block LIGHT_GRAY_WOOL = m_pddyceds(
       "light_gray_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_zdrwyqnb)
+         .mapColor(MapColor.LIGHT_GRAY)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1556,7 +1474,7 @@
    public static final Block CYAN_WOOL = m_pddyceds(
       "cyan_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_kqmerndc)
+         .mapColor(MapColor.CYAN)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1569,7 +1487,7 @@
    public static final Block PURPLE_WOOL = m_pddyceds(
       "purple_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_miwsejow)
+         .mapColor(MapColor.PURPLE)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1582,7 +1500,7 @@
    public static final Block BLUE_WOOL = m_pddyceds(
       "blue_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_bavpcjfh)
+         .mapColor(MapColor.BLUE)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1595,7 +1513,7 @@
    public static final Block BROWN_WOOL = m_pddyceds(
       "brown_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_glauclrj)
+         .mapColor(MapColor.BROWN)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1608,7 +1526,7 @@
    public static final Block GREEN_WOOL = m_pddyceds(
       "green_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_tnwxiwcj)
+         .mapColor(MapColor.GREEN)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1620,12 +1538,7 @@
     */
    public static final Block RED_WOOL = m_pddyceds(
       "red_wool",
-      AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_lfadxhyj)
-         .instrument(NoteBlockInstrument.GUITAR)
-         .strength(0.8F)
-         .sounds(BlockSoundGroup.WOOL)
-         .lavaIgnitable()
+      AbstractBlock.Settings.create().mapColor(MapColor.RED).instrument(NoteBlockInstrument.GUITAR).strength(0.8F).sounds(BlockSoundGroup.WOOL).lavaIgnitable()
    );
    /**
     * @mapping {@literal hashed f_snabdnsa Lnet/minecraft/unmapped/C_jricjyva;f_snabdnsa:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -1634,7 +1547,7 @@
    public static final Block BLACK_WOOL = m_pddyceds(
       "black_wool",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_hmzpcgsp)
+         .mapColor(MapColor.BLACK)
          .instrument(NoteBlockInstrument.GUITAR)
          .strength(0.8F)
          .sounds(BlockSoundGroup.WOOL)
@@ -1648,7 +1561,7 @@
       "moving_piston",
       PistonExtensionBlock::new,
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_aizqsezc)
+         .mapColor(MapColor.STONE)
          .solid()
          .strength(-1.0F)
          .dynamicBounds()
@@ -1667,7 +1580,7 @@
       "dandelion",
       settings -> new FlowerBlock(StatusEffects.SATURATION, 0.35F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1682,7 +1595,7 @@
       "torchflower",
       settings -> new FlowerBlock(StatusEffects.NIGHT_VISION, 5.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1697,7 +1610,7 @@
       "poppy",
       settings -> new FlowerBlock(StatusEffects.NIGHT_VISION, 5.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1712,7 +1625,7 @@
       "blue_orchid",
       settings -> new FlowerBlock(StatusEffects.SATURATION, 0.35F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1727,7 +1640,7 @@
       "allium",
       settings -> new FlowerBlock(StatusEffects.FIRE_RESISTANCE, 3.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1742,7 +1655,7 @@
       "azure_bluet",
       settings -> new FlowerBlock(StatusEffects.BLINDNESS, 11.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1757,7 +1670,7 @@
       "red_tulip",
       settings -> new FlowerBlock(StatusEffects.WEAKNESS, 7.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1772,7 +1685,7 @@
       "orange_tulip",
       settings -> new FlowerBlock(StatusEffects.WEAKNESS, 7.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1787,7 +1700,7 @@
       "white_tulip",
       settings -> new FlowerBlock(StatusEffects.WEAKNESS, 7.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1802,7 +1715,7 @@
       "pink_tulip",
       settings -> new FlowerBlock(StatusEffects.WEAKNESS, 7.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1817,7 +1730,7 @@
       "oxeye_daisy",
       settings -> new FlowerBlock(StatusEffects.REGENERATION, 7.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1832,7 +1745,7 @@
       "cornflower",
       settings -> new FlowerBlock(StatusEffects.JUMP_BOOST, 5.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1847,7 +1760,7 @@
       "wither_rose",
       settings -> new WitherRoseBlock(StatusEffects.WITHER, 7.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1862,7 +1775,7 @@
       "lily_of_the_valley",
       settings -> new FlowerBlock(StatusEffects.POISON, 11.0F, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_librttps)
+         .mapColor(MapColor.PLANT)
          .noCollision()
          .breakInstantly()
          .sounds(BlockSoundGroup.GRASS)
@@ -1877,7 +1790,7 @@
       "brown_mushroom",
       settings -> new MushroomPlantBlock(TreeConfiguredFeatures.HUGE_BROWN_MUSHROOM, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_glauclrj)
+         .mapColor(MapColor.BROWN)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -1894,7 +1807,7 @@
       "red_mushroom",
       settings -> new MushroomPlantBlock(TreeConfiguredFeatures.HUGE_RED_MUSHROOM, settings),
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_lfadxhyj)
+         .mapColor(MapColor.RED)
          .noCollision()
          .ticksRandomly()
          .breakInstantly()
@@ -1909,7 +1822,7 @@
    public static final Block GOLD_BLOCK = m_pddyceds(
       "gold_block",
       AbstractBlock.Settings.create()
-         .mapColor(C_vhpmxtfv.f_rzfkujer)
+         .mapColor(MapColor.GOLD)
          .instrument(NoteBlockInstrument.BELL)

The diff for this file is not complete!

Please sign in to comment.