Merge pull request #251 from PolyhedralDev/dev/refactors-6.0

Grable

build.gradle.kts

@@ -1,4 +1,4 @@
-import com.dfsek.terra.getGitHash
+import com.dfsek.terra.*
 
 val versionObj = Version("6", "0", "0", true)
 
@@ -6,10 +6,15 @@ allprojects {
     version = versionObj
     group = "com.dfsek.terra"
 
+    configureDependencies()
+    configureCompilation()
+    configurePublishing()
+
     tasks.withType<JavaCompile>().configureEach {
         options.isFork = true
         options.isIncremental = true
     }
+
     tasks.withType<Test>().configureEach {
         useJUnitPlatform()
 
@@ -21,8 +26,14 @@ allprojects {
         reports.html.isEnabled = false
         reports.junitXml.isEnabled = false
     }
-
 }
+
+afterEvaluate {
+    project(":platforms").subprojects.forEach { // Platform projects are where distribution happens
+        it.configureDistribution()
+    }
+}
+
 /**
  * Version class that does version stuff.
  */

buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt

@@ -3,14 +3,6 @@ package com.dfsek.terra
 import org.gradle.api.Project
 import java.io.ByteArrayOutputStream
 
-fun Project.configureCommon() {
-    configureDependencies()
-    configureCompilation()
-    configureDistribution()
-
-    version = rootProject.version
-}
-
 fun Project.getGitHash(): String {
     val stdout = ByteArrayOutputStream()
     exec {

buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt

@@ -11,6 +11,8 @@ import org.gradle.language.jvm.tasks.ProcessResources
 
 fun Project.configureCompilation() {
     apply(plugin = "maven-publish")
+    apply(plugin = "java")
+    apply(plugin = "java-library")
     apply(plugin = "idea")
 
     configure<JavaPluginConvention> {

buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt

@@ -1,10 +1,7 @@
 package com.dfsek.terra
 
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.*
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.invoke
-import org.gradle.kotlin.dsl.repositories
 
 fun Project.configureDependencies() {
     apply(plugin = "java")
@@ -34,5 +31,15 @@ fun Project.configureDependencies() {
         "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0")
         "testImplementation"("org.junit.jupiter:junit-jupiter-engine:5.7.0")
         "compileOnly"("org.jetbrains:annotations:20.1.0")
+
+        "compileOnly"("com.google.guava:guava:30.0-jre")
+        "testImplementation"("com.google.guava:guava:30.0-jre")
+    }
+
+    if (project(":common:addons").subprojects.contains(this)) { // If this is an addon project, depend on the API.
+        dependencies {
+            "compileOnly"(project(":common:api"))
+            "testImplementation"(project(":common:api"))
+        }
     }
 }

buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt

@@ -20,7 +20,6 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
 fun Project.configureDistribution() {
-    apply(plugin = "java-library")
     apply(plugin = "com.github.johnrengelman.shadow")
 
     val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {

buildSrc/src/main/kotlin/com/dfsek/terra/PublishingConfig.kt

@@ -0,0 +1,33 @@
+package com.dfsek.terra
+
+import org.gradle.api.Project
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.*
+
+fun Project.configurePublishing() {
+    configure<PublishingExtension> {
+        publications {
+            create<MavenPublication>("mavenJava") {
+                artifact(tasks["sourcesJar"])
+                artifact(tasks["jar"])
+            }
+        }
+
+        repositories {
+            val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
+            //val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
+
+            maven(mavenUrl) {
+                val mavenUsername: String? by project
+                val mavenPassword: String? by project
+                if (mavenUsername != null && mavenPassword != null) {
+                    credentials {
+                        username = mavenUsername
+                        password = mavenPassword
+                    }
+                }
+            }
+        }
+    }
+}

common/addons/api-features/README.md

@@ -0,0 +1,8 @@
+# api-features
+Contains the API for feature generation.
+
+This API implemented in:
+ * `config-feature`
+ * `generation-stage-feature`
+ * `config-locators`
+ * `config-distributors`

common/addons/api-features/build.gradle.kts

@@ -0,0 +1,2 @@
+dependencies {
+}

common/addons/biome-provider-image/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/biome-provider-pipeline/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/biome-provider-single/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/chunk-generator-noise-3d/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-biome/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-carver/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-distributors/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-feature/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-flora/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-locators/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-noise-function/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-ore/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-palette/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/config-structure/build.gradle.kts

@@ -1,50 +1,3 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-
-
-
     "shadedApi"("com.googlecode.json-simple:json-simple:1.1.1")
-
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/generation-stage-feature/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/generation-stage-flora/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/generation-stage-structure/build.gradle.kts

@@ -1,45 +1,2 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/language-yaml/build.gradle.kts

@@ -1,45 +1,3 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
+    "shadedImplementation"("com.dfsek.tectonic:yaml:2.1.2")
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/addons/structure-terrascript-loader/build.gradle.kts

@@ -1,50 +1,3 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
-    "shadedApi"(project(":common:api"))
-
-
     "shadedApi"("commons-io:commons-io:2.6")
-
-
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/api/build.gradle.kts

@@ -1,27 +1,8 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
     "shadedApi"("com.dfsek:Paralithic:0.4.0")
 
     "shadedApi"("com.dfsek.tectonic:common:2.1.2")
-    "shadedApi"("com.dfsek.tectonic:yaml:2.1.2")
 
     "shadedApi"("net.jafama:jafama:2.3.2")
-
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
 

common/implementation/build.gradle.kts

@@ -1,17 +1,3 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
     "shadedApi"(project(":common:api"))
     "shadedApi"(project(":common:loader:config"))
@@ -21,35 +7,8 @@ dependencies {
     "shadedApi"("commons-io:commons-io:2.6")
     "shadedImplementation"("org.apache.commons:commons-text:1.9")
 
+    "shadedImplementation"("com.dfsek.tectonic:yaml:2.1.2")
+
     "shadedImplementation"("org.yaml:snakeyaml:1.27")
     "shadedImplementation"("org.ow2.asm:asm:9.0")
-
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/loader/addon/build.gradle.kts

@@ -1,45 +1,3 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
     "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

common/loader/config/build.gradle.kts

@@ -1,45 +1,3 @@
-import com.dfsek.terra.configureCompilation
-import com.dfsek.terra.configureDependencies
-
-plugins {
-    `java-library`
-    `maven-publish`
-    idea
-}
-
-configureCompilation()
-configureDependencies()
-
-group = "com.dfsek.terra.common"
-
 dependencies {
     "shadedApi"(project(":common:api"))
-    "compileOnly"("com.google.guava:guava:30.0-jre")
-
-    "testImplementation"("com.google.guava:guava:30.0-jre")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-        val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 org.gradle.jvmargs=-Xmx4096m

platforms/bukkit/build.gradle.kts

@@ -1,4 +1,3 @@
-import com.dfsek.terra.configureCommon
 import com.dfsek.terra.gitClone
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.net.URL
@@ -6,13 +5,6 @@ import java.nio.channels.Channels
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 
-plugins {
-    `java-library`
-    `maven-publish`
-}
-configureCommon()
-
-group = "com.dfsek.terra.bukkit"
 
 val mcVersion = "1.17"
 val testDir = "target/server"
@@ -183,27 +175,3 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
     relocate("com.google.common", "com.dfsek.terra.lib.google.common")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

platforms/fabric/build.gradle.kts

@@ -1,18 +1,14 @@
 import com.dfsek.terra.addonDir
-import com.dfsek.terra.configureCommon
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.modrinth.minotaur.TaskModrinthUpload
 import net.fabricmc.loom.LoomGradleExtension
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    `java-library`
-    `maven-publish`
     id("fabric-loom").version("0.8-SNAPSHOT")
     id("com.modrinth.minotaur").version("1.1.0")
 }
 
-configureCommon()
 addonDir(project.rootProject.file("./run/config/Terra/addons"), tasks.named("runClient").get())
 addonDir(project.rootProject.file("./run/config/Terra/addons"), tasks.named("runServer").get())
 
@@ -21,7 +17,6 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("org.yaml", "com.dfsek.terra.lib.yaml")
 }
 
-group = "com.dfsek.terra.fabric"
 
 dependencies {
     "shadedApi"(project(":common:implementation"))
@@ -73,27 +68,3 @@ tasks.register<TaskModrinthUpload>("publishModrinthFabric") {
     addGameVersion("1.16.5")
     addLoader("fabric")
 }
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            artifact(tasks["sourcesJar"])
-            artifact(tasks["jar"])
-        }
-    }
-
-    repositories {
-        val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-
-        maven(mavenUrl) {
-            val mavenUsername: String? by project
-            val mavenPassword: String? by project
-            if (mavenUsername != null && mavenPassword != null) {
-                credentials {
-                    username = mavenUsername
-                    password = mavenPassword
-                }
-            }
-        }
-    }
-}

platforms/forge/build.gradle.kts.old

@@ -24,13 +24,11 @@ configure<org.spongepowered.asm.gradle.plugins.MixinExtension> {
 }
 
 plugins {
-    java
     id("com.modrinth.minotaur").version("1.1.0")
 }
 
 configureCommon()
 
-group = "com.dfsek.terra.forge"
 
 repositories {
     maven { url = uri("https://files.minecraftforge.net/maven") }

platforms/region/build.gradle.kts.old

@@ -1,13 +1,8 @@
 import com.dfsek.terra.configureCommon
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
-plugins {
-    `java-library`
-}
-
 configureCommon()
 
-group = "com.dfsek.terra"
 
 repositories {
     mavenCentral()

platforms/sponge/build.gradle.kts.old

@@ -1,13 +1,11 @@
 import com.dfsek.terra.configureCommon
 
 plugins {
-    java
     id("org.spongepowered.plugin").version("0.9.0")
 }
 
 configureCommon()
 
-group = "com.dfsek.terra"
 
 repositories {
     mavenCentral()