diff --git a/src/main/kotlin/mods/betterfoliage/client/config/Config.kt b/src/main/kotlin/mods/betterfoliage/client/config/Config.kt
index 8ea870c..437b722 100644
--- a/src/main/kotlin/mods/betterfoliage/client/config/Config.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/config/Config.kt
@@ -84,6 +84,7 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.DOMAI
val lenientConnect by boolean(true)
val connectPerpendicular by boolean(true)
val connectGrass by boolean(true)
+ val defaultY by boolean(false)
val zProtection by double(min = 0.9, default = 0.99)
}
diff --git a/src/main/kotlin/mods/betterfoliage/client/render/AbstractRenderColumn.kt b/src/main/kotlin/mods/betterfoliage/client/render/AbstractRenderColumn.kt
index a605633..77aa9fd 100644
--- a/src/main/kotlin/mods/betterfoliage/client/render/AbstractRenderColumn.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/render/AbstractRenderColumn.kt
@@ -26,6 +26,7 @@ open class ColumnTextures(val matcher: BlockMatcher) : BlockTextureInspector
, atlas: TextureMap) =
ColumnInfo(textures[0], textures[1], textures[2])
@@ -131,7 +132,7 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
modelRenderer.updateShading(Int3.zero, allFaces)
// check log neighborhood
- val logAxis = ctx.blockAxis ?: return renderWorldBlockBase(ctx, dispatcher, renderer, layer)
+ val logAxis = ctx.blockAxis ?: return renderWorldBlockBase(ctx, dispatcher, renderer, null)
val baseRotation = rotationFromUp[(logAxis to AxisDirection.POSITIVE).face.ordinal]
val upType = ctx.blockType(baseRotation, logAxis, Int3(0, 1, 0))
@@ -325,7 +326,7 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
return if (!blockPredicate(state)) {
if (state.block.isOpaqueCube) SOLID else NONSOLID
} else {
- if (axisFunc(state) == axis) PARALLEL else PERPENDICULAR
+ axisFunc(state)?.let { if (it == axis) PARALLEL else PERPENDICULAR } ?: SOLID
}
}
}
\ No newline at end of file
diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt
index e78d04c..9d189d9 100644
--- a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt
@@ -28,7 +28,7 @@ class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) {
"x" -> Axis.X
"y" -> Axis.Y
"z" -> Axis.Z
- else -> null
+ else -> if (Config.roundLogs.defaultY) Axis.Y else null
}
}
diff --git a/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt b/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt
index afcacf5..edf97c8 100644
--- a/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt
+++ b/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt
@@ -42,10 +42,7 @@ abstract class ModelDataInspector {
onAfterModelLoad()
stateMappings.forEach { mapping ->
- val model = stateModels[mapping.value]
- if (model != null) {
- val result = processModelDefinition(mapping.key, mapping.value, model)
- }
+ stateModels[mapping.value]?.let { processModelDefinition(mapping.key, mapping.value, it) }
}
}
diff --git a/src/main/resources/assets/betterfoliage/LogDefault.cfg b/src/main/resources/assets/betterfoliage/LogDefault.cfg
index c060056..4c52606 100644
--- a/src/main/resources/assets/betterfoliage/LogDefault.cfg
+++ b/src/main/resources/assets/betterfoliage/LogDefault.cfg
@@ -20,4 +20,7 @@ forestry.arboriculture.gadgets.BlockLog
// TerraFirmaCraft
com.bioxx.tfc.Blocks.Flora.BlockLogVert
-com.bioxx.tfc.Blocks.Flora.BlockLogNatural
\ No newline at end of file
+com.bioxx.tfc.Blocks.Flora.BlockLogNatural
+
+// The Agricultural Revolution a.k.a. Cooking Plus
+CookingPlus.blocks.CookingPlusTangleLog
\ No newline at end of file
diff --git a/src/main/resources/assets/betterfoliage/lang/en_US.lang b/src/main/resources/assets/betterfoliage/lang/en_US.lang
index 7d3b6b4..bcad15a 100644
--- a/src/main/resources/assets/betterfoliage/lang/en_US.lang
+++ b/src/main/resources/assets/betterfoliage/lang/en_US.lang
@@ -209,4 +209,6 @@ betterfoliage.roundLogs.radiusLarge.tooltip=How much to chop off from the outer
betterfoliage.roundLogs.dimming=Dimming
betterfoliage.roundLogs.dimming.tooltip=Amount to darken obscured log faces
betterfoliage.roundLogs.zProtection=Z-Protection
-betterfoliage.roundLogs.zProtection.tooltip=Amount to scale parallel log connection bits to stop Z-fighting (flickering). Try to set it as high as possible without having glitches.
\ No newline at end of file
+betterfoliage.roundLogs.zProtection.tooltip=Amount to scale parallel log connection bits to stop Z-fighting (flickering). Try to set it as high as possible without having glitches.
+betterfoliage.roundLogs.defaultY=Default to vertical
+betterfoliage.roundLogs.defaultY.tooltip=If true, log blocks where the orientation cannot be determined will be rendered as vertical. Otherwise, they will be rendered as cube blocks.