From 155349a00cc4408bb45d0e0a0fc09305458f54bf Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 6 Jul 2022 20:03:07 -0700 Subject: [PATCH 01/14] dont run gradle tasks in parallel --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c4cea48ca..25ab57550 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,6 @@ org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemor org.gradle.vfs.watch=true kapt.use.worker.api=true kapt.include.compile.classpath=false -org.gradle.parallel=true +#org.gradle.parallel=true org.gradle.caching=true org.gradle.warning.mode=all From 6c8c4f0e01a2e4033da2cd2fada355e3c256e333 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 6 Jul 2022 22:55:40 -0700 Subject: [PATCH 02/14] remove suspect options --- gradle.properties | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 25ab57550..20a66e947 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,16 @@ terra.source=https://github.com/PolyhedralDev/Terra terra.issues=https://github.com/PolyhedralDev/Terra/issues terra.wiki=https://github.com/PolyhedralDev/Terra/wiki terra.license=MIT + # Gradle options org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -org.gradle.vfs.watch=true -kapt.use.worker.api=true -kapt.include.compile.classpath=false -#org.gradle.parallel=true -org.gradle.caching=true org.gradle.warning.mode=all + +# EVIL stuff that BREAKS THINGS, DO NOT USE! + +#org.gradle.vfs.watch=true +#kapt.use.worker.api=true +#kapt.include.compile.classpath=false +#org.gradle.parallel=true +#org.gradle.caching=true + From fa0fb3cd15e11c906371db94ec48cf55a80978fa Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 7 Jul 2022 07:03:17 -0700 Subject: [PATCH 03/14] specify exact arch loom version --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 28ca98ca0..6d0a1e2e0 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -34,7 +34,7 @@ object Versions { const val yarn = "$minecraft+build.1" const val fabricLoader = "0.14.2" - const val architecuryLoom = "0.12.0-SNAPSHOT" + const val architecuryLoom = "0.12.0.290" const val architecturyPlugin = "3.4-SNAPSHOT" const val loomQuiltflower = "1.7.1" From d63606a9b1a533d2979319e2822ac10c1ab9b61c Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 7 Jul 2022 09:10:14 -0700 Subject: [PATCH 04/14] maybe fix bukkit resource manifest building --- buildSrc/src/main/kotlin/DistributionConfig.kt | 8 +++++--- gradle.properties | 9 +-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index 56fe68ad7..e21181b4b 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -8,6 +8,7 @@ import java.nio.file.StandardCopyOption import org.gradle.api.DefaultTask import org.gradle.api.Project import org.gradle.api.plugins.BasePluginExtension +import org.gradle.kotlin.dsl.TaskContainerScope import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.extra @@ -88,8 +89,7 @@ fun Project.configureDistribution() { val jar = getJarTask().archiveFileName.get() resources.computeIfAbsent( if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap" - else "addons" - ) { ArrayList() }.add(jar) + else "addons") { ArrayList() }.add(jar) } val options = DumperOptions() @@ -106,7 +106,9 @@ fun Project.configureDistribution() { if (manifest.exists()) manifest.delete() manifest.createNewFile() - yaml.dump(resources, FileWriter(manifest)) + FileWriter(manifest).use { + yaml.dump(resources, it) + } } } diff --git a/gradle.properties b/gradle.properties index 20a66e947..f8c5c8cfa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,12 +8,5 @@ terra.license=MIT # Gradle options org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC org.gradle.warning.mode=all - -# EVIL stuff that BREAKS THINGS, DO NOT USE! - -#org.gradle.vfs.watch=true -#kapt.use.worker.api=true -#kapt.include.compile.classpath=false -#org.gradle.parallel=true -#org.gradle.caching=true +org.gradle.parallel=true From 59af552be2e19738d7b1b841848d55b0dba44c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB?= Date: Thu, 7 Jul 2022 12:33:15 -0700 Subject: [PATCH 05/14] fix bukkit --- buildSrc/src/main/kotlin/DistributionConfig.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index e21181b4b..c9d9877e5 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -109,10 +109,13 @@ fun Project.configureDistribution() { FileWriter(manifest).use { yaml.dump(resources, it) } + } } - tasks["processResources"].dependsOn(generateResourceManifest) + tasks.named("processResources") { + finalizedBy(generateResourceManifest) + } tasks.named("shadowJar") { From eb79a6f762aa36ff3933cf86089bdb7ba74c8ced Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 7 Jul 2022 18:49:33 -0700 Subject: [PATCH 06/14] create resources dir if not exist --- buildSrc/src/main/kotlin/DistributionConfig.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index c9d9877e5..4fe61781b 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -105,6 +105,7 @@ fun Project.configureDistribution() { val manifest = File("${project.buildDir}/resources/main/resources.yml") if (manifest.exists()) manifest.delete() + manifest.parentFile.mkdirs() manifest.createNewFile() FileWriter(manifest).use { yaml.dump(resources, it) From 7d056bd88c81af9c969270b6d7fbb3116dad406a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB?= Date: Thu, 7 Jul 2022 20:35:46 -0700 Subject: [PATCH 07/14] try fix packs --- buildSrc/src/main/kotlin/DistributionConfig.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index 4fe61781b..6c743e9e8 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -68,7 +68,6 @@ fun Project.configureDistribution() { val generateResourceManifest = tasks.create("generateResourceManifest") { group = "terra" - dependsOn(downloadDefaultPacks) doLast { val resources = HashMap>() val packsDir = File("${project.buildDir}/resources/main/packs/") @@ -115,6 +114,8 @@ fun Project.configureDistribution() { } tasks.named("processResources") { + generateResourceManifest.mustRunAfter(downloadDefaultPacks) + finalizedBy(downloadDefaultPacks) finalizedBy(generateResourceManifest) } From a175601424a1e7158ce8917a404a13c26a80ae18 Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 7 Jul 2022 23:27:20 -0700 Subject: [PATCH 08/14] disable parallel build --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f8c5c8cfa..76e5fa68b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,5 +8,5 @@ terra.license=MIT # Gradle options org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC org.gradle.warning.mode=all -org.gradle.parallel=true +#org.gradle.parallel=true From f8a602790a72c1ec14bf65f6ad5a565ed72b88cf Mon Sep 17 00:00:00 2001 From: Browsit <80560008+Browsit@users.noreply.github.com> Date: Wed, 20 Jul 2022 08:28:58 -0400 Subject: [PATCH 09/14] Update BUG_REPORT.md --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index d074cff47..e5c4b0d4a 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -43,7 +43,7 @@ assignees: "" is Terra that is causing the issue. - [ ] I have checked that this is an issue with Terra and not an issue with the pack I am using. - + - [ ] I have attached a copy of the `latest.log` file - [ ] I have filled out and provided all the appropriate information. From 43adf056c39cc4e49b2f2542f5bf794454915261 Mon Sep 17 00:00:00 2001 From: Browsit <80560008+Browsit@users.noreply.github.com> Date: Wed, 20 Jul 2022 22:27:22 -0400 Subject: [PATCH 10/14] Fix type mismatch Just pulled the master branch and got the error: `C:\Users\{owner}\IdeaProjects\Terra\buildSrc\src\main\kotlin\DistributionConfig.kt: (49, 39): Type mismatch: inferred type is Path! but URI! was expected` --- buildSrc/src/main/kotlin/DistributionConfig.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index 6c743e9e8..2cc7cab02 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -44,7 +44,7 @@ fun Project.configureDistribution() { doLast { // https://github.com/johnrengelman/shadow/issues/111 - val dest = tasks.named("shadowJar").get().archiveFile.get().asFile.toPath() + val dest = tasks.named("shadowJar").get().archiveFile.get().asFile.toURI() FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs -> forSubProjects(":common:addons") { From 829696ccc82dabf7e4da33c47c844af089ed4852 Mon Sep 17 00:00:00 2001 From: Browsit <80560008+Browsit@users.noreply.github.com> Date: Thu, 21 Jul 2022 02:35:38 -0400 Subject: [PATCH 11/14] Use jar URI prefix Fixes `Path component should be '/'` on Windows --- buildSrc/src/main/kotlin/DistributionConfig.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index 2cc7cab02..24750233f 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -1,6 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import java.io.File import java.io.FileWriter +import java.net.URI import java.net.URL import java.nio.file.FileSystems import java.nio.file.Files @@ -44,7 +45,7 @@ fun Project.configureDistribution() { doLast { // https://github.com/johnrengelman/shadow/issues/111 - val dest = tasks.named("shadowJar").get().archiveFile.get().asFile.toURI() + val dest = URI.create("jar:" + tasks.named("shadowJar").get().archiveFile.get().asFile.toURI()) FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs -> forSubProjects(":common:addons") { From befc0c66368c6e4d140d7036901fa0f0a28543a0 Mon Sep 17 00:00:00 2001 From: solonovamax Date: Tue, 6 Sep 2022 10:15:01 -0400 Subject: [PATCH 12/14] Fix an oopsie in the code of conduct with weird list formatting --- CODE_OF_CONDUCT.md | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d0f7e32c0..f6c1d9b1f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -318,8 +318,7 @@ members: - discord: [@solonovamax#6983](https://discord.com/channels/@me/566146322273402881)* - github: [@solonovamax](https://github.com/solonovamax) - - - email: [solonovamax@12oclockpoint.com](mailto:solonovamax@12oclockpoint.com) + - email: [solonovamax@12oclockpoint.com](mailto:solonovamax@12oclockpoint.com) - dfsek - discord: [@dfsek#4208](https://discord.com/channels/@me/378350362236682240)* @@ -401,32 +400,27 @@ issue on this github repo, or contact a member of the global moderation team. ## License and Attribution This set of guidelines is distributed under a -[Creative Commons Attribution-ShareAlike license](https://creativecommons.org/licenses/by-sa/3.0/) -. +[Creative Commons Attribution-ShareAlike license](https://creativecommons.org/licenses/by-sa/3.0/). These guidelines have been adapted from -[Mozilla's Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/) -, which were adapted from: +[Mozilla's Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/), +which were adapted from: - Mozilla's original Community Participation Guidelines - The [Ubuntu Code of Conduct](https://ubuntu.com/community/code-of-conduct) -- +- Mozilla's [View Source Conference Code of Conduct](https://viewsourceconf.org/berlin-2016/code-of-conduct/) +- The [Rust Language Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct) -Mozilla's [View Source Conference Code of Conduct](https://viewsourceconf.org/berlin-2016/code-of-conduct/) +which in turn were based on +[Stumptown Syndicate's Citizen Code of Conduct](http://citizencodeofconduct.org/), +along with some adapted text from the +[LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html) +and the +[WisCon code of conduct](http://wiscon.net/policies/anti-harassment/code-of-conduct/). -- And - the [Rust Language Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct) - -which in turn were based -on [Stumptown Syndicate's Citizen Code of Conduct](http://citizencodeofconduct.org/) -, along with some adapted text from -the [LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html) and -the [WisCon code of conduct](http://wiscon.net/policies/anti-harassment/code-of-conduct/) -. - -It was then modified by solonovamax with various inclusions from -the [LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html) and -a few other sources. +It was then modified by solonovamax with various inclusions from the +[LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html) +and several other sources. ## Notes @@ -443,7 +437,6 @@ people are not comfortable using [neopronouns](https://www.mypronouns.org/neopronouns). But if someone refuses to use your more common pronouns, you should report them to us. Additionally, you may not ask people to use unreasonable pronouns, such as ' -acab/acabself', 'that/bitch', 'ur/mom', or -'dream/dreamself' (pronouns related to real people, eg. the minecraft youtuber ' -dreamwastaken'). Doing so will be considered mockery of individuals who use +acab/acabself', 'that/bitch', 'ur/mom', or anything else that may be considered +disrectful. Doing so will be considered mockery of individuals who use non-standard pronouns and is very disrespectful. \ No newline at end of file From f1290b36d804320dfd2c95b2215d372779b019cf Mon Sep 17 00:00:00 2001 From: solonovamax Date: Tue, 6 Sep 2022 10:40:43 -0400 Subject: [PATCH 13/14] Fix more weird list formatting in code of conduct --- CODE_OF_CONDUCT.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f6c1d9b1f..583baa61b 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -315,18 +315,15 @@ Terra has a global moderation team which is currently comprised of the following members: - solonovamax - - - discord: [@solonovamax#6983](https://discord.com/channels/@me/566146322273402881)* + - discord: [@solonovamax#6983](https://discord.com/channels/@me/566146322273402881)* - github: [@solonovamax](https://github.com/solonovamax) - email: [solonovamax@12oclockpoint.com](mailto:solonovamax@12oclockpoint.com) - dfsek - - - discord: [@dfsek#4208](https://discord.com/channels/@me/378350362236682240)* + - discord: [@dfsek#4208](https://discord.com/channels/@me/378350362236682240)* - github: [@dfsek](https://github.com/dfsek) - email: [dfsek@protonmail.com](mailto:dfsek@protonmail.com) - duplex (duplexsystem) - - - discord: [@Duplex#0797](https://discord.com/channels/@me/356822848641171456)* + - discord: [@Duplex#0797](https://discord.com/channels/@me/356822848641171456)* - github: [@duplexsystem](https://github.com/duplexsystem) - email: [duplexsys@protonmail.com](mailto:duplexsys@protonmail.com) From e8fa5514cca97411cf8a1cd657d19b4703b85311 Mon Sep 17 00:00:00 2001 From: solonovamax Date: Tue, 6 Sep 2022 10:42:05 -0400 Subject: [PATCH 14/14] Clean up language in code of conduct's license & attribution section --- CODE_OF_CONDUCT.md | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 583baa61b..98ac590d7 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -399,25 +399,15 @@ issue on this github repo, or contact a member of the global moderation team. This set of guidelines is distributed under a [Creative Commons Attribution-ShareAlike license](https://creativecommons.org/licenses/by-sa/3.0/). -These guidelines have been adapted from -[Mozilla's Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/), -which were adapted from: +These guidelines have been adapted with modifications from the following sources: -- Mozilla's original Community Participation Guidelines +- [Mozilla's Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/) - The [Ubuntu Code of Conduct](https://ubuntu.com/community/code-of-conduct) - Mozilla's [View Source Conference Code of Conduct](https://viewsourceconf.org/berlin-2016/code-of-conduct/) - The [Rust Language Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct) - -which in turn were based on -[Stumptown Syndicate's Citizen Code of Conduct](http://citizencodeofconduct.org/), -along with some adapted text from the -[LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html) -and the -[WisCon code of conduct](http://wiscon.net/policies/anti-harassment/code-of-conduct/). - -It was then modified by solonovamax with various inclusions from the -[LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html) -and several other sources. +- The [Stumptown Syndicate's Citizen Code of Conduct](http://citizencodeofconduct.org/) +- The [LGBTQ in Technology Code of Conduct](https://lgbtq.technology/coc.html) +- The [WisCon code of conduct](http://wiscon.net/policies/anti-harassment/code-of-conduct/) ## Notes