remove useless config option: distance limit

This commit is contained in:
octarine-noise
2019-09-04 11:28:28 +02:00
parent 6801304bd1
commit 02509fa44d
11 changed files with 2 additions and 22 deletions

View File

@@ -13,7 +13,6 @@ import org.lwjgl.opengl.GL11
// BetterFoliage-specific property delegates // BetterFoliage-specific property delegates
private val OBSOLETE = ObsoleteConfigProperty() private val OBSOLETE = ObsoleteConfigProperty()
private fun featureEnable() = boolean(true).lang("enabled") 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 { fun biomeList(defaults: (Biome) -> Boolean) = intList {
Biome.REGISTRY Biome.REGISTRY
.filter { it != null && defaults(it) } .filter { it != null && defaults(it) }
@@ -59,7 +58,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI
object leaves { object leaves {
val enabled by featureEnable() val enabled by featureEnable()
val snowEnabled 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 hOffset by double(max=0.4, default=0.2).lang("hOffset")
val vOffset by double(max=0.4, default=0.1).lang("vOffset") 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") 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 grassEnabled by boolean(true)
val myceliumEnabled by boolean(true) val myceliumEnabled by boolean(true)
val snowEnabled 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 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 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") 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 { object roundLogs {
val enabled by featureEnable() val enabled by featureEnable()
val distance by distanceLimit()
val radiusSmall by double(max=0.5, default=0.25) val radiusSmall by double(max=0.5, default=0.25)
val radiusLarge by double(max=0.5, default=0.44) val radiusLarge by double(max=0.5, default=0.44)
val dimming by float(default = 0.7) val dimming by float(default = 0.7)
@@ -109,7 +105,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI
object cactus { object cactus {
val enabled by featureEnable() val enabled by featureEnable()
val distance by distanceLimit()
val size by double(min=0.5, max=1.5, default=0.8).lang("size") 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 sizeVariation by double(max=0.5, default=0.1)
val hOffset by double(max=0.5, default=0.1).lang("hOffset") 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 { object lilypad {
val enabled by featureEnable() val enabled by featureEnable()
val distance by distanceLimit()
val hOffset by double(max=0.25, default=0.1).lang("hOffset") val hOffset by double(max=0.25, default=0.1).lang("hOffset")
val flowerChance by int(max=64, default=16, min=0) val flowerChance by int(max=64, default=16, min=0)
} }
object reed { object reed {
val enabled by featureEnable() val enabled by featureEnable()
val distance by distanceLimit()
val hOffset by double(max=0.4, default=0.2).lang("hOffset") 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 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") 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 { object algae {
val enabled by featureEnable() val enabled by featureEnable()
val distance by distanceLimit()
val hOffset by double(max=0.25, default=0.1).lang("hOffset") 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 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") 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 { object coral {
val enabled by featureEnable() val enabled by featureEnable()
val distance by distanceLimit()
val shallowWater by boolean(false) val shallowWater by boolean(false)
val hOffset by double(max=0.4, default=0.2).lang("hOffset") 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 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 { object netherrack {
val enabled by featureEnable() val enabled by featureEnable()
val distance by distanceLimit()
val hOffset by double(max=0.4, default=0.2).lang("hOffset") 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 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") val heightMax by double(min=0.1, max=1.5, default=0.8).lang("heightMax")

View File

@@ -29,7 +29,6 @@ class RenderAlgae : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
override fun isEligible(ctx: BlockContext) = override fun isEligible(ctx: BlockContext) =
Config.enabled && Config.algae.enabled && Config.enabled && Config.algae.enabled &&
ctx.cameraDistance < Config.algae.distance &&
ctx.blockState(up2).material == Material.WATER && ctx.blockState(up2).material == Material.WATER &&
ctx.blockState(up1).material == Material.WATER && ctx.blockState(up1).material == Material.WATER &&
Config.blocks.dirt.matchesClass(ctx.block) && Config.blocks.dirt.matchesClass(ctx.block) &&

View File

@@ -94,7 +94,6 @@ class RenderCactus : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
override fun isEligible(ctx: BlockContext): Boolean = override fun isEligible(ctx: BlockContext): Boolean =
Config.enabled && Config.cactus.enabled && Config.enabled && Config.cactus.enabled &&
ctx.cameraDistance < Config.cactus.distance &&
Config.blocks.cactus.matchesClass(ctx.block) Config.blocks.cactus.matchesClass(ctx.block)
override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean { override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean {

View File

@@ -47,7 +47,6 @@ class RenderCoral : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
override fun isEligible(ctx: BlockContext) = override fun isEligible(ctx: BlockContext) =
Config.enabled && Config.coral.enabled && Config.enabled && Config.coral.enabled &&
ctx.cameraDistance < Config.coral.distance &&
(ctx.blockState(up2).material == Material.WATER || Config.coral.shallowWater) && (ctx.blockState(up2).material == Material.WATER || Config.coral.shallowWater) &&
ctx.blockState(up1).material == Material.WATER && ctx.blockState(up1).material == Material.WATER &&
Config.blocks.sand.matchesClass(ctx.block) && Config.blocks.sand.matchesClass(ctx.block) &&

View File

@@ -49,7 +49,6 @@ class RenderGrass : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
override fun isEligible(ctx: BlockContext) = override fun isEligible(ctx: BlockContext) =
Config.enabled && Config.enabled &&
ctx.cameraDistance < Config.shortGrass.distance &&
(Config.shortGrass.grassEnabled || Config.connectedGrass.enabled) && (Config.shortGrass.grassEnabled || Config.connectedGrass.enabled) &&
GrassRegistry[ctx, UP] != null GrassRegistry[ctx, UP] != null

View File

@@ -46,7 +46,6 @@ class RenderLeaves : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
override fun isEligible(ctx: BlockContext) = override fun isEligible(ctx: BlockContext) =
Config.enabled && Config.enabled &&
Config.leaves.enabled && Config.leaves.enabled &&
ctx.cameraDistance < Config.leaves.distance &&
LeafRegistry[ctx, DOWN] != null LeafRegistry[ctx, DOWN] != null
override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean { override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean {

View File

@@ -41,7 +41,6 @@ class RenderLilypad : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
override fun isEligible(ctx: BlockContext): Boolean = override fun isEligible(ctx: BlockContext): Boolean =
Config.enabled && Config.lilypad.enabled && Config.enabled && Config.lilypad.enabled &&
ctx.cameraDistance < Config.lilypad.distance &&
Config.blocks.lilypad.matchesClass(ctx.block) Config.blocks.lilypad.matchesClass(ctx.block)
override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean { override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean {

View File

@@ -25,7 +25,6 @@ class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) {
override fun isEligible(ctx: BlockContext) = override fun isEligible(ctx: BlockContext) =
Config.enabled && Config.roundLogs.enabled && Config.enabled && Config.roundLogs.enabled &&
ctx.cameraDistance < Config.roundLogs.distance &&
Config.blocks.logClasses.matchesClass(ctx.block) Config.blocks.logClasses.matchesClass(ctx.block)
override val registry: IColumnRegistry get() = LogRegistry override val registry: IColumnRegistry get() = LogRegistry

View File

@@ -28,8 +28,7 @@ class RenderMycelium : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
override fun isEligible(ctx: BlockContext): Boolean { override fun isEligible(ctx: BlockContext): Boolean {
if (!Config.enabled || !Config.shortGrass.myceliumEnabled) return false if (!Config.enabled || !Config.shortGrass.myceliumEnabled) return false
return Config.blocks.mycelium.matchesClass(ctx.block) && return Config.blocks.mycelium.matchesClass(ctx.block)
ctx.cameraDistance < Config.shortGrass.distance
} }
override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean { override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean {

View File

@@ -34,8 +34,7 @@ class RenderNetherrack : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID)
override fun isEligible(ctx: BlockContext): Boolean { override fun isEligible(ctx: BlockContext): Boolean {
if (!Config.enabled || !Config.netherrack.enabled) return false if (!Config.enabled || !Config.netherrack.enabled) return false
return Config.blocks.netherrack.matchesClass(ctx.block) && return Config.blocks.netherrack.matchesClass(ctx.block)
ctx.cameraDistance < Config.netherrack.distance
} }
override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean { override fun render(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: BufferBuilder, layer: BlockRenderLayer): Boolean {

View File

@@ -46,7 +46,6 @@ class RenderReeds : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
override fun isEligible(ctx: BlockContext) = override fun isEligible(ctx: BlockContext) =
Config.enabled && Config.reed.enabled && Config.enabled && Config.reed.enabled &&
ctx.cameraDistance < Config.reed.distance &&
ctx.blockState(up2).material == Material.AIR && ctx.blockState(up2).material == Material.AIR &&
ctx.blockState(up1).material == Material.WATER && ctx.blockState(up1).material == Material.WATER &&
Config.blocks.dirt.matchesClass(ctx.block) && Config.blocks.dirt.matchesClass(ctx.block) &&