From 7c305093239fc1d7c4defa84e8bc5babf7043e4a Mon Sep 17 00:00:00 2001 From: Shiewk Date: Thu, 27 Nov 2025 12:27:16 +0100 Subject: [PATCH] 1.21 backport --- gradle.properties | 8 ++++---- .../java/de/shiewk/widgets/client/WidgetRenderer.java | 5 ++--- .../client/screen/components/WidgetListWidget.java | 5 ----- .../screen/components/WidgetSettingsEditWidget.java | 5 +---- .../java/de/shiewk/widgets/widgets/ArmorHudWidget.java | 2 +- .../java/de/shiewk/widgets/widgets/InventoryWidget.java | 9 ++++----- 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2599a2f..a5f9804 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.2 -yarn_mappings=1.21.2+build.1 +minecraft_version=1.21 +yarn_mappings=1.21+build.9 loader_version=0.17.2 # Mod Properties mod_version=2.0.0 @@ -11,5 +11,5 @@ maven_group=de.shiewk archives_base_name=Widgets # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.106.1+1.21.2 -modmenu_version=12.0.0 +fabric_version=0.100.1+1.21 +modmenu_version=11.0.3 diff --git a/src/main/java/de/shiewk/widgets/client/WidgetRenderer.java b/src/main/java/de/shiewk/widgets/client/WidgetRenderer.java index da50ccb..fa02bfe 100644 --- a/src/main/java/de/shiewk/widgets/client/WidgetRenderer.java +++ b/src/main/java/de/shiewk/widgets/client/WidgetRenderer.java @@ -13,7 +13,6 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderTickCounter; import net.minecraft.util.Util; import net.minecraft.util.profiler.Profiler; -import net.minecraft.util.profiler.Profilers; public class WidgetRenderer implements ClientTickEvents.StartTick, ClientLifecycleEvents.ClientStarted, HudRenderCallback { @@ -22,7 +21,7 @@ public class WidgetRenderer implements ClientTickEvents.StartTick, ClientLifecyc public void renderWidgets(DrawContext drawContext) { if (client.options.hudHidden) return; if (client.currentScreen instanceof EditWidgetPositionsScreen) return; - final Profiler profiler = Profilers.get(); + final Profiler profiler = client.getProfiler(); profiler.push("widgets"); final TextRenderer textRenderer = client.textRenderer; final long timeNano = Util.getMeasuringTimeNano(); @@ -48,7 +47,7 @@ public class WidgetRenderer implements ClientTickEvents.StartTick, ClientLifecyc @Override public void onStartTick(MinecraftClient client) { WidgetRenderer.client = client; - final Profiler profiler = Profilers.get(); + final Profiler profiler = client.getProfiler(); profiler.push("widgets"); final ObjectArrayList enabled = WidgetManager.enabled; diff --git a/src/main/java/de/shiewk/widgets/client/screen/components/WidgetListWidget.java b/src/main/java/de/shiewk/widgets/client/screen/components/WidgetListWidget.java index dbb57a5..c2fe2a9 100644 --- a/src/main/java/de/shiewk/widgets/client/screen/components/WidgetListWidget.java +++ b/src/main/java/de/shiewk/widgets/client/screen/components/WidgetListWidget.java @@ -12,7 +12,6 @@ import net.minecraft.client.gui.widget.GridWidget; import net.minecraft.client.gui.widget.ScrollableWidget; import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.client.sound.PositionedSoundInstance; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; @@ -90,13 +89,9 @@ public class WidgetListWidget extends ScrollableWidget { @Override protected void renderContents(DrawContext context, int mouseX, int mouseY, float delta) { context.enableScissor(getX(), getY(), getX()+width, getY()+height); - MatrixStack stack = context.getMatrices(); - stack.push(); - stack.translate(0, (float) -getScrollY(), 0); for (WidgetWidget element : elements) { element.render(context, mouseX, (int) (mouseY + getScrollY()), delta); } - stack.pop(); context.disableScissor(); } diff --git a/src/main/java/de/shiewk/widgets/client/screen/components/WidgetSettingsEditWidget.java b/src/main/java/de/shiewk/widgets/client/screen/components/WidgetSettingsEditWidget.java index 6664d01..f1bf362 100644 --- a/src/main/java/de/shiewk/widgets/client/screen/components/WidgetSettingsEditWidget.java +++ b/src/main/java/de/shiewk/widgets/client/screen/components/WidgetSettingsEditWidget.java @@ -51,11 +51,9 @@ public class WidgetSettingsEditWidget extends ScrollableWidget { @Override protected void renderContents(DrawContext context, int mouseX, int mouseY, float delta) { - context.fill(getX(), getY(), getX()+width, getY()+height, COLOR_BG); + context.fill(getX(), getY() - 67, getX()+width, getY()+getContentsHeight() + 67, COLOR_BG); MatrixStack matrices = context.getMatrices(); matrices.push(); - matrices.translate(0, (float) -getScrollY(), 0); - matrices.push(); matrices.scale(2, 2, 1); matrices.translate(0, (float) -getScrollY(), 0); context.drawText(textRenderer, widget.getName(), this.width / 4 - textRenderer.getWidth(widget.getName()) / 2, this.height / 100, COLOR_FG, true); @@ -78,7 +76,6 @@ public class WidgetSettingsEditWidget extends ScrollableWidget { y += 5; } this.contentsHeight = y; - matrices.pop(); } @Override diff --git a/src/main/java/de/shiewk/widgets/widgets/ArmorHudWidget.java b/src/main/java/de/shiewk/widgets/widgets/ArmorHudWidget.java index 41842a1..314dad0 100644 --- a/src/main/java/de/shiewk/widgets/widgets/ArmorHudWidget.java +++ b/src/main/java/de/shiewk/widgets/widgets/ArmorHudWidget.java @@ -75,7 +75,7 @@ public class ArmorHudWidget extends ResizableWidget { private void renderItem(DrawContext context, long mt, TextRenderer textRenderer, ItemStack stack, int posX, int posY){ context.drawItemWithoutEntity(stack, posX, posY); - context.drawStackOverlay(textRenderer, stack, posX, posY); + context.drawItemInSlot(textRenderer, stack, posX, posY); if (showDurability){ renderDurability(context, mt, textRenderer, stack, posX, posY); } diff --git a/src/main/java/de/shiewk/widgets/widgets/InventoryWidget.java b/src/main/java/de/shiewk/widgets/widgets/InventoryWidget.java index 199a5f5..f836d1d 100644 --- a/src/main/java/de/shiewk/widgets/widgets/InventoryWidget.java +++ b/src/main/java/de/shiewk/widgets/widgets/InventoryWidget.java @@ -9,7 +9,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.render.RenderLayer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; @@ -98,13 +97,13 @@ public class InventoryWidget extends ResizableWidget { private void drawBackground(DrawContext context, long mt, int posX, int posY) { switch (mode){ - case VANILLA -> context.drawTexture(RenderLayer::getGuiTextured, VANILLA_INVENTORY, posX, posY, 0, 0, 176, 91, 176, 91); + case VANILLA -> context.drawTexture(VANILLA_INVENTORY, posX, posY, 0, 0, 176, 91, 176, 91); case TEXTURE_PACK -> { context.enableScissor(posX, posY, posX + width(), posY + 6); - context.drawTexture(RenderLayer::getGuiTextured, TEXTURE_PACK_INVENTORY, posX, posY, 0, 0, 256, 256, 256, 256); + context.drawTexture(TEXTURE_PACK_INVENTORY, posX, posY, 0, 0, 256, 256, 256, 256); context.disableScissor(); context.enableScissor(posX, posY + 6, posX + width(), posY + height()); - context.drawTexture(RenderLayer::getGuiTextured, TEXTURE_PACK_INVENTORY, posX, posY - 75, 0, 0, 256, 256, 256, 256); + context.drawTexture(TEXTURE_PACK_INVENTORY, posX, posY - 75, 0, 0, 256, 256, 256, 256); context.disableScissor(); } case GRID -> { @@ -159,7 +158,7 @@ public class InventoryWidget extends ResizableWidget { int itemX = posX + rx * 18; context.drawItem(stack, itemX, itemY); - context.drawStackOverlay(textRenderer, stack, itemX, itemY); + context.drawItemInSlot(textRenderer, stack, itemX, itemY); } } }