Port to 1.16.5

Kottle -> KotlinForForge

src/main/kotlin/mods/betterfoliage/render/pipeline/RenderCtxBase.kt

@@ -3,18 +3,18 @@ package mods.betterfoliage.render.pipeline
 import com.mojang.blaze3d.matrix.MatrixStack
 import mods.betterfoliage.chunk.BasicBlockCtx
 import mods.betterfoliage.chunk.BlockCtx
+import mods.betterfoliage.model.HalfBakedQuad
 import mods.betterfoliage.model.SpecialRenderModel
 import mods.betterfoliage.render.lighting.VanillaFullBlockLighting
 import mods.betterfoliage.render.lighting.VanillaQuadLighting
 import mods.betterfoliage.render.lighting.VanillaVertexLighter
-import mods.betterfoliage.model.HalfBakedQuad
 import mods.betterfoliage.util.Int3
 import mods.betterfoliage.util.plus
 import net.minecraft.block.Block
 import net.minecraft.client.Minecraft
 import net.minecraft.util.Direction
 import net.minecraft.util.math.BlockPos
-import net.minecraft.world.ILightReader
+import net.minecraft.world.IBlockDisplayReader
 import net.minecraftforge.client.model.data.IModelData
 import java.util.Random
 
@@ -25,7 +25,7 @@ import java.util.Random
  * push-based partial rendering pipeline for [SpecialRenderModel] instances.
  */
 abstract class RenderCtxBase(
-    world: ILightReader,
+    world: IBlockDisplayReader,
     pos: BlockPos,
     val matrixStack: MatrixStack,
     var checkSides: Boolean,
@@ -36,14 +36,14 @@ abstract class RenderCtxBase(
     abstract fun renderQuad(quad: HalfBakedQuad)
 
     var hasRendered = false
-    val blockModelShapes = Minecraft.getInstance().blockRendererDispatcher.blockModelShapes
+    val blockModelShapes = Minecraft.getInstance().blockRenderer.blockModelShaper
     var vertexLighter: VanillaVertexLighter = VanillaFullBlockLighting
     protected val lightingData = RenderCtxBase.lightingData.get().apply {
         calc.reset(this@RenderCtxBase)
         blockColors = Minecraft.getInstance().blockColors
     }
 
-    inline fun Direction?.shouldRender() = this == null || !checkSides || Block.shouldSideBeRendered(state, world, pos, this)
+    inline fun Direction?.shouldRender() = this == null || !checkSides || Block.shouldRenderFace(state, world, pos, this)
 
     fun renderQuads(quads: Iterable<HalfBakedQuad>) {
         quads.forEach { quad ->

src/main/kotlin/mods/betterfoliage/render/pipeline/RenderCtxForge.kt

@@ -1,20 +1,20 @@
 package mods.betterfoliage.render.pipeline
 
 import com.mojang.blaze3d.matrix.MatrixStack
+import mods.betterfoliage.model.HalfBakedQuad
 import mods.betterfoliage.model.SpecialRenderModel
 import mods.betterfoliage.render.lighting.ForgeVertexLighter
 import mods.betterfoliage.render.lighting.ForgeVertexLighterAccess
-import mods.betterfoliage.model.HalfBakedQuad
 import net.minecraft.block.BlockState
 import net.minecraft.client.renderer.LightTexture
 import net.minecraft.util.math.BlockPos
-import net.minecraft.world.ILightReader
+import net.minecraft.world.IBlockDisplayReader
 import net.minecraftforge.client.model.data.IModelData
 import net.minecraftforge.client.model.pipeline.VertexLighterFlat
 import java.util.Random
 
 class RenderCtxForge(
-    world: ILightReader,
+    world: IBlockDisplayReader,
     pos: BlockPos,
     val lighter: VertexLighterFlat,
     matrixStack: MatrixStack,
@@ -33,8 +33,8 @@ class RenderCtxForge(
     var vIdx = 0
     override fun updateVertexLightmap(normal: FloatArray, lightmap: FloatArray, x: Float, y: Float, z: Float) {
         lightingData.packedLight[vIdx].let { packedLight ->
-            lightmap[0] = LightTexture.getLightBlock(packedLight) / 0xF.toFloat()
-            lightmap[1] = LightTexture.getLightSky(packedLight) / 0xF.toFloat()
+            lightmap[0] = LightTexture.block(packedLight) / 0xF.toFloat()
+            lightmap[1] = LightTexture.sky(packedLight) / 0xF.toFloat()
         }
     }
 
@@ -49,7 +49,7 @@ class RenderCtxForge(
         @JvmStatic
         fun render(
             lighter: VertexLighterFlat,
-            world: ILightReader,
+            world: IBlockDisplayReader,
             model: SpecialRenderModel,
             state: BlockState,
             pos: BlockPos,

src/main/kotlin/mods/betterfoliage/render/pipeline/RenderCtxVanilla.kt

@@ -2,18 +2,18 @@ package mods.betterfoliage.render.pipeline
 
 import com.mojang.blaze3d.matrix.MatrixStack
 import com.mojang.blaze3d.vertex.IVertexBuilder
-import mods.betterfoliage.model.SpecialRenderModel
 import mods.betterfoliage.model.HalfBakedQuad
+import mods.betterfoliage.model.SpecialRenderModel
 import net.minecraft.block.BlockState
 import net.minecraft.client.renderer.BlockModelRenderer
 import net.minecraft.util.math.BlockPos
-import net.minecraft.world.ILightReader
+import net.minecraft.world.IBlockDisplayReader
 import net.minecraftforge.client.model.data.IModelData
 import java.util.Random
 
 class RenderCtxVanilla(
     val renderer: BlockModelRenderer,
-    world: ILightReader,
+    world: IBlockDisplayReader,
     pos: BlockPos,
     val buffer: IVertexBuilder,
     val combinedOverlay: Int,
@@ -27,8 +27,8 @@ class RenderCtxVanilla(
 
     override fun renderQuad(quad: HalfBakedQuad) {
         vertexLighter.updateLightmapAndColor(quad, lightingData)
-        buffer.addQuad(
-            matrixStack.last, quad.baked,
+        buffer.putBulkData(
+            matrixStack.last(), quad.baked,
             lightingData.colorMultiplier,
             lightingData.tint[0], lightingData.tint[1], lightingData.tint[2],
             lightingData.packedLight, combinedOverlay, true
@@ -39,7 +39,7 @@ class RenderCtxVanilla(
         @JvmStatic
         fun render(
             renderer: BlockModelRenderer,
-            world: ILightReader,
+            world: IBlockDisplayReader,
             model: SpecialRenderModel,
             state: BlockState,
             pos: BlockPos,