MaterialColor -> MapColor

src/main/java/org/betterx/betterend/blocks/AeterniumBlock.java

@@ -8,14 +8,14 @@ import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
 public class AeterniumBlock extends BaseBlock implements CustomItemProvider {
     public AeterniumBlock() {
         super(FabricBlockSettings
-                .of(Material.METAL, MaterialColor.COLOR_GRAY)
+                .of(Material.METAL, MapColor.COLOR_GRAY)
                 .hardness(65F)
                 .resistance(1200F)
                 .requiresCorrectToolForDrops()

src/main/java/org/betterx/betterend/blocks/AmaranitaStemBlock.java

@@ -3,12 +3,12 @@ package org.betterx.betterend.blocks;
 import org.betterx.bclib.blocks.BaseRotatedPillarBlock;
 
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
 public class AmaranitaStemBlock extends BaseRotatedPillarBlock {
     public AmaranitaStemBlock() {
-        super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).mapColor(MaterialColor.COLOR_LIGHT_GREEN));
+        super(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS).mapColor(MapColor.COLOR_LIGHT_GREEN));
     }
 }

src/main/java/org/betterx/betterend/blocks/AmberBlock.java

@@ -3,12 +3,12 @@ package org.betterx.betterend.blocks;
 import org.betterx.bclib.blocks.BaseBlock;
 
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
 public class AmberBlock extends BaseBlock {
     public AmberBlock() {
-        super(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MaterialColor.COLOR_YELLOW));
+        super(FabricBlockSettings.copyOf(Blocks.DIAMOND_BLOCK).mapColor(MapColor.COLOR_YELLOW));
     }
 }

src/main/java/org/betterx/betterend/blocks/BrimstoneBlock.java

@@ -20,7 +20,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.Fluids;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
@@ -30,7 +30,7 @@ public class BrimstoneBlock extends BaseBlock {
     public static final BooleanProperty ACTIVATED = BlockProperties.ACTIVE;
 
     public BrimstoneBlock() {
-        super(FabricBlockSettings.copyOf(Blocks.END_STONE).mapColor(MaterialColor.COLOR_BROWN).randomTicks());
+        super(FabricBlockSettings.copyOf(Blocks.END_STONE).mapColor(MapColor.COLOR_BROWN).randomTicks());
         registerDefaultState(stateDefinition.any().setValue(ACTIVATED, false));
     }
 

src/main/java/org/betterx/betterend/blocks/BulbVineLanternBlock.java

@@ -16,7 +16,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -38,7 +38,7 @@ public class BulbVineLanternBlock extends EndLanternBlock implements RenderLayer
         this(FabricBlockSettings.of(Material.METAL)
                                 .hardness(1)
                                 .resistance(1)
-                                .mapColor(MaterialColor.COLOR_LIGHT_GRAY)
+                                .mapColor(MapColor.COLOR_LIGHT_GRAY)
                                 .luminance(15)
                                 .requiresCorrectToolForDrops()
                                 .sound(SoundType.LANTERN));

src/main/java/org/betterx/betterend/blocks/CrystalMossCoverBlock.java

@@ -21,7 +21,7 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
@@ -29,7 +29,7 @@ public class CrystalMossCoverBlock extends MultifaceBlock implements Bonemealabl
     private static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
     private final MultifaceSpreader spreader = new MultifaceSpreader(this);
 
-    public CrystalMossCoverBlock(MaterialColor color) {
+    public CrystalMossCoverBlock(MapColor color) {
         super(FabricBlockSettings.of(Material.REPLACEABLE_PLANT, color)
                                  .noCollission()
                                  .strength(0.2f)

src/main/java/org/betterx/betterend/blocks/EndStoneSmelter.java

@@ -28,7 +28,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.BlockHitResult;
@@ -48,7 +48,7 @@ public class EndStoneSmelter extends BaseBlockWithEntity implements AlloyingReci
     public static final String ID = "end_stone_smelter";
 
     public EndStoneSmelter() {
-        super(FabricBlockSettings.of(Material.STONE, MaterialColor.COLOR_GRAY)
+        super(FabricBlockSettings.of(Material.STONE, MapColor.COLOR_GRAY)
                                  .luminance(state -> state.getValue(LIT) ? 15 : 0)
                                  .hardness(4F)
                                  .resistance(100F)

src/main/java/org/betterx/betterend/blocks/EnderBlock.java

@@ -7,7 +7,7 @@ import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -16,7 +16,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 public class EnderBlock extends BaseBlock {
 
     public EnderBlock() {
-        super(FabricBlockSettings.of(Material.STONE, MaterialColor.WARPED_WART_BLOCK)
+        super(FabricBlockSettings.of(Material.STONE, MapColor.WARPED_WART_BLOCK)
                                  .hardness(5F)
                                  .resistance(6F)
                                  .requiresCorrectToolForDrops()

src/main/java/org/betterx/betterend/blocks/GlowingPillarLuminophorBlock.java

@@ -15,7 +15,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
@@ -24,7 +24,7 @@ public class GlowingPillarLuminophorBlock extends BaseBlock implements AddMineab
 
     public GlowingPillarLuminophorBlock() {
         super(FabricBlockSettings.of(Material.LEAVES)
-                                 .mapColor(MaterialColor.COLOR_ORANGE)
+                                 .mapColor(MapColor.COLOR_ORANGE)
                                  .strength(0.2F)
                                  .luminance(15)
                                  .sound(SoundType.GRASS));

src/main/java/org/betterx/betterend/blocks/HelixTreeLeavesBlock.java

@@ -22,7 +22,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.level.storage.loot.LootContext;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -36,7 +36,7 @@ public class HelixTreeLeavesBlock extends BaseBlock implements CustomColorProvid
     public HelixTreeLeavesBlock() {
         super(FabricBlockSettings
                 .of(Material.LEAVES)
-                .mapColor(MaterialColor.COLOR_ORANGE)
+                .mapColor(MapColor.COLOR_ORANGE)
                 .sound(SoundType.WART_BLOCK)
                 .sound(SoundType.GRASS)
                 .strength(0.2F)

src/main/java/org/betterx/betterend/blocks/HydraluxPetalBlock.java

@@ -9,7 +9,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
@@ -20,7 +20,7 @@ public class HydraluxPetalBlock extends BaseBlock implements AddMineableAxe {
                         .of(Material.PLANT)
                         .hardness(1)
                         .resistance(1)
-                        .mapColor(MaterialColor.PODZOL)
+                        .mapColor(MapColor.PODZOL)
                         .sound(SoundType.WART_BLOCK)
         );
     }

src/main/java/org/betterx/betterend/blocks/PallidiumBlock.java

@@ -15,7 +15,7 @@ import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.phys.BlockHitResult;
 
 import net.fabricmc.api.EnvType;
@@ -27,7 +27,7 @@ public class PallidiumBlock extends EndTerrainBlock {
     private final Block nextLevel;
 
     public PallidiumBlock(String thickness, Block nextLevel) {
-        super(MaterialColor.COLOR_LIGHT_GRAY);
+        super(MapColor.COLOR_LIGHT_GRAY);
         this.nextLevel = nextLevel;
     }
 

src/main/java/org/betterx/betterend/blocks/ShadowGrassBlock.java

@@ -12,7 +12,7 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -21,7 +21,7 @@ import java.util.List;
 
 public class ShadowGrassBlock extends EndTerrainBlock implements TagProvider {
     public ShadowGrassBlock() {
-        super(MaterialColor.COLOR_BLACK);
+        super(MapColor.COLOR_BLACK);
     }
 
     @Environment(EnvType.CLIENT)

src/main/java/org/betterx/betterend/blocks/SmaragdantCrystalShardBlock.java

@@ -37,7 +37,7 @@ public class SmaragdantCrystalShardBlock extends BaseAttachedBlock implements Ad
 
     public SmaragdantCrystalShardBlock() {
         super(FabricBlockSettings.of(Material.STONE)
-                                 .materialColor(MaterialColor.COLOR_GREEN)
+                                 .materialColor(MapColor.COLOR_GREEN)
                                  .luminance(15)
                                  .sound(SoundType.AMETHYST_CLUSTER)
                                  .requiresCorrectToolForDrops()

src/main/java/org/betterx/betterend/blocks/SulphurCrystalBlock.java

@@ -47,7 +47,7 @@ public class SulphurCrystalBlock extends BaseAttachedBlock implements AddMineabl
 
     public SulphurCrystalBlock() {
         super(FabricBlockSettings.of(Material.STONE)
-                                 .materialColor(MaterialColor.COLOR_YELLOW)
+                                 .materialColor(MapColor.COLOR_YELLOW)
                                  .sound(SoundType.GLASS)
                                  .requiresCorrectToolForDrops()
                                  .noCollission());

src/main/java/org/betterx/betterend/blocks/UmbrellaTreeClusterBlock.java

@@ -20,7 +20,7 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.phys.BlockHitResult;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -31,7 +31,7 @@ public class UmbrellaTreeClusterBlock extends BaseBlock {
     public UmbrellaTreeClusterBlock() {
         super(FabricBlockSettings
                 .copyOf(Blocks.NETHER_WART_BLOCK)
-                .mapColor(MaterialColor.COLOR_PURPLE)
+                .mapColor(MapColor.COLOR_PURPLE)
                 .luminance(15)
         );
         registerDefaultState(stateDefinition.any().setValue(NATURAL, false));

src/main/java/org/betterx/betterend/blocks/UmbrellaTreeClusterEmptyBlock.java

@@ -12,7 +12,7 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
@@ -22,7 +22,7 @@ public class UmbrellaTreeClusterEmptyBlock extends BaseBlock {
     public UmbrellaTreeClusterEmptyBlock() {
         super(FabricBlockSettings
                 .copyOf(Blocks.NETHER_WART_BLOCK)
-                .mapColor(MaterialColor.COLOR_PURPLE)
+                .mapColor(MapColor.COLOR_PURPLE)
                 .randomTicks()
         );
         registerDefaultState(stateDefinition.any().setValue(NATURAL, false));

src/main/java/org/betterx/betterend/blocks/basis/EndAnvilBlock.java

@@ -3,16 +3,16 @@ package org.betterx.betterend.blocks.basis;
 import org.betterx.bclib.blocks.LeveledAnvilBlock;
 import org.betterx.betterend.complexmaterials.MetalMaterial;
 
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 public class EndAnvilBlock extends LeveledAnvilBlock {
     protected MetalMaterial metalMaterial;
 
-    public EndAnvilBlock(MaterialColor color, int level) {
+    public EndAnvilBlock(MapColor color, int level) {
         super(color, level);
     }
 
-    public EndAnvilBlock(MetalMaterial metalMaterial, MaterialColor color, int level) {
+    public EndAnvilBlock(MetalMaterial metalMaterial, MapColor color, int level) {
         super(color, level);
         this.metalMaterial = metalMaterial;
     }

src/main/java/org/betterx/betterend/blocks/basis/EndTerrainBlock.java

@@ -9,12 +9,12 @@ import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import java.util.List;
 
 public class EndTerrainBlock extends BaseTerrainBlock implements PottableTerrain, TagProvider {
-    public EndTerrainBlock(MaterialColor color) {
+    public EndTerrainBlock(MapColor color) {
         super(Blocks.END_STONE, color);
     }
 

src/main/java/org/betterx/betterend/blocks/basis/EndTripleTerrain.java

@@ -4,10 +4,10 @@ import org.betterx.bclib.blocks.TripleTerrainBlock;
 import org.betterx.betterend.interfaces.PottableTerrain;
 
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 public class EndTripleTerrain extends TripleTerrainBlock implements PottableTerrain {
-    public EndTripleTerrain(MaterialColor color) {
+    public EndTripleTerrain(MapColor color) {
         super(Blocks.END_STONE, color);
     }
 }

src/main/java/org/betterx/betterend/blocks/basis/PottableLeavesBlock.java

@@ -4,15 +4,15 @@ import org.betterx.bclib.blocks.BaseLeavesBlock;
 import org.betterx.betterend.interfaces.PottablePlant;
 
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 public class PottableLeavesBlock extends BaseLeavesBlock implements PottablePlant {
 
-    public PottableLeavesBlock(Block sapling, MaterialColor color) {
+    public PottableLeavesBlock(Block sapling, MapColor color) {
         super(sapling, color);
     }
 
-    public PottableLeavesBlock(Block sapling, MaterialColor color, int light) {
+    public PottableLeavesBlock(Block sapling, MapColor color, int light) {
         super(sapling, color, light);
     }
 

src/main/java/org/betterx/betterend/complexmaterials/ColoredMaterial.java

@@ -10,7 +10,7 @@ import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.DyeItem;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
@@ -38,7 +38,7 @@ public class ColoredMaterial {
         String id = BuiltInRegistries.BLOCK.getKey(source).getPath();
         colors.forEach((color, name) -> {
             String blockName = id + "_" + name;
-            Block block = constructor.apply(FabricBlockSettings.copyOf(source).mapColor(MaterialColor.COLOR_BLACK));
+            Block block = constructor.apply(FabricBlockSettings.copyOf(source).mapColor(MapColor.COLOR_BLACK));
             EndBlocks.registerBlock(blockName, block);
             if (craftEight) {
                 BCLRecipeBuilder.crafting(BetterEnd.makeID(blockName), block)

src/main/java/org/betterx/betterend/complexmaterials/EndWoodenComplexMaterial.java

@@ -7,13 +7,13 @@ import org.betterx.betterend.registry.EndItems;
 
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 public class EndWoodenComplexMaterial extends WoodenComplexMaterial {
     private Block bark;
     private Block log;
 
-    public EndWoodenComplexMaterial(String name, MaterialColor woodColor, MaterialColor planksColor) {
+    public EndWoodenComplexMaterial(String name, MapColor woodColor, MapColor planksColor) {
         super(BetterEnd.MOD_ID, name, name, woodColor, planksColor);
     }
 

src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java

@@ -29,7 +29,7 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.BlockSetType;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
@@ -79,7 +79,7 @@ public class MetalMaterial {
 
     public static MetalMaterial makeNormal(
             String name,
-            MaterialColor color,
+            MapColor color,
             Tier material,
             ArmorMaterial armor,
             int anvilAndToolLevel
@@ -97,7 +97,7 @@ public class MetalMaterial {
 
     public static MetalMaterial makeNormal(
             String name,
-            MaterialColor color,
+            MapColor color,
             float hardness,
             float resistance,
             Tier material,
@@ -120,7 +120,7 @@ public class MetalMaterial {
 
     public static MetalMaterial makeOreless(
             String name,
-            MaterialColor color,
+            MapColor color,
             Tier material,
             ArmorMaterial armor,
             int anvilAndToolLevel
@@ -138,7 +138,7 @@ public class MetalMaterial {
 
     public static MetalMaterial makeOreless(
             String name,
-            MaterialColor color,
+            MapColor color,
             float hardness,
             float resistance,
             Tier material,

src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java

@@ -18,7 +18,7 @@ import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.properties.BlockSetType;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
@@ -44,11 +44,11 @@ public class StoneMaterial {
     public final Block furnace;
     public final Block flowerPot;
 
-    public static FabricBlockSettings createMaterial(MaterialColor color) {
+    public static FabricBlockSettings createMaterial(MapColor color) {
         return FabricBlockSettings.copyOf(Blocks.END_STONE).mapColor(color);
     }
 
-    public StoneMaterial(String name, MaterialColor color) {
+    public StoneMaterial(String name, MapColor color) {
         FabricBlockSettings material = createMaterial(color);
 
         this.baseName = name;

src/main/java/org/betterx/betterend/registry/EndBlocks.java

@@ -19,7 +19,7 @@ import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.material.MaterialColor;
+import net.minecraft.world.level.material.MapColor;
 
 import java.util.List;
 import org.jetbrains.annotations.ApiStatus;
@@ -32,29 +32,29 @@ public class EndBlocks {
     public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new EndstoneDustBlock());
     public static final Block END_MYCELIUM = registerBlock(
             "end_mycelium",
-            new EndTerrainBlock(MaterialColor.COLOR_LIGHT_BLUE)
+            new EndTerrainBlock(MapColor.COLOR_LIGHT_BLUE)
     );
     public static final Block END_MOSS = registerBlock(
             "end_moss",
-            new EndTerrainBlock(MaterialColor.COLOR_CYAN),
+            new EndTerrainBlock(MapColor.COLOR_CYAN),
             BCLBlockTags.BONEMEAL_SOURCE_END_STONE,
             BlockTags.NYLIUM
     );
     public static final Block CHORUS_NYLIUM = registerBlock(
             "chorus_nylium",
-            new EndTerrainBlock(MaterialColor.COLOR_MAGENTA),
+            new EndTerrainBlock(MapColor.COLOR_MAGENTA),
             BCLBlockTags.BONEMEAL_SOURCE_END_STONE,
             BlockTags.NYLIUM
     );
     public static final Block CAVE_MOSS = registerBlock(
             "cave_moss",
-            new EndTripleTerrain(MaterialColor.COLOR_PURPLE),
+            new EndTripleTerrain(MapColor.COLOR_PURPLE),
             BCLBlockTags.BONEMEAL_SOURCE_END_STONE,
             BlockTags.NYLIUM
     );
     public static final Block CRYSTAL_MOSS = registerBlock(
             "crystal_moss",
-            new EndTerrainBlock(MaterialColor.COLOR_PINK),
+            new EndTerrainBlock(MapColor.COLOR_PINK),
             BCLBlockTags.BONEMEAL_SOURCE_END_STONE,
             BlockTags.NYLIUM
     );
@@ -66,31 +66,31 @@ public class EndBlocks {
     );
     public static final Block PINK_MOSS = registerBlock(
             "pink_moss",
-            new EndTerrainBlock(MaterialColor.COLOR_PINK),
+            new EndTerrainBlock(MapColor.COLOR_PINK),
             BCLBlockTags.BONEMEAL_SOURCE_END_STONE,
             BlockTags.NYLIUM
     );
     public static final Block AMBER_MOSS = registerBlock(
             "amber_moss",
-            new EndTerrainBlock(MaterialColor.COLOR_ORANGE),
+            new EndTerrainBlock(MapColor.COLOR_ORANGE),
             BCLBlockTags.BONEMEAL_SOURCE_END_STONE,
             BlockTags.NYLIUM
     );
     public static final Block JUNGLE_MOSS = registerBlock(
             "jungle_moss",
-            new EndTerrainBlock(MaterialColor.COLOR_GREEN),
+            new EndTerrainBlock(MapColor.COLOR_GREEN),
             BCLBlockTags.BONEMEAL_SOURCE_END_STONE,
             BlockTags.NYLIUM
     );
     public static final Block SANGNUM = registerBlock(
             "sangnum",
-            new EndTerrainBlock(MaterialColor.COLOR_RED),
+            new EndTerrainBlock(MapColor.COLOR_RED),
             BCLBlockTags.BONEMEAL_SOURCE_END_STONE,
             BlockTags.NYLIUM
     );
     public static final Block RUTISCUS = registerBlock(
             "rutiscus",
-            new EndTerrainBlock(MaterialColor.COLOR_ORANGE),
+            new EndTerrainBlock(MapColor.COLOR_ORANGE),
             BCLBlockTags.BONEMEAL_SOURCE_END_STONE,
             BlockTags.NYLIUM
     );
@@ -160,19 +160,19 @@ public class EndBlocks {
     );
 
     // Rocks //
-    public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MaterialColor.SAND);
+    public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MapColor.SAND);
-    public static final StoneMaterial VIOLECITE = new StoneMaterial("violecite", MaterialColor.COLOR_PURPLE);
+    public static final StoneMaterial VIOLECITE = new StoneMaterial("violecite", MapColor.COLOR_PURPLE);
-    public static final StoneMaterial SULPHURIC_ROCK = new StoneMaterial("sulphuric_rock", MaterialColor.COLOR_BROWN);
+    public static final StoneMaterial SULPHURIC_ROCK = new StoneMaterial("sulphuric_rock", MapColor.COLOR_BROWN);
-    public static final StoneMaterial VIRID_JADESTONE = new StoneMaterial("virid_jadestone", MaterialColor.COLOR_GREEN);
+    public static final StoneMaterial VIRID_JADESTONE = new StoneMaterial("virid_jadestone", MapColor.COLOR_GREEN);
     public static final StoneMaterial AZURE_JADESTONE = new StoneMaterial(
             "azure_jadestone",
-            MaterialColor.COLOR_LIGHT_BLUE
+            MapColor.COLOR_LIGHT_BLUE
     );
     public static final StoneMaterial SANDY_JADESTONE = new StoneMaterial(
             "sandy_jadestone",
-            MaterialColor.COLOR_YELLOW
+            MapColor.COLOR_YELLOW
     );
-    public static final StoneMaterial UMBRALITH = new StoneMaterial("umbralith", MaterialColor.DEEPSLATE);
+    public static final StoneMaterial UMBRALITH = new StoneMaterial("umbralith", MapColor.DEEPSLATE);
     public static final Block BRIMSTONE = registerBlock("brimstone", new BrimstoneBlock());
     public static final Block SULPHUR_CRYSTAL = registerBlock("sulphur_crystal", new SulphurCrystalBlock());
     public static final Block MISSING_TILE = registerBlock("missing_tile", new MissingTileBlock());
@@ -246,8 +246,8 @@ public class EndBlocks {
     );
     public static final EndWoodenComplexMaterial MOSSY_GLOWSHROOM = new EndWoodenComplexMaterial(
             "mossy_glowshroom",
-            MaterialColor.COLOR_GRAY,
+            MapColor.COLOR_GRAY,
-            MaterialColor.WOOD
+            MapColor.WOOD
     ).init();
 
     public static final Block PYTHADENDRON_SAPLING = registerBlock(
@@ -258,13 +258,13 @@ public class EndBlocks {
             "pythadendron_leaves",
             new PottableLeavesBlock(
                     PYTHADENDRON_SAPLING,
-                    MaterialColor.COLOR_MAGENTA
+                    MapColor.COLOR_MAGENTA
             )
     );
     public static final EndWoodenComplexMaterial PYTHADENDRON = new EndWoodenComplexMaterial(
             "pythadendron",
-            MaterialColor.COLOR_MAGENTA,
+            MapColor.COLOR_MAGENTA,
-            MaterialColor.COLOR_PURPLE
+            MapColor.COLOR_PURPLE
     ).init();
 
     public static final Block END_LOTUS_SEED = registerBlock("end_lotus_seed", new EndLotusSeedBlock());
@@ -273,8 +273,8 @@ public class EndBlocks {
     public static final Block END_LOTUS_FLOWER = registerEndBlockOnly("end_lotus_flower", new EndLotusFlowerBlock());
     public static final EndWoodenComplexMaterial END_LOTUS = new EndWoodenComplexMaterial(
             "end_lotus",
-            MaterialColor.COLOR_LIGHT_BLUE,
+            MapColor.COLOR_LIGHT_BLUE,
-            MaterialColor.COLOR_CYAN
+            MapColor.COLOR_CYAN
     ).init();
 
     public static final Block LACUGROVE_SAPLING = registerBlock("lacugrove_sapling", new LacugroveSaplingBlock());
@@ -282,13 +282,13 @@ public class EndBlocks {
             "lacugrove_leaves",
             new PottableLeavesBlock(
                     LACUGROVE_SAPLING,
-                    MaterialColor.COLOR_CYAN
+                    MapColor.COLOR_CYAN
             )
     );
     public static final EndWoodenComplexMaterial LACUGROVE = new EndWoodenComplexMaterial(
             "lacugrove",
-            MaterialColor.COLOR_BROWN,
+            MapColor.COLOR_BROWN,
-            MaterialColor.COLOR_YELLOW
+            MapColor.COLOR_YELLOW
     ).init();
 
     public static final Block DRAGON_TREE_SAPLING = registerBlock("dragon_tree_sapling", new DragonTreeSaplingBlock());
@@ -296,13 +296,13 @@ public class EndBlocks {
             "dragon_tree_leaves",
             new PottableLeavesBlock(
                     DRAGON_TREE_SAPLING,
-                    MaterialColor.COLOR_MAGENTA
+                    MapColor.COLOR_MAGENTA
             )
     );
     public static final EndWoodenComplexMaterial DRAGON_TREE = new EndWoodenComplexMaterial(
             "dragon_tree",
-            MaterialColor.COLOR_BLACK,
+            MapColor.COLOR_BLACK,
-            MaterialColor.COLOR_MAGENTA
+            MapColor.COLOR_MAGENTA
     ).init();
 
     public static final Block TENANEA_SAPLING = registerBlock("tenanea_sapling", new TenaneaSaplingBlock());
@@ -310,7 +310,7 @@ public class EndBlocks {
             "tenanea_leaves",
             new PottableLeavesBlock(
                     TENANEA_SAPLING,
-                    MaterialColor.COLOR_PINK
+                    MapColor.COLOR_PINK
             )
     );
     public static final Block TENANEA_FLOWERS = registerBlock("tenanea_flowers", new TenaneaFlowersBlock());
@@ -320,16 +320,16 @@ public class EndBlocks {
     );
     public static final EndWoodenComplexMaterial TENANEA = new EndWoodenComplexMaterial(
             "tenanea",
-            MaterialColor.COLOR_BROWN,
+            MapColor.COLOR_BROWN,
-            MaterialColor.COLOR_PINK
+            MapColor.COLOR_PINK
     ).init();
 
     public static final Block HELIX_TREE_SAPLING = registerBlock("helix_tree_sapling", new HelixTreeSaplingBlock());
     public static final Block HELIX_TREE_LEAVES = registerBlock("helix_tree_leaves", new HelixTreeLeavesBlock());
     public static final EndWoodenComplexMaterial HELIX_TREE = new EndWoodenComplexMaterial(
             "helix_tree",
-            MaterialColor.COLOR_GRAY,
+            MapColor.COLOR_GRAY,
-            MaterialColor.COLOR_ORANGE
+            MapColor.COLOR_ORANGE
     ).init();
 
     public static final Block UMBRELLA_TREE_SAPLING = registerBlock(
@@ -350,8 +350,8 @@ public class EndBlocks {
     );
     public static final EndWoodenComplexMaterial UMBRELLA_TREE = new EndWoodenComplexMaterial(
             "umbrella_tree",
-            MaterialColor.COLOR_BLUE,
+            MapColor.COLOR_BLUE,
-            MaterialColor.COLOR_GREEN
+            MapColor.COLOR_GREEN
     ).init();
 
     public static final Block JELLYSHROOM_CAP_PURPLE = registerBlock(
@@ -367,8 +367,8 @@ public class EndBlocks {
     );
     public static final EndWoodenComplexMaterial JELLYSHROOM = new EndWoodenComplexMaterial(
             "jellyshroom",
-            MaterialColor.COLOR_PURPLE,
+            MapColor.COLOR_PURPLE,
-            MaterialColor.COLOR_LIGHT_BLUE
+            MapColor.COLOR_LIGHT_BLUE
     ).init();
 
     public static final Block LUCERNIA_SAPLING = registerBlock("lucernia_sapling", new LucerniaSaplingBlock());
@@ -376,7 +376,7 @@ public class EndBlocks {
             "lucernia_leaves",
             new PottableLeavesBlock(
                     LUCERNIA_SAPLING,
-                    MaterialColor.COLOR_ORANGE
+                    MapColor.COLOR_ORANGE
             )
     );
     public static final Block LUCERNIA_OUTER_LEAVES = registerBlock(
@@ -385,8 +385,8 @@ public class EndBlocks {
     );
     public static final EndWoodenComplexMaterial LUCERNIA = new EndWoodenComplexMaterial(
             "lucernia",
-            MaterialColor.COLOR_ORANGE,
+            MapColor.COLOR_ORANGE,
-            MaterialColor.COLOR_ORANGE
+            MapColor.COLOR_ORANGE
     ).init();
 
     // Small Plants //
@@ -446,7 +446,7 @@ public class EndBlocks {
 
     public static final Block CRYSTAL_MOSS_COVER = registerBlock(
             "crystal_moss_cover",
-            new CrystalMossCoverBlock(MaterialColor.COLOR_PINK)
+            new CrystalMossCoverBlock(MapColor.COLOR_PINK)
     );
 
     public static final Block BLUE_VINE_SEED = registerBlock("blue_vine_seed", new BlueVineSeedBlock());
@@ -562,7 +562,7 @@ public class EndBlocks {
 
     public static final Block CAVE_BUSH = registerBlock(
             "cave_bush",
-            new SimpleLeavesBlock(MaterialColor.COLOR_MAGENTA)
+            new SimpleLeavesBlock(MapColor.COLOR_MAGENTA)
     );
 
     public static final Block MURKWEED = registerBlock("murkweed", new MurkweedBlock());
@@ -608,7 +608,7 @@ public class EndBlocks {
     // Materials //
     public static final MetalMaterial THALLASIUM = MetalMaterial.makeNormal(
             "thallasium",
-            MaterialColor.COLOR_BLUE,
+            MapColor.COLOR_BLUE,
             EndToolMaterial.THALLASIUM,
             EndArmorMaterial.THALLASIUM,
             EndToolMaterial.THALLASIUM.getLevel()
@@ -616,7 +616,7 @@ public class EndBlocks {
 
     public static final MetalMaterial TERMINITE = MetalMaterial.makeOreless(
             "terminite",
-            MaterialColor.WARPED_WART_BLOCK,
+            MapColor.WARPED_WART_BLOCK,
             7F,
             9F,
             EndToolMaterial.TERMINITE,