Merge branch 'kotlin-1.10' into kotlin-1.11.2

src/main/kotlin/mods/octarinecore/client/render/AbstractBlockRenderingHandler.kt

@@ -1,6 +1,9 @@
 @file:JvmName("RendererHolder")
 package mods.octarinecore.client.render
 
+import mods.betterfoliage.client.render.canRenderInCutout
+import mods.betterfoliage.client.render.canRenderInLayer
+import mods.betterfoliage.client.render.isCutout
 import mods.octarinecore.ThreadLocalDelegate
 import mods.octarinecore.client.resource.ResourceHandler
 import mods.octarinecore.common.Double3
@@ -49,8 +52,11 @@ abstract class AbstractBlockRenderingHandler(modId: String) : ResourceHandler(mo
      */
     fun renderWorldBlockBase(ctx: BlockContext, dispatcher: BlockRendererDispatcher, renderer: VertexBuffer, layer: BlockRenderLayer?): Boolean {
         ctx.blockState(Int3.zero).let { state ->
-            if (layer == null || state.block.canRenderInLayer(state, layer))
+            if (layer == null ||
+                state.canRenderInLayer(layer) ||
+                (state.canRenderInCutout() && layer.isCutout)) {
                 return dispatcher.renderBlock(state, ctx.pos, ctx.world, renderer)
+            }
         }
         return false
     }
@@ -63,7 +69,7 @@ data class BlockData(val state: IBlockState, val color: Int, val brightness: Int
  * Represents the block being rendered. Has properties and methods to query the neighborhood of the block in
  * block-relative coordinates.
  */
-class BlockContext() {
+class BlockContext {
     var world: IBlockAccess? = null
     var pos = BlockPos.ORIGIN
 

src/main/kotlin/mods/octarinecore/client/render/Model.kt

@@ -81,6 +81,12 @@ data class Quad(val v1: Vertex, val v2: Vertex, val v3: Vertex, val v4: Vertex)
     fun setFlatShader(shader: Shader) = transformVI { vertex, idx -> vertex.copy(flatShader = shader) }
     val flipped: Quad get() = Quad(v4, v3, v2, v1)
 
+    fun cycleVertices(n: Int) = when(n % 4) {
+        1 -> Quad(v2, v3, v4, v1)
+        2 -> Quad(v3, v4, v1, v2)
+        3 -> Quad(v4, v1, v2, v3)
+        else -> this.copy()
+    }
 }
 
 /**

src/main/kotlin/mods/octarinecore/client/render/ModelRenderer.kt

@@ -1,5 +1,6 @@
 package mods.octarinecore.client.render
 
+import mods.betterfoliage.loader.Refs
 import mods.octarinecore.common.*
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.VertexBuffer
@@ -48,6 +49,10 @@ class ModelRenderer : ShadingContext() {
             if (quadFilter(quadIdx, quad)) {
                 val drawIcon = icon(this, quadIdx, quad)
                 if (drawIcon != null) {
+                    // let OptiFine know the texture we're using, so it can
+                    // transform UV coordinates to quad-relative
+                    Refs.quadSprite.set(worldRenderer, drawIcon)
+
                     quad.verts.forEachIndexed { vertIdx, vert ->
                         temp.init(vert).rotate(rotation).translate(trans)
                         val shader = if (aoEnabled && !forceFlat) vert.aoShader else vert.flatShader