diff --git a/buildSrc/src/main/groovy/dh-loader.gradle b/buildSrc/src/main/groovy/dh-loader.gradle index 10874f545..ef135bf68 100644 --- a/buildSrc/src/main/groovy/dh-loader.gradle +++ b/buildSrc/src/main/groovy/dh-loader.gradle @@ -484,7 +484,11 @@ if (isNotCommonProject) { "META-INF/neoforge.mods.toml", ] - def compatible_forgemc_versions = "${rootProject.compatible_minecraft_versions}".replaceAll("\"", "").replaceAll("]", ",)") + // incoming format: `["26.2.0","26.2-alpha.9"]` + // outgoing format: `[26.2.0],[26.2-alpha.9]` + def compatible_forgemc_versions = "${rootProject.compatible_minecraft_versions}" + .replaceAll("\",\"", "],[") + .replaceAll("\"", "") // Quilt contributors def quilt_contributors = [] diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java index 555fe4529..87de4c0c1 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -446,7 +446,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper #if MC_VER <= MC_26_1_2 - this.renderApi = EDhApiRenderApi.OPEN_GL; + this.renderApi = EDhApiRenderingApi.OPEN_GL; #else String backendName = RenderSystem .getDevice() diff --git a/versionProperties/26.1.2.properties b/versionProperties/26.1.2.properties index a01a5f1fc..7362e69f0 100644 --- a/versionProperties/26.1.2.properties +++ b/versionProperties/26.1.2.properties @@ -2,8 +2,7 @@ java_version=25 minecraft_version=26.1.2 parchment_version=1.21:2024.07.28 -# version range should be used instead of individual versions due to how NeoForge handles version loading -compatible_minecraft_versions=["26.1.0", "26.1.2"] +compatible_minecraft_versions=["26.1.0", "26.1.1", "26.1.2"] accessWidenerVersion=26_1 builds_for=fabric,neoforge # forge is broken due to gradle/build script issues @@ -48,7 +47,7 @@ fabric_api_version=0.149.1+26.1.2 # NeoForge loader forge_version= neoforge_version=15-beta - neoforge_version_range=[*,) +neoforge_version_range=[*,) # NeoForge mod versions neo_iris_version=1.10.9+26.1-neoforge diff --git a/versionProperties/26.2.0.properties b/versionProperties/26.2.0.properties index f5da4cb9b..82cac14e4 100644 --- a/versionProperties/26.2.0.properties +++ b/versionProperties/26.2.0.properties @@ -2,8 +2,6 @@ java_version=25 minecraft_version=26.2-snapshot-7 parchment_version=1.21:2024.07.28 -# version range should be used instead of individual versions due to how NeoForge handles version loading -# TODO this isn't currently a version range for fabric, it's just 2 versions compatible_minecraft_versions=["26.2.0","26.2-alpha.7"] accessWidenerVersion=26_1 builds_for=fabric @@ -19,43 +17,44 @@ lwjgl_version=3.4.1 # Fabric loader fabric_loader_version=0.18.5 fabric_api_version=0.149.0+26.2 -modmenu_version= -starlight_version_fabric= -phosphor_version_fabric= -lithium_version= -sodium_version= -iris_version= -bclib_version= -immersive_portals_version= -canvas_version= + modmenu_version= + starlight_version_fabric= + phosphor_version_fabric= + lithium_version= + sodium_version= + iris_version= + bclib_version= + immersive_portals_version= + canvas_version= + + # vertigo - prevents DH from seeing the full chunk, causing holes + fabric_incompatibility_list={ "vertigo": "*" } + fabric_recommend_list={} -fabric_incompatibility_list={ } -fabric_recommend_list={} - -# Fabric mod run -# 0 = Don't enable and don't run -# 1 = Can be referenced in code but doesn't run -# 2 = Can be referenced in code and runs in client -enable_mod_menu=0 -enable_starlight=0 -enable_phosphor=0 -enable_sodium=0 -enable_lithium=0 -enable_iris=0 -enable_bclib=0 -enable_immersive_portals=0 -enable_canvas=0 + # Fabric mod run + # 0 = Don't enable and don't run + # 1 = Can be referenced in code but doesn't run + # 2 = Can be referenced in code and runs in client + enable_mod_menu=0 + enable_starlight=0 + enable_phosphor=0 + enable_sodium=0 + enable_lithium=0 + enable_iris=0 + enable_bclib=0 + enable_immersive_portals=0 + enable_canvas=0 # NeoForge loader forge_version= neoforge_version=15-beta neoforge_version_range=[*,) -# NeoForge mod versions -neo_iris_version= - -# (Neo)Forge mod run -# 0 = Don't enable and don't run -# 1 = Can be referenced in code but doesn't run -# 2 = Can be referenced in code and runs in client -neo_enable_iris=0 + # NeoForge mod versions + neo_iris_version= + + # (Neo)Forge mod run + # 0 = Don't enable and don't run + # 1 = Can be referenced in code but doesn't run + # 2 = Can be referenced in code and runs in client + neo_enable_iris=0