[WIP] start port to 1.15.2

src/main/kotlin/mods/betterfoliage/chunk/BlockContext.kt

@@ -1,5 +1,6 @@
 package mods.betterfoliage.chunk
 
+import mods.betterfoliage.ChunkRendererRegion_world
 import mods.betterfoliage.util.Int3
 import mods.betterfoliage.util.allDirections
 import mods.betterfoliage.util.offset
@@ -7,9 +8,11 @@ import mods.betterfoliage.util.plus
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
 import net.minecraft.client.MinecraftClient
+import net.minecraft.client.render.chunk.ChunkRendererRegion
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
-import net.minecraft.world.ExtendedBlockView
+import net.minecraft.world.BlockRenderView
+import net.minecraft.world.WorldView
 import net.minecraft.world.biome.Biome
 
 /**
@@ -17,7 +20,7 @@ import net.minecraft.world.biome.Biome
  * block-relative coordinates.
  */
 interface BlockCtx {
-    val world: ExtendedBlockView
+    val world: BlockRenderView
     val pos: BlockPos
 
     fun offset(dir: Direction) = offset(dir.offset)
@@ -27,7 +30,8 @@ interface BlockCtx {
     fun state(dir: Direction) = world.getBlockState(pos + dir.offset)
     fun state(offset: Int3) = world.getBlockState(pos + offset)
 
-    val biome: Biome get() = world.getBiome(pos)
+    val biome: Biome? get() =
+        ChunkRendererRegion_world[world]?.getBiome(pos)
 
     val isNormalCube: Boolean get() = state.isSimpleFullBlock(world, pos)
 
@@ -40,7 +44,7 @@ interface BlockCtx {
 }
 
 open class BasicBlockCtx(
-    override val world: ExtendedBlockView,
+    override val world: BlockRenderView,
     override val pos: BlockPos
 ) : BlockCtx {
     override val state = world.getBlockState(pos)
@@ -48,8 +52,8 @@ open class BasicBlockCtx(
     fun cache() = CachedBlockCtx(world, pos)
 }
 
-open class CachedBlockCtx(world: ExtendedBlockView, pos: BlockPos) : BasicBlockCtx(world, pos) {
+open class CachedBlockCtx(world: BlockRenderView, pos: BlockPos) : BasicBlockCtx(world, pos) {
     var neighbors = Array<BlockState>(6) { world.getBlockState(pos + allDirections[it].offset) }
-    override var biome: Biome = world.getBiome(pos)
+    override var biome: Biome? = super.biome
     override fun state(dir: Direction) = neighbors[dir.ordinal]
 }

src/main/kotlin/mods/betterfoliage/chunk/OffsetBlockView.kt

@@ -2,8 +2,8 @@ package mods.betterfoliage.chunk
 
 import net.minecraft.util.math.BlockPos
 import net.minecraft.world.BlockView
-import net.minecraft.world.ExtendedBlockView
 import net.minecraft.world.LightType
+import net.minecraft.world.WorldView
 
 /**
  * Delegating [IBlockAccess] that fakes a _modified_ location to return values from a _target_ location.
@@ -21,7 +21,7 @@ open class OffsetBlockView(open val original: BlockView, val modded: BlockPos, v
 }
 
 @Suppress("NOTHING_TO_INLINE", "NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "HasPlatformType")
-class OffsetExtBlockView(val original: ExtendedBlockView, val modded: BlockPos, val target: BlockPos) : ExtendedBlockView by original {
+class OffsetExtBlockView(val original: WorldView, val modded: BlockPos, val target: BlockPos) : WorldView by original {
     inline fun actualPos(pos: BlockPos) = if (pos != null && pos.x == modded.x && pos.y == modded.y && pos.z == modded.z) target else pos
 
     override fun getBlockState(pos: BlockPos) = original.getBlockState(actualPos(pos))
@@ -29,7 +29,7 @@ class OffsetExtBlockView(val original: ExtendedBlockView, val modded: BlockPos,
     override fun getFluidState(pos: BlockPos) = original.getFluidState(actualPos(pos))
 
     override fun getLightLevel(type: LightType, pos: BlockPos) = original.getLightLevel(type, actualPos(pos))
-    override fun getLightmapIndex(pos: BlockPos, light: Int) = original.getLightmapIndex(actualPos(pos), light)
+    override fun getBaseLightLevel(pos: BlockPos, light: Int) = original.getBaseLightLevel(actualPos(pos), light)
     override fun getBiome(pos: BlockPos) = original.getBiome(actualPos(pos))
 }
 

src/main/kotlin/mods/betterfoliage/chunk/Overlay.kt

@@ -7,9 +7,9 @@ import net.minecraft.client.render.chunk.ChunkRendererRegion
 import net.minecraft.client.world.ClientWorld
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.ChunkPos
-import net.minecraft.world.ExtendedBlockView
-import net.minecraft.world.ViewableWorld
+import net.minecraft.world.BlockRenderView
 import net.minecraft.world.World
+import net.minecraft.world.WorldView
 import net.minecraft.world.chunk.WorldChunk
 import net.minecraft.world.dimension.DimensionType
 import java.util.*
@@ -21,13 +21,8 @@ import kotlin.collections.mutableListOf
 import kotlin.collections.mutableMapOf
 import kotlin.collections.set
 
-// net.minecraft.world.chunk.WorldChunk.world
-val WorldChunk_world = YarnHelper.requiredField<World>("net.minecraft.class_2818", "field_12858", "Lnet/minecraft/class_1937;")
-// net.minecraft.client.render.chunk.ChunkRendererRegion.world
-val ChunkRendererRegion_world = YarnHelper.requiredField<World>("net.minecraft.class_853", "field_4490", "Lnet/minecraft/class_1937;")
-
-val ExtendedBlockView.dimType: DimensionType get() = when {
-    this is ViewableWorld -> dimension.type
+val BlockRenderView.dimType: DimensionType get() = when {
+    this is WorldView -> dimension.type
     this is ChunkRendererRegion -> this[ChunkRendererRegion_world]!!.dimension.type
 //    this.isInstance(ChunkCacheOF) -> this[ChunkCacheOF.chunkCache]!!.dimType
     else -> throw IllegalArgumentException("DimensionType of world with class ${this::class.qualifiedName} cannot be determined!")
@@ -38,7 +33,7 @@ val ExtendedBlockView.dimType: DimensionType get() = when {
  */
 interface ChunkOverlayLayer<T> {
     fun calculate(ctx: BlockCtx): T
-    fun onBlockUpdate(world: ExtendedBlockView, pos: BlockPos)
+    fun onBlockUpdate(world: WorldView, pos: BlockPos)
 }
 
 /**