backport to 1.19.4

Vivecraft · Aug 4, 2023 · 105f1af · 105f1af
1 parent 717bd73
commit 105f1af
Show file tree

Hide file tree

Showing 60 changed files with 250 additions and 260 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -14,23 +14,23 @@ dependencies {
     modApi("dev.architectury:architectury-fabric:${rootProject.architectury_version}")
 
     // for sodium compat
-    modCompileOnly "maven.modrinth:sodium:mc1.20-0.4.10"
+    modCompileOnly "maven.modrinth:sodium:mc1.19.4-0.4.10"
     modCompileOnly "883067831485366304:1080535317733462076:sodium-fabric-mc1.19.4-pre2-0.4.11rev.9a2a2ea-dirty:jar"
     modCompileOnly("maven.modrinth:rubidium:0.6.4")
 
     // for iris compat
-    modCompileOnly "maven.modrinth:iris:1.6.4+1.20"
+    modCompileOnly "maven.modrinth:iris:1.5.2+1.19.4"
 
     // for REI compat
-    modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:12.0.634"
+    modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:11.0.597"
 
     // for Pehkui compat
     modApi("com.github.Virtuoel:Pehkui:3.7.7", { exclude group: "net.fabricmc.fabric-api" })
 
     // other mods
     // modCompileOnly("com.simibubi.create:create-fabric-1.19.2:0.5.0.i-969+1.19.2")
-    modCompileOnly "maven.modrinth:lithium:mc1.20.1-0.11.2"
-    modCompileOnly "maven.modrinth:indium:1.0.21+mc1.20.1"
+    modCompileOnly "maven.modrinth:lithium:mc1.19.4-0.11.1"
+    modCompileOnly "maven.modrinth:indium:1.0.15+mc1.19.4"
 
     /*
     // for immersive portals compat

diff --git a/common/src/main/java/org/vivecraft/client/VivecraftVRMod.java b/common/src/main/java/org/vivecraft/client/VivecraftVRMod.java
@@ -10,8 +10,6 @@
 
 public class VivecraftVRMod {
 
-    public static final boolean compiledWithForge = true;
-
     private static final Minecraft mc = Minecraft.getInstance();
 
     public static VivecraftVRMod INSTANCE = new VivecraftVRMod();

diff --git a/common/src/main/java/org/vivecraft/client/gui/framework/GuiVROptionsBase.java b/common/src/main/java/org/vivecraft/client/gui/framework/GuiVROptionsBase.java
@@ -1,6 +1,6 @@
 package org.vivecraft.client.gui.framework;
 
-import net.minecraft.client.gui.GuiGraphics;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.ObjectSelectionList;
@@ -215,22 +215,22 @@ protected void init(VRSettings.VrOptions[] settings, boolean clear)
         this.init(avroptionentry, clear);
     }
 
-    public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTicks)
+    public void render(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks)
     {
         if (this.reinit)
         {
             this.reinit = false;
             this.init();
         }
 
-        this.renderBackground(guiGraphics);
+        this.renderBackground(pMatrixStack);
 
         if (this.visibleList != null)
         {
-            this.visibleList.render(guiGraphics, pMouseX, pMouseY, pPartialTicks);
+            this.visibleList.render(pMatrixStack, pMouseX, pMouseY, pPartialTicks);
         }
 
-        guiGraphics.drawCenteredString(this.font, Component.translatable(this.vrTitle), this.width / 2, 15, 16777215);
+        drawCenteredString(pMatrixStack, this.font, Component.translatable(this.vrTitle), this.width / 2, 15, 16777215);
 
         if (this.btnDefaults != null)
         {
@@ -242,8 +242,8 @@ public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPar
             this.btnDone.visible = this.drawDefaultButtons;
         }
 
-        super.render(guiGraphics, pMouseX, pMouseY, pPartialTicks);
-        renderTooltip(guiGraphics, pMouseX, pMouseY);
+        super.render(pMatrixStack, pMouseX, pMouseY, pPartialTicks);
+        renderTooltip(pMatrixStack, pMouseX, pMouseY);
     }
 
     protected void actionPerformed(AbstractWidget button)
@@ -321,7 +321,7 @@ public boolean charTyped(char pCodePoint, int pModifiers)
         return this.visibleList != null && this.visibleList.charTyped(pCodePoint, pModifiers) ? true : super.charTyped(pCodePoint, pModifiers);
     }
 
-    private void renderTooltip(GuiGraphics guiGraphics, int pMouseX, int pMouseY) {
+    private void renderTooltip(PoseStack pMatrixStack, int pMouseX, int pMouseY) {
         AbstractWidget hover = null;
         // find active button
         for (GuiEventListener child: children()) {
@@ -345,9 +345,9 @@ private void renderTooltip(GuiGraphics guiGraphics, int pMouseX, int pMouseY) {
 
                         // if tooltip is not too low, draw below button, else above
                         if (guiHover.getY() + guiHover.getHeight() + formattedText.size() * (font.lineHeight + 1) + 14 < this.height) {
-                            guiGraphics.renderTooltip(this.font, font.split(Component.literal(tooltip), 308), this.width / 2 - 166, guiHover.getY() + guiHover.getHeight() + 14);
+                            renderTooltip(pMatrixStack, font.split(Component.literal(tooltip), 308), this.width / 2 - 166, guiHover.getY() + guiHover.getHeight() + 14);
                         } else {
-                            guiGraphics.renderTooltip(this.font, font.split(Component.literal(tooltip), 308), this.width / 2 - 166, guiHover.getY() - formattedText.size() * (font.lineHeight + 1) + 9);
+                            renderTooltip(pMatrixStack, font.split(Component.literal(tooltip), 308), this.width / 2 - 166, guiHover.getY() - formattedText.size() * (font.lineHeight + 1) + 9);
                         }
                     }
                 }

diff --git a/common/src/main/java/org/vivecraft/client/gui/framework/TwoHandedScreen.java b/common/src/main/java/org/vivecraft/client/gui/framework/TwoHandedScreen.java
@@ -1,11 +1,12 @@
 package org.vivecraft.client.gui.framework;
 
-import net.minecraft.client.gui.GuiGraphics;
 import org.vivecraft.client_vr.ClientDataHolderVR;
 import org.vivecraft.client_vr.extensions.GuiExtension;
 import org.vivecraft.client_vr.provider.ControllerType;
 import org.vivecraft.client_vr.provider.MCVR;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
@@ -40,7 +41,7 @@ public boolean mouseClicked(double pMouseX, double p_94738_, int pMouseY)
         }
     }
 
-    public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTicks)
+    public void render(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks)
     {
         if (this.reinit)
         {
@@ -63,11 +64,11 @@ public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPar
 
             if (flag)
             {
-                abstractwidget2.render(guiGraphics, (int)d0, (int)d1, pPartialTicks);
+                abstractwidget2.render(pMatrixStack, (int)d0, (int)d1, pPartialTicks);
             }
             else
             {
-                abstractwidget2.render(guiGraphics, (int)d2, (int)d3, pPartialTicks);
+                abstractwidget2.render(pMatrixStack, (int)d2, (int)d3, pPartialTicks);
             }
 
             if (flag)

diff --git a/common/src/main/java/org/vivecraft/client/gui/screens/ErrorScreen.java b/common/src/main/java/org/vivecraft/client/gui/screens/ErrorScreen.java
@@ -1,7 +1,7 @@
 package org.vivecraft.client.gui.screens;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -37,10 +37,10 @@ protected void init() {
     }
 
     @Override
-    public void render(@NotNull GuiGraphics guiGraphics, int i, int j, float f) {
-        this.renderBackground(guiGraphics);
-        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 16777215);
+    public void render(@NotNull PoseStack poseStack, int i, int j, float f) {
+        this.renderBackground(poseStack);
+        drawCenteredString(poseStack, this.font, this.title, this.width / 2, 15, 16777215);
 
-        super.render(guiGraphics, i, j, f);
+        super.render(poseStack, i, j, f);
     }
 }
diff --git a/common/src/main/java/org/vivecraft/client/gui/screens/UpdateScreen.java b/common/src/main/java/org/vivecraft/client/gui/screens/UpdateScreen.java
@@ -1,8 +1,8 @@
 package org.vivecraft.client.gui.screens;
 
+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.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
@@ -55,10 +55,10 @@ protected void init() {
     }
 
     @Override
-    public void render(@NotNull GuiGraphics guiGraphics, int i, int j, float f) {
-        this.renderBackground(guiGraphics);
-        guiGraphics.drawCenteredString(this.font, this.title, this.width / 2, 15, 16777215);
-        super.render(guiGraphics, i, j, f);
+    public void render(@NotNull PoseStack poseStack, int i, int j, float f) {
+        this.renderBackground(poseStack);
+        drawCenteredString(poseStack, this.font, this.title, this.width / 2, 15, 16777215);
+        super.render(poseStack, i, j, f);
     }
 
     @Override

diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiQuickCommandsInGame.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiQuickCommandsInGame.java
@@ -1,7 +1,7 @@
 package org.vivecraft.client.gui.settings;
 
-import net.minecraft.client.gui.GuiGraphics;
 import org.vivecraft.client_vr.ClientDataHolderVR;
+import com.mojang.blaze3d.vertex.PoseStack;
 
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.gui.components.Button;
@@ -59,10 +59,10 @@ public void init()
             .build());
     }
 
-    public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTicks)
+    public void render(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks)
     {
-        this.renderBackground(guiGraphics);
-        guiGraphics.drawCenteredString(this.font, "Quick Commands", this.width / 2, 16, 16777215);
-        super.render(guiGraphics, pMouseX, pMouseY, pPartialTicks);
+        this.renderBackground(pMatrixStack);
+        drawCenteredString(pMatrixStack, this.font, "Quick Commands", this.width / 2, 16, 16777215);
+        super.render(pMatrixStack, pMouseX, pMouseY, pPartialTicks);
     }
 }
diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiQuickCommandsList.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiQuickCommandsList.java
@@ -1,8 +1,8 @@
 package org.vivecraft.client.gui.settings;
 
-import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.*;
 import org.vivecraft.client_vr.ClientDataHolderVR;
+import com.mojang.blaze3d.vertex.PoseStack;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
@@ -30,7 +30,7 @@ public GuiQuickCommandsList(GuiQuickCommandEditor parent, Minecraft mc)
     }
 
     @Override
-    protected void renderSelection(GuiGraphics guiGraphics, int i, int j, int k, int l, int m) {
+    protected void renderSelection(PoseStack poseStack, int i, int j, int k, int l, int m) {
     }
 
     public class CommandEntry extends Entry<CommandEntry>
@@ -115,15 +115,15 @@ public boolean keyPressed(int pKeyCode, int pScanCode, int pModifiers)
             return this.txt.isFocused() ? this.txt.keyPressed(pKeyCode, pScanCode, pModifiers) : super.keyPressed(pKeyCode, pScanCode, pModifiers);
         }
 
-        public void render(GuiGraphics guiGraphics, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, boolean pIsMouseOver, float pPartialTicks)
+        public void render(PoseStack pMatrixStack, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, boolean pIsMouseOver, float pPartialTicks)
         {
             this.txt.setX(pLeft);
             this.txt.setY(pTop);
-            this.txt.render(guiGraphics, pMouseX, pMouseY, pPartialTicks);
+            this.txt.render(pMatrixStack, pMouseX, pMouseY, pPartialTicks);
             this.btnDelete.setX(this.txt.getX() + this.txt.getWidth() + 2);
             this.btnDelete.setY(this.txt.getY());
             this.btnDelete.visible = true;
-            this.btnDelete.render(guiGraphics, pMouseX, pMouseY, pPartialTicks);
+            this.btnDelete.render(pMatrixStack, pMouseX, pMouseY, pPartialTicks);
         }
 
 		@Override

diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialConfiguration.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialConfiguration.java
@@ -1,11 +1,12 @@
 package org.vivecraft.client.gui.settings;
 
-import net.minecraft.client.gui.GuiGraphics;
 import org.apache.commons.lang3.ArrayUtils;
 import org.vivecraft.client.gui.framework.GuiVROptionsBase;
 import org.vivecraft.client.gui.framework.VROptionLayout;
 import org.vivecraft.client_vr.settings.VRSettings;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
@@ -223,18 +224,18 @@ protected boolean onDoneClicked()
         }
     }
 
-    public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTicks)
+    public void render(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks)
     {
-        super.render(guiGraphics, pMouseX, pMouseY, pPartialTicks);
+        super.render(pMatrixStack, pMouseX, pMouseY, pPartialTicks);
 
         if (this.visibleList == null)
         {
-            guiGraphics.drawCenteredString(this.minecraft.font,  Component.translatable("vivecraft.messages.radialmenubind.1"), this.width / 2, this.height - 50, 5635925);
+            drawCenteredString(pMatrixStack, this.minecraft.font,  Component.translatable("vivecraft.messages.radialmenubind.1"), this.width / 2, this.height - 50, 5635925);
         }
 
         if (this.isShift)
         {
-            guiGraphics.drawCenteredString(this.minecraft.font,  Component.translatable("vivecraft.messages.radialmenubind.2"), this.width / 2, this.height - 36, 13777015);
+            drawCenteredString(pMatrixStack, this.minecraft.font,  Component.translatable("vivecraft.messages.radialmenubind.2"), this.width / 2, this.height - 36, 13777015);
         }
     }
 }
diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialItemsList.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiRadialItemsList.java
@@ -2,9 +2,10 @@
 
 import java.util.Arrays;
 
-import net.minecraft.client.gui.GuiGraphics;
 import org.apache.commons.lang3.ArrayUtils;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
@@ -62,9 +63,9 @@ public CategoryEntry(String name)
             this.labelWidth = GuiRadialItemsList.this.mc.font.width(this.labelText);
         }
 
-        public void render(GuiGraphics guiGraphics, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, boolean pIsMouseOver, float pPartialTicks)
+        public void render(PoseStack pMatrixStack, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, boolean pIsMouseOver, float pPartialTicks)
         {
-            guiGraphics.drawString(mc.font, this.labelText, (mc.screen.width / 2 - this.labelWidth / 2), (pTop + pHeight - 9 - 1), 6777215);
+            GuiRadialItemsList.this.mc.font.draw(pMatrixStack, this.labelText, (float)(GuiRadialItemsList.this.mc.screen.width / 2 - this.labelWidth / 2), (float)(pTop + pHeight - 9 - 1), 6777215);
         }
 
 		@Override
@@ -85,7 +86,7 @@ private MappingEntry(KeyMapping key, GuiRadialConfiguration parent)
             this.parentScreen = parent;
         }
 
-        public void render(GuiGraphics guiGraphics, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, boolean pIsMouseOver, float pPartialTicks)
+        public void render(PoseStack pMatrixStack, int pIndex, int pTop, int pLeft, int pWidth, int pHeight, int pMouseX, int pMouseY, boolean pIsMouseOver, float pPartialTicks)
         {
             ChatFormatting chatformatting = ChatFormatting.WHITE;
 
@@ -94,7 +95,7 @@ public void render(GuiGraphics guiGraphics, int pIndex, int pTop, int pLeft, int
                 chatformatting = ChatFormatting.GREEN;
             }
 
-            guiGraphics.drawString(mc.font, chatformatting + I18n.get(this.myKey.getName()), (mc.screen.width / 2 - GuiRadialItemsList.this.maxListLabelWidth / 2), (pTop + pHeight / 2 - 9 / 2), 16777215);
+            GuiRadialItemsList.this.mc.font.draw(pMatrixStack, chatformatting + I18n.get(this.myKey.getName()), (float)(GuiRadialItemsList.this.mc.screen.width / 2 - GuiRadialItemsList.this.maxListLabelWidth / 2), (float)(pTop + pHeight / 2 - 9 / 2), 16777215);
         }
 
         public boolean mouseClicked(double pMouseX, double p_94738_, int pMouseY)

diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiRenderOpticsSettings.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiRenderOpticsSettings.java
@@ -1,13 +1,14 @@
 package org.vivecraft.client.gui.settings;
 
-import net.minecraft.client.gui.GuiGraphics;
 import org.vivecraft.mod_compat_vr.ShadersHelper;
 import org.vivecraft.client_vr.VRState;
 import org.vivecraft.client.gui.framework.GuiVROption;
 import org.vivecraft.client.gui.framework.GuiVROptionsBase;
 import org.vivecraft.client_vr.settings.VRHotkeys;
 import org.vivecraft.client_vr.settings.VRSettings;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.screens.Screen;
 
@@ -132,9 +133,9 @@ else if (this.dataholder.vrSettings.displayMirrorMode == VRSettings.MirrorMode.T
         });
     }
 
-    public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTicks)
+    public void render(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks)
     {
-        super.render(guiGraphics, pMouseX, pMouseY, pPartialTicks);
+        super.render(pMatrixStack, pMouseX, pMouseY, pPartialTicks);
     }
 
     protected void loadDefaults()

diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiVRControls.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiVRControls.java
@@ -1,10 +1,11 @@
 package org.vivecraft.client.gui.settings;
 
-import net.minecraft.client.gui.GuiGraphics;
 import org.vivecraft.client.gui.framework.VROptionEntry;
 import org.vivecraft.client.gui.framework.GuiVROptionsBase;
 import org.vivecraft.client_vr.settings.VRSettings;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 
@@ -36,15 +37,15 @@ public void init()
         super.addDefaultButtons();
     }
 
-    public void render(GuiGraphics guiGraphics, int pMouseX, int pMouseY, float pPartialTicks)
+    public void render(PoseStack pMatrixStack, int pMouseX, int pMouseY, float pPartialTicks)
     {
-        super.render(guiGraphics, pMouseX, pMouseY, pPartialTicks);
+        super.render(pMatrixStack, pMouseX, pMouseY, pPartialTicks);
 
         int middle = 240 / 2 - this.minecraft.font.lineHeight / 2 - 24;
         int lineHeight = this.minecraft.font.lineHeight + 3;
 
-        guiGraphics.drawCenteredString(this.minecraft.font, Component.translatable("vivecraft.messages.controls.1"), this.width / 2, middle - lineHeight, 16777215);
-        guiGraphics.drawCenteredString(this.minecraft.font, Component.translatable("vivecraft.messages.controls.2"), this.width / 2, middle, 16777215);
-        guiGraphics.drawCenteredString(this.minecraft.font, Component.translatable("vivecraft.messages.controls.3"), this.width / 2, middle + lineHeight, 16777215);
+        drawCenteredString(pMatrixStack, this.minecraft.font, Component.translatable("vivecraft.messages.controls.1"), this.width / 2, middle - lineHeight, 16777215);
+        drawCenteredString(pMatrixStack, this.minecraft.font, Component.translatable("vivecraft.messages.controls.2"), this.width / 2, middle, 16777215);
+        drawCenteredString(pMatrixStack, this.minecraft.font, Component.translatable("vivecraft.messages.controls.3"), this.width / 2, middle + lineHeight, 16777215);
     }
 }