From ccfc64566a2c42f976014b8859cac7353078b225 Mon Sep 17 00:00:00 2001 From: IMS212 Date: Tue, 3 Dec 2024 18:51:12 -0800 Subject: [PATCH] carrot fix --- build.gradle.kts | 2 +- common/src/main/java/net/irisshaders/iris/Iris.java | 5 +++++ .../iris/mixin/fantastic/MixinFireworkSparkParticle.java | 3 ++- .../irisshaders/iris/mixin/fabric/MixinParticleEngine.java | 5 +---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 83109ea579..7ffda55d93 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ val FABRIC_API_VERSION by extra { "0.110.5+1.21.4" } val PARCHMENT_VERSION by extra { null } // https://semver.org/ -val MOD_VERSION by extra { "1.8.2" } +val MOD_VERSION by extra { "1.8.3" } allprojects { apply(plugin = "java") diff --git a/common/src/main/java/net/irisshaders/iris/Iris.java b/common/src/main/java/net/irisshaders/iris/Iris.java index d16b55c7bb..73d04f8133 100644 --- a/common/src/main/java/net/irisshaders/iris/Iris.java +++ b/common/src/main/java/net/irisshaders/iris/Iris.java @@ -59,6 +59,7 @@ import java.nio.file.InvalidPathException; import java.nio.file.NoSuchFileException; import java.nio.file.Path; +import java.util.Calendar; import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -77,6 +78,7 @@ public class Iris { */ public static final String MODNAME = "Iris"; public static final IrisLogging logger = new IrisLogging(MODNAME); + public static final boolean IS_FOOL; private static final Map shaderPackOptionQueue = new HashMap<>(); // Change this for snapshots! private static final String backupVersionNumber = "1.21"; @@ -107,6 +109,9 @@ public class Iris { static { if (!BuildConfig.ACTIVATE_RENDERDOC && IrisPlatformHelpers.getInstance().isDevelopmentEnvironment() && System.getProperty("user.name").contains("ims") && Util.getPlatform() == Util.OS.LINUX) { } + + Calendar c = Calendar.getInstance(); + IS_FOOL = c.get(Calendar.MONTH) == Calendar.APRIL && c.get(Calendar.DAY_OF_MONTH) == 1; } /** diff --git a/common/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinFireworkSparkParticle.java b/common/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinFireworkSparkParticle.java index 8e1529e737..3f315c9e8c 100644 --- a/common/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinFireworkSparkParticle.java +++ b/common/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinFireworkSparkParticle.java @@ -1,5 +1,6 @@ package net.irisshaders.iris.mixin.fantastic; +import net.irisshaders.iris.Iris; import net.irisshaders.iris.fantastic.IrisParticleRenderTypes; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.ParticleRenderType; @@ -15,6 +16,6 @@ private MixinFireworkSparkParticle(ClientLevel level, double x, double y, double @Override public ParticleRenderType getRenderType() { - return IrisParticleRenderTypes.TERRAIN_OPAQUE; + return Iris.IS_FOOL ? ParticleRenderType.TERRAIN_SHEET : ParticleRenderType.PARTICLE_SHEET_OPAQUE; } } diff --git a/fabric/src/main/java/net/irisshaders/iris/mixin/fabric/MixinParticleEngine.java b/fabric/src/main/java/net/irisshaders/iris/mixin/fabric/MixinParticleEngine.java index ba17421d11..dbbe8485ce 100644 --- a/fabric/src/main/java/net/irisshaders/iris/mixin/fabric/MixinParticleEngine.java +++ b/fabric/src/main/java/net/irisshaders/iris/mixin/fabric/MixinParticleEngine.java @@ -11,7 +11,6 @@ import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.ParticleEngine; import net.minecraft.client.particle.ParticleRenderType; -import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -26,7 +25,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Queue; -import java.util.function.Supplier; /** * Extends the ParticleEngine class to allow multiple phases of particle rendering. @@ -64,8 +62,7 @@ public class MixinParticleEngine implements PhasedParticleEngine { static { OPAQUE_PARTICLE_RENDER_TYPES = ImmutableList.of( ParticleRenderType.PARTICLE_SHEET_OPAQUE, - IrisParticleRenderTypes.TERRAIN_OPAQUE, - ParticleRenderType.NO_RENDER + IrisParticleRenderTypes.TERRAIN_OPAQUE ); RENDER_ORDER = List.of(ParticleRenderType.TERRAIN_SHEET, IrisParticleRenderTypes.TERRAIN_OPAQUE, ParticleRenderType.PARTICLE_SHEET_OPAQUE, ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT);