diff --git a/src/main/kotlin/mods/betterfoliage/client/config/Config.kt b/src/main/kotlin/mods/betterfoliage/client/config/Config.kt index 4abf14f..dce8746 100644 --- a/src/main/kotlin/mods/betterfoliage/client/config/Config.kt +++ b/src/main/kotlin/mods/betterfoliage/client/config/Config.kt @@ -36,6 +36,7 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI val leavesModels = ModelTextureListConfigOption(BetterFoliageMod.DOMAIN, "LeavesModelsDefault.cfg", 1) val grassClasses = ConfigurableBlockMatcher(BetterFoliageMod.DOMAIN, "GrassBlocksDefault.cfg") val grassModels = ModelTextureListConfigOption(BetterFoliageMod.DOMAIN, "GrassModelsDefault.cfg", 1) + val mycelium = ConfigurableBlockMatcher(BetterFoliageMod.DOMAIN, "MyceliumBlocksDefault.cfg") val dirt = ConfigurableBlockMatcher(BetterFoliageMod.DOMAIN, "DirtDefault.cfg") val crops = ConfigurableBlockMatcher(BetterFoliageMod.DOMAIN, "CropDefault.cfg") val logClasses = ConfigurableBlockMatcher(BetterFoliageMod.DOMAIN, "LogBlocksDefault.cfg") @@ -43,6 +44,7 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI val sand = ConfigurableBlockMatcher(BetterFoliageMod.DOMAIN, "SandDefault.cfg") val lilypad = ConfigurableBlockMatcher(BetterFoliageMod.DOMAIN, "LilypadDefault.cfg") val cactus = ConfigurableBlockMatcher(BetterFoliageMod.DOMAIN, "CactusDefault.cfg") + val netherrack = ConfigurableBlockMatcher(BetterFoliageMod.DOMAIN, "NetherrackBlocksDefault.cfg") val leavesWhitelist = OBSOLETE val leavesBlacklist = OBSOLETE diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt index 3608eb0..40921ec 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt @@ -11,7 +11,6 @@ import mods.octarinecore.common.Double3 import mods.octarinecore.common.Rotation import net.minecraft.client.renderer.BlockRendererDispatcher import net.minecraft.client.renderer.VertexBuffer -import net.minecraft.init.Blocks import net.minecraft.util.BlockRenderLayer import net.minecraftforge.fml.relauncher.Side import net.minecraftforge.fml.relauncher.SideOnly @@ -29,8 +28,8 @@ class RenderMycelium : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext): Boolean { if (!Config.enabled || !Config.shortGrass.myceliumEnabled) return false - return ctx.block == Blocks.MYCELIUM && - ctx.cameraDistance < Config.shortGrass.distance + return Config.blocks.mycelium.matchesClass(ctx.block) && + ctx.cameraDistance < Config.shortGrass.distance } override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: VertexBuffer, layer: BlockRenderLayer): Boolean { diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderNetherrack.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderNetherrack.kt index 880b7d8..0665e3f 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderNetherrack.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderNetherrack.kt @@ -9,7 +9,6 @@ import mods.octarinecore.common.Rotation import mods.octarinecore.random import net.minecraft.client.renderer.BlockRendererDispatcher import net.minecraft.client.renderer.VertexBuffer -import net.minecraft.init.Blocks import net.minecraft.util.BlockRenderLayer import net.minecraft.util.EnumFacing.* import net.minecraftforge.fml.relauncher.Side @@ -35,8 +34,8 @@ class RenderNetherrack : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) override fun isEligible(ctx: BlockContext): Boolean { if (!Config.enabled || !Config.netherrack.enabled) return false - return ctx.block == Blocks.NETHERRACK && - ctx.cameraDistance < Config.netherrack.distance + return Config.blocks.netherrack.matchesClass(ctx.block) && + ctx.cameraDistance < Config.netherrack.distance } override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: VertexBuffer, layer: BlockRenderLayer): Boolean { diff --git a/src/main/resources/assets/betterfoliage/MyceliumBlocksDefault.cfg b/src/main/resources/assets/betterfoliage/MyceliumBlocksDefault.cfg new file mode 100644 index 0000000..970dc3f --- /dev/null +++ b/src/main/resources/assets/betterfoliage/MyceliumBlocksDefault.cfg @@ -0,0 +1,5 @@ +// Vanilla +net.minecraft.block.BlockMycelium + +// NetherEx +nex.block.BlockMycelium diff --git a/src/main/resources/assets/betterfoliage/NetherrackBlocksDefault.cfg b/src/main/resources/assets/betterfoliage/NetherrackBlocksDefault.cfg new file mode 100644 index 0000000..ca37623 --- /dev/null +++ b/src/main/resources/assets/betterfoliage/NetherrackBlocksDefault.cfg @@ -0,0 +1,5 @@ +// Vanilla +net.minecraft.block.BlockNetherrack + +// NetherEx +nex.block.BlockNetherrack