diff --git a/patches/minecraft/net/minecraft/world/level/block/state/BlockBehaviour.java.patch b/patches/minecraft/net/minecraft/world/level/block/state/BlockBehaviour.java.patch index 5f4bf81cac..deecc108be 100644 --- a/patches/minecraft/net/minecraft/world/level/block/state/BlockBehaviour.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/state/BlockBehaviour.java.patch @@ -88,7 +88,8 @@ } public MaterialColor m_60780_(BlockGetter p_60781_, BlockPos p_60782_) { - return this.f_60598_; +- return this.f_60598_; ++ return m_60734_().getMapColor(this.m_7160_(), p_60781_, p_60782_, this.f_60598_); } + /** @deprecated use {@link BlockState#rotate(LevelAccessor, BlockPos, Rotation)} */ diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java index 2a36b8d51e..1a6a3d49fa 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java @@ -23,7 +23,9 @@ import net.minecraft.world.entity.projectile.WitherSkull; import net.minecraft.world.item.*; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.pathfinder.BlockPathTypes; import net.minecraft.tags.BlockTags; import net.minecraft.core.Direction; @@ -879,4 +881,17 @@ public interface IForgeBlock { return fluid.canHydrate(getter, fluidPos, state, pos); } + + /** + * Returns the {@link MaterialColor} shown on the map. + * + * @param state The state of this block + * @param level The level this block is in + * @param pos The blocks position in the level + * @param defaultColor The {@code MaterialColor} configured for the given {@code BlockState} in the {@link BlockBehaviour.Properties} + */ + default MaterialColor getMapColor(BlockState state, BlockGetter level, BlockPos pos, MaterialColor defaultColor) + { + return defaultColor; + } }