From 02509fa44d046972d91fa3950737bf7f749e1c4f Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Wed, 4 Sep 2019 11:28:28 +0200 Subject: [PATCH] remove useless config option: distance limit --- .../kotlin/mods/betterfoliage/client/config/Config.kt | 10 ---------- .../mods/betterfoliage/client/render/RenderAlgae.kt | 1 - .../mods/betterfoliage/client/render/RenderCactus.kt | 1 - .../mods/betterfoliage/client/render/RenderCoral.kt | 1 - .../mods/betterfoliage/client/render/RenderGrass.kt | 1 - .../mods/betterfoliage/client/render/RenderLeaves.kt | 1 - .../mods/betterfoliage/client/render/RenderLilypad.kt | 1 - .../mods/betterfoliage/client/render/RenderLog.kt | 1 - .../mods/betterfoliage/client/render/RenderMycelium.kt | 3 +-- .../betterfoliage/client/render/RenderNetherrack.kt | 3 +-- .../mods/betterfoliage/client/render/RenderReeds.kt | 1 - 11 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/main/kotlin/mods/betterfoliage/client/config/Config.kt b/src/main/kotlin/mods/betterfoliage/client/config/Config.kt index 4cab178..c5b5ad9 100644 --- a/src/main/kotlin/mods/betterfoliage/client/config/Config.kt +++ b/src/main/kotlin/mods/betterfoliage/client/config/Config.kt @@ -13,7 +13,6 @@ import org.lwjgl.opengl.GL11 // BetterFoliage-specific property delegates private val OBSOLETE = ObsoleteConfigProperty() private fun featureEnable() = boolean(true).lang("enabled") -private fun distanceLimit() = int(min=1, max=1000, default=1000).lang("distance") fun biomeList(defaults: (Biome) -> Boolean) = intList { Biome.REGISTRY .filter { it != null && defaults(it) } @@ -59,7 +58,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI object leaves { val enabled by featureEnable() val snowEnabled by boolean(true) - val distance by distanceLimit() val hOffset by double(max=0.4, default=0.2).lang("hOffset") val vOffset by double(max=0.4, default=0.1).lang("vOffset") val size by double(min=0.75, max=2.5, default=1.4).lang("size") @@ -70,7 +68,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI val grassEnabled by boolean(true) val myceliumEnabled by boolean(true) val snowEnabled by boolean(true) - val distance by distanceLimit() val hOffset by double(max=0.4, default=0.2).lang("hOffset") val heightMin by double(min=0.1, max=2.5, default=0.6).lang("heightMin") val heightMax by double(min=0.1, max=2.5, default=0.8).lang("heightMax") @@ -95,7 +92,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI object roundLogs { val enabled by featureEnable() - val distance by distanceLimit() val radiusSmall by double(max=0.5, default=0.25) val radiusLarge by double(max=0.5, default=0.44) val dimming by float(default = 0.7) @@ -109,7 +105,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI object cactus { val enabled by featureEnable() - val distance by distanceLimit() val size by double(min=0.5, max=1.5, default=0.8).lang("size") val sizeVariation by double(max=0.5, default=0.1) val hOffset by double(max=0.5, default=0.1).lang("hOffset") @@ -117,14 +112,12 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI object lilypad { val enabled by featureEnable() - val distance by distanceLimit() val hOffset by double(max=0.25, default=0.1).lang("hOffset") val flowerChance by int(max=64, default=16, min=0) } object reed { val enabled by featureEnable() - val distance by distanceLimit() val hOffset by double(max=0.4, default=0.2).lang("hOffset") val heightMin by double(min=1.5, max=3.5, default=1.7).lang("heightMin") val heightMax by double(min=1.5, max=3.5, default=2.2).lang("heightMax") @@ -135,7 +128,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI object algae { val enabled by featureEnable() - val distance by distanceLimit() val hOffset by double(max=0.25, default=0.1).lang("hOffset") val size by double(min=0.5, max=1.5, default=1.0).lang("size") val heightMin by double(min=0.1, max=1.5, default=0.5).lang("heightMin") @@ -147,7 +139,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI object coral { val enabled by featureEnable() - val distance by distanceLimit() val shallowWater by boolean(false) val hOffset by double(max=0.4, default=0.2).lang("hOffset") val vOffset by double(max=0.4, default=0.1).lang("vOffset") @@ -160,7 +151,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI object netherrack { val enabled by featureEnable() - val distance by distanceLimit() val hOffset by double(max=0.4, default=0.2).lang("hOffset") val heightMin by double(min=0.1, max=1.5, default=0.6).lang("heightMin") val heightMax by double(min=0.1, max=1.5, default=0.8).lang("heightMax") diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderAlgae.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderAlgae.kt index 81a0a92..255601b 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderAlgae.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderAlgae.kt @@ -29,7 +29,6 @@ class RenderAlgae : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext) = Config.enabled && Config.algae.enabled && - ctx.cameraDistance < Config.algae.distance && ctx.blockState(up2).material == Material.WATER && ctx.blockState(up1).material == Material.WATER && Config.blocks.dirt.matchesClass(ctx.block) && diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderCactus.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderCactus.kt index e04911f..f92776f 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderCactus.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderCactus.kt @@ -94,7 +94,6 @@ class RenderCactus : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext): Boolean = Config.enabled && Config.cactus.enabled && - ctx.cameraDistance < Config.cactus.distance && Config.blocks.cactus.matchesClass(ctx.block) override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean { diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderCoral.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderCoral.kt index dfe05e1..69a07d0 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderCoral.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderCoral.kt @@ -47,7 +47,6 @@ class RenderCoral : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext) = Config.enabled && Config.coral.enabled && - ctx.cameraDistance < Config.coral.distance && (ctx.blockState(up2).material == Material.WATER || Config.coral.shallowWater) && ctx.blockState(up1).material == Material.WATER && Config.blocks.sand.matchesClass(ctx.block) && diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderGrass.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderGrass.kt index aff8a77..359eb74 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderGrass.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderGrass.kt @@ -49,7 +49,6 @@ class RenderGrass : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext) = Config.enabled && - ctx.cameraDistance < Config.shortGrass.distance && (Config.shortGrass.grassEnabled || Config.connectedGrass.enabled) && GrassRegistry[ctx, UP] != null diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt index 7a9765b..2269601 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt @@ -46,7 +46,6 @@ class RenderLeaves : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext) = Config.enabled && Config.leaves.enabled && - ctx.cameraDistance < Config.leaves.distance && LeafRegistry[ctx, DOWN] != null override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean { diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderLilypad.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderLilypad.kt index e623525..4beea88 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderLilypad.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderLilypad.kt @@ -41,7 +41,6 @@ class RenderLilypad : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext): Boolean = Config.enabled && Config.lilypad.enabled && - ctx.cameraDistance < Config.lilypad.distance && Config.blocks.lilypad.matchesClass(ctx.block) override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean { diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt index 7a722bc..380971f 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt @@ -25,7 +25,6 @@ class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext) = Config.enabled && Config.roundLogs.enabled && - ctx.cameraDistance < Config.roundLogs.distance && Config.blocks.logClasses.matchesClass(ctx.block) override val registry: IColumnRegistry get() = LogRegistry diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt index a4ffc39..2062d88 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt @@ -28,8 +28,7 @@ class RenderMycelium : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext): Boolean { if (!Config.enabled || !Config.shortGrass.myceliumEnabled) return false - return Config.blocks.mycelium.matchesClass(ctx.block) && - ctx.cameraDistance < Config.shortGrass.distance + return Config.blocks.mycelium.matchesClass(ctx.block) } override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, 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 3911e81..913f44d 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderNetherrack.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderNetherrack.kt @@ -34,8 +34,7 @@ class RenderNetherrack : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) override fun isEligible(ctx: BlockContext): Boolean { if (!Config.enabled || !Config.netherrack.enabled) return false - return Config.blocks.netherrack.matchesClass(ctx.block) && - ctx.cameraDistance < Config.netherrack.distance + return Config.blocks.netherrack.matchesClass(ctx.block) } override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean { diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderReeds.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderReeds.kt index c421931..963e001 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderReeds.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderReeds.kt @@ -46,7 +46,6 @@ class RenderReeds : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) { override fun isEligible(ctx: BlockContext) = Config.enabled && Config.reed.enabled && - ctx.cameraDistance < Config.reed.distance && ctx.blockState(up2).material == Material.AIR && ctx.blockState(up1).material == Material.WATER && Config.blocks.dirt.matchesClass(ctx.block) &&