Merge branch 'MeteorDevelopment:master' into master

Author: Kiriyaga7615

.github/builds/mc_version.js

@@ -4,27 +4,22 @@
  */
 
 import * as fs from "fs"
-import * as readline from "readline"
+import * as path from "path"
+import {fileURLToPath} from "url"
 
-export async function getMcVersion() {
-    let lines = readline.createInterface({
-        input: fs.createReadStream("../../gradle.properties"),
-        crlfDelay: Infinity
-    })
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
-    let mcVersion = ""
+export async function getMcVersion() {
+    const filePath = path.resolve(__dirname, "../../gradle/libs.versions.toml")
 
-    for await (const line of lines) {
-        if (line.startsWith("minecraft_version")) {
-            mcVersion = line.substring(line.indexOf("=") + 1)
-            break
-        }
+    if (!fs.existsSync(filePath)) {
+        throw new Error(`File not found: ${filePath}`)
     }
 
-    if (mcVersion === "") {
-        console.log("Failed to read minecraft_version")
-        process.exit(1)
-    }
+    const content = await fs.promises.readFile(filePath, "utf-8")
+
+    const match = content.match(/^\s*minecraft\s*=\s*["']([^"']+)["']\s*$/m)
+    if (match) return match[1].trim()
 
-    return mcVersion
+    throw new Error(`Failed to find minecraft version in ${filePath}`)
 }

build.gradle.kts

@@ -1,20 +1,14 @@
 plugins {
-    id("fabric-loom") version "1.10-SNAPSHOT"
+    alias(libs.plugins.fabric.loom)
     id("maven-publish")
-    id("com.gradleup.shadow") version "9.0.0-beta11"
 }
 
 base {
     archivesName = properties["archives_base_name"] as String
     group = properties["maven_group"] as String
 
-    val suffix = if (project.hasProperty("build_number")) {
-        project.findProperty("build_number")
-    } else {
-        "local"
-    }
-
-    version = properties["minecraft_version"] as String + "-" + suffix
+    val suffix = providers.gradleProperty("build_number").getOrElse("local")
+    version = "${libs.versions.minecraft.get()}-$suffix"
 }
 
 repositories {
@@ -50,7 +44,7 @@ repositories {
 }
 
 val modInclude: Configuration by configurations.creating
-val library: Configuration by configurations.creating
+val jij: Configuration by configurations.creating
 
 configurations {
     // include mods
@@ -61,71 +55,109 @@ configurations {
         extendsFrom(modInclude)
     }
 
-    // include libraries
+    // include libraries (jar-in-jar)
     implementation.configure {
-        extendsFrom(library)
+        extendsFrom(jij)
     }
-    shadow.configure {
-        extendsFrom(library)
+    include.configure {
+        extendsFrom(jij)
     }
 }
 
 dependencies {
     // Fabric
-    minecraft("com.mojang:minecraft:${properties["minecraft_version"] as String}")
-    mappings("net.fabricmc:yarn:${properties["yarn_mappings"] as String}:v2")
-    modImplementation("net.fabricmc:fabric-loader:${properties["loader_version"] as String}")
+    minecraft(libs.minecraft)
+    mappings(variantOf(libs.yarn) { classifier("v2") })
+    modImplementation(libs.fabric.loader)
 
-    modInclude(fabricApi.module("fabric-api-base", properties["fapi_version"] as String))
-    modInclude(fabricApi.module("fabric-resource-loader-v0", properties["fapi_version"] as String))
+    val fapiVersion = libs.versions.fabric.api.get()
+    modInclude(fabricApi.module("fabric-api-base", fapiVersion))
+    modInclude(fabricApi.module("fabric-resource-loader-v1", fapiVersion))
 
     // Compat fixes
-    modCompileOnly(fabricApi.module("fabric-renderer-indigo", properties["fapi_version"] as String))
-    modCompileOnly("maven.modrinth:sodium:${properties["sodium_version"] as String}") { isTransitive = false }
-    modCompileOnly("maven.modrinth:lithium:${properties["lithium_version"] as String}") { isTransitive = false }
-    modCompileOnly("maven.modrinth:iris:${properties["iris_version"] as String}") { isTransitive = false }
-    modCompileOnly("com.viaversion:viafabricplus:${properties["viafabricplus_version"] as String}") { isTransitive = false }
-    modCompileOnly("com.viaversion:viafabricplus-api:${properties["viafabricplus_version"] as String}") { isTransitive = false }
-
-    // Baritone (https://github.com/MeteorDevelopment/baritone)
-    modCompileOnly("meteordevelopment:baritone:${properties["baritone_version"] as String}-SNAPSHOT")
-    // ModMenu (https://github.com/TerraformersMC/ModMenu)
-    modCompileOnly("com.terraformersmc:modmenu:${properties["modmenu_version"] as String}")
-
-    // Libraries
-    library("meteordevelopment:orbit:${properties["orbit_version"] as String}")
-    library("org.meteordev:starscript:${properties["starscript_version"] as String}")
-    library("meteordevelopment:discord-ipc:${properties["discordipc_version"] as String}")
-    library("org.reflections:reflections:${properties["reflections_version"] as String}")
-    library("io.netty:netty-handler-proxy:${properties["netty_version"] as String}") { isTransitive = false }
-    library("io.netty:netty-codec-socks:${properties["netty_version"] as String}") { isTransitive = false }
-    library("de.florianmichael:WaybackAuthLib:${properties["waybackauthlib_version"] as String}")
-
-    // Launch sub project
-    shadow(project(":launch"))
+    modCompileOnly(fabricApi.module("fabric-renderer-indigo", fapiVersion))
+    modCompileOnly(libs.sodium) { isTransitive = false }
+    modCompileOnly(libs.lithium) { isTransitive = false }
+    modCompileOnly(libs.iris) { isTransitive = false }
+    modCompileOnly(libs.viafabricplus) { isTransitive = false }
+    modCompileOnly(libs.viafabricplus.api) { isTransitive = false }
+
+    modCompileOnly(libs.baritone)
+    modCompileOnly(libs.modmenu)
+
+    // Libraries (JAR-in-JAR)
+    jij(libs.orbit)
+    jij(libs.starscript)
+    jij(libs.discord.ipc)
+    jij(libs.reflections)
+    jij(libs.netty.handler.proxy) { isTransitive = false }
+    jij(libs.netty.codec.socks) { isTransitive = false }
+    jij(libs.waybackauthlib)
 }
 
-loom {
-    accessWidenerPath = file("src/main/resources/meteor-client.accesswidener")
+sourceSets {
+    val launcher by creating {
+        java {
+            srcDir("src/launcher/java")
+        }
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+
+    if (System.getenv("CI")?.toBoolean() == true) {
+        withSourcesJar()
+        withJavadocJar()
+    }
 }
 
+// Handle transitive dependencies for jar-in-jar
+// Based on implementation from BaseProject by FlorianMichael/EnZaXD
+// Source: https://github.com/FlorianMichael/BaseProject/blob/main/src/main/kotlin/de/florianmichael/baseproject/Fabric.kt
+// Licensed under Apache License 2.0
 afterEvaluate {
-    tasks.migrateMappings.configure {
-        outputDir.set(project.file("src/main/java"))
+    val jijConfig = configurations.findByName("jij") ?: return@afterEvaluate
+
+    // Dependencies to exclude from jar-in-jar
+    val excluded = setOf(
+        "org.slf4j",    // Logging provided by Minecraft
+        "jsr305"        // Compile time annotations only
+    )
+
+    jijConfig.incoming.resolutionResult.allDependencies.forEach { dep ->
+        val requested = dep.requested.displayName
+
+        if (excluded.any { requested.contains(it) }) return@forEach
+
+        val compileOnlyDep = dependencies.create(requested) {
+            isTransitive = false
+        }
+
+        val implDep = dependencies.create(compileOnlyDep)
+
+        dependencies.add("compileOnlyApi", compileOnlyDep)
+        dependencies.add("implementation", implDep)
+        dependencies.add("include", compileOnlyDep)
     }
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/meteor-client.accesswidener")
+}
+
 tasks {
     processResources {
-        val buildNumber = project.findProperty("build_number")?.toString() ?: ""
-        val commit = project.findProperty("commit")?.toString() ?: ""
+        val buildNumber = providers.gradleProperty("build_number").getOrElse("")
+        val commit = providers.gradleProperty("commit").getOrElse("")
 
         val propertyMap = mapOf(
             "version" to project.version,
             "build_number" to buildNumber,
             "commit" to commit,
-            "minecraft_version" to project.property("minecraft_version"),
-            "loader_version" to project.property("loader_version")
+            "minecraft_version" to libs.versions.minecraft.get(),
+            "loader_version" to libs.versions.fabric.loader.get()
         )
 
         inputs.properties(propertyMap)
@@ -134,53 +166,35 @@ tasks {
         }
     }
 
+    // Compile launcher with Java 8 for backwards compatibility
+    named<JavaCompile>("compileLauncherJava").configure {
+        sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+        targetCompatibility = JavaVersion.VERSION_1_8.toString()
+        options.compilerArgs.add("-Xlint:-options")
+    }
+
     jar {
         inputs.property("archivesName", project.base.archivesName.get())
 
         from("LICENSE") {
             rename { "${it}_${inputs.properties["archivesName"]}" }
         }
 
+        // Include launcher classes
+        from(sourceSets["launcher"].output)
+
         manifest {
             attributes["Main-Class"] = "meteordevelopment.meteorclient.Main"
         }
     }
 
-    java {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-
-        if (System.getenv("CI")?.toBoolean() == true) {
-            withSourcesJar()
-            withJavadocJar()
-        }
-    }
-
-    withType<JavaCompile> {
-        options.release = 21
-        options.compilerArgs.add("-Xlint:deprecation")
-        options.compilerArgs.add("-Xlint:unchecked")
-    }
-
-    shadowJar {
-        configurations = listOf(project.configurations.shadow.get())
-
-        inputs.property("archivesName", project.base.archivesName.get())
-
-        from("LICENSE") {
-            rename { "${it}_${inputs.properties["archivesName"]}" }
-        }
-
-        dependencies {
-            exclude {
-                it.moduleGroup == "org.slf4j"
-            }
-        }
-    }
-
-    remapJar {
-        dependsOn(shadowJar)
-        inputFile.set(shadowJar.get().archiveFile)
+    withType<JavaCompile>().configureEach {
+        options.compilerArgs.addAll(
+            listOf(
+                "-Xlint:deprecation",
+                "-Xlint:unchecked"
+            )
+        )
     }
 
     javadoc {
@@ -204,7 +218,7 @@ publishing {
             from(components["java"])
             artifactId = "meteor-client"
 
-            version = properties["minecraft_version"] as String + "-SNAPSHOT"
+            version = "${libs.versions.minecraft.get()}-SNAPSHOT"
         }
     }
 

gradle.properties

@@ -1,50 +1,6 @@
 org.gradle.jvmargs=-Xmx2G
-org.gradle.configuration-cache=true
-
-# Fabric (https://fabricmc.net/develop)
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
-loader_version=0.16.14
-fapi_version=0.129.0+1.21.8
+org.gradle.configuration-cache=false
 
 # Mod Properties
 maven_group=meteordevelopment
 archives_base_name=meteor-client
-
-# Dependency Versions
-
-# Baritone (https://github.com/MeteorDevelopment/baritone)
-baritone_version=1.21.5
-
-# Sodium (https://github.com/CaffeineMC/sodium-fabric)
-sodium_version=mc1.21.6-0.6.13-fabric
-
-# Lithium (https://github.com/CaffeineMC/lithium-fabric)
-lithium_version=mc1.21.6-0.17.0-fabric
-
-# Iris (https://github.com/IrisShaders/Iris)
-iris_version=1.9.0+1.21.6-fabric
-
-# ModMenu (https://github.com/TerraformersMC/ModMenu)
-modmenu_version=15.0.0-beta.3
-
-# Orbit (https://github.com/MeteorDevelopment/orbit)
-orbit_version=0.2.4
-
-# Starscript (https://github.com/MeteorDevelopment/starscript)
-starscript_version=0.2.4
-
-# DiscordRPC (https://github.com/MeteorDevelopment/java-discord-rpc)
-discordipc_version=1.1
-
-# Reflections (https://github.com/ronmamo/reflections)
-reflections_version=0.10.2
-
-# Netty (https://github.com/netty/netty)
-netty_version=4.1.118.Final
-
-# ViaFabricPlus (https://github.com/ViaVersion/ViaFabricPlus)
-viafabricplus_version=4.1.5
-
-# WaybackAuthLib (https://github.com/FlorianMichael/WaybackAuthLib)
-waybackauthlib_version=1.0.1