Update to 1.20.1

MinecraftschurliMods · Aug 5, 2023 · 9958287 · 9958287
1 parent 41f7279
commit 9958287
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -10,8 +10,8 @@ vendor=Minecraftschurli
 github=MinecraftschurliMods/BetterHUDLib
 url=https://github.com/MinecraftschurliMods/BetterHUDLib
 
-mc_version=1.19.4
-forge_version=45.1.0
+mc_version=1.20.1
+forge_version=47.0.34
 
 mappings_channel=parchment
-mappings_version=2023.06.26-1.19.4
+mappings_version=2023.06.26-1.20.1
diff --git a/src/main/java/com/github/minecraftschurlimods/betterhudlib/HUDElement.java b/src/main/java/com/github/minecraftschurlimods/betterhudlib/HUDElement.java
@@ -1,14 +1,13 @@
 package com.github.minecraftschurlimods.betterhudlib;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraftforge.client.gui.overlay.ForgeGui;
 import net.minecraftforge.client.gui.overlay.IGuiOverlay;
 
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
 
-public abstract class HUDElement extends GuiComponent implements IGuiOverlay {
+public abstract class HUDElement implements IGuiOverlay {
     private final Supplier<AnchorX> defaultAnchorX;
     private final Supplier<AnchorY> defaultAnchorY;
     private final IntSupplier defaultX;
@@ -37,12 +36,12 @@ protected HUDElement(Supplier<AnchorX> anchorX, Supplier<AnchorY> anchorY, IntSu
     }
 
     @Override
-    public void render(ForgeGui gui, PoseStack poseStack, float partialTick, int screenWidth, int screenHeight) {
+    public void render(ForgeGui gui, GuiGraphics graphics, float partialTick, int screenWidth, int screenHeight) {
         applyDefaults();
-        poseStack.pushPose();
-        poseStack.translate(getNormalizedX(screenWidth), getNormalizedY(screenHeight), 0);
-        draw(gui, poseStack, partialTick);
-        poseStack.popPose();
+        graphics.pose().pushPose();
+        graphics.pose().translate(getNormalizedX(screenWidth), getNormalizedY(screenHeight), 0);
+        draw(gui, graphics, partialTick);
+        graphics.pose().popPose();
     }
 
     private void applyDefaults() {
@@ -80,7 +79,7 @@ private int getNormalizedY(int screenHeight) {
         return y;
     }
 
-    public abstract void draw(ForgeGui gui, PoseStack poseStack, float partialTick);
+    public abstract void draw(ForgeGui gui, GuiGraphics graphics, float partialTick);
 
     protected final int getX(int screenWidth) {
         return switch (anchorX) {

diff --git a/src/main/java/com/github/minecraftschurlimods/betterhudlib/HUDManagerScreen.java b/src/main/java/com/github/minecraftschurlimods/betterhudlib/HUDManagerScreen.java
@@ -1,8 +1,8 @@
 package com.github.minecraftschurlimods.betterhudlib;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.components.events.GuiEventListener;
@@ -48,11 +48,11 @@ public void onClose() {
     private interface HUDWidget extends Renderable {
 
         @Override
-        default void render(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) {
+        default void render(GuiGraphics graphics, int pMouseX, int pMouseY, float pPartialTick) {
             Minecraft minecraft = Minecraft.getInstance();
             getHUDElement().render(
                     ((ForgeGui) minecraft.gui),
-                    pPoseStack,
+                    graphics,
                     pPartialTick,
                     minecraft.getWindow().getGuiScaledWidth(),
                     minecraft.getWindow().getGuiScaledHeight()
@@ -81,8 +81,8 @@ public HUDElementWrapper(Component name, HUDElement element) {
         }
 
         @Override
-        public void renderWidget(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) {
-            HUDWidget.super.render(pPoseStack, pMouseX, pMouseY, pPartialTick);
+        public void renderWidget(GuiGraphics pGuiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
+            HUDWidget.super.render(pGuiGraphics, pMouseX, pMouseY, pPartialTick);
         }
 
         @Override

diff --git a/src/test/java/com/github/minecraftschurlimods/betterhudlib/test/TestMod.java b/src/test/java/com/github/minecraftschurlimods/betterhudlib/test/TestMod.java
@@ -2,7 +2,7 @@
 
 import com.github.minecraftschurlimods.betterhudlib.HUDElement;
 import com.github.minecraftschurlimods.betterhudlib.HUDManager;
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
 import net.minecraftforge.client.gui.overlay.ForgeGui;
@@ -24,14 +24,14 @@ public void run() {
             FMLJavaModLoadingContext.get().getModEventBus().addListener((RegisterGuiOverlaysEvent evt) -> {
                 evt.registerAboveAll("test_hud", new HUDElement(HUDElement.AnchorX.CENTER, HUDElement.AnchorY.CENTER, 0, 0, 100, 100) {
                     @Override
-                    public void draw(ForgeGui gui, PoseStack poseStack, float partialTick) {
-                        fill(poseStack, 0, 0, getHeight(), getWidth(), 0xFF00FF00);
+                    public void draw(ForgeGui gui, GuiGraphics graphics, float partialTick) {
+                        graphics.fill(0, 0, getHeight(), getWidth(), 0xFF00FF00);
                     }
                 });
                 evt.registerAboveAll("test_hud2", new HUDElement(HUDElement.AnchorX.CENTER, HUDElement.AnchorY.BOTTOM, 100, 0, 100, 100) {
                     @Override
-                    public void draw(ForgeGui gui, PoseStack poseStack, float partialTick) {
-                        fill(poseStack, 0, 0, getHeight(), getWidth(), 0xFFFF0000);
+                    public void draw(ForgeGui gui, GuiGraphics graphics, float partialTick) {
+                        graphics.fill(0, 0, getHeight(), getWidth(), 0xFFFF0000);
                     }
                 });
             });