From 21dc0f13c91a0cb5a7f0a0a142b6e4473ddcc485 Mon Sep 17 00:00:00 2001 From: Ran-Mewo <43445785+Ran-Mewo@users.noreply.github.com> Date: Tue, 31 Mar 2026 00:22:13 +1100 Subject: [PATCH] JVM Args & Don't use mappings on 26.1+ --- buildSrc/src/main/groovy/dh-loader.gradle | 28 ++++++++++++++++++++--- versionProperties/1.26.1.properties | 9 ++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/groovy/dh-loader.gradle b/buildSrc/src/main/groovy/dh-loader.gradle index 02aad4ffa..e6b7a0087 100644 --- a/buildSrc/src/main/groovy/dh-loader.gradle +++ b/buildSrc/src/main/groovy/dh-loader.gradle @@ -126,9 +126,11 @@ if (isNotCommonProject) { unimined.minecraft(sourceSets.main, true) { version gradle.ext.minecraft_version - mappings { - mojmap() - //devNamespace "mojmap" + if (gradle.ext.minecraft_version.startsWith("1.")) { // 26.1+ doesn't use obfuscation + mappings { + mojmap() + devNamespace "mojmap" + } } } @@ -347,6 +349,26 @@ if (isNotCommonProject) { !file.path.contains("common${File.separator}build") && !(shadowedPaths.contains(file.path) && !loaderPaths.contains(file.path)) } + + // Shared run directory so all loaders use the same worlds + def isClient = runTask.name.toLowerCase().contains("client") + runTask.workingDir = rootProject.file("run/${isClient ? 'client' : 'server'}") + + // JVM args + runTask.jvmArgs( + "-Dio.netty.leakDetection.level=advanced", + "-XX:+UseZGC", + "-XX:+ZGenerational", + ) + if (isClient) { + runTask.jvmArgs( + "-Dminecraft.api.auth.host=https://nope.invalid", + "-Dminecraft.api.account.host=https://nope.invalid", + "-Dminecraft.api.session.host=https://nope.invalid", + "-Dminecraft.api.services.host=https://nope.invalid", + ) + runTask.args("--username", "Dev", "--renderDebugLabels", "--tracy") + } } } } diff --git a/versionProperties/1.26.1.properties b/versionProperties/1.26.1.properties index 7e8aa8304..a5587f8be 100644 --- a/versionProperties/1.26.1.properties +++ b/versionProperties/1.26.1.properties @@ -4,8 +4,7 @@ minecraft_version=26.1 parchment_version=1.21:2024.07.28 compatible_minecraft_versions=["26.1"] accessWidenerVersion=1_21_11 -builds_for= -#fabric,neoforge +builds_for=fabric,neoforge # forge is broken due to gradle/build script issues # Netty @@ -34,7 +33,7 @@ fabric_recommend_list={} # 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=2 +enable_mod_menu=0 enable_starlight=0 enable_phosphor=0 enable_sodium=1 @@ -46,7 +45,7 @@ enable_canvas=0 # NeoForge loader forge_version= -neoforge_version=26.1.0.1-beta +neoforge_version=1-beta neoforge_version_range=[*,) # NeoForge mod versions @@ -56,4 +55,4 @@ neo_iris_version= # 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 \ No newline at end of file +neo_enable_iris=0