[WIP] finishing touches

+bunch of renames to bring the 2 version closer

src/main/kotlin/mods/betterfoliage/Hooks.kt

@@ -3,12 +3,12 @@ package mods.betterfoliage
 
 import mods.betterfoliage.chunk.ChunkOverlayManager
 import mods.betterfoliage.config.Config
-import mods.betterfoliage.model.getActualRenderModel
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.WeightedModelWrapper
 import mods.betterfoliage.render.block.vanilla.RoundLogKey
 import mods.betterfoliage.render.particle.FallingLeafParticle
 import mods.betterfoliage.render.particle.LeafBlockModel
 import mods.betterfoliage.render.particle.RisingSoulParticle
-import mods.betterfoliage.util.plus
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
 import net.minecraft.block.Blocks
@@ -21,11 +21,12 @@ import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.shapes.VoxelShape
 import net.minecraft.util.math.shapes.VoxelShapes
 import net.minecraft.world.IBlockReader
+import net.minecraft.world.ILightReader
 import net.minecraft.world.World
 import java.util.Random
 
 fun getAmbientOcclusionLightValueOverride(original: Float, state: BlockState): Float {
-    if (Config.enabled && Config.roundLogs.enabled && Client.blockTypes.stateKeys[state] is RoundLogKey)
+    if (Config.enabled && Config.roundLogs.enabled && BetterFoliage.blockTypes.hasTyped<RoundLogKey>(state))
         return Config.roundLogs.dimming.toFloat()
     return original
 }
@@ -56,10 +57,20 @@ fun onRandomDisplayTick(block: Block, state: BlockState, world: World, pos: Bloc
 }
 
 fun getVoxelShapeOverride(state: BlockState, reader: IBlockReader, pos: BlockPos, dir: Direction): VoxelShape {
-    if (Config.enabled && Config.roundLogs.enabled && Client.blockTypes.stateKeys[state] is RoundLogKey)
+    if (Config.enabled && Config.roundLogs.enabled && BetterFoliage.blockTypes.hasTyped<RoundLogKey>(state))
         return VoxelShapes.empty()
     return state.getFaceOcclusionShape(reader, pos, dir)
 }
 
 fun shouldForceSideRenderOF(state: BlockState, world: IBlockReader, pos: BlockPos, face: Direction) =
-    world.getBlockState(pos.offset(face)).let { neighbor -> Client.blockTypes.stateKeys[neighbor] is RoundLogKey }
+    world.getBlockState(pos.offset(face)).let { neighbor -> BetterFoliage.blockTypes.hasTyped<RoundLogKey>(neighbor) }
+
+fun getActualRenderModel(world: ILightReader, pos: BlockPos, state: BlockState, random: Random): SpecialRenderModel? {
+    val model = Minecraft.getInstance().blockRendererDispatcher.blockModelShapes.getModel(state) as? SpecialRenderModel
+        ?: return null
+    if (model is WeightedModelWrapper) {
+        random.setSeed(state.getPositionRandom(pos))
+        return model.getModel(random).model
+    }
+    return model
+}