From 71ca26bba99dcd41e82cb08dc12f44d0f0aa5011 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Thu, 30 May 2024 20:14:04 -0500 Subject: [PATCH 01/10] Up the version number 2.0.4-a-dev -> 2.1.0-a --- coreSubProjects | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreSubProjects b/coreSubProjects index f49a79b54..76f28e648 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit f49a79b54a8af3d49ce51a889720392b7efa0045 +Subproject commit 76f28e648cf31c1b1cc16b23cd91b3ff7ac8bbdd diff --git a/gradle.properties b/gradle.properties index 5d644a4bc..cab4d25d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.caching=true # Mod Info mod_name=DistantHorizons -mod_version=2.0.4-a-dev +mod_version=2.1.0-a api_version=2.0.0 maven_group=com.seibel.distanthorizons mod_readable_name=Distant Horizons From 6073d8122a413e59d551ebc0d793997e8897b3e3 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 7 Jun 2024 17:42:46 -0500 Subject: [PATCH 02/10] Up the version number 2.1.0-a -> 2.1.1-a-dev --- coreSubProjects | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreSubProjects b/coreSubProjects index 76f28e648..c3abfb123 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 76f28e648cf31c1b1cc16b23cd91b3ff7ac8bbdd +Subproject commit c3abfb123db2ad57afc266559b5e3546bedac833 diff --git a/gradle.properties b/gradle.properties index cab4d25d0..b66a886ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.caching=true # Mod Info mod_name=DistantHorizons -mod_version=2.1.0-a +mod_version=2.1.1-a-dev api_version=2.0.0 maven_group=com.seibel.distanthorizons mod_readable_name=Distant Horizons From c533b2e8ea759a6e1c335eee2141314e0bc24e2a Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 8 Jun 2024 07:19:50 -0500 Subject: [PATCH 03/10] Fix config screen blur on 1.20.6 --- .../common/wrappers/gui/updater/ChangelogScreen.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java index 1328a5ba9..76adb6d58 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java @@ -168,10 +168,9 @@ public class ChangelogScreen extends DhScreen #endif - this.changelogArea.render(matrices, mouseX, mouseY, delta); // Render the changelog - + // render order matters, otherwise on 1.20.6+ the blurred background will render on top of the text super.render(matrices, mouseX, mouseY, delta); // Render the buttons - + this.changelogArea.render(matrices, mouseX, mouseY, delta); // Render the changelog DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title } From 564e0d3263c7cb0e7773a3ab46bd37dd967b3721 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 8 Jun 2024 08:11:26 -0500 Subject: [PATCH 04/10] Add update branch config "auto" --- .../common/wrappers/gui/ClassicConfigGUI.java | 2 +- .../wrappers/gui/updater/UpdateModScreen.java | 24 ++++++++++--------- coreSubProjects | 2 +- .../fabric/mixins/client/MixinMinecraft.java | 19 +++++++++++---- .../forge/mixins/client/MixinMinecraft.java | 16 +++++++++++-- .../mixins/client/MixinMinecraft.java | 17 +++++++++++-- 6 files changed, 59 insertions(+), 21 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java index 3e601ecd3..228c4a218 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java @@ -245,7 +245,7 @@ public class ClassicConfigGUI } // Changelog button - if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE) + if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && !ModInfo.IS_DEV_BUILD) // we only have changelogs for stable builds { this.addBtn(new TexturedButtonWidget( // Where the button is on the screen diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java index 446af8432..01ac2bb2f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java @@ -41,16 +41,18 @@ public class UpdateModScreen extends DhScreen super(Translatable(ModInfo.ID + ".updater.title")); this.parent = parent; this.newVersionID = newVersionID; - - switch (Config.Client.Advanced.AutoUpdater.updateBranch.get()) { - case STABLE: - currentVer = ModInfo.VERSION; - nextVer = ModrinthGetter.releaseNames.get(this.newVersionID); - break; - case NIGHTLY: - currentVer = ModJarInfo.Git_Commit.substring(0,7); - nextVer = this.newVersionID.substring(0,7); - break; + + + EDhApiUpdateBranch updateBranch = EDhApiUpdateBranch.convertAutoToStableOrNightly(Config.Client.Advanced.AutoUpdater.updateBranch.get()); + if (updateBranch == EDhApiUpdateBranch.STABLE) + { + this.currentVer = ModInfo.VERSION; + this.nextVer = ModrinthGetter.releaseNames.get(this.newVersionID); + } + else + { + this.currentVer = ModJarInfo.Git_Commit.substring(0,7); + this.nextVer = this.newVersionID.substring(0,7); } } @@ -88,7 +90,7 @@ public class UpdateModScreen extends DhScreen e.printStackTrace(); } - if (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE) + if (!ModInfo.IS_DEV_BUILD) { this.addBtn(new TexturedButtonWidget( // Where the button is on the screen diff --git a/coreSubProjects b/coreSubProjects index c3abfb123..b7a5bfd27 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit c3abfb123db2ad57afc266559b5e3546bedac833 +Subproject commit b7a5bfd274724195ddc32ca9746c5b38b9fa629a diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java index de4766fd1..f6b4b112a 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java @@ -8,6 +8,7 @@ import com.seibel.distanthorizons.core.jar.installer.GitlabGetter; import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.coreapi.ModInfo; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; @@ -87,13 +88,23 @@ public class MixinMinecraft ) ) { - runnable = () -> { + runnable = () -> + { + String versionId; + EDhApiUpdateBranch updateBranch = EDhApiUpdateBranch.convertAutoToStableOrNightly(Config.Client.Advanced.AutoUpdater.updateBranch.get()); + if (updateBranch == EDhApiUpdateBranch.STABLE) + { + versionId = ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()); + } + else + { + versionId = GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"); + } + Minecraft.getInstance().setScreen(new UpdateModScreen( // TODO: Change to runnable, instead of tittle screen new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons - (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE - ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) - : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) + versionId )); }; } diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java index 699b8017f..ca7a417d5 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java @@ -73,11 +73,23 @@ public class MixinMinecraft && SelfUpdater.onStart() ) { - runnable = () -> { + runnable = () -> + { + String versionId; + EDhApiUpdateBranch updateBranch = EDhApiUpdateBranch.convertAutoToStableOrNightly(Config.Client.Advanced.AutoUpdater.updateBranch.get()); + if (updateBranch == EDhApiUpdateBranch.STABLE) + { + versionId = ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()); + } + else + { + versionId = GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"); + } + Minecraft.getInstance().setScreen(new UpdateModScreen( // TODO: Change to runnable, instead of tittle screen new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons - (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) + versionId )); }; } diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java index 45e166c78..a202069a0 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java @@ -8,6 +8,7 @@ import com.seibel.distanthorizons.core.jar.installer.GitlabGetter; import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.coreapi.ModInfo; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; import org.spongepowered.asm.mixin.Mixin; @@ -75,11 +76,23 @@ public class MixinMinecraft && SelfUpdater.onStart() ) { - runnable = () -> { + runnable = () -> + { + String versionId; + EDhApiUpdateBranch updateBranch = EDhApiUpdateBranch.convertAutoToStableOrNightly(Config.Client.Advanced.AutoUpdater.updateBranch.get()); + if (updateBranch == EDhApiUpdateBranch.STABLE) + { + versionId = ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()); + } + else + { + versionId = GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"); + } + Minecraft.getInstance().setScreen(new UpdateModScreen( // TODO: Change to runnable, instead of tittle screen new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons - (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) + versionId )); }; } From 955524c6322020bedc3330f72ecb54ce20d6ecf6 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 8 Jun 2024 08:11:34 -0500 Subject: [PATCH 05/10] Remove blendium from the list of suggested fabric mods --- fabric/src/main/resources/fabric.mod.json | 1 - 1 file changed, 1 deletion(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 3aa8af35d..db15ae4bf 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -56,7 +56,6 @@ }, "suggests": { - "blendium": "*" }, "breaks": $fabric_incompatibility_list, From 2c263a2549c747a02e987436e6d33477756b588f Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 8 Jun 2024 08:11:48 -0500 Subject: [PATCH 06/10] Up the API version 2.0.0 -> 2.1.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b66a886ee..b8928e5de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.caching=true # Mod Info mod_name=DistantHorizons mod_version=2.1.1-a-dev -api_version=2.0.0 +api_version=2.1.0 maven_group=com.seibel.distanthorizons mod_readable_name=Distant Horizons mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow. From ebb0f6ebad105b04fe4f74f5fb433bcea74cdc85 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 8 Jun 2024 08:12:03 -0500 Subject: [PATCH 07/10] Up the manifold version 2023.1.17 -> 2024.1.15 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b8928e5de..b66ef5dbd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues mod_discord=https://discord.gg/xAB8G4cENx # Global Plugin Versions -manifold_version=2023.1.17 +manifold_version=2024.1.15 # 2023.1.17 can be used if there are mystery Java compiler issues nightconfig_version=3.6.6 lz4_version=1.8.0 From 2708c1ee116002e10222d8121f09dfb442a8f3ab Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 8 Jun 2024 08:33:41 -0500 Subject: [PATCH 08/10] Improve config comment spacing --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index b7a5bfd27..e41abdd17 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit b7a5bfd274724195ddc32ca9746c5b38b9fa629a +Subproject commit e41abdd17649681367871ddf674f03c3cb2bba18 From 4cf48fd99764e32f26509477a5bcd865b44bdbb0 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 8 Jun 2024 11:06:42 -0500 Subject: [PATCH 09/10] Try changing LZMA preset from 4 -> 3 (faster, less compressed) won't require any lod regeneration since the decompressor is the same --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index e41abdd17..1dd6359c8 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit e41abdd17649681367871ddf674f03c3cb2bba18 +Subproject commit 1dd6359c89adfcc2010a18f6cb5f7567811a7001 From 7706240acb94b4953e2be34c600c228fe9253f09 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 8 Jun 2024 12:49:17 -0500 Subject: [PATCH 10/10] Remove OpenGL multithreading --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 1dd6359c8..e011ce3ee 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 1dd6359c89adfcc2010a18f6cb5f7567811a7001 +Subproject commit e011ce3ee065fa195a694495ec54d5f446520879