From 9f3de07bd857ddf9265cf3c91178787dd4ec686e Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 18 Jun 2024 07:12:01 -0500 Subject: [PATCH 1/8] Increase default world gen timeout to 3 minutes (from 60 sec) --- .../wrappers/worldGeneration/BatchGenerationEnvironment.java | 2 +- coreSubProjects | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index a3cf7bc3e..b7a46b875 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -346,7 +346,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } else if (event.hasTimeout(Config.Client.Advanced.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get(), TimeUnit.SECONDS)) { - EVENT_LOGGER.error("Batching World Generator: " + event + " timed out and terminated!"); + EVENT_LOGGER.error("Batching World Generator: " + event + " timed out and terminated! Please lower your CPU load."); EVENT_LOGGER.info("Dump PrefEvent: " + event.timer); try { diff --git a/coreSubProjects b/coreSubProjects index 7f50de17c..0d16c037f 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 7f50de17c03a0e0cf4ac25fb1de62129adfdbab1 +Subproject commit 0d16c037f50e3e03d4f54ca1046e6f34c96d48a5 From 99c713967b48db39be1bbc37d4b008611b677f53 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 22 Jun 2024 16:21:19 -0500 Subject: [PATCH 2/8] Temporary spongepowered.vanillagradle fix/workaround --- common/build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/build.gradle b/common/build.gradle index b6df3a307..72e64e14d 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,4 +1,13 @@ +// temporary fix for broken spongepowered version +buildscript { + configurations.configureEach { + resolutionStrategy { + force 'org.spongepowered:vanillagradle:0.2.1-20240507.024226-82' + } + } +} + plugins { id "org.spongepowered.gradle.vanilla" version "0.2.1-SNAPSHOT" } From 62fb5ffb73c92cb2e8ab20f37a7ddebc2db8d6ba Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 23 Jun 2024 08:36:48 -0500 Subject: [PATCH 3/8] Add DB file lock checking --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 0d16c037f..30dda058f 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 0d16c037f50e3e03d4f54ca1046e6f34c96d48a5 +Subproject commit 30dda058febd0c56400118e9baa5150279f235a2 From b57ea416866632a92ef83a348aa338ebadf7afe0 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 23 Jun 2024 08:52:55 -0500 Subject: [PATCH 4/8] neoforge build script cleanup --- build.gradle | 25 +++++++++-------- neoforge/build.gradle | 62 +++++++++++++------------------------------ 2 files changed, 32 insertions(+), 55 deletions(-) diff --git a/build.gradle b/build.gradle index a59d9a744..bf8b33c82 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ def writeBuildGradlePredefine(List mcVers, int mcIndex) // Transfers the values set in settings.gradle to the rest of the project project.gradle.ext.getProperties().each { prop -> rootProject.ext.set(prop.key, prop.value) -// println "Added prop [key:" + prop.key + ", value:" + prop.value + "]" + //println "Added prop [key:" + prop.key + ", value:" + prop.value + "]" } // Sets up manifold stuff writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex) @@ -106,11 +106,12 @@ subprojects { p -> apply plugin: "systems.manifold.manifold-gradle-plugin" // Apply forge's loom - if ( - (findProject(":forge") && p == project(":forge")) || - (findProject(":neoforge") && p == project(":neoforge")) - ) - apply plugin: "dev.architectury.loom" + if ((findProject(":forge") && p == project(":forge")) || + (findProject(":neoforge") && p == project(":neoforge")) + ) + { + apply plugin: "dev.architectury.loom" + } // Set the manifold version (may not be required tough) @@ -521,15 +522,17 @@ allprojects { p -> } } - // Required for ModMenu - maven { url "https://maven.terraformersmc.com/" } - - // Required for Mixins & VanillaGradle + // VanillaGradle and Mixins in common maven { url "https://repo.spongepowered.org/maven/" } - // Required for Canvas (mod) + // Canvas mod maven { url "https://maven.vram.io/" } + // ModMenu mod + maven { url "https://maven.terraformersmc.com/" } + // neoforge + maven { url "https://maven.neoforged.net/releases/" } + // These 3 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource flatDir { dirs "${rootDir}/mods/fabric" diff --git a/neoforge/build.gradle b/neoforge/build.gradle index f5ab276fd..04da288d0 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -11,43 +11,19 @@ architectury { neoForge() } -// TODO this is already defined in the main settings.gradle file, why doesn't it work unless also defined here? (If compiling does work without this block feel free to remove) -repositories { - maven { - name "Neoforge" - url "https://maven.neoforged.net/releases/" - } -} - -//loom { -// forge { -// convertAccessWideners.set(true) -// extraAccessWideners.add("lod.accesswidener") -// mixinConfigs("DistantHorizons.mixins.json") -// } -//} - loom { silentMojangMappingsLicense() // Shut the licencing warning accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener") neoForge { - // Access wideners are now defined in the `remapJar.atAccessWideners` -// convertAccessWideners = true -// extraAccessWideners.add loom.accessWidenerPath.get().asFile.name + // Access wideners are defined in the `remapJar.atAccessWideners` - // Mixins are now defined in the `mods.toml` -// mixinConfigs = [ -// "DistantHorizons.mixins.json" -// ] + // Mixins are defined in the `mods.toml` } mixin { - // Mixins are now defined in the `mods.toml` -// mixinConfigs = [ -// "DistantHorizons.mixins.json" -// ] + // Mixins are defined in the `mods.toml` } - + // "runs" isn't required, but when we do need it then it can be useful runs { client { @@ -55,7 +31,7 @@ loom { setConfigName("NeoForge Client") ideConfigGenerated(true) runDir("../run") -// vmArgs("-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg) + //vmArgs("-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg) } server { server() @@ -66,13 +42,7 @@ loom { } } -remapJar { - inputFile = shadowJar.archiveFile - dependsOn shadowJar -// classifier null - atAccessWideners.add("distanthorizons.accesswidener") -} def addMod(path, enabled) { if (enabled == "2") @@ -80,21 +50,24 @@ def addMod(path, enabled) { else if (enabled == "1") dependencies { modCompileOnly(path) } } - dependencies { minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" - mappings loom.layered() { + mappings loom.layered() + { // Mojmap mappings officialMojangMappings() // Parchment mappings (it adds parameter mappings & javadoc) parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip") } - + + // Neoforge neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}" addMod("curse.maven:TerraFirmaCraft-302973:4616004", rootProject.enable_terrafirmacraft) } + + task deleteResources(type: Delete) { delete file("build/resources/main") } @@ -113,14 +86,15 @@ tasks.named('runClient') { finalizedBy(deleteResources) } +remapJar { + inputFile = shadowJar.archiveFile + dependsOn shadowJar + + atAccessWideners.add("distanthorizons.accesswidener") +} + sourcesJar { def commonSources = project(":common").sourcesJar dependsOn commonSources from commonSources.archiveFile.map { zipTree(it) } } - -//components.java { -// withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { -// skip() -// } -//} From a23211d06109c36f2f428ad3bcd6333b9cdd7ef7 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 24 Jun 2024 20:52:14 -0500 Subject: [PATCH 5/8] Fix NeoForge not running --- build.gradle | 8 +++++--- .../META-INF/{NeoForge.mods.toml => neoforge.mods.toml} | 0 2 files changed, 5 insertions(+), 3 deletions(-) rename neoforge/src/main/resources/META-INF/{NeoForge.mods.toml => neoforge.mods.toml} (100%) diff --git a/build.gradle b/build.gradle index bf8b33c82..fb9650a7d 100644 --- a/build.gradle +++ b/build.gradle @@ -431,9 +431,11 @@ subprojects { p -> jar { from "LICENSE.txt" manifest { - attributes 'Implementation-Title': rootProject.mod_name, - 'Implementation-Version': rootProject.mod_version, - 'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain' // When changing the main of the jar change this line + attributes( + 'Implementation-Title': rootProject.mod_name, + 'Implementation-Version': rootProject.mod_version, + 'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain' // When changing the main of the jar change this line + ) } } diff --git a/neoforge/src/main/resources/META-INF/NeoForge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from neoforge/src/main/resources/META-INF/NeoForge.mods.toml rename to neoforge/src/main/resources/META-INF/neoforge.mods.toml From 095fff96ff360513ae486764ec5942f778b50300 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 24 Jun 2024 20:53:45 -0500 Subject: [PATCH 6/8] Up version 2.1.1-dev -> 2.1.2 --- coreSubProjects | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreSubProjects b/coreSubProjects index 30dda058f..28e1eaae7 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 30dda058febd0c56400118e9baa5150279f235a2 +Subproject commit 28e1eaae77547a47efb33b809ec022c9b7640eb0 diff --git a/gradle.properties b/gradle.properties index 6da075fb9..43c0bb48c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.caching=true # Mod Info mod_name=DistantHorizons -mod_version=2.1.1-a-dev +mod_version=2.1.2-a api_version=2.1.0 maven_group=com.seibel.distanthorizons mod_readable_name=Distant Horizons From a4501f86e93d84e41622230744b254fedc607209 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 25 Jun 2024 19:24:13 -0500 Subject: [PATCH 7/8] Update coreSubProjects --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 28e1eaae7..71ffbfb7b 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 28e1eaae77547a47efb33b809ec022c9b7640eb0 +Subproject commit 71ffbfb7b98ea12c75190bb01ba8a79de88149a3 From f3a8afeee31df94ee7f5e4da7dd819f82fd51857 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 25 Jun 2024 19:25:35 -0500 Subject: [PATCH 8/8] Up version 2.1.2 -> 2.1.3-dev --- coreSubProjects | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coreSubProjects b/coreSubProjects index 71ffbfb7b..321afa2a9 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 71ffbfb7b98ea12c75190bb01ba8a79de88149a3 +Subproject commit 321afa2a9ee8cdaa8da8ff8b21d5120d7ab5e08d diff --git a/gradle.properties b/gradle.properties index 43c0bb48c..ece9015a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.caching=true # Mod Info mod_name=DistantHorizons -mod_version=2.1.2-a +mod_version=2.1.3-a-dev api_version=2.1.0 maven_group=com.seibel.distanthorizons mod_readable_name=Distant Horizons