Mixin attempt to make model rendering work regardless of loader.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.kt

@@ -21,6 +21,7 @@ import generations.gg.generations.core.generationscore.common.GenerationsCore.LO
 import generations.gg.generations.core.generationscore.common.client.model.GenerationsClientMolangFunctions
 import generations.gg.generations.core.generationscore.common.client.model.RareCandyBone
 import generations.gg.generations.core.generationscore.common.client.model.inventory.GenericChestItemStackRenderer
+import generations.gg.generations.core.generationscore.common.client.render.RenderStateRecord
 import generations.gg.generations.core.generationscore.common.client.render.block.entity.*
 import generations.gg.generations.core.generationscore.common.client.render.entity.*
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.MinecraftClientGameProvider
@@ -533,6 +534,31 @@ object GenerationsCoreClient {
             .get() /*&& Minecraft.getInstance().options.renderDebugCharts*/ && !Minecraft.getInstance().options.hideGui
     }
 
+    fun secondRenderPass() {
+//        renderHighlightedPath(stack, Minecraft.getInstance().levelRenderer.ticks, camera)
+
+        RenderStateRecord.push()
+        RenderSystem.enableDepthTest()
+        RenderSystem.defaultBlendFunc()
+        RenderSystem.enableBlend()
+        renderRareCandyTransparent(true)
+        RenderStateRecord.pop()
+    }
+
+    fun firstRenderPass() {
+
+        MatrixCache.projectionMatrix = RenderSystem.getProjectionMatrix()
+        MatrixCache.viewMatrix = RenderSystem.getModelViewMatrix()
+
+        RenderStateRecord.push()
+
+        renderRareCandySolid()
+        renderRareCandyTransparent()
+
+        RenderStateRecord.pop()
+    }
+
+
     fun renderRareCandySolid() {
         renderRareCandy(RenderStage.SOLID, false)
     }
@@ -545,7 +571,6 @@ object GenerationsCoreClient {
         if (GenerationsCore.CONFIG.client.useVanilla) return
 
         var startTime = System.currentTimeMillis()
-//        level.profiler.popPush("render_models")
         RenderSystem.enableDepthTest()
         BufferUploader.reset()
 

common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/LevelRendererMixin.java

@@ -42,17 +42,15 @@
 
 @Mixin(LevelRenderer.class)
 public abstract class LevelRendererMixin {
+    @Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/debug/DebugRenderer;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;DDD)V"))
+    private void pokecraft$firstPass(DeltaTracker deltaTracker, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f frustumMatrix, Matrix4f projectionMatrix, CallbackInfo ci) {
+        GenerationsCoreClient.INSTANCE.firstRenderPass();
+    }
 
-    @Shadow
-    @Nullable
-    private ClientLevel level;
+    @Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Options;getCloudsType()Lnet/minecraft/client/CloudStatus;"))
+    private void pokecraft$secondPass(DeltaTracker deltaTracker, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f frustumMatrix, Matrix4f projectionMatrix, CallbackInfo ci) {
+        GenerationsCoreClient.INSTANCE.secondRenderPass();
+    }
 
-    @Shadow
-    @Final
-    private static Logger LOGGER;
 
-    @Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/debug/DebugRenderer;render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;DDD)V"))
-    private void pokecraft$rksRender(DeltaTracker deltaTracker, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f frustumMatrix, Matrix4f projectionMatrix, CallbackInfo ci) {
-//        GenerationsCoreClient.renderRareCandy(level);
-    }
 }

fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/client/GenerationsCoreClientFabric.kt

@@ -1,18 +1,12 @@
 package generations.gg.generations.core.generationscore.fabric.client
 
-import com.mojang.blaze3d.systems.RenderSystem
 import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient
 import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.BlockEntityRendererHandler
 import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.EntityRendererHandler
 import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.onInitialize
 import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.registerBlockEntityRenderers
 import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.registerEntityRenderers
 import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.registerLayerDefinitions
-import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderHighlightedPath
-import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderRareCandySolid
-import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderRareCandyTransparent
-import generations.gg.generations.core.generationscore.common.client.MatrixCache
-import generations.gg.generations.core.generationscore.common.client.render.RenderStateRecord
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsBlocks
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsMushroomBlock
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsWood
@@ -23,9 +17,6 @@ import net.fabricmc.api.Environment
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap
 import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents.AfterTranslucent
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.RenderType
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider
@@ -54,31 +45,9 @@ class GenerationsCoreClientFabric : ClientModInitializer {
      * @see ClientModInitializer.onInitializeClient
      */
     override fun onInitializeClient() {
-        WorldRenderEvents.AFTER_TRANSLUCENT.register(AfterTranslucent { context: WorldRenderContext ->
-            renderHighlightedPath(
-                context.matrixStack()!!, Minecraft.getInstance().levelRenderer.ticks, context.camera()
-            )
+//        WorldRenderEvents.AFTER_TRANSLUCENT.register { secondRenderPass() }
 
-            RenderStateRecord.push()
-            RenderSystem.enableDepthTest()
-            RenderSystem.defaultBlendFunc()
-            RenderSystem.enableBlend()
-            renderRareCandyTransparent(true)
-            RenderStateRecord.pop()
-        })
-
-        WorldRenderEvents.BEFORE_DEBUG_RENDER.register {
-
-            MatrixCache.projectionMatrix = RenderSystem.getProjectionMatrix()
-            MatrixCache.viewMatrix = RenderSystem.getModelViewMatrix()
-
-            RenderStateRecord.push()
-
-            renderRareCandySolid()
-            renderRareCandyTransparent()
-
-            RenderStateRecord.pop()
-        }
+//        WorldRenderEvents.BEFORE_DEBUG_RENDER.register { firstRenderPass() }
 
         GenerationsCoreFabric.networkManager.registerClientHandlers()
 

neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/client/GenerationsCoreClientForge.kt

@@ -74,11 +74,11 @@ class GenerationsCoreClientForge(eventBus: IEventBus) {
 //                event
 //            )
 //        }
-        NeoForge.EVENT_BUS.addListener { event: RenderLevelStageEvent ->
-            renderHighlightedPath(
-                event
-            )
-        }
+//        NeoForge.EVENT_BUS.addListener { event: RenderLevelStageEvent ->
+//            renderHighlightedPath(
+//                event
+//            )
+//        }
     }
 
     companion object {