Fix particles becoming dark, fixes #21

Hantonik · Sep 14, 2024 · d0116e2 · d0116e2
1 parent bd68a2f
commit d0116e2
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 75 deletions.
diff --git a/Common/src/main/java/hantonik/fbp/util/FBPConstants.java b/Common/src/main/java/hantonik/fbp/util/FBPConstants.java
@@ -50,12 +50,14 @@ public final class FBPConstants {
     public static final ParticleRenderType FBP_PARTICLE_RENDER = new ParticleRenderType() {
         @Override
         public void begin(BufferBuilder buffer, @NotNull TextureManager manager) {
+            Minecraft.getInstance().gameRenderer.lightTexture().turnOnLightLayer();
+
             RenderSystem.enableBlend();
             RenderSystem.defaultBlendFunc();
             RenderSystem.depthMask(true);
+            RenderSystem.enableDepthTest();
             RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS);
             RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-            RenderSystem.setShader(GameRenderer::getParticleShader);
 
             RenderSystem.enableCull();
 
@@ -78,9 +80,12 @@ public void end(Tesselator tesselator) {
     public static final ParticleRenderType FBP_TERRAIN_RENDER = new ParticleRenderType() {
         @Override
         public void begin(BufferBuilder buffer, TextureManager manager) {
+            Minecraft.getInstance().gameRenderer.lightTexture().turnOnLightLayer();
+
             RenderSystem.enableBlend();
             RenderSystem.defaultBlendFunc();
             RenderSystem.depthMask(true);
+            RenderSystem.enableDepthTest();
             RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS);
             RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
             RenderSystem.setShader(GameRenderer::getRendertypeTranslucentShader);

diff --git a/Common/src/main/java/hantonik/fbp/util/FBPRenderHelper.java b/Common/src/main/java/hantonik/fbp/util/FBPRenderHelper.java
@@ -4,6 +4,7 @@
 import hantonik.fbp.platform.Services;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.util.Mth;
 import org.joml.Vector2f;
 import org.joml.Vector3d;
@@ -69,7 +70,7 @@ public static void renderCubeShaded(VertexConsumer buffer, Vector2f[] uv, double
     }
 
     public static void addVertex(VertexConsumer buffer, Vector3d pos, float u, float v, int light, float red, float green, float blue, float alpha, Vector3d normal) {
-        buffer.vertex(pos.x, pos.y, pos.z).color(red, green, blue, alpha).uv(u, v).uv2(light).normal((float) normal.x, (float) normal.y, (float) normal.z).endVertex();
+        buffer.vertex(pos.x, pos.y, pos.z).color(red, green, blue, alpha).uv(u, v).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(light).normal((float) normal.x, (float) normal.y, (float) normal.z).endVertex();
     }
 
     public static Vector3d rotate(Vector3d vector, float angleX, float angleY, float angleZ) {

diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -13,7 +13,6 @@ base {
 
 mixin {
     config "${mod_id}.mixins.json"
-    config "${mod_id}.forge.mixins.json"
 }
 
 println "Forge: $forge_version"
@@ -94,7 +93,7 @@ if (minecraft.reobf) {
 jar {
     manifest {
         attributes([
-                'MixinConfigs': "${mod_id}.mixins.json,${mod_id}.forge.mixins.json"
+                'MixinConfigs': "${mod_id}.mixins.json"
         ])
     }
 

diff --git a/Forge/src/main/java/hantonik/fbp/mixin/MixinItemPickupParticle.java b/Forge/src/main/java/hantonik/fbp/mixin/MixinItemPickupParticle.java
diff --git a/Forge/src/main/resources/fbp.forge.mixins.json b/Forge/src/main/resources/fbp.forge.mixins.json
diff --git a/NeoForge/src/main/java/hantonik/fbp/mixin/MixinItemPickupParticle.java b/NeoForge/src/main/java/hantonik/fbp/mixin/MixinItemPickupParticle.java
diff --git a/NeoForge/src/main/resources/META-INF/neoforge.mods.toml b/NeoForge/src/main/resources/META-INF/neoforge.mods.toml
@@ -15,8 +15,6 @@ issueTrackerURL="https://github.com/Hantonik/FancyBlockParticles/issues"
     credits="Original mod by TominoCZ"
     description='''3D Digging particles! YAY!'''
 
-[[mixins]]
-    config="${mod_id}.neoforge.mixins.json"
 [[mixins]]
     config="${mod_id}.mixins.json"
 

diff --git a/NeoForge/src/main/resources/fbp.neoforge.mixins.json b/NeoForge/src/main/resources/fbp.neoforge.mixins.json
diff --git a/update.json b/update.json
@@ -2,10 +2,11 @@
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/fbp-renewed",
 
   "promos": {
-    "1.20.6-latest": "20.6.0.3-beta"
+    "1.20.6-latest": "20.6.0.4-beta"
   },
 
   "1.20.6": {
+    "20.6.0.4-beta": "Fix particles becoming dark",
     "20.6.0.3-beta": "Fix crash when config file is corrupt",
     "20.6.0.2-beta": "Fix a crash on Freeze effect",
     "20.6.0.1-beta": "Fixed a crash when particles were killed during the freeze effect",