Fixed the block entiteis jiggling as well fixed transaprency with rare candy!

Waterpicker · Waterpicker · commit 09949d236a6c · 2025-06-06T10:32:44.000-05:00
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.kt
@@ -16,13 +16,10 @@ import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.BufferUploader
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
-import dev.architectury.registry.ReloadListenerRegistry
 import dev.architectury.registry.item.ItemPropertiesRegistry
 import dev.architectury.registry.menu.MenuRegistry
 import generations.gg.generations.core.generationscore.common.GenerationsCore
 import generations.gg.generations.core.generationscore.common.GenerationsCore.LOGGER
-import generations.gg.generations.core.generationscore.common.GenerationsDataProvider
-import generations.gg.generations.core.generationscore.common.GenerationsDataProvider.SimpleResourceReloader
 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.RunnableKeybind
@@ -88,7 +85,6 @@ import net.minecraft.world.phys.Vec3
 import net.minecraft.world.phys.shapes.CollisionContext
 import net.minecraft.world.phys.shapes.VoxelShape
 import org.joml.Matrix4f
-import org.joml.Quaternionf
 import org.joml.Vector4f
 import org.lwjgl.glfw.GLFW
 import java.io.File
@@ -107,6 +103,11 @@ private operator fun Vec3.minus(vec3: Vec3): Vec3 {
     return this.subtract(vec3)
 }
 
+object MatrixCache {
+    var projectionMatrix = Matrix4f()
+    var viewMatrix = Matrix4f()
+}
+
 object GenerationsCoreClient {
     fun onInitialize(minecraft: Minecraft) {
         if (GenerationsCore.CONFIG.client.useRenderDoc) {
@@ -531,16 +532,15 @@ object GenerationsCoreClient {
             .get() /*&& Minecraft.getInstance().options.renderDebugCharts*/ && !Minecraft.getInstance().options.hideGui
     }
 
-    fun renderRareCandy(level: ClientLevel) {
+    fun renderRareCandy(stage: RenderStage, clear: Boolean) {
         if (GenerationsCore.CONFIG.client.useVanilla) return
 
         var startTime = System.currentTimeMillis()
-        level.profiler.popPush("render_models")
+//        level.profiler.popPush("render_models")
         RenderSystem.enableDepthTest()
         BufferUploader.reset()
 
-        ModelRegistry.worldRareCandy.render(RenderStage.SOLID, false, MinecraftClientGameProvider.getTimePassed())
-        ModelRegistry.worldRareCandy.render(RenderStage.TRANSPARENT, true, MinecraftClientGameProvider.getTimePassed())
+        ModelRegistry.worldRareCandy.render(stage, clear, MinecraftClientGameProvider.getTimePassed())
         if (shouldRenderFpsPie()) LOGGER.warn("RareCandy render took " + (System.currentTimeMillis() - startTime) + "ms")
     }
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyBone.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyBone.kt
@@ -92,6 +92,7 @@ class RareCandyBone /*Remove when cobblemon doesn't have parts of code that assu
             if (variant != null) {
                 instance.setVariant(variant)
             }
+
             stack.pushPose()
             stack.mulPose(ROTATION_CORRECTION)
             stack.scale(-scale, -scale, scale)
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/block/entity/GeneralUseBlockEntityRenderer.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/block/entity/GeneralUseBlockEntityRenderer.kt
@@ -1,5 +1,7 @@
 package generations.gg.generations.core.generationscore.common.client.render.block.entity
 
+import com.cobblemon.mod.common.util.set
+import com.cobblemon.mod.common.util.toVec3d
 import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.PoseStack
 import generations.gg.generations.core.generationscore.common.client.model.ModelContextProviders.FrameProvider
@@ -12,10 +14,14 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
 import gg.generations.rarecandy.renderer.animation.AnimationInstance
 import gg.generations.rarecandy.renderer.rendering.ObjectInstance
 import gg.generations.rarecandy.renderer.storage.AnimatedObjectInstance
+import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider
 import net.minecraft.resources.ResourceLocation
+import org.joml.Matrix4f
+import org.joml.Quaternionf
+import org.joml.Vector3f
 
 open class GeneralUseBlockEntityRenderer<T : ModelProvidingBlockEntity>(ctx: BlockEntityRendererProvider.Context) :
     BlockEntityRenderer<T> {
@@ -72,7 +78,6 @@ open class GeneralUseBlockEntityRenderer<T : ModelProvidingBlockEntity>(ctx: Blo
             }
 
             instance.transformationMatrix().set(stack.last().pose())
-//            instance.viewMatrix().set(RenderSystem.getModelViewMatrix())
 
             (instance as BlockObjectInstance).light = packedLight
             if (blockEntity is TintProvider) instance.tint = blockEntity.tint
@@ -114,7 +119,11 @@ open class GeneralUseBlockEntityRenderer<T : ModelProvidingBlockEntity>(ctx: Blo
             }
         }
 
-        primeInstance.transformationMatrix().set(stack.last().pose())
+        var offset = blockEntity.blockPos.toVec3d().subtract(Minecraft.getInstance().cameraEntity!!.position())
+
+        primeInstance.transformationMatrix().set(stack.last().pose()).translate(offset.x.toFloat(),
+            offset.y.toFloat(), offset.z.toFloat()
+        )
         (primeInstance as BlockLightValueProvider).light = packedLight
         if (blockEntity is TintProvider) (primeInstance as BlockAnimatedObjectInstance).tint = blockEntity.tint
 
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/entity/ZygardeCellRenderer.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/entity/ZygardeCellRenderer.java
@@ -1,5 +1,6 @@
 package generations.gg.generations.core.generationscore.common.client.render.entity;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
 import generations.gg.generations.core.generationscore.common.GenerationsCore;
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/ModelRegistry.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/ModelRegistry.kt
@@ -19,6 +19,7 @@ import gg.generations.rarecandy.shaded.caffeine.cache.RemovalCause
 import net.minecraft.client.Minecraft
 import net.minecraft.core.Direction
 import net.minecraft.resources.ResourceLocation
+import org.joml.Matrix4f
 import java.time.Duration
 import java.time.Instant
 import java.util.concurrent.TimeUnit
@@ -82,7 +83,6 @@ object ModelRegistry {
         CompiledModel.init()
     }
 
-    @JvmStatic
     fun prepForBER(stack: PoseStack, supplier: AngleProvider) {
         stack.translate(0.5f, 0.0f, 0.5f)
         if (supplier is ModelProvidingBlockEntity) {
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/Pipelines.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/Pipelines.kt
@@ -8,6 +8,7 @@ import dev.architectury.event.Event
 import dev.architectury.event.EventFactory
 import generations.gg.generations.core.generationscore.common.GenerationsCore
 import generations.gg.generations.core.generationscore.common.client.GenerationsTextureLoader
+import generations.gg.generations.core.generationscore.common.client.MatrixCache
 import generations.gg.generations.core.generationscore.common.client.model.ModelContextProviders.TintProvider
 import gg.generations.rarecandy.pokeutils.BlendType
 import gg.generations.rarecandy.pokeutils.CullType
@@ -96,9 +97,9 @@ object Pipelines {
     fun createShader(manager: ResourceManager): Pipeline = Pipeline.Builder()
         .supplyBooleanUniform("legacy") { useLegacy }
         .supplyEnumUniform("FogShape", RenderSystem.getShaderFogShape())
-        .supplyMat4("viewMatrix") { RenderSystem.getModelViewMatrix() }
+        .supplyMat4("viewMatrix") { MatrixCache.viewMatrix  }
         .supplyMat4("modelMatrix") { it.instance().transformationMatrix() }
-        .supplyMat4("projectionMatrix") { RenderSystem.getProjectionMatrix() }
+        .supplyMat4("projectionMatrix") { MatrixCache.projectionMatrix }
         .supplyVec2("uvOffset") { it.transform.offset() ?: Transform.DEFAULT_OFFSET }
         .supplyVec2("uvScale") { it.transform.scale() ?: Transform.DEFAULT_SCALE }
         .supplyMat4s("boneTransforms") { ctx -> ctx.instance.instanceOrNull<AnimatedObjectInstance>()?.transforms ?: AnimationController.NO_ANIMATION }
@@ -162,11 +163,11 @@ object Pipelines {
             if (material.blendType() == BlendType.Regular) {
                 RenderSystem.enableBlend()
                 RenderSystem.defaultBlendFunc()
-            } }, { material ->
+            } }, {/* material ->
                 if (material.blendType() == BlendType.Regular) {
                     RenderSystem.disableBlend()
                 }
-            })
+            */})
         .shader(manager, "shaders/animated.vs.glsl", "shaders/animated.fs.glsl")
         .build()
     }
@@ -212,29 +213,6 @@ object Pipelines {
 
     private fun Pipeline.Builder.supplyBooleanUniform(name: String, function: (UniformUploadContext) -> Boolean): Pipeline.Builder { return this.supplyUniform(name) { it.uniform.uploadBoolean(function.invoke(it)) } }
 
-    private object BlendRecord {
-        var enabled: Boolean = false
-        var srcRgb: Int = 0
-        var dstRgb: Int = 0
-        var srcAlpha: Int = 0
-        var dstAlpha: Int = 0
-
-        fun push() {
-            enabled = GlStateManager.BLEND.mode.enabled
-            srcRgb = GlStateManager.BLEND.srcRgb
-            dstRgb = GlStateManager.BLEND.dstRgb
-            srcAlpha = GlStateManager.BLEND.srcAlpha
-            dstAlpha = GlStateManager.BLEND.dstAlpha
-        }
-
-        fun pop() {
-            if (enabled) RenderSystem.enableBlend()
-            else RenderSystem.disableBlend()
-
-            RenderSystem.blendFuncSeparate(srcRgb, dstRgb, srcAlpha, dstAlpha)
-        }
-    }
-
 fun read(manager: ResourceManager, name: ResourceLocation): String {
     try {
         manager.getResource(name).orElseThrow().open().use { `is` ->
diff --git a/common/src/main/resources/assets/generations_core/shaders/animated.fs.glsl b/common/src/main/resources/assets/generations_core/shaders/animated.fs.glsl
@@ -3,6 +3,7 @@
 in vec2 texCoord0;
 in vec4 vertexColor;
 in float vertexDistance;
+in vec4 lightMapColor;
 
 out vec4 outColor;
 
@@ -16,15 +17,12 @@ uniform vec4 FogColor;
 uniform sampler2D diffuse;
 uniform sampler2D mask;
 uniform sampler2D layer;
-uniform sampler2D lightmap;
 uniform sampler2D emission;
 uniform sampler2D paradoxMask;
 
 uniform int colorMethod;
 uniform int effect;
 
-uniform ivec2 light;
-
 uniform vec3 tint;
 
 uniform int frame;
@@ -377,10 +375,7 @@ void main() {
         outColor.rgb = calculateTersaalizationEffect(outColor.rgb);
     } else if (useLight) {
         outColor *= vertexColor;
-        // Sample Minecraft's light level from the lightmap texture
-        vec4 minecraftLight = minecraft_sample_lightmap(lightmap, light);
-
-        outColor *= mix(minecraftLight, vec4(1, 1, 1, 1), texture(emission, texCoord0).r);
+        outColor *= mix(lightMapColor, vec4(1, 1, 1, 1), texture(emission, texCoord0).r);
     }
 
     outColor = linear_fog(outColor, vertexDistance, FogStart, FogEnd, FogColor);
diff --git a/common/src/main/resources/assets/generations_core/shaders/animated.vs.glsl b/common/src/main/resources/assets/generations_core/shaders/animated.vs.glsl
@@ -15,11 +15,16 @@ out vec2 texCoord0;
 out vec3 fragNormal;
 out vec3 fragViewDir;
 out vec3 worldPos;
+out vec4 lightMapColor;
+
+uniform sampler2D lightmap;
 
 uniform bool legacy;
 
 uniform int FogShape;
 
+uniform ivec2 light;
+
 uniform mat4 viewMatrix;
 uniform mat4 modelMatrix;
 uniform mat4 projectionMatrix;
@@ -40,12 +45,12 @@ mat4 getBoneTransform() {
     return boneTransform;
 }
 
-float fog_distance(mat4 modelViewMat, vec3 pos, int shape) {
+float fog_distance(vec3 pos, int shape) {
     if (shape == 0) {
-        return length((modelViewMat * vec4(pos, 1.0)).xyz);
+        return length(pos);
     } else {
-        float distXZ = length((modelViewMat * vec4(pos.x, 0.0, pos.z, 1.0)).xyz);
-        float distY = length((modelViewMat * vec4(0.0, pos.y, 0.0, 1.0)).xyz);
+        float distXZ = length(pos.xz);
+        float distY = abs(pos.y);
         return max(distXZ, distY);
     }
 }
@@ -66,10 +71,11 @@ void main() {
     mat4 modelTransform = modelMatrix * getBoneTransform();
     vec4 worldPosition = modelTransform * vec4(positions, 1.0);
 
-    texCoord0 = (texcoords * uvScale) + uvOffset;
     gl_Position = worldSpace * worldPosition;
-    vertexDistance = fog_distance(worldSpace * modelTransform, positions, FogShape);
     vertexColor = getVertexColor();
+    vertexDistance = fog_distance(positions, FogShape);
+    lightMapColor = texelFetch(lightmap, light / 16, 0);
+    texCoord0 = (texcoords * uvScale) + uvOffset;
 
     fragViewDir = normalize(-(viewMatrix * worldPosition).xyz);
     worldPos = worldPosition.xyz;
diff --git a/common/src/main/resources/generationscore.accesswidener b/common/src/main/resources/generationscore.accesswidener
@@ -40,6 +40,11 @@ accessible field net/minecraft/world/level/block/entity/BlockEntityType validBlo
 mutable field net/minecraft/world/level/block/entity/BlockEntityType validBlocks Ljava/util/Set;
 
 accessible field com/mojang/blaze3d/platform/GlStateManager BLEND Lcom/mojang/blaze3d/platform/GlStateManager$BlendState;
+accessible field com/mojang/blaze3d/platform/GlStateManager CULL Lcom/mojang/blaze3d/platform/GlStateManager$CullState;
+accessible class com/mojang/blaze3d/platform/GlStateManager$CullState
+accessible field com/mojang/blaze3d/platform/GlStateManager DEPTH Lcom/mojang/blaze3d/platform/GlStateManager$DepthState;
+accessible class com/mojang/blaze3d/platform/GlStateManager$DepthState
+
 accessible class com/mojang/blaze3d/platform/GlStateManager$BlendState
 accessible field com/mojang/blaze3d/platform/GlStateManager$BooleanState enabled Z
 
diff --git a/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/client/GenerationsCoreClientFabric.kt b/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/client/GenerationsCoreClientFabric.kt
diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ class RareCandyBone /*Remove when cobblemon doesn't have parts of code that assu`
`92`	`92`	`if (variant != null) {`
`93`	`93`	`instance.setVariant(variant)`
`94`	`94`	`}`
	`95`	`+`
`95`	`96`	`stack.pushPose()`
`96`	`97`	`stack.mulPose(ROTATION_CORRECTION)`
`97`	`98`	`stack.scale(-scale, -scale, scale)`