Version 1.3.6.1

Author: EssentialGGBot

changelog/release-1.3.6.1.md

@@ -0,0 +1,10 @@
+Title: Bug Patch
+Summary: Minor bug fixes
+
+## Essential Settings
+- Added setting to hide cosmetic particles in first person view
+
+## Compatibility
+- Fixed crash with KotlinForForge 5.8
+- Fixed crash with "Sinytra Connector"
+- Fixed compatibility with Iris on 1.21.5 NeoForge

gradle.properties

@@ -10,4 +10,4 @@ minecraftVersion=11202
 # TODO remove once upgrading to Loom 1.10
 # fabric-api 1.21.5 was built with Loom 1.10, seems to work well enough in dev with our current 1.7 though
 loom.ignoreDependencyLoomVersionValidation=true
-version=1.3.6
+version=1.3.6.1

gui/essential/src/main/kotlin/gg/essential/config/EssentialConfig.kt

@@ -260,6 +260,8 @@ object EssentialConfig : Vigilant2(), GuiEssentialPlatform.Config {
 
     val playEmoteSoundsInWardrobe = property("Hidden.play_emote_sounds_in_wardrobe", true)
 
+    val hideCosmeticParticlesInFirstPerson = property("Cosmetics.General.Hide cosmetic particles in first person", false)
+
     override val migrations = listOf(
         Migration { config ->
             val overrideGuiScale = config.remove("general.general.gui_scale") as Boolean? ?: return@Migration
@@ -422,6 +424,11 @@ object EssentialConfig : Vigilant2(), GuiEssentialPlatform.Config {
                             description = "Hide your equipped cosmetics for everyone."
                         }
 
+                        switch(hideCosmeticParticlesInFirstPerson) {
+                            name = "Hide cosmetic particles in first person"
+                            description = "Hide particle effects coming from your equipped cosmetics in first person."
+                        }
+
                         val swapFirstTwo: (Int) -> Int = { if (it in 0..1) (it + 1) % 2 else it }
 
                         selector(cosmeticArmorSettingSelfState.bimap(swapFirstTwo, swapFirstTwo)) {

loader

@@ -11,6 +11,7 @@
  */
 package gg.essential.mixins.transformers.feature.particles;
 
+import gg.essential.config.EssentialConfig;
 import gg.essential.mixins.ext.client.ParticleSystemHolder;
 import gg.essential.model.ParticleSystem;
 import gg.essential.model.backend.minecraft.MinecraftRenderBackend;
@@ -217,7 +218,15 @@ public abstract class Mixin_RenderParticleSystemOfClientWorld {
         );
 
         boolean isFirstPerson = getPerspective() == 0;
-        particleSystem.render(stack, cameraPos, cameraRot, particleVertexConsumer, cameraUuid, isFirstPerson);
+        particleSystem.render(
+                stack,
+                cameraPos,
+                cameraRot,
+                particleVertexConsumer,
+                cameraUuid,
+                isFirstPerson,
+                EssentialConfig.INSTANCE.getHideCosmeticParticlesInFirstPerson().getUntracked()
+        );
 
         profiler.endSection();
     }

src/main/java/gg/essential/mixins/transformers/feature/particles/Mixin_RenderParticleSystemOfClientWorld.java

@@ -683,7 +683,15 @@ open class UI3DPlayer(
 
         val camera = perspectiveCamera ?: rotationAngleCamera
         val cameraPos = camera.camera.rotateBy(realRotation).plus(realPosition)
-        particleSystem.render(stack, cameraPos, realRotation * camera.rotation, vertexConsumerProvider, UUID(0, 0), false)
+        particleSystem.render(
+            stack,
+            cameraPos,
+            realRotation * camera.rotation,
+            vertexConsumerProvider,
+            UUID(0, 0),
+            false,
+            false
+        )
 
         //#if MC>=12104
         //$$ immediate.draw()

src/main/kotlin/gg/essential/gui/common/UI3DPlayer.kt

@@ -102,6 +102,7 @@ object MinecraftRenderBackend : RenderBackend {
     }
 
     //#if MC>=12105
+    //#if FABRIC || FORGE
     //$$ private fun RenderPipeline.toBuilder(): RenderPipeline.Builder = RenderPipeline.builder().copyFrom(this)
     //$$ private fun RenderPipeline.Builder.copyFrom(pipeline: RenderPipeline): RenderPipeline.Builder = apply {
     //$$     withLocation(pipeline.location)
@@ -132,7 +133,8 @@ object MinecraftRenderBackend : RenderBackend {
     //$$     withVertexFormat(pipeline.vertexFormat, pipeline.vertexFormatMode)
     //$$     withDepthBias(pipeline.depthBiasScaleFactor, pipeline.depthBiasConstant)
     //$$ }
-    //#if FORGE==0
+    //#endif
+    //#if FABRIC
     //$$ // Note: Cannot pass `program` directly because Iris might not be installed
     //$$ private fun RenderPipeline.assignIrisProgram(program: () -> IrisProgram): RenderPipeline = apply {
     //$$     if (ModLoaderUtil.isModLoaded("iris")) {
@@ -186,7 +188,7 @@ object MinecraftRenderBackend : RenderBackend {
     //$$ private val particleAdditivePipeline = RenderPipelines.TRANSLUCENT_PARTICLE.toBuilder()
     //$$     .withBlend(BlendFunction.LIGHTNING)
     //$$     .build()
-        //#if FORGE==0
+        //#if FABRIC
         //$$ .assignIrisProgram { IrisProgram.PARTICLES_TRANSLUCENT }
         //#endif
     //#endif
@@ -246,7 +248,7 @@ object MinecraftRenderBackend : RenderBackend {
     //$$ // have to build it ourselves.
     //#if MC>=12105
     //$$ private val entityTranslucentCullPipeline = RenderPipelines.ENTITY_TRANSLUCENT.toBuilder().withCull(true).build()
-        //#if FORGE==0
+        //#if FABRIC
         //$$ .assignIrisProgram { IrisProgram.ENTITIES_TRANSLUCENT }
         //#endif
     //#endif

src/main/kotlin/gg/essential/model/backend/minecraft/MinecraftRenderBackend.kt

@@ -1 +1 @@
-22164f0866
+51d1cdc4b3

src/main/resources/assets/essential/commit.txt

@@ -248,6 +248,7 @@ class ParticleSystem(
         particleVertexConsumerProvider: VertexConsumerProvider,
         cameraUuid: UUID,
         cameraFirstPerson: Boolean,
+        hideParticlesInFirstPerson: Boolean,
     ) {
         val cameraFacing = vec3(0f, 0f, -1f).rotateBy(cameraRot)
         for ((renderPass, particles) in billboardRenderPasses.entries.sortedBy { it.key.material.needsSorting }) {
@@ -260,12 +261,12 @@ class ParticleSystem(
                         particle.distance = cameraPos.minus(particle.billboardPosition).dot(billboardNormal)
                     }
                     for (particle in particles.sortedByDescending { it.distance }) {
-                        particle.renderBillboard(matrixStack, vertexConsumer, cameraFacing, cameraUuid, cameraFirstPerson)
+                        particle.renderBillboard(matrixStack, vertexConsumer, cameraFacing, cameraUuid, cameraFirstPerson, hideParticlesInFirstPerson)
                     }
                 } else {
                     for (particle in particles) {
                         particle.prepareBillboard(cameraPos, cameraRot)
-                        particle.renderBillboard(matrixStack, vertexConsumer, cameraFacing, cameraUuid, cameraFirstPerson)
+                        particle.renderBillboard(matrixStack, vertexConsumer, cameraFacing, cameraUuid, cameraFirstPerson, hideParticlesInFirstPerson)
                     }
                 }
             }
@@ -981,9 +982,11 @@ class ParticleSystem(
             cameraFacing: Vec3,
             cameraUuid: UUID,
             cameraFirstPerson: Boolean,
+            hideParticlesInFirstPerson: Boolean,
         ) {
             // Abide by the particle effect visibility component for the current player.
             if (cameraUuid == emitter.sourceEntity.uuid) {
+                if (cameraFirstPerson && hideParticlesInFirstPerson) return
                 if (!components.particleVisibility.let { if (cameraFirstPerson) it.firstPerson else it.thirdPerson }) return
             }