[WIP] Optifine and Shaders fixes

2020-01-06 20:51:51 +01:00
parent 4efa831296
commit 2252fb3b42
22 changed files with 111 additions and 62 deletions
--- a/src/main/kotlin/mods/betterfoliage/client/Client.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/Client.kt
@@ -3,10 +3,7 @@ package mods.betterfoliage.client
 import mods.betterfoliage.BetterFoliageMod
 import mods.betterfoliage.client.chunk.ChunkOverlayManager
 import mods.betterfoliage.client.config.BlockConfig
-import mods.betterfoliage.client.integration.ForestryIntegration
-import mods.betterfoliage.client.integration.IC2RubberIntegration
-import mods.betterfoliage.client.integration.OptifineCustomColors
-import mods.betterfoliage.client.integration.TechRebornRubberIntegration
+import mods.betterfoliage.client.integration.*
 import mods.betterfoliage.client.render.*
 import mods.betterfoliage.client.texture.AsyncGrassDiscovery
 import mods.betterfoliage.client.texture.AsyncLeafDiscovery
@@ -59,7 +56,7 @@ object Client {

        // init mod integrations
        val integrations = listOf(
-//            ShadersModIntegration,
+            ShadersModIntegration,
            OptifineCustomColors,
            ForestryIntegration,
            IC2RubberIntegration,
--- a/src/main/kotlin/mods/betterfoliage/client/config/Config.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/config/Config.kt
@@ -16,11 +16,6 @@ object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.MOD_I
    val enabled by boolean(true)
    val nVidia by boolean(false)

-    object shaders {
-        val leavesId by long(min = 1, max = 65535, default = ShadersModIntegration.leavesDefaultBlockId)
-        val grassId by long(min = 1, max = 65535, default = ShadersModIntegration.grassDefaultBlockId)
-    }
-
    object leaves : ConfigCategory() {
        val enabled by featureEnable()
        val snowEnabled by boolean(true)
--- a/src/main/kotlin/mods/betterfoliage/client/integration/OptifineCustomColors.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/integration/OptifineCustomColors.kt
@@ -1,7 +1,6 @@
 package mods.betterfoliage.client.integration

 import mods.betterfoliage.BetterFoliage
-import mods.betterfoliage.client.Client
 import mods.octarinecore.*
 import mods.octarinecore.client.render.CombinedContext
 import mods.octarinecore.metaprog.allAvailable
--- a/src/main/kotlin/mods/betterfoliage/client/integration/ShadersModIntegration.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/integration/ShadersModIntegration.kt
@@ -1,10 +1,11 @@
 package mods.betterfoliage.client.integration

 import mods.betterfoliage.BetterFoliage
-import mods.betterfoliage.client.Client
 import mods.betterfoliage.client.config.BlockConfig
 import mods.betterfoliage.client.config.Config
-import mods.octarinecore.SVertexBuilder
+import mods.betterfoliage.client.texture.GrassRegistry
+import mods.betterfoliage.client.texture.LeafRegistry
+import mods.octarinecore.*
 import mods.octarinecore.client.render.CombinedContext
 import mods.octarinecore.metaprog.allAvailable
 import mods.octarinecore.metaprog.get
@@ -12,9 +13,9 @@ import net.minecraft.block.BlockRenderType
 import net.minecraft.block.BlockRenderType.MODEL
 import net.minecraft.block.BlockState
 import net.minecraft.block.Blocks
-import net.minecraft.block.TallGrassBlock
 import net.minecraft.client.renderer.BufferBuilder
-import net.minecraftforge.registries.ForgeRegistries
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.IEnviromentBlockReader
 import org.apache.logging.log4j.Level.INFO

 /**
@@ -24,45 +25,44 @@ object ShadersModIntegration {

    @JvmStatic val isAvailable = allAvailable(SVertexBuilder, SVertexBuilder.pushState, SVertexBuilder.pushNum, SVertexBuilder.pop)

-    val grassDefaultBlockId = 31L
-    val leavesDefaultBlockId = 18L
+    val defaultLeaves = Blocks.OAK_LEAVES.defaultState
+    val defaultGrass = Blocks.TALL_GRASS.defaultState

    /**
     * Called from transformed ShadersMod code.
     * @see mods.betterfoliage.loader.BetterFoliageTransformer
     */
-    @JvmStatic fun getBlockIdOverride(original: Long, blockState: BlockState): Long {
-        if (BlockConfig.leafBlocks.matchesClass(blockState.block)) return Config.shaders.leavesId
-        if (BlockConfig.crops.matchesClass(blockState.block)) return Config.shaders.grassId
-        return original
+    @JvmStatic fun getBlockStateOverride(state: BlockState, world: IEnviromentBlockReader, pos: BlockPos): BlockState {
+        if (LeafRegistry[state, world, pos] != null) return defaultLeaves
+        if (BlockConfig.crops.matchesClass(state.block)) return defaultGrass
+        return state
    }

    init {
        BetterFoliage.log(INFO, "ShadersMod integration is ${if (isAvailable) "enabled" else "disabled" }")
    }

+    inline fun renderAs(ctx: CombinedContext, renderType: BlockRenderType, enabled: Boolean = true, func: ()->Unit) =
+        renderAs(ctx, ctx.state, renderType, enabled, func)
+
    /** Quads rendered inside this block will use the given block entity data in shader programs. */
-    inline fun renderAs(blockId: Long, renderType: BlockRenderType, renderer: BufferBuilder, enabled: Boolean = true, func: ()->Unit) {
-        if ((isAvailable && enabled)) {
-            val vertexBuilder = renderer[mods.octarinecore.BufferBuilder.sVertexBuilder]!!
-            SVertexBuilder.pushNum.invoke(vertexBuilder, blockId)
+    inline fun renderAs(ctx: CombinedContext, state: BlockState, renderType: BlockRenderType, enabled: Boolean = true, func: ()->Unit) {
+        if (isAvailable && enabled) {
+            val buffer = ctx.renderCtx.renderBuffer
+            val sVertexBuilder = buffer[BufferBuilder_sVertexBuilder]
+            SVertexBuilder.pushState.invoke(sVertexBuilder, ctx.state, ctx.pos, ctx.world, buffer)
            func()
-            SVertexBuilder.pop.invoke(vertexBuilder)
+            SVertexBuilder.pop.invoke(sVertexBuilder)
        } else {
            func()
        }
    }

-    /** Quads rendered inside this block will use the given block entity data in shader programs. */
-    // temporarily NO-OP
-    inline fun renderAs(state: BlockState, renderType: BlockRenderType, renderer: BufferBuilder, enabled: Boolean = true, func: ()->Unit) = func()
-    inline fun renderAs(ctx: CombinedContext, renderType: BlockRenderType, enabled: Boolean = true, func: ()->Unit) = func()
-
    /** Quads rendered inside this block will behave as tallgrass blocks in shader programs. */
    inline fun grass(ctx: CombinedContext, enabled: Boolean = true, func: ()->Unit) =
-        renderAs(Config.shaders.grassId, MODEL, ctx.renderCtx.renderBuffer, enabled, func)
+        renderAs(ctx, defaultGrass, MODEL, enabled, func)

    /** Quads rendered inside this block will behave as leaf blocks in shader programs. */
    inline fun leaves(ctx: CombinedContext, enabled: Boolean = true, func: ()->Unit) =
-        renderAs(Config.shaders.leavesId, MODEL, ctx.renderCtx.renderBuffer, enabled, func)
+        renderAs(ctx, defaultLeaves, MODEL, enabled, func)
 }
--- a/src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt
@@ -70,7 +70,7 @@ class RenderLeaves : RenderDecorator(BetterFoliageMod.MOD_ID, BetterFoliageMod.b
            if (isSnowed && Config.leaves.snowEnabled) ctx.render(
                leavesModel.model,
                translation = ctx.blockCenter + perturbs[rand[0]],
-                icon = { _, _, _ -> snowedIcon[rand[1]]!! },
+                icon = { _, _, _ -> snowedIcon[rand[1]] },
                postProcess = whitewash
            )
        }
--- a/src/main/kotlin/mods/octarinecore/CommonRefs.kt
+++ b/src/main/kotlin/mods/octarinecore/CommonRefs.kt
@@ -1,6 +1,7 @@
 package mods.octarinecore

 import mods.octarinecore.metaprog.ClassRef
+import mods.octarinecore.metaprog.ClassRef.Companion.void
 import mods.octarinecore.metaprog.FieldRef
 import mods.octarinecore.metaprog.MethodRef
 import net.minecraft.block.Block
@@ -8,6 +9,7 @@ import net.minecraft.block.BlockState
 import net.minecraft.client.renderer.BlockRendererDispatcher
 import net.minecraft.client.renderer.BufferBuilder
 import net.minecraft.client.renderer.chunk.ChunkRenderCache
+import net.minecraft.client.renderer.model.BakedQuad
 import net.minecraft.client.renderer.texture.TextureAtlasSprite
 import net.minecraft.util.BlockRenderLayer
 import net.minecraft.util.ResourceLocation
@@ -24,21 +26,20 @@ val Random = ClassRef<Random>("java.util.Random")

 // Minecraft
 val IBlockReader = ClassRef<IBlockReader>("net.minecraft.world.IBlockReader")
-val IEnvironmentBlockReader = ClassRef<IEnviromentBlockReader>("net.minecraft.world.IEnvironmentBlockReader")
-val BlockState = ClassRef<BlockState>("net.minecraft.block.state.BlockState")
+val IEnvironmentBlockReader = ClassRef<IEnviromentBlockReader>("net.minecraft.world.IEnviromentBlockReader")
+val BlockState = ClassRef<BlockState>("net.minecraft.block.BlockState")
 val BlockPos = ClassRef<BlockPos>("net.minecraft.util.math.BlockPos")
 val BlockRenderLayer = ClassRef<BlockRenderLayer>("net.minecraft.util.BlockRenderLayer")
 val Block = ClassRef<Block>("net.minecraft.block.Block")
-object BufferBuilder : ClassRef<BufferBuilder>("net.minecraft.client.renderer.BufferBuilder") {
-    /** Optifine only */
-    val sVertexBuilder = FieldRef(this, "sVertexBuilder", SVertexBuilder)
-    /** Optifine only */
-    val quadSprite = FieldRef(this, "quadSprite", TextureAtlasSprite)
-}
+
+val TextureAtlasSprite = ClassRef<TextureAtlasSprite>("net.minecraft.client.renderer.texture.TextureAtlasSprite")
+val BufferBuilder = ClassRef<BufferBuilder>("net.minecraft.client.renderer.BufferBuilder")
+val BufferBuilder_setSprite = MethodRef(BufferBuilder, "setSprite", void, TextureAtlasSprite)
+val BufferBuilder_sVertexBuilder = FieldRef(BufferBuilder, "sVertexBuilder", SVertexBuilder)
 val BlockRendererDispatcher = ClassRef<BlockRendererDispatcher>("net.minecraft.client.renderer.BlockRendererDispatcher")
 val ChunkRenderCache = ClassRef<ChunkRenderCache>("net.minecraft.client.renderer.chunk.ChunkRenderCache")
-val TextureAtlasSprite = ClassRef<TextureAtlasSprite>("net.minecraft.client.renderer.texture.TextureAtlasSprite")
 val ResourceLocation = ClassRef<ResourceLocation>("net.minecraft.util.ResourceLocation")
+val BakedQuad = ClassRef<BakedQuad>("net.minecraft.client.renderer.model.BakedQuad")

 // Optifine
 val OptifineClassTransformer = ClassRef<Any>("optifine.OptiFineClassTransformer")
@@ -54,12 +55,12 @@ object RenderEnv : ClassRef<Any>("net.optifine.render.RenderEnv") {
 // Optifine custom colors
 val IColorizer = ClassRef<Any>("net.optifine.CustomColors\$IColorizer")
 object CustomColors : ClassRef<Any>("net.optifine.CustomColors") {
-    val getColorMultiplier = MethodRef(this, "getSmoothColorMultiplier", int, BlockState, IEnvironmentBlockReader, BlockPos, IColorizer, BlockPosM)
+    val getColorMultiplier = MethodRef(this, "getColorMultiplier", int, BakedQuad, BlockState, IEnvironmentBlockReader, BlockPos, RenderEnv)
 }

 // Optifine shaders
 object SVertexBuilder : ClassRef<Any>("net.optifine.shaders.SVertexBuilder") {
-    val pushState = MethodRef(this, "pushEntity", void, BlockState, BlockPos, IBlockReader, BufferBuilder)
+    val pushState = MethodRef(this, "pushEntity", void, BlockState, BlockPos, IEnvironmentBlockReader, BufferBuilder)
    val pushNum = MethodRef(this, "pushEntity", void, long)
    val pop = MethodRef(this, "popEntity", void)
 }
--- a/src/main/kotlin/mods/octarinecore/client/render/CombinedContext.kt
+++ b/src/main/kotlin/mods/octarinecore/client/render/CombinedContext.kt
@@ -3,6 +3,7 @@ package mods.octarinecore.client.render
 import mods.betterfoliage.client.render.canRenderInCutout
 import mods.betterfoliage.client.render.isCutout
 import mods.octarinecore.BufferBuilder
+import mods.octarinecore.BufferBuilder_setSprite
 import mods.octarinecore.client.render.lighting.*
 import mods.octarinecore.common.Double3
 import mods.octarinecore.common.Int3
@@ -62,7 +63,7 @@ class CombinedContext(
                if (drawIcon != null) {
                    // let OptiFine know the texture we're using, so it can
                    // transform UV coordinates to quad-relative
-                    renderCtx.renderBuffer[BufferBuilder.quadSprite] = drawIcon
+                    BufferBuilder_setSprite.invoke(renderCtx.renderBuffer, drawIcon)

                    quad.verts.forEachIndexed { vertIdx, vert ->
                        temp.init(vert).rotate(lightingCtx.modelRotation).translate(translation)