From 5715c3cc453599ff537efd19b96593d399a7f601 Mon Sep 17 00:00:00 2001 From: MoePus <547007249@qq.com> Date: Mon, 31 Mar 2025 20:39:45 +0900 Subject: [PATCH] update embeddium to lastest --- gradle.properties | 2 +- .../iris/compat/sodium/mixin/copyEntity/CuboidMixin.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b0c27e6b7a..e5b8ecf860 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,4 +14,4 @@ loom.platform = forge archives_base_name = oculus # Dependencies - embeddium_version=0.3.14-git.8af1729+mc1.20.1 + embeddium_version=0.3.31-beta.53+mc1.20.1 diff --git a/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/CuboidMixin.java b/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/CuboidMixin.java index ebd96a3551..ab558b39db 100644 --- a/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/CuboidMixin.java +++ b/src/sodiumCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/CuboidMixin.java @@ -4,6 +4,7 @@ import me.jellysquid.mods.sodium.client.render.immediate.model.ModelCuboid; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.core.Direction; +import org.jetbrains.annotations.Nullable; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.At; @@ -17,6 +18,8 @@ public class CuboidMixin implements ModelCuboidAccessor { @Unique private ModelCuboid sodium$cuboid; + @Unique + private ModelCuboid embeddium$simpleCuboid; @Mutable @Shadow @@ -27,6 +30,7 @@ public class CuboidMixin implements ModelCuboidAccessor { @Redirect(method = "", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/client/model/geom/ModelPart$Cube;minX:F", ordinal = 0)) private void onInit(ModelPart.Cube instance, float value, int u, int v, float x, float y, float z, float sizeX, float sizeY, float sizeZ, float extraX, float extraY, float extraZ, boolean mirror, float textureWidth, float textureHeight, Set renderDirections) { this.sodium$cuboid = new ModelCuboid(u, v, x, y, z, sizeX, sizeY, sizeZ, extraX, extraY, extraZ, mirror, textureWidth, textureHeight, renderDirections); + this.embeddium$simpleCuboid = (Class)getClass() == ModelPart.Cube.class ? this.sodium$cuboid : null; this.minX = value; } @@ -35,4 +39,9 @@ private void onInit(ModelPart.Cube instance, float value, int u, int v, float x, public ModelCuboid sodium$copy() { return this.sodium$cuboid; } + + @Override + public @Nullable ModelCuboid embeddium$getSimpleCuboid() { + return this.embeddium$simpleCuboid; + } }