From 2a291a9e96fc95bcc84ecfdd11dcd46f608178fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E8=91=89=20Scarlet?= <93977077+mukjepscarlet@users.noreply.github.com> Date: Thu, 23 Oct 2025 23:26:27 +0800 Subject: [PATCH] Remove usage of java.util.Stack --- .../meteorclient/gui/renderer/GuiRenderer.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/gui/renderer/GuiRenderer.java b/src/main/java/meteordevelopment/meteorclient/gui/renderer/GuiRenderer.java index 93a3cbef31..591fb638c7 100644 --- a/src/main/java/meteordevelopment/meteorclient/gui/renderer/GuiRenderer.java +++ b/src/main/java/meteordevelopment/meteorclient/gui/renderer/GuiRenderer.java @@ -5,6 +5,8 @@ package meteordevelopment.meteorclient.gui.renderer; +import it.unimi.dsi.fastutil.Stack; +import it.unimi.dsi.fastutil.objects.ObjectArrayList; import meteordevelopment.meteorclient.MeteorClient; import meteordevelopment.meteorclient.gui.GuiTheme; import meteordevelopment.meteorclient.gui.renderer.operations.TextOperation; @@ -22,9 +24,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; -import java.util.ArrayList; import java.util.List; -import java.util.Stack; import static meteordevelopment.meteorclient.MeteorClient.mc; import static meteordevelopment.meteorclient.utils.Utils.getWindowHeight; @@ -49,12 +49,12 @@ public class GuiRenderer { private final Renderer2D rTex = new Renderer2D(true); private final Pool scissorPool = new Pool<>(Scissor::new); - private final Stack scissorStack = new Stack<>(); + private final Stack scissorStack = new ObjectArrayList<>(); private final Pool textPool = new Pool<>(TextOperation::new); - private final List texts = new ArrayList<>(); + private final List texts = new ObjectArrayList<>(); - private final List postTasks = new ArrayList<>(); + private final List postTasks = new ObjectArrayList<>(); public String tooltip, lastTooltip; public WWidget tooltipWidget; @@ -141,7 +141,7 @@ public void endRender(Scissor scissor) { public void scissorStart(double x, double y, double width, double height) { if (!scissorStack.isEmpty()) { - Scissor parent = scissorStack.peek(); + Scissor parent = scissorStack.top(); if (x < parent.x) x = parent.x; else if (x + width > parent.x + parent.width) width -= (x + width) - (parent.x + parent.width); @@ -253,7 +253,7 @@ public void texture(double x, double y, double width, double height, double rota } public void post(Runnable task) { - scissorStack.peek().postTasks.add(task); + scissorStack.top().postTasks.add(task); } public void item(ItemStack itemStack, int x, int y, float scale, boolean overlay) {