Skip to content

Commit d9397e2

Browse files
IMS212IMS212
committed
minor improvements
1 parent 61c7bf1 commit d9397e2

File tree

11 files changed

+29
-37
lines changed

11 files changed

+29
-37
lines changed

‎build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
id("fabric-loom") version("1.8.10") apply(false)
55
}
66

7-
val MINECRAFT_VERSION by extra { "1.21.4-rc3" }
8-
val NEOFORGE_VERSION by extra { "21.3.9-beta" }
7+
val MINECRAFT_VERSION by extra { "1.21.4" }
8+
val NEOFORGE_VERSION by extra { "21.4.0-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

@@ -14,7 +14,7 @@ val FABRIC_API_VERSION by extra { "0.110.5+1.21.4" }
1414
val PARCHMENT_VERSION by extra { null }
1515

1616
// https://semver.org/
17-
val MOD_VERSION by extra { "1.8.1" }
17+
val MOD_VERSION by extra { "1.8.2" }
1818

1919
allprojects {
2020
apply(plugin = "java")

‎common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dependencies {
5959

6060
modCompileOnly("net.fabricmc.fabric-api:fabric-renderer-api-v1:3.2.9+1172e897d7")
6161

62-
modImplementation(files(rootDir.resolve("custom_sodium").resolve("sodium-fabric-0.6.0-snapshot+mc1.21.4-rc3-local.jar")))
62+
modImplementation("maven.modrinth", "sodium", "mc1.21.4-0.6.2-fabric")
6363
modCompileOnly("org.antlr:antlr4-runtime:4.13.1")
6464
modCompileOnly("io.github.douira:glsl-transformer:2.0.1")
6565
modCompileOnly("org.anarres:jcpp:1.4.14")

‎common/src/main/java/net/irisshaders/iris/mixin/MixinWeatherRenderer.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.irisshaders.iris.Iris;
66
import net.irisshaders.iris.pipeline.WorldRenderingPipeline;
77
import net.minecraft.client.Camera;
8+
import net.minecraft.client.Minecraft;
89
import net.minecraft.client.multiplayer.ClientLevel;
910
import net.minecraft.client.renderer.LightTexture;
1011
import net.minecraft.client.renderer.MultiBufferSource;
@@ -15,16 +16,17 @@
1516
import org.spongepowered.asm.mixin.Mixin;
1617
import org.spongepowered.asm.mixin.injection.At;
1718
import org.spongepowered.asm.mixin.injection.ModifyArg;
19+
import org.spongepowered.asm.mixin.injection.Redirect;
1820

1921
@Mixin(WeatherEffectRenderer.class)
2022
public class MixinWeatherRenderer {
21-
@ModifyArg(method = "render(Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/phys/Vec3;IFLjava/util/List;Ljava/util/List;)V", index = 1, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderType;weather(Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/client/renderer/RenderType;", remap = false))
22-
private boolean iris$writeRainAndSnowToDepthBuffer(boolean depthMaskEnabled) {
23+
@Redirect(method = "render(Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/phys/Vec3;IFLjava/util/List;Ljava/util/List;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;useShaderTransparency()Z"))
24+
private boolean iris$writeRainAndSnowToDepthBuffer() {
2325
if (Iris.getPipelineManager().getPipeline().map(WorldRenderingPipeline::shouldWriteRainAndSnowToDepthBuffer).orElse(false)) {
2426
return true;
2527
}
2628

27-
return depthMaskEnabled;
29+
return Minecraft.useShaderTransparency();
2830
}
2931

3032
@WrapMethod(method = "render(Lnet/minecraft/world/level/Level;Lnet/minecraft/client/renderer/MultiBufferSource;IFLnet/minecraft/world/phys/Vec3;)V")

‎common/src/main/java/net/irisshaders/iris/mixin/entity_render_context/ItemStackStateLayerMixin.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import net.minecraft.core.registries.BuiltInRegistries;
1313
import net.minecraft.resources.ResourceLocation;
1414
import net.minecraft.world.item.BlockItem;
15-
import net.minecraft.world.item.ItemStack;
15+
import net.minecraft.world.item.Item;
1616
import net.minecraft.world.item.SolidBucketItem;
1717
import org.spongepowered.asm.mixin.Mixin;
1818
import org.spongepowered.asm.mixin.Shadow;
@@ -29,7 +29,7 @@ public class ItemStackStateLayerMixin {
2929
@Inject(method = "render", at = @At("HEAD"))
3030
private void onRender(PoseStack poseStack, MultiBufferSource multiBufferSource, int i, int j, CallbackInfo ci, @Share("lastBState") LocalIntRef ref) {
3131
ref.set(CapturedRenderingState.INSTANCE.getCurrentRenderedBlockEntity());
32-
iris$setupId(((ItemContextState) parentState).getDisplayStack());
32+
iris$setupId(((ItemContextState) parentState).getDisplayItem());
3333
}
3434

3535
@Inject(method = "render", at = @At("TAIL"))
@@ -39,18 +39,18 @@ private void onRenderEnd(PoseStack poseStack, MultiBufferSource multiBufferSourc
3939
}
4040

4141
@Unique
42-
private void iris$setupId(ItemStack pItemRenderer0) {
42+
private void iris$setupId(Item item) {
4343
if (WorldRenderingSettings.INSTANCE.getItemIds() == null) return;
4444

45-
if (pItemRenderer0.getItem() instanceof BlockItem blockItem && !(pItemRenderer0.getItem() instanceof SolidBucketItem)) {
45+
if (item instanceof BlockItem blockItem && !(item instanceof SolidBucketItem)) {
4646
if (WorldRenderingSettings.INSTANCE.getBlockStateIds() == null) return;
4747

4848
CapturedRenderingState.INSTANCE.setCurrentBlockEntity(1);
4949

5050
//System.out.println(WorldRenderingSettings.INSTANCE.getBlockStateIds().getInt(blockItem.getBlock().defaultBlockState()));
5151
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(WorldRenderingSettings.INSTANCE.getBlockStateIds().getOrDefault(blockItem.getBlock().defaultBlockState(), 0));
5252
} else {
53-
ResourceLocation location = BuiltInRegistries.ITEM.getKey(pItemRenderer0.getItem());
53+
ResourceLocation location = BuiltInRegistries.ITEM.getKey(item);
5454

5555
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(WorldRenderingSettings.INSTANCE.getItemIds().applyAsInt(new NamespacedId(location.getNamespace(), location.getPath())));
5656
}

‎common/src/main/java/net/irisshaders/iris/mixin/entity_render_context/ItemStackStateMixin.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import net.irisshaders.iris.mixinterface.ItemContextState;
44
import net.minecraft.client.renderer.item.ItemStackRenderState;
5+
import net.minecraft.world.item.Item;
56
import net.minecraft.world.item.ItemStack;
67
import org.spongepowered.asm.mixin.Mixin;
78
import org.spongepowered.asm.mixin.Unique;
@@ -12,15 +13,15 @@
1213
@Mixin(ItemStackRenderState.class)
1314
public class ItemStackStateMixin implements ItemContextState {
1415
@Unique
15-
private ItemStack iris_displayStack;
16+
private Item iris_displayStack;
1617

1718
@Override
18-
public void setDisplayStack(ItemStack itemStack) {
19+
public void setDisplayItem(Item itemStack) {
1920
this.iris_displayStack = itemStack;
2021
}
2122

2223
@Override
23-
public ItemStack getDisplayStack() {
24+
public Item getDisplayItem() {
2425
return iris_displayStack;
2526
}
2627

‎common/src/main/java/net/irisshaders/iris/mixin/entity_render_context/MixinItemRenderer.java

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
package net.irisshaders.iris.mixin.entity_render_context;
22

3-
import com.mojang.blaze3d.vertex.PoseStack;
43
import net.irisshaders.iris.mixinterface.ItemContextState;
5-
import net.irisshaders.iris.shaderpack.materialmap.NamespacedId;
6-
import net.irisshaders.iris.shaderpack.materialmap.WorldRenderingSettings;
7-
import net.irisshaders.iris.uniforms.CapturedRenderingState;
8-
import net.minecraft.client.renderer.MultiBufferSource;
9-
import net.minecraft.client.renderer.RenderType;
10-
import net.minecraft.client.renderer.entity.ItemRenderer;
114
import net.minecraft.client.renderer.item.ItemModelResolver;
125
import net.minecraft.client.renderer.item.ItemStackRenderState;
13-
import net.minecraft.client.resources.model.BakedModel;
14-
import net.minecraft.core.registries.BuiltInRegistries;
15-
import net.minecraft.resources.ResourceLocation;
166
import net.minecraft.world.entity.LivingEntity;
17-
import net.minecraft.world.item.BlockItem;
187
import net.minecraft.world.item.ItemDisplayContext;
198
import net.minecraft.world.item.ItemStack;
20-
import net.minecraft.world.item.SolidBucketItem;
219
import net.minecraft.world.level.Level;
2210
import org.spongepowered.asm.mixin.Mixin;
2311
import org.spongepowered.asm.mixin.Unique;
@@ -32,6 +20,6 @@ public abstract class MixinItemRenderer {
3220

3321
@Inject(method = "appendItemLayers", at = @At(value = "HEAD"))
3422
private void changeId(ItemStackRenderState itemStackRenderState, ItemStack itemStack, ItemDisplayContext itemDisplayContext, Level level, LivingEntity livingEntity, int i, CallbackInfo ci) {
35-
((ItemContextState) itemStackRenderState).setDisplayStack(itemStack);
23+
((ItemContextState) itemStackRenderState).setDisplayItem(itemStack != null ? itemStack.getItem() : null);
3624
}
3725
}

‎common/src/main/java/net/irisshaders/iris/mixinterface/ItemContextState.java

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

3+
import net.minecraft.world.item.Item;
34
import net.minecraft.world.item.ItemStack;
45

56
public interface ItemContextState {
6-
void setDisplayStack(ItemStack itemStack);
7+
void setDisplayItem(Item itemStack);
78

8-
ItemStack getDisplayStack();
9+
Item getDisplayItem();
910
}

‎fabric/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dependencies {
6464
addRuntimeFabricModule("fabric-rendering-fluids-v1")
6565
addRuntimeFabricModule("fabric-resource-loader-v0")
6666

67-
modImplementation(files(rootDir.resolve("custom_sodium").resolve("sodium-fabric-0.6.0-snapshot+mc1.21.4-rc3-local.jar")))
67+
modImplementation("maven.modrinth", "sodium", "mc1.21.4-0.6.2-fabric")
6868
implementAndInclude("org.antlr:antlr4-runtime:4.13.1")
6969
implementAndInclude("io.github.douira:glsl-transformer:2.0.1")
7070
implementAndInclude("org.anarres:jcpp:1.4.14")

‎neoforge/build.gradle.kts

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

129-
implementation("maven.modrinth", "sodium", "mc1.21.3-0.6.1-neoforge")
129+
implementation("maven.modrinth", "sodium", "mc1.21.4-0.6.2-neoforge")
130130
includeAdditional("io.github.douira:glsl-transformer:2.0.1")
131131
includeAdditional("org.anarres:jcpp:1.4.14")
132132
includeAdditional("org.antlr:antlr4-runtime:4.13.1")

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public abstract class MixinLevelRenderer {
5050
@Shadow
5151
public abstract Frustum getFrustum();
5252

53-
@WrapOperation(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/ParticleEngine;render(Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/culling/Frustum;Ljava/util/function/Predicate;)V", ordinal = 1))
54-
private void redirectSolidParticles(ParticleEngine instance, LightTexture lightTexture, Camera camera, float v, Frustum frustum, Predicate<ParticleRenderType> predicate, Operation<Void> original) {
53+
@WrapOperation(method = "lambda$addMainPass$2", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/ParticleEngine;render(Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/renderer/culling/Frustum;Ljava/util/function/Predicate;)V"))
54+
private void redirectSolidParticles(ParticleEngine instance, Camera camera, float v, MultiBufferSource.BufferSource bufferSource, Frustum frustum, Predicate<ParticleRenderType> predicate, Operation<Void> original) {
5555
ParticleRenderingSettings settings = getRenderingSettings();
5656

5757
Predicate<ParticleRenderType> newPredicate = predicate;
@@ -62,10 +62,10 @@ private void redirectSolidParticles(ParticleEngine instance, LightTexture lightT
6262
return;
6363
}
6464

65-
original.call(instance, lightTexture, camera, v, frustum, newPredicate);
65+
original.call(instance, camera, v, bufferSource, frustum, newPredicate);
6666
}
6767

68-
@WrapOperation(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/ParticleEngine;render(Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/culling/Frustum;Ljava/util/function/Predicate;)V", ordinal = 2))
68+
@WrapOperation(method = "lambda$addParticlesPass$3", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/ParticleEngine;render(Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/renderer/culling/Frustum;Ljava/util/function/Predicate;)V"))
6969
private void redirectTransParticles(ParticleEngine instance, LightTexture lightTexture, Camera camera, float v, Frustum frustum, Predicate<ParticleRenderType> predicate, Operation<Void> original) {
7070
ParticleRenderingSettings settings = getRenderingSettings();
7171

‎settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ pluginManagement {
88
}
99
}
1010

11-
include("common", "fabric")
11+
include("common", "fabric", "neoforge")

0 commit comments

Comments
 (0)