Skip to content

Commit 1ed1d36

Browse files
IMS212IMS212
committed
Neo fixes
1 parent 92d421c commit 1ed1d36

File tree

6 files changed

+20
-41
lines changed

6 files changed

+20
-41
lines changed

‎build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
val MINECRAFT_VERSION by extra { "1.21.4" }
8-
val NEOFORGE_VERSION by extra { "21.4.0-beta" }
8+
val NEOFORGE_VERSION by extra { "21.4.13-beta" }
99
val FABRIC_LOADER_VERSION by extra { "0.16.9" }
1010
val FABRIC_API_VERSION by extra { "0.110.5+1.21.4" }
1111

‎common/src/main/java/net/irisshaders/iris/NeoLambdas.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package net.irisshaders.iris;
22

33
public class NeoLambdas {
4-
public static final String NEO_RENDER_SKY = "lambda$addSkyPass$10";
4+
public static final String NEO_RENDER_SKY = "lambda$addSkyPass$12";
55
public static final String NEO_RENDER_MAIN_PASS = "lambda$addMainPass$2";
6-
public static final String NEO_RENDER_WEATHER = "lambda$addWeatherPass$5";
7-
public static final String NEO_RENDER_CLOUDS = "lambda$addCloudsPass$4";
6+
public static final String NEO_RENDER_WEATHER = "lambda$addWeatherPass$7";
7+
public static final String NEO_RENDER_CLOUDS = "lambda$addCloudsPass$6";
88
public static final String NEO_PARTICLE = "lambda$static$26";
99
public static final String NEO_WEATHER_TYPE = "lambda$createWeather$35";
1010
}

‎neoforge/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ dependencies {
134134
runtimeOnly("org.sinytra.forgified-fabric-api:fabric-rendering-data-attachment-v1:0.3.48+73761d2e19")
135135
runtimeOnly("org.sinytra.forgified-fabric-api:fabric-block-view-api-v2:1.0.10+9afaaf8c19")
136136

137-
implementation("maven.modrinth", "sodium", "mc1.21.4-0.6.2-neoforge")
137+
implementation("maven.modrinth", "sodium", "mc1.21.4-0.6.3-neoforge")
138138
includeAdditional("io.github.douira:glsl-transformer:2.0.1")
139139
includeAdditional("org.anarres:jcpp:1.4.14")
140140
includeAdditional("org.antlr:antlr4-runtime:4.13.1")

‎neoforge/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinLevelRenderer.java ‎neoforge/src/main/java/net/irisshaders/iris/mixin/forge/MixinLevelRenderer.java

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,18 @@
1-
package net.irisshaders.iris.mixin.fantastic;
1+
package net.irisshaders.iris.mixin.forge;
22

33
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
44
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
5-
import com.mojang.blaze3d.systems.RenderSystem;
6-
import com.mojang.blaze3d.vertex.PoseStack;
75
import net.irisshaders.iris.Iris;
8-
import net.irisshaders.iris.fantastic.ParticleRenderingPhase;
9-
import net.irisshaders.iris.fantastic.PhasedParticleEngine;
106
import net.irisshaders.iris.pipeline.WorldRenderingPipeline;
117
import net.irisshaders.iris.shaderpack.properties.ParticleRenderingSettings;
128
import net.minecraft.client.Camera;
13-
import net.minecraft.client.DeltaTracker;
14-
import net.minecraft.client.Minecraft;
159
import net.minecraft.client.particle.ParticleEngine;
1610
import net.minecraft.client.particle.ParticleRenderType;
17-
import net.minecraft.client.renderer.GameRenderer;
1811
import net.minecraft.client.renderer.LevelRenderer;
19-
import net.minecraft.client.renderer.LightTexture;
2012
import net.minecraft.client.renderer.MultiBufferSource;
21-
import net.minecraft.client.renderer.RenderBuffers;
2213
import net.minecraft.client.renderer.culling.Frustum;
23-
import org.joml.Matrix4fStack;
24-
import org.joml.Matrix4fc;
25-
import org.joml.Matrix4f;
26-
import org.spongepowered.asm.mixin.Final;
2714
import org.spongepowered.asm.mixin.Mixin;
28-
import org.spongepowered.asm.mixin.Shadow;
2915
import org.spongepowered.asm.mixin.injection.At;
30-
import org.spongepowered.asm.mixin.injection.Inject;
31-
import org.spongepowered.asm.mixin.injection.Redirect;
32-
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3316

3417
import java.util.function.Predicate;
3518

‎neoforge/src/main/java/net/irisshaders/iris/mixin/fantastic/MixinParticleEngine.java ‎neoforge/src/main/java/net/irisshaders/iris/mixin/forge/MixinParticleEngine.java

+12-18
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,19 @@
1-
package net.irisshaders.iris.mixin.fantastic;
1+
package net.irisshaders.iris.mixin.forge;
22

3-
import com.google.common.collect.ImmutableList;
4-
import com.google.common.collect.Sets;
5-
import com.mojang.blaze3d.systems.RenderSystem;
6-
import net.irisshaders.iris.fantastic.ParticleRenderingPhase;
7-
import net.irisshaders.iris.fantastic.PhasedParticleEngine;
8-
import net.irisshaders.iris.pipeline.programs.ShaderAccess;
3+
import net.irisshaders.iris.fantastic.IrisParticleRenderTypes;
94
import net.minecraft.client.Camera;
105
import net.minecraft.client.particle.Particle;
116
import net.minecraft.client.particle.ParticleEngine;
127
import net.minecraft.client.particle.ParticleRenderType;
13-
import net.minecraft.client.renderer.LightTexture;
148
import net.minecraft.client.renderer.MultiBufferSource;
159
import net.minecraft.client.renderer.culling.Frustum;
16-
import org.spongepowered.asm.mixin.Final;
1710
import org.spongepowered.asm.mixin.Mixin;
18-
import org.spongepowered.asm.mixin.Shadow;
19-
import org.spongepowered.asm.mixin.Unique;
2011
import org.spongepowered.asm.mixin.injection.At;
21-
import org.spongepowered.asm.mixin.injection.Inject;
2212
import org.spongepowered.asm.mixin.injection.Redirect;
2313
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
2414

25-
import javax.annotation.Nullable;
26-
import java.util.ArrayList;
2715
import java.util.List;
28-
import java.util.Map;
2916
import java.util.Queue;
30-
import java.util.Set;
31-
import java.util.function.Predicate;
32-
import java.util.function.Supplier;
3317

3418
/**
3519
* Extends the ParticleEngine class to allow multiple phases of particle rendering.
@@ -64,4 +48,14 @@ public class MixinParticleEngine {
6448
// RenderSystem.setShader(ShaderAccess.getParticleTranslucentShader());
6549
//}
6650
}
51+
52+
@Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/util/List;of(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/List;"))
53+
private static <E> List<E> iris$changeList(E e1, E e2, E e3) {
54+
return (List<E>) List.of(IrisParticleRenderTypes.TERRAIN_OPAQUE, e1, e2, e3);
55+
}
56+
57+
//@Inject(method = "renderParticleType(Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/particle/ParticleRenderType;Ljava/util/Queue;Lnet/minecraft/client/renderer/culling/Frustum;)V", at = @At("HEAD"))
58+
private static void i(Camera p_382847_, float p_383032_, MultiBufferSource.BufferSource p_383105_, ParticleRenderType p_383179_, Queue<Particle> p_383046_, Frustum frustum, CallbackInfo ci) {
59+
System.out.println("Rendering particle " + p_383179_.name());
60+
}
6761
}

‎neoforge/src/main/resources/mixins.iris.forge.json

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"MixinItemBlockRenderTypes",
88
"MixinRenderFlame",
99
"MixinRenderMekasuit",
10+
"MixinLevelRenderer",
11+
"MixinParticleEngine",
1012
"MixinRenderSPS",
1113
"MixinShadowRenderer",
1214
"MixinVBOIE"

0 commit comments

Comments
 (0)