Merge remote-tracking branch 'remotes/origin/Multiloader-1.20' into M…

…ultiloader-1.19.4
Vivecraft · Oct 12, 2023 · 09a1ea8 · 09a1ea8
2 parents 2bde7bc + 9a77a5a
commit 09a1ea8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/publish-on-release.yml b/.github/workflows/publish-on-release.yml
@@ -183,7 +183,7 @@ jobs:
 
       - name: publish fabric
         if: steps.assets.outputs.FABRIC_FILE_PATH != ''
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           modrinth-id: wGoQDPN5
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -203,7 +203,7 @@ jobs:
 
       - name: publish forge
         if: steps.assets.outputs.FORGE_FILE_PATH != ''
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           modrinth-id: wGoQDPN5
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -223,7 +223,7 @@ jobs:
 
       - name: publish quilt
         if: steps.assets.outputs.QUILT_FILE_PATH != ''
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           modrinth-id: wGoQDPN5
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

diff --git a/common/src/main/java/org/vivecraft/client/gui/widgets/SettingsList.java b/common/src/main/java/org/vivecraft/client/gui/widgets/SettingsList.java
@@ -21,7 +21,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
 
 public class SettingsList extends ContainerObjectSelectionList<SettingsList.BaseEntry> {
     final Screen parent;

diff --git a/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java
@@ -1188,7 +1188,6 @@ String getDisplayString(String prefix, Object value) {
                 } else {
                     return prefix + String.format("%.1f", (float) value) + "s";
                 }
-
             }
         },
         MIXED_REALITY_KEY_COLOR(false, false) { // Key Color

diff --git a/common/src/main/java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java b/common/src/main/java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java
@@ -362,6 +362,7 @@ public abstract class MinecraftVRMixin implements MinecraftExtension {
             this.mainRenderTarget.bindWrite(true);
 
             // draw screen/gui to buffer
+            // push pose so we can pop it later
             RenderSystem.getModelViewStack().pushPose();
             ((GameRendererExtension) this.gameRenderer).vivecraft$setShouldDrawScreen(true);
             // only draw the gui when the level was rendered once, since some mods expect that
@@ -397,6 +398,10 @@ public abstract class MinecraftVRMixin implements MinecraftExtension {
             // reset that, do not draw it again on something else
             fpsPieResults = null;
 
+            // pop pose that we pushed before the gui
+            RenderSystem.getModelViewStack().popPose();
+            RenderSystem.applyModelViewMatrix();
+
             // generate mipmaps
             // TODO: does this do anything?
             mainRenderTarget.bindRead();

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.19.4
 enabled_platforms=fabric,forge
 
 archives_base_name=vivecraft
-mod_version=1.1.0
+mod_version=1.1.2
 maven_group=org.vivecraft
 
 architectury_version=8.1.75
-Original file line number
+Diff line change
@@ Expand Up / @@ -1188,7 +1188,6 @@ String getDisplayString(String prefix, Object value) { @@
                     } else {
                         return prefix + String.format("%.1f", (float) value) + "s";
                     }
                 }
             },
             MIXED_REALITY_KEY_COLOR(false, false) { // Key Color
@@ Expand Down @@