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. diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d0f7e32c0..98ac590d7 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -315,19 +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) + - 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) @@ -401,32 +397,17 @@ 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: +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/) - -- 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. +- 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) +- 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 @@ -443,7 +424,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 diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index 56fe68ad7..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 @@ -8,6 +9,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 @@ -43,7 +45,7 @@ fun Project.configureDistribution() { doLast { // https://github.com/johnrengelman/shadow/issues/111 - val dest = tasks.named("shadowJar").get().archiveFile.get().asFile.toPath() + 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") { @@ -67,7 +69,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/") @@ -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() @@ -105,12 +105,20 @@ fun Project.configureDistribution() { val manifest = File("${project.buildDir}/resources/main/resources.yml") if (manifest.exists()) manifest.delete() + manifest.parentFile.mkdirs() manifest.createNewFile() - yaml.dump(resources, FileWriter(manifest)) + FileWriter(manifest).use { + yaml.dump(resources, it) + } + } } - tasks["processResources"].dependsOn(generateResourceManifest) + tasks.named("processResources") { + generateResourceManifest.mustRunAfter(downloadDefaultPacks) + finalizedBy(downloadDefaultPacks) + finalizedBy(generateResourceManifest) + } tasks.named("shadowJar") { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 80fd1c961..09b2244af 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" diff --git a/gradle.properties b/gradle.properties index c4cea48ca..76e5fa68b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,9 @@ 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 +#org.gradle.parallel=true +