From 6d6258f4fc4d07abceb9c66ca7d128076a65487b Mon Sep 17 00:00:00 2001 From: HawtBawlz Date: Tue, 27 May 2025 07:41:01 -0400 Subject: [PATCH] Revert "update embeddium to lastest" --- gradle.properties | 2 +- .../iris/compat/sodium/mixin/copyEntity/CuboidMixin.java | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index da3fb0b4cb..61f3fedf12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,4 +14,4 @@ loom.platform = forge archives_base_name = oculus # Dependencies - embeddium_version=0.3.31-beta.53+mc1.20.1 + embeddium_version=0.3.14-git.8af1729+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 ab558b39db..ebd96a3551 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,7 +4,6 @@ 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; @@ -18,8 +17,6 @@ public class CuboidMixin implements ModelCuboidAccessor { @Unique private ModelCuboid sodium$cuboid; - @Unique - private ModelCuboid embeddium$simpleCuboid; @Mutable @Shadow @@ -30,7 +27,6 @@ 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; } @@ -39,9 +35,4 @@ 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; - } }