diff --git a/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnQuaternionf.java b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnQuaternionf.java new file mode 100644 index 0000000..deba303 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnQuaternionf.java @@ -0,0 +1,9 @@ +package org.saturnclient.common.minecraft.bindings; + +import org.saturnclient.common.minecraft.MinecraftBinding; + +public class SaturnQuaternionf extends MinecraftBinding { + public SaturnQuaternionf(Object o) { + super(o); + } +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/render/IMatrixStack.java b/common/src/main/java/org/saturnclient/common/minecraft/render/IMatrixStack.java new file mode 100644 index 0000000..a588891 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/render/IMatrixStack.java @@ -0,0 +1,25 @@ +package org.saturnclient.common.minecraft.render; + +import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf; + +public interface IMatrixStack { + public void translate(double x, double y, double z); + + public void translate(float x, float y, float z); + + public void scale(float x, float y, float z); + + public void multiply(SaturnQuaternionf quaternion); + + public void multiply(SaturnQuaternionf quaternion, float originX, float originY, float originZ); + + public void push(); + + public void pop(); + + public Object peek(); + + public boolean isEmpty(); + + public void loadIdentity(); +} diff --git a/common/src/main/java/org/saturnclient/ui/elements/TabMenu.java b/common/src/main/java/org/saturnclient/ui/elements/TabMenu.java index a8daf13..b87040a 100644 --- a/common/src/main/java/org/saturnclient/ui/elements/TabMenu.java +++ b/common/src/main/java/org/saturnclient/ui/elements/TabMenu.java @@ -7,16 +7,14 @@ import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.Utils; -import net.minecraft.util.Identifier; - public class TabMenu extends Element { public static class TabMenuComponent { Runnable onClick; - Identifier sprite; + SaturnIdentifier sprite; public TabMenuComponent(SaturnIdentifier sprite, Runnable onClick) { this.onClick = onClick; - this.sprite = (Identifier) sprite.inner; + this.sprite = sprite; } } diff --git a/common/src/main/java/org/saturnclient/ui/resources/SvgTexture.java b/common/src/main/java/org/saturnclient/ui/resources/SvgTexture.java index e35bb8f..c4f4ea6 100644 --- a/common/src/main/java/org/saturnclient/ui/resources/SvgTexture.java +++ b/common/src/main/java/org/saturnclient/ui/resources/SvgTexture.java @@ -11,6 +11,7 @@ import com.kitfox.svg.SVGDiagram; import com.kitfox.svg.SVGUniverse; import org.saturnclient.common.minecraft.IMinecraftClient; +import org.saturnclient.common.minecraft.MinecraftProvider; import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; public class SvgTexture { @@ -61,7 +62,7 @@ public class SvgTexture { BufferedImage image = renderSvg(svgStream, width, height); - IdentifierUtils.registerBufferedImageTexture(id, image); + MinecraftProvider.PROVIDER.registerBufferedImageTexture(id, image); return id;