diff --git a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java b/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java index 3cc69cf..664cc97 100644 --- a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java +++ b/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java @@ -3,7 +3,7 @@ package org.saturnclient.common.minecraft.bindings; import org.saturnclient.common.minecraft.MinecraftBinding; public class SaturnItemStack extends MinecraftBinding { - SaturnItemStack(Object binding) { + public SaturnItemStack(Object binding) { super(binding); } } diff --git a/src/main/java/org/saturnclient/ui/RenderScope.java b/src/main/java/org/saturnclient/ui/RenderScope.java index 598a6ee..3467e58 100644 --- a/src/main/java/org/saturnclient/ui/RenderScope.java +++ b/src/main/java/org/saturnclient/ui/RenderScope.java @@ -3,8 +3,11 @@ package org.saturnclient.ui; import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; import org.saturnclient.common.minecraft.bindings.SaturnItemStack; import org.saturnclient.common.minecraft.bindings.SaturnSprite; +import org.saturnclient.common.minecraft.render.IMatrixStack; public interface RenderScope { + public IMatrixStack getMatrixStack(); + public void setOpacity(float alpha); public int getColor(int color); diff --git a/src/main/java/org/saturnclient/ui/Utils.java b/src/main/java/org/saturnclient/ui/Utils.java index 9f66b5e..2887d0a 100644 --- a/src/main/java/org/saturnclient/ui/Utils.java +++ b/src/main/java/org/saturnclient/ui/Utils.java @@ -51,13 +51,12 @@ public class Utils { return (index >= 0 && index < list.size()) ? list.get(index) : null; } - // public static void notify(NotificationKind kind, String title, String toast) - // { - // if (SaturnClient.client.currentScreen instanceof SaturnScreen) { - // ((SaturnScreen) SaturnClient.client.currentScreen) - // .draw(new Notification(SaturnClient.client.currentScreen.width, - // SaturnClient.client.currentScreen.height, kind, - // title, toast)); - // } + // public static void notify(NotificationKind kind, String title, String toast) { + // if (SaturnClient.client.currentScreen instanceof SaturnScreen) { + // ((SaturnScreen) SaturnClient.client.currentScreen) + // .draw(new Notification(SaturnClient.client.currentScreen.width, + // SaturnClient.client.currentScreen.height, kind, + // title, toast)); + // } // } } diff --git a/src/main/java/org/saturnclient/ui/elements/Scroll.java b/src/main/java/org/saturnclient/ui/elements/Scroll.java index 434ea39..05aa2d3 100644 --- a/src/main/java/org/saturnclient/ui/elements/Scroll.java +++ b/src/main/java/org/saturnclient/ui/elements/Scroll.java @@ -36,14 +36,14 @@ public class Scroll extends Element { Theme.BG_RADIUS.value, Theme.BACKGROUND.value); renderScope.enableScissor(padding, padding, width - padding, height - padding); - renderScope.matrices.push(); - renderScope.matrices.translate(padding, -scroll + padding, 0); + renderScope.getMatrixStack().push(); + renderScope.getMatrixStack().translate(padding, -scroll + padding, 0); ElementRenderer.render(children, ctx.elapsed, renderScope, ctx.mouseX - padding, ctx.mouseY - padding + scroll); - renderScope.matrices.pop(); + renderScope.getMatrixStack().pop(); renderScope.disableScissor(); if (maxScroll > 0) {