Merge branch 'kotlin-1.10' into kotlin-1.11

src/main/kotlin/mods/betterfoliage/client/render/AbstractRenderColumn.kt

@@ -1,5 +1,6 @@
 package mods.betterfoliage.client.render
 
+import mods.betterfoliage.client.config.Config
 import mods.betterfoliage.client.integration.OptifineCTM
 import mods.betterfoliage.client.integration.ShadersModIntegration
 import mods.betterfoliage.client.render.AbstractRenderColumn.BlockType.*
@@ -13,20 +14,27 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite
 import net.minecraft.util.BlockRenderLayer
 import net.minecraft.util.EnumFacing
 import net.minecraft.util.EnumFacing.*
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 
-interface IColumnTextureResolver {
+@SideOnly(Side.CLIENT)
+interface IColumnTextureInfo {
+    val axis: Axis?
     val top: (ShadingContext, Int, Quad)->TextureAtlasSprite?
     val bottom: (ShadingContext, Int, Quad)->TextureAtlasSprite?
     val side: (ShadingContext, Int, Quad)->TextureAtlasSprite?
 }
 
+@SideOnly(Side.CLIENT)
 interface IColumnRegistry {
-    operator fun get(state: IBlockState): IColumnTextureResolver?
+    operator fun get(state: IBlockState): IColumnTextureInfo?
 }
 
-data class StaticColumnInfo(val topTexture: TextureAtlasSprite,
+@SideOnly(Side.CLIENT)
+data class StaticColumnInfo(override val axis: Axis?,
+                            val topTexture: TextureAtlasSprite,
                             val bottomTexture: TextureAtlasSprite,
-                            val sideTexture: TextureAtlasSprite) : IColumnTextureResolver {
+                            val sideTexture: TextureAtlasSprite) : IColumnTextureInfo {
     override val top = { ctx: ShadingContext, idx: Int, quad: Quad ->
         OptifineCTM.override(topTexture, blockContext, UP.rotate(ctx.rotation))
     }
@@ -47,6 +55,7 @@ const val NW = 2
 /** Index of SOUTH-WEST quadrant. */
 const val SW = 3
 
+@SideOnly(Side.CLIENT)
 @Suppress("NOTHING_TO_INLINE")
 abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandler(modId) {
 
@@ -123,7 +132,6 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
     inline fun continous(q1: QuadrantType, q2: QuadrantType) =
         q1 == q2 || ((q1 == SQUARE || q1 == INVISIBLE) && (q2 == SQUARE || q2 == INVISIBLE))
 
-    abstract val axisFunc: (IBlockState)->EnumFacing.Axis?
     abstract val blockPredicate: (IBlockState)->Boolean
 
     abstract val registry: IColumnRegistry
@@ -138,7 +146,8 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
         modelRenderer.updateShading(Int3.zero, allFaces)
 
         // check log neighborhood
-        val logAxis = ctx.blockAxis ?: return renderWorldBlockBase(ctx, dispatcher, renderer, null)
+        // if log axis is not defined and "Default to vertical" config option is not set, render normally
+        val logAxis = columnTextures.axis ?: if (Config.roundLogs.defaultY) Axis.Y else 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))
@@ -328,9 +337,6 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
         return this
     }
 
-    /** Get the axis of the block */
-    val BlockContext.blockAxis: Axis? get() = axisFunc(blockState(Int3.zero))
-
     /**
      * Get the type of the block at the given offset in a rotated reference frame.
      */
@@ -340,7 +346,9 @@ abstract class AbstractRenderColumn(modId: String) : AbstractBlockRenderingHandl
         return if (!blockPredicate(state)) {
             if (state.isOpaqueCube) SOLID else NONSOLID
         } else {
-            axisFunc(state)?.let { if (it == axis) PARALLEL else PERPENDICULAR } ?: SOLID
+            (registry[state]?.axis ?: if (Config.roundLogs.defaultY) Axis.Y else null)?.let {
+                if (it == axis) PARALLEL else PERPENDICULAR
+            } ?: SOLID
         }
     }
 }

src/main/kotlin/mods/betterfoliage/client/render/EntityFallingLeavesFX.kt

@@ -25,6 +25,7 @@ import org.lwjgl.opengl.GL11
 import java.lang.Math.*
 import java.util.*
 
+@SideOnly(Side.CLIENT)
 class EntityFallingLeavesFX(world: World, pos: BlockPos) :
 AbstractEntityFX(world, pos.x.toDouble() + 0.5, pos.y.toDouble(), pos.z.toDouble() + 0.5) {
 

src/main/kotlin/mods/betterfoliage/client/render/EntityRisingSoulFX.kt

@@ -16,6 +16,7 @@ import net.minecraftforge.fml.relauncher.SideOnly
 import org.apache.logging.log4j.Level.INFO
 import java.util.*
 
+@SideOnly(Side.CLIENT)
 class EntityRisingSoulFX(world: World, pos: BlockPos) :
 AbstractEntityFX(world, pos.x.toDouble() + 0.5, pos.y.toDouble() + 1.0, pos.z.toDouble() + 0.5) {
 

src/main/kotlin/mods/betterfoliage/client/render/RenderAlgae.kt

@@ -11,8 +11,11 @@ import net.minecraft.block.material.Material
 import net.minecraft.client.renderer.BlockRendererDispatcher
 import net.minecraft.client.renderer.VertexBuffer
 import net.minecraft.util.BlockRenderLayer
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 import org.apache.logging.log4j.Level.INFO
 
+@SideOnly(Side.CLIENT)
 class RenderAlgae : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     val noise = simplexNoise()

src/main/kotlin/mods/betterfoliage/client/render/RenderCactus.kt

@@ -5,12 +5,9 @@ import mods.betterfoliage.client.Client
 import mods.betterfoliage.client.config.Config
 import mods.octarinecore.client.render.*
 import mods.octarinecore.client.resource.TextureListModelProcessor
-import mods.octarinecore.client.resource.get
 import mods.octarinecore.client.resource.registerSprite
 import mods.octarinecore.common.Int3
 import mods.octarinecore.common.Rotation
-import mods.octarinecore.common.config.ConfigurableBlockMatcher
-import mods.octarinecore.common.config.ModelTextureList
 import mods.octarinecore.common.config.SimpleBlockMatcher
 import mods.octarinecore.common.config.modelTextures
 import net.minecraft.block.BlockCactus
@@ -21,8 +18,11 @@ import net.minecraft.client.renderer.texture.TextureMap
 import net.minecraft.util.BlockRenderLayer
 import net.minecraft.util.EnumFacing.*
 import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 import org.apache.logging.log4j.Level
 
+@SideOnly(Side.CLIENT)
 class RenderCactus : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     val cactusStemRadius = 0.4375
@@ -31,12 +31,12 @@ class RenderCactus : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
     val iconCross = iconStatic(BetterFoliageMod.LEGACY_DOMAIN, "blocks/better_cactus")
     val iconArm = iconSet(BetterFoliageMod.LEGACY_DOMAIN, "blocks/better_cactus_arm_%d")
 
-    val cactusTextures: IColumnRegistry = object : TextureListModelProcessor<IColumnTextureResolver>, IColumnRegistry {
+    val cactusTextures: IColumnRegistry = object : TextureListModelProcessor<IColumnTextureInfo>, IColumnRegistry {
 
         init { MinecraftForge.EVENT_BUS.register(this) }
 
         override var stateToKey = mutableMapOf<IBlockState, List<String>>()
-        override var stateToValue = mapOf<IBlockState, IColumnTextureResolver>()
+        override var stateToValue = mapOf<IBlockState, IColumnTextureInfo>()
 
         override val logger = BetterFoliageMod.logDetail
         override val logName = "CactusTextures"
@@ -45,11 +45,11 @@ class RenderCactus : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
             modelTextures("block/cactus", "top", "bottom", "side")
         )
 
-        override fun processStitch(state: IBlockState, key: List<String>, atlas: TextureMap): IColumnTextureResolver? {
+        override fun processStitch(state: IBlockState, key: List<String>, atlas: TextureMap): IColumnTextureInfo? {
             val topTex = atlas.registerSprite(key[0])
             val bottomTex = atlas.registerSprite(key[1])
             val sideTex = atlas.registerSprite(key[2])
-            return StaticColumnInfo(topTex, bottomTex, sideTex)
+            return StaticColumnInfo(Axis.Y, topTex, bottomTex, sideTex)
         }
 
         override fun get(state: IBlockState) = stateToValue[state]

src/main/kotlin/mods/betterfoliage/client/render/RenderConnectedGrass.kt

@@ -9,7 +9,10 @@ import mods.octarinecore.common.Int3
 import net.minecraft.client.renderer.BlockRendererDispatcher
 import net.minecraft.client.renderer.VertexBuffer
 import net.minecraft.util.BlockRenderLayer
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 
+@SideOnly(Side.CLIENT)
 class RenderConnectedGrass : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
     override fun isEligible(ctx: BlockContext) =
         Config.enabled && Config.connectedGrass.enabled &&

src/main/kotlin/mods/betterfoliage/client/render/RenderConnectedGrassLog.kt

@@ -11,7 +11,10 @@ import net.minecraft.client.renderer.BlockRendererDispatcher
 import net.minecraft.client.renderer.VertexBuffer
 import net.minecraft.util.BlockRenderLayer
 import net.minecraft.util.EnumFacing.*
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 
+@SideOnly(Side.CLIENT)
 class RenderConnectedGrassLog : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     val grassCheckDirs = listOf(EAST, WEST, NORTH, SOUTH)

src/main/kotlin/mods/betterfoliage/client/render/RenderCoral.kt

@@ -14,8 +14,11 @@ import net.minecraft.client.renderer.VertexBuffer
 import net.minecraft.util.BlockRenderLayer
 import net.minecraft.util.EnumFacing.Axis
 import net.minecraft.util.EnumFacing.UP
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 import org.apache.logging.log4j.Level.INFO
 
+@SideOnly(Side.CLIENT)
 class RenderCoral : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     val noise = simplexNoise()

src/main/kotlin/mods/betterfoliage/client/render/RenderGrass.kt

@@ -15,8 +15,11 @@ import net.minecraft.client.renderer.VertexBuffer
 import net.minecraft.util.BlockRenderLayer
 import net.minecraft.util.EnumFacing.Axis
 import net.minecraft.util.EnumFacing.UP
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 import org.apache.logging.log4j.Level.INFO
 
+@SideOnly(Side.CLIENT)
 class RenderGrass : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     companion object {

src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt

@@ -17,9 +17,12 @@ import net.minecraft.client.renderer.VertexBuffer
 import net.minecraft.util.BlockRenderLayer
 import net.minecraft.util.EnumFacing.DOWN
 import net.minecraft.util.EnumFacing.UP
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 import java.lang.Math.cos
 import java.lang.Math.sin
 
+@SideOnly(Side.CLIENT)
 class RenderLeaves : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     val leavesModel = model {

src/main/kotlin/mods/betterfoliage/client/render/RenderLilypad.kt

@@ -12,8 +12,11 @@ import net.minecraft.client.renderer.VertexBuffer
 import net.minecraft.util.BlockRenderLayer
 import net.minecraft.util.EnumFacing.DOWN
 import net.minecraft.util.EnumFacing.UP
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 import org.apache.logging.log4j.Level
 
+@SideOnly(Side.CLIENT)
 class RenderLilypad : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     val rootModel = model {

src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt

@@ -2,25 +2,21 @@ package mods.betterfoliage.client.render
 
 import mods.betterfoliage.BetterFoliageMod
 import mods.betterfoliage.client.config.Config
-import mods.betterfoliage.client.texture.GrassRegistry
-import mods.betterfoliage.client.texture.IGrassRegistry
-import mods.betterfoliage.client.texture.StandardGrassSupport
 import mods.octarinecore.client.render.BlockContext
 import mods.octarinecore.client.resource.TextureListModelProcessor
-import mods.octarinecore.client.resource.get
 import mods.octarinecore.client.resource.registerSprite
-import mods.octarinecore.common.Int3
 import mods.octarinecore.common.config.ConfigurableBlockMatcher
 import mods.octarinecore.common.config.ModelTextureList
 import mods.octarinecore.findFirst
 import mods.octarinecore.tryDefault
 import net.minecraft.block.BlockLog
 import net.minecraft.block.state.IBlockState
-import net.minecraft.client.renderer.texture.TextureAtlasSprite
 import net.minecraft.client.renderer.texture.TextureMap
 import net.minecraft.util.EnumFacing.Axis
 import net.minecraftforge.common.MinecraftForge
-import org.apache.logging.log4j.Logger
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
+
 
 class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) {
 
@@ -31,17 +27,6 @@ class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) {
         ctx.cameraDistance < Config.roundLogs.distance &&
         Config.blocks.logClasses.matchesClass(ctx.block)
 
-    override var axisFunc = { state: IBlockState ->
-        val axis = tryDefault(null) { state.getValue(BlockLog.LOG_AXIS).toString() } ?:
-            state.properties.entries.find { it.key.getName().toLowerCase() == "axis" }?.let { it.value.toString() }
-        when (axis) {
-            "x" -> Axis.X
-            "y" -> Axis.Y
-            "z" -> Axis.Z
-            else -> if (Config.roundLogs.defaultY) Axis.Y else null
-        }
-    }
-
     override val registry: IColumnRegistry get() = LogRegistry
 
     override val blockPredicate = { state: IBlockState -> Config.blocks.logClasses.matchesClass(state.block) }
@@ -55,29 +40,45 @@ class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) {
 
 }
 
+@SideOnly(Side.CLIENT)
 object LogRegistry : IColumnRegistry {
-    val subRegistries: MutableList<IColumnRegistry> = mutableListOf(StandardLogSupport)
+    val subRegistries: MutableList<IColumnRegistry> = mutableListOf()
     override fun get(state: IBlockState) = subRegistries.findFirst { it[state] }
 }
 
-object StandardLogSupport : TextureListModelProcessor<IColumnTextureResolver>, IColumnRegistry {
+@SideOnly(Side.CLIENT)
+object StandardLogSupport : TextureListModelProcessor<IColumnTextureInfo>, IColumnRegistry {
 
-    init { MinecraftForge.EVENT_BUS.register(this) }
+    init {
+        LogRegistry.subRegistries.add(this)
+        MinecraftForge.EVENT_BUS.register(this)
+    }
 
     override var stateToKey = mutableMapOf<IBlockState, List<String>>()
-    override var stateToValue = mapOf<IBlockState, IColumnTextureResolver>()
+    override var stateToValue = mapOf<IBlockState, IColumnTextureInfo>()
 
     override val logger = BetterFoliageMod.logDetail
     override val logName = "StandardLogSupport"
     override val matchClasses: ConfigurableBlockMatcher get() = Config.blocks.logClasses
     override val modelTextures: List<ModelTextureList> get() = Config.blocks.logModels.list
 
-    override fun processStitch(state: IBlockState, key: List<String>, atlas: TextureMap): IColumnTextureResolver? {
+    override fun processStitch(state: IBlockState, key: List<String>, atlas: TextureMap): IColumnTextureInfo? {
         val topTex = atlas.registerSprite(key[0])
         val bottomTex = atlas.registerSprite(key[1])
         val sideTex = atlas.registerSprite(key[2])
-        return StaticColumnInfo(topTex, bottomTex, sideTex)
+        return StaticColumnInfo(getAxis(state), topTex, bottomTex, sideTex)
     }
 
     override fun get(state: IBlockState) = stateToValue[state]
+
+    fun getAxis(state: IBlockState): Axis? {
+        val axis = tryDefault(null) { state.getValue(BlockLog.LOG_AXIS).toString() } ?:
+            state.properties.entries.find { it.key.getName().toLowerCase() == "axis" }?.let { it.value.toString() }
+        return when (axis) {
+            "x" -> Axis.X
+            "y" -> Axis.Y
+            "z" -> Axis.Z
+            else -> null
+        }
+    }
 }

src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt

@@ -13,8 +13,11 @@ 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
 import org.apache.logging.log4j.Level.INFO
 
+@SideOnly(Side.CLIENT)
 class RenderMycelium : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     val myceliumIcon = iconSet(BetterFoliageMod.LEGACY_DOMAIN, "blocks/better_mycel_%d")

src/main/kotlin/mods/betterfoliage/client/render/RenderNetherrack.kt

@@ -12,8 +12,11 @@ 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
+import net.minecraftforge.fml.relauncher.SideOnly
 import org.apache.logging.log4j.Level.INFO
 
+@SideOnly(Side.CLIENT)
 class RenderNetherrack : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     val netherrackIcon = iconSet(BetterFoliageMod.LEGACY_DOMAIN, "blocks/better_netherrack_%d")

src/main/kotlin/mods/betterfoliage/client/render/RenderReeds.kt

@@ -13,8 +13,11 @@ import net.minecraft.client.renderer.BlockRendererDispatcher
 import net.minecraft.client.renderer.VertexBuffer
 import net.minecraft.util.BlockRenderLayer
 import net.minecraft.util.EnumFacing.UP
+import net.minecraftforge.fml.relauncher.Side
+import net.minecraftforge.fml.relauncher.SideOnly
 import org.apache.logging.log4j.Level
 
+@SideOnly(Side.CLIENT)
 class RenderReeds : AbstractBlockRenderingHandler(BetterFoliageMod.MOD_ID) {
 
     val noise = simplexNoise()