Skip to content

Commit

Permalink
carrot fix
Browse files Browse the repository at this point in the history
  • Loading branch information
IMS212 committed Dec 4, 2024
1 parent d9397e2 commit ccfc645
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 5 additions & 0 deletions common/src/main/java/net/irisshaders/iris/Iris.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<String, String> shaderPackOptionQueue = new HashMap<>();
// Change this for snapshots!
private static final String backupVersionNumber = "1.21";
Expand Down Expand Up @@ -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;
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit ccfc645

Please sign in to comment.