Skip to content

Commit 6d62f11

Browse files
committed
Attempt at fixing rendering with forge.
1 parent 793dad3 commit 6d62f11

File tree

2 files changed

+27
-13
lines changed

2 files changed

+27
-13
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package generations.gg.generations.core.generationscore.fabric.client
22

3-
import com.mojang.blaze3d.platform.GlStateManager
4-
import com.mojang.blaze3d.platform.GlStateManager.BlendState
53
import com.mojang.blaze3d.systems.RenderSystem
64
import dev.architectury.registry.registries.RegistrySupplier
75
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient
@@ -12,7 +10,6 @@ import generations.gg.generations.core.generationscore.common.client.Generations
1210
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.registerEntityRenderers
1311
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.registerLayerDefinitions
1412
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderHighlightedPath
15-
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderRareCandy
1613
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderRareCandySolid
1714
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderRareCandyTransparent
1815
import generations.gg.generations.core.generationscore.common.client.MatrixCache
@@ -21,7 +18,6 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
2118
import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsMushroomBlock
2219
import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsWood
2320
import generations.gg.generations.core.generationscore.fabric.networking.GenerationsFabricNetwork
24-
import gg.generations.rarecandy.renderer.rendering.RenderStage
2521
import net.fabricmc.api.ClientModInitializer
2622
import net.fabricmc.api.EnvType
2723
import net.fabricmc.api.Environment
@@ -44,7 +40,6 @@ import net.minecraft.world.level.block.TransparentBlock
4440
import net.minecraft.world.level.block.TrapDoorBlock
4541
import net.minecraft.world.level.block.entity.BlockEntity
4642
import net.minecraft.world.level.block.entity.BlockEntityType
47-
import org.joml.Matrix4f
4843
import java.util.function.Consumer
4944

5045
/**

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

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package generations.gg.generations.core.generationscore.forge.client
22

3+
import com.mojang.blaze3d.systems.RenderSystem
34
import generations.gg.generations.core.generationscore.common.GenerationsCore
45
import generations.gg.generations.core.generationscore.common.GenerationsCore.id
56
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient
@@ -13,6 +14,7 @@ import generations.gg.generations.core.generationscore.common.client.Generations
1314
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderRareCandy
1415
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderRareCandySolid
1516
import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient.renderRareCandyTransparent
17+
import generations.gg.generations.core.generationscore.common.client.MatrixCache
1618
import generations.gg.generations.core.generationscore.common.client.render.RenderStateRecord
1719
import generations.gg.generations.core.generationscore.common.mixin.client.LevelRendererMixin
1820
import net.minecraft.client.DeltaTracker
@@ -85,16 +87,33 @@ class GenerationsCoreClientForge(eventBus: IEventBus) {
8587

8688
companion object {
8789
private fun renderHighlightedPath(event: RenderLevelStageEvent) {
88-
if (event.stage === RenderLevelStageEvent.Stage.AFTER_PARTICLES) {
89-
renderHighlightedPath(event.poseStack, event.renderTick, event.camera)
90-
renderRareCandyTransparent(true)
91-
} else if (event.stage === RenderLevelStageEvent.Stage.AFTER_BLOCK_ENTITIES) {
92-
RenderStateRecord.push()
90+
when (event.stage) {
91+
RenderLevelStageEvent.Stage.AFTER_TRANSLUCENT_BLOCKS -> {
92+
renderHighlightedPath(
93+
event.poseStack,
94+
event.partialTick.getGameTimeDeltaPartialTick(false).toInt(),
95+
event.camera
96+
)
9397

94-
renderRareCandySolid()
95-
renderRareCandyTransparent()
98+
RenderStateRecord.push()
99+
RenderSystem.enableDepthTest()
100+
RenderSystem.defaultBlendFunc()
101+
RenderSystem.enableBlend()
102+
renderRareCandyTransparent(true)
103+
RenderStateRecord.pop()
104+
}
96105

97-
RenderStateRecord.pop()
106+
RenderLevelStageEvent.Stage.AFTER_LEVEL -> {
107+
MatrixCache.projectionMatrix = event.projectionMatrix
108+
MatrixCache.viewMatrix = event.modelViewMatrix
109+
110+
RenderStateRecord.push()
111+
renderRareCandySolid()
112+
renderRareCandyTransparent()
113+
RenderStateRecord.pop()
114+
}
115+
116+
else -> {}
98117
}
99118
}
100119

0 commit comments

Comments
 (0)