Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,8 +17,6 @@
public class CuboidMixin implements ModelCuboidAccessor {
@Unique
private ModelCuboid sodium$cuboid;
@Unique
private ModelCuboid embeddium$simpleCuboid;

@Mutable
@Shadow
Expand All @@ -30,7 +27,6 @@ public class CuboidMixin implements ModelCuboidAccessor {
@Redirect(method = "<init>", 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<Direction> 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;
}
Expand All @@ -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;
}
}