Split the mod up in 2 subprojects, add datagen subproject, improve 3D model generation/texture stitching (#8)

Author: eclipseisoffline

.github/workflows/build.yml

@@ -33,12 +33,19 @@ jobs:
         env:
           BUILD_NUMBER: ${{ steps.release-info.outputs.curentRelease }}
 
+      - name: Publish to Maven Repository
+        if: ${{ success() && github.repository == 'GeyserMC/Rainbow' && github.ref_name == 'master' }}
+        run: ./gradlew publish
+        env:
+          ORG_GRADLE_PROJECT_geysermcUsername: ${{ vars.DEPLOY_USER }}
+          ORG_GRADLE_PROJECT_geysermcPassword: ${{ secrets.DEPLOY_PASS }}
+
       - name: Archive Artifacts
         uses: GeyserMC/actions/upload-multi-artifact@master
         if: success()
         with:
           artifacts: |
-            rainbow:build/libs/Rainbow.jar
+            rainbow:client/build/libs/Rainbow.jar
 
       - name: Get Version
         if: ${{ (success() || failure()) && github.repository == 'GeyserMC/Rainbow' }}
@@ -69,7 +76,7 @@ jobs:
           privateKey: ${{ secrets.DOWNLOADS_PRIVATE_KEY }}
           host: ${{ secrets.DOWNLOADS_SERVER_IP }}
           files: |
-            build/libs/Rainbow.jar
+            client/build/libs/Rainbow.jar
           changelog: ${{ steps.metadata.outputs.body }}
 
 #      - name: Publish to Modrinth
@@ -87,4 +94,4 @@ jobs:
           discordWebhook: ${{ secrets.DISCORD_WEBHOOK }}
           status: ${{ job.status }}
           body: ${{ steps.metadata.outputs.body }}
-          includeDownloads: ${{ success() && github.repository == 'GeyserMC/Rainbow' && github.ref_name == 'master' }}
+          includeDownloads: ${{ github.ref_name == 'master' }}

README.md

@@ -4,7 +4,7 @@
 [![Discord](https://img.shields.io/discord/613163671870242838.svg?color=%237289da&label=discord)](https://discord.gg/geysermc)
 
 Rainbow is a client-side Minecraft mod for the Fabric modloader to generate Geyser item mappings and bedrock resourcepacks
-for use with Geyser's [custom item API (v2)](https://github.com/geyserMC/geyser/pull/5189). Rainbow is available for Minecraft 1.21.7 and 1.21.8.
+for use with Geyser's [custom item API (v2)](https://github.com/geyserMC/geyser/pull/5189). Rainbow is available for Minecraft 1.21.9 and 1.21.10.
 
 Rainbow is currently experimental and capable of the following:
 

build-logic/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    maven {
+        name = "Fabric"
+        url = uri("https://maven.fabricmc.net/")
+    }
+    gradlePluginPortal()
+}
+
+dependencies {
+    // Very ugly... https://github.com/gradle/gradle/issues/15383
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+
+    implementation(libs.fabric.loom)
+}

build-logic/settings.gradle.kts

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

build-logic/src/main/kotlin/libs.kt

@@ -0,0 +1,6 @@
+import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+val Project.libs: LibrariesForLibs
+    get() = rootProject.extensions.getByType()

build-logic/src/main/kotlin/rainbow.base-conventions.gradle.kts

@@ -0,0 +1,87 @@
+plugins {
+    id("fabric-loom")
+}
+
+version = properties["mod_version"]!! as String
+group = properties["maven_group"]!! as String
+
+val archivesBaseName = properties["archives_base_name"]!! as String
+val targetJavaVersion = 21
+
+base {
+    archivesName = archivesBaseName
+}
+
+repositories {
+    maven {
+        name = "ParchmentMC"
+        url = uri("https://maven.parchmentmc.org")
+    }
+
+    maven {
+        name = "Jitpack"
+        url = uri("https://jitpack.io")
+    }
+
+    maven {
+        name = "Open Collaboration"
+        url = uri("https://repo.opencollab.dev/main")
+    }
+}
+
+dependencies {
+    minecraft(libs.minecraft)
+    mappings(loom.layered {
+        officialMojangMappings()
+        parchment(libs.parchment)
+    })
+
+    modImplementation(libs.fabric.loader)
+    modImplementation(libs.fabric.api)
+}
+
+tasks {
+    processResources {
+        inputs.property("version", version)
+        inputs.property("supported_versions", libs.versions.minecraft.supported.get())
+        inputs.property("loader_version", libs.versions.fabric.loader.get())
+        filteringCharset = "UTF-8"
+
+        filesMatching("fabric.mod.json") {
+            expand(
+                mapOf(
+                    "version" to version,
+                    "supported_versions" to libs.versions.minecraft.supported.get(),
+                    "loader_version" to libs.versions.fabric.loader.get()
+                )
+            )
+        }
+    }
+
+    jar {
+        from("LICENSE") {
+            rename { "${it}_${archivesBaseName}" }
+        }
+    }
+
+    withType<JavaCompile>().configureEach {
+        options.encoding = "UTF-8"
+        options.release = targetJavaVersion
+    }
+}
+
+java {
+    val javaVersion = JavaVersion.toVersion(targetJavaVersion)
+    if (JavaVersion.current() < javaVersion) {
+        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+    }
+    withSourcesJar()
+}
+
+loom {
+    runs {
+        named("server") {
+            runDir = "run-server"
+        }
+    }
+}

build-logic/src/main/kotlin/rainbow.publish-conventions.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    `maven-publish`
+}
+
+val archivesBaseName = properties["archives_base_name"]!! as String
+
+publishing {
+    repositories {
+        maven {
+            name = "geysermc"
+            url = uri(
+                when {
+                    version.toString().endsWith("-SNAPSHOT") -> "https://repo.opencollab.dev/maven-snapshots"
+                    else -> "https://repo.opencollab.dev/maven-releases"
+                }
+            )
+            credentials(PasswordCredentials::class)
+        }
+    }
+
+    publications {
+        register("publish", MavenPublication::class) {
+            artifactId = archivesBaseName
+            from(project.components["java"])
+        }
+    }
+}

build.gradle

@@ -0,0 +1,31 @@
+import net.fabricmc.loom.task.RemapJarTask
+
+plugins {
+    id("rainbow.base-conventions")
+    id("rainbow.publish-conventions")
+}
+
+dependencies {
+    // Implement namedElements so IDEs can use it correctly, but include the remapped build
+    implementation(project(path = ":rainbow", configuration = "namedElements"))
+    include(project(":rainbow"))
+}
+
+tasks {
+    val copyJarTask = register<Copy>("copyRainbowClientJar") {
+        group = "build"
+
+        val remapJarTask = getByName<RemapJarTask>("remapJar")
+        dependsOn(remapJarTask)
+
+        from(remapJarTask.archiveFile)
+        rename {
+            "Rainbow.jar"
+        }
+        into(project.layout.buildDirectory.file("libs"))
+    }
+
+    named("build") {
+        dependsOn(copyJarTask)
+    }
+}

client/build.gradle.kts

@@ -0,0 +1 @@
+archives_base_name=rainbow-client