Merge pull request #372 from Polyfrost/dgt-port

Port to Deftu's Gradle Toolkit, replace UniversalCraft with OmniCore, add support for new versions

Author: Wyvest

.github/workflows/build.yml

@@ -47,10 +47,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: |
-            8
-            16
-            17
+          java-version: 21
           distribution: temurin
 
       - name: Setup Gradle

build.gradle.kts

@@ -1,52 +1,31 @@
-import org.quiltmc.gradle.licenser.extension.QuiltLicenserGradleExtension
-
 plugins {
-    alias(libs.plugins.kotlin) apply false
-    alias(libs.plugins.pgt.defaults.repo) apply false
-    alias(libs.plugins.licenser) apply false
+    alias(libs.plugins.kotlin) apply(false)
+    alias(libs.plugins.licenser) apply(false)
     alias(libs.plugins.jetbrains.idea.ext)
-}
 
-val major = project.properties["version_major"]
-val minor = project.properties["version_minor"]
-val patch = project.properties["version_patch"]
+    alias(libs.plugins.dgt.base) apply(false)
+}
 
-version = "$major.$minor.$patch"
-group = properties["group"] as String
+// Note for future devs: DON'T apply the java-library plugin to subprojects here.
+// This will cause loom to completely break apart and throw itself into oblivion.
+// I have no idea how to fix it, and honestly, I don't want to know.
 
 subprojects {
-    version = rootProject.version
-    group = "${rootProject.group}.${rootProject.properties["mod_id"] as String}"
-
-    apply(plugin = rootProject.libs.plugins.licenser.get().pluginId)
-    // Note for future devs: DON'T apply the java-library plugin to subprojects here.
-    // This will cause loom to completely break apart and throw itself into oblivion.
-    // I have no idea how to fix it, and honestly, I don't want to know.
-    apply(plugin = "maven-publish")
-    apply(plugin = "signing")
-
-    afterEvaluate { // ew.
-        if (project.pluginManager.hasPlugin("java")) {
-            configure<JavaPluginExtension> {
-                withSourcesJar()
-            }
-        }
-    }
-
-//    configure<QuiltLicenserGradleExtension> {
-//        rule("${rootProject.rootDir}/FILEHEADER")
-//        include("**/*.kt")
-//        include("**/*.java")
-//    }
-
-    configure<PublishingExtension> {
-        repositories {
-            arrayOf("releases", "snapshots", "private").forEach { type ->
-                maven {
-                    name = type
-                    url = uri("https://repo.polyfrost.org/$type")
-                    credentials(PasswordCredentials::class)
-                    authentication { create<BasicAuthentication>("basic") }
+    pluginManager.withPlugin("java") {
+        apply(plugin = rootProject.libs.plugins.licenser.get().pluginId)
+        apply(plugin = rootProject.libs.plugins.dgt.base.get().pluginId)
+        apply(plugin = rootProject.libs.plugins.dgt.publishing.maven.get().pluginId)
+        apply(plugin = "signing")
+
+        configure<PublishingExtension> {
+            repositories {
+                arrayOf("releases", "snapshots", "private").forEach { type ->
+                    maven {
+                        name = type
+                        url = uri("https://repo.polyfrost.org/$type")
+                        credentials(PasswordCredentials::class)
+                        authentication { create<BasicAuthentication>("basic") }
+                    }
                 }
             }
         }

buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt

@@ -23,6 +23,7 @@ fun Project.provideIncludedDependencies(version: Triple<Int, Int, Int>?, loader:
     deps.addAll(libs.findBundle("nightconfig").get().get())
     deps.add(libs.findLibrary("snakeyaml").get().get())
     deps.add(libs.findLibrary("isolated-lwjgl3-loader").get().get())
+    deps.add(libs.findLibrary("textile").get().get())
     deps.add(libs.findLibrary("polyio").get().get())
     val copycat = libs.findLibrary("copycat").get().get()
     deps.add(copycat)
@@ -47,6 +48,7 @@ fun Project.provideIncludedDependencies(version: Triple<Int, Int, Int>?, loader:
             in 16..18 -> "3.2.2"
             19 -> "3.3.1"
             20 -> "3.3.2"
+            21 -> "3.3.3"
             else -> error("Unsupported Minecraft version: ${version.toMCVer()}")
         }
 
@@ -75,7 +77,8 @@ fun Project.provideIncludedDependencies(version: Triple<Int, Int, Int>?, loader:
         actualDeps.add(OCDependency(dep))
     }
     if (version != null) {
-        actualDeps.add(OCDependency("org.polyfrost:universalcraft-${version.toMCVer()}-$loader:${libs.findVersion("universalcraft").get().displayName}", true))
+        actualDeps.add(OCDependency("dev.deftu:textile-${version.toMCVer()}-$loader:${libs.findVersion("textile").get().displayName}", true))
+        actualDeps.add(OCDependency("dev.deftu:omnicore-${version.toMCVer()}-$loader:${libs.findVersion("omnicore").get().displayName}", true))
     }
     return actualDeps
 }

gradle.properties

@@ -1,21 +1,15 @@
-group=org.polyfrost
-name=OneConfig
-mod_id=oneconfig
-version_major=1
-version_minor=0
-version_patch=0-alpha.68
-
-polyfrost.defaults.loom=3
-
-kotlin.code.style=official
-
+# Gradle Configuration -- DO NOT TOUCH THESE VALUES.
+org.gradle.daemon=true
 org.gradle.parallel=true
-org.gradle.caching=true
-#org.gradle.configuration-cache=true
 org.gradle.configureondemand=true
 org.gradle.parallel.threads=4
-org.gradle.dependency.verification=strict
-org.gradle.kotlin.dsl.allWarningsAsErrors=true
-org.gradle.kotlin.dsl.precompiled.accessors.strict=true
-org.gradle.workers.max=4
-org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx10G
+
+kotlin.code.style=official
+
+dgt.java.version=8
+
+# Project Configuration
+project.group=org.polyfrost.oneconfig
+project.name=OneConfig
+project.version=1.0.0-alpha.70

gradle/libs.versions.toml

@@ -20,7 +20,8 @@ copycat = "0.1.3"
 copycat-image-awt = "0.1.1"
 
 # Per version
-universalcraft = "2.0.0"
+textile = "0.8.0"
+omnicore = "0.21.0"
 lwjgl = "3.3.3" # All downloaded by the isolated-lwjgl3-loader
 
 # Legacy only
@@ -29,10 +30,9 @@ mixin-extras = "0.4.1"
 asm = "5.2"
 
 # Gradle
+dgt = "2.27.1"
 kotlinx-abi = "0.14.0"
-pgt = "0.6.6"
-shadow = "8.1.1"
-licenser = "2.0.1"
+licenser = "2.1.1"
 jetbrains-idea-ext = "1.1.8"
 
 log4j-api = "2.0-beta9" # used because this is the version that 1.8.9 supports, so we have to compile against the same (annoying)
@@ -64,6 +64,8 @@ annotations = { module = "org.jetbrains:annotations", version.ref = "annotations
 logging-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j-api" }
 logging-impl = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j-impl" }
 
+textile = { module = "dev.deftu:textile", version.ref = "textile" }
+
 lwjgl = { module = "org.lwjgl:lwjgl", version.ref = "lwjgl" }
 lwjgl-nvg = { module = "org.lwjgl:lwjgl-nanovg", version.ref = "lwjgl" }
 lwjgl-stb = { module = "org.lwjgl:lwjgl-stb", version.ref = "lwjgl" }
@@ -97,14 +99,16 @@ test-core = ["junit", "logging-impl"]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinx-api-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-abi" }
 
-pgt-main = { id = "org.polyfrost.multi-version", version.ref = "pgt" }
-pgt-root = { id = "org.polyfrost.multi-version.root", version.ref = "pgt" }
-pgt-api-validator = { id = "org.polyfrost.multi-version.api-validation", version.ref = "pgt" }
-pgt-default = { id = "org.polyfrost.defaults", version.ref = "pgt" }
-pgt-defaults-repo = { id = "org.polyfrost.defaults.repo", version.ref = "pgt" }
-pgt-defaults-java = { id = "org.polyfrost.defaults.java", version.ref = "pgt" }
-
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
-licenser = { id = "org.quiltmc.gradle.licenser", version.ref = "licenser" }
+dgt-base = { id = "dev.deftu.gradle.tools", version.ref = "dgt" }
+dgt-multiversion-platform = { id = "dev.deftu.gradle.multiversion", version.ref = "dgt" }
+dgt-multiversion-root = { id = "dev.deftu.gradle.multiversion-root", version.ref = "dgt" }
+dgt-java = { id = "dev.deftu.gradle.tools.java", version.ref = "dgt" }
+dgt-kotlin = { id = "dev.deftu.gradle.tools.kotlin", version.ref = "dgt" }
+dgt-resources = { id = "dev.deftu.gradle.tools.resources", version.ref = "dgt" }
+dgt-shadow = { id = "dev.deftu.gradle.tools.shadow", version.ref = "dgt" }
+dgt-publishing-maven = { id = "dev.deftu.gradle.tools.publishing.maven", version.ref = "dgt" }
+dgt-loom = { id = "dev.deftu.gradle.tools.minecraft.loom", version.ref = "dgt" }
+
+licenser = { id = "dev.yumi.gradle.licenser", version.ref = "licenser" }
 
 jetbrains-idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "jetbrains-idea-ext" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -7,5 +7,5 @@ The project is designed to be version agnostic, and so the version specific code
 It is designed to be as small as possible, with the majority of the code being in the `modules/` directory.
 This project was originally made for `1.8.9-forge`, and so this is the `mainProject` and the API used in the `src/main` directory.
 
-Each of the other directories is a separate project, which is automatically generated using [Polyfrost's Gradle Toolkit](https://github.com/Polyfrost/polyfrost-gradle-toolkit) and [ReplayMod's preprocessor](https://github.com/ReplayMod/preprocessor).
-Some very version specific code is overwritten in these directories as well, with the exact same path as the `src/main` directory.
+Each of the other directories is a separate project, which is automatically generated using [Deftu's Gradle Toolkit](https://github.com/Deftu/gradle-toolkit) and [ReplayMod's preprocessor](https://github.com/ReplayMod/preprocessor).
+Some very version specific code is overwritten in these directories as well, with the exact same path as the `src/main` directory.