From c596f720bdd1be644759b5ab18fc53910827a5bf Mon Sep 17 00:00:00 2001 From: fayer3 Date: Thu, 12 Oct 2023 02:03:40 +0200 Subject: [PATCH 1/6] fix slow memory leak, fixes some stuff pre 1.19.4 --- .../java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java | 5 +++++ 1 file changed, 5 insertions(+) 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 index 0d857f18f..8a0a5353c 100644 --- a/common/src/main/java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java +++ b/common/src/main/java/org/vivecraft/mixin/client_vr/MinecraftVRMixin.java @@ -368,6 +368,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 @@ -403,6 +404,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(); From 2bde7bc9777b2c81910ef9ed0f1e006dcb498e56 Mon Sep 17 00:00:00 2001 From: fayer3 Date: Thu, 12 Oct 2023 02:04:50 +0200 Subject: [PATCH 2/6] fix fps limit on forge --- .../mixin/client_vr/blaze3d/systems/RenderSystemVRMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/org/vivecraft/mixin/client_vr/blaze3d/systems/RenderSystemVRMixin.java b/common/src/main/java/org/vivecraft/mixin/client_vr/blaze3d/systems/RenderSystemVRMixin.java index c3f60ce86..4f4b6385e 100644 --- a/common/src/main/java/org/vivecraft/mixin/client_vr/blaze3d/systems/RenderSystemVRMixin.java +++ b/common/src/main/java/org/vivecraft/mixin/client_vr/blaze3d/systems/RenderSystemVRMixin.java @@ -20,7 +20,7 @@ public class RenderSystemVRMixin { ci.cancel(); } - @Inject(at = @At("HEAD"), method = "limitDisplayFPS", cancellable = true, remap = false) + @Inject(at = @At("HEAD"), method = "limitDisplayFPS", cancellable = true) private static void vivecraft$noFPSlimit(CallbackInfo ci) { if (VRState.vrRunning) { ci.cancel(); From 1fb83cb32d962b5ceb8912eca46c6d736934e630 Mon Sep 17 00:00:00 2001 From: fayer3 Date: Thu, 12 Oct 2023 02:06:49 +0200 Subject: [PATCH 3/6] update mc-publish to 3.3, to hopefully fix publishing issues --- .github/workflows/publish-on-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-on-release.yml b/.github/workflows/publish-on-release.yml index 0a9e699ef..1949f9811 100644 --- 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 }} From e6cb5a724f0e33215084d90e91768370269a09a3 Mon Sep 17 00:00:00 2001 From: fayer3 Date: Thu, 12 Oct 2023 02:20:07 +0200 Subject: [PATCH 4/6] fix loading of V5 menuworlds --- .../org/vivecraft/client_vr/menuworlds/MenuWorldExporter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/org/vivecraft/client_vr/menuworlds/MenuWorldExporter.java b/common/src/main/java/org/vivecraft/client_vr/menuworlds/MenuWorldExporter.java index 3cf3c0ea3..52c7b2e7e 100644 --- a/common/src/main/java/org/vivecraft/client_vr/menuworlds/MenuWorldExporter.java +++ b/common/src/main/java/org/vivecraft/client_vr/menuworlds/MenuWorldExporter.java @@ -439,7 +439,9 @@ void readPalette(DataInputStream dis) throws IOException { dis.readUTF(); // registry key, not actually used though, just for reference boolean hasPrecipitation = dis.readBoolean(); - builder.temperature(dis.readFloat()); + float temperature = dis.readFloat(); + builder.precipitation(hasPrecipitation ? (temperature < 0.15f ? Biome.Precipitation.SNOW : Biome.Precipitation.RAIN) : Biome.Precipitation.NONE); + builder.temperature(temperature); decodeEnum(Biome.TemperatureModifier.class, dis.readUTF()).ifPresent(builder::temperatureAdjustment); builder.downfall(dis.readFloat()); From 2fc4504a13e0d633bb1181a252ba01e855fcaf22 Mon Sep 17 00:00:00 2001 From: fayer3 Date: Thu, 12 Oct 2023 02:28:44 +0200 Subject: [PATCH 5/6] small code cleanup --- .../main/java/org/vivecraft/client/gui/widgets/SettingsList.java | 1 - .../main/java/org/vivecraft/client_vr/settings/VRSettings.java | 1 - 2 files changed, 2 deletions(-) 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 index fa7870a56..3b51cdc56 100644 --- 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 { 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 index a3fb1d52c..3540dc908 100644 --- 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 From 9a77a5a5b1572d9f980432577ebb3f5020a8ef00 Mon Sep 17 00:00:00 2001 From: fayer3 Date: Thu, 12 Oct 2023 02:32:35 +0200 Subject: [PATCH 6/6] bump to 1.1.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 50bd04af2..9f92f24a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version=1.20.1 enabled_platforms=fabric,forge archives_base_name=vivecraft -mod_version=1.1.0 +mod_version=1.1.2 maven_group=org.vivecraft architectury_version=9.0.5