Merge branch 'beta' into backend/graph-editor-refactor

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/test/graph/GraphEditor.kt

Author: hannibal002

.github/workflows/detekt.yml

@@ -142,3 +142,6 @@ jobs:
                             repo: context.repo.repo,
                             body: commentBody
                         })
+
+            -   name: Try to fail
+                run: exit 1

.github/workflows/generate-constants.yaml

@@ -38,7 +38,7 @@ jobs:
                 name: Upload generated repo regexes
                 with:
                     name: Repo Regexes
-                    path: versions/1.21.5/build/regexes/constants.json
+                    path: versions/1.21.10/build/regexes/constants.json
     publish-regexes:
         runs-on: ubuntu-latest
         needs: regexes

.github/workflows/illegal-imports.txt

@@ -5,12 +5,6 @@
 
 at/hannibal2/skyhanni/ scala.
 at/hannibal2/skyhanni/ jline.
-at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.core.GlScissorStack
-at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.events.SlotClickEvent
-at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.events.ReplaceItemEvent
-at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Constants
-at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Utils
-at/hannibal2/skyhanni/ java.util.function.Supplier
 at/hannibal2/skyhanni/ com.mojang.realmsclient.
 at/hannibal2/skyhanni/ com.ibm.icu.
 at/hannibal2/skyhanni/ io.netty.util.internal.

.github/workflows/modrinth-version-upload.yml

@@ -29,7 +29,10 @@ jobs:
 
             -   name: Grant execute permission for gradlew
                 run: chmod +x gradlew
-
+            -   name: Disable preprocessor
+                run: |
+                    mkdir -p .gradle
+                    echo skyhanni.multi-version=off > .gradle/private.properties
             -   name: Download release file
                 env:
                     GITHUB_TOKEN: ${{ github.token }}

.github/workflows/pr-check.yml

@@ -23,6 +23,11 @@ jobs:
             -   name: Grant execute permission for gradlew
                 run: chmod +x gradlew
 
+            - name: Disable preprocessor
+              run: |
+                  mkdir -p .gradle
+                  echo skyhanni.multi-version=off > .gradle/private.properties
+
             -   name: Run ChangeLog verification w/retry
                 env:
                     PR_TITLE: ${{ github.event.pull_request.title }}
@@ -52,7 +57,7 @@ jobs:
                     github-token: ${{ secrets.GITHUB_TOKEN }}
                     script: |
                         const fs = require('fs');
-                        const test = fs.readFileSync('build/changelog_errors.txt', 'utf8');
+                        const test = fs.readFileSync('versions/1.21.10/build/changelog_errors.txt', 'utf8');
                         const commentBody = `${test}`
                         
                         github.rest.issues.createComment({

CONTRIBUTING.md

@@ -14,7 +14,7 @@
 
 ## What it does
 
-SkyHanni is a Fabric 1.21 and Forge 1.8.9 Minecraft mod that adds many useful features to [Hypixel SkyBlock](https://wiki.hypixel.net/Main_Page). With SkyHanni you have access to:
+SkyHanni is a Fabric Minecraft mod that adds many useful features to [Hypixel SkyBlock](https://wiki.hypixel.net/Main_Page). With SkyHanni you have access to:
 
 * **Helpful GUIs:** View important information at a glance.
 * **Extra Chat Messages:** Receive reminders and tips at the right moment.

README.md

@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
-    implementation("com.google.devtools.ksp:symbol-processing-api:1.8.0-1.0.8")
+    implementation("com.google.devtools.ksp:symbol-processing-api:2.3.4")
 }
 
 tasks.withType<JavaCompile> {

annotation-processors/build.gradle.kts

@@ -2,24 +2,20 @@ import at.skyhanni.sharedvariables.MultiVersionStage
 import at.skyhanni.sharedvariables.ProjectTarget
 import at.skyhanni.sharedvariables.SHVersionInfo
 import at.skyhanni.sharedvariables.versionString
-import com.google.devtools.ksp.gradle.KspTaskJvm
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 import net.fabricmc.loom.task.prod.ClientProductionRunTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import skyhannibuildsystem.ChangelogVerification
-import skyhannibuildsystem.CleanupMappingFiles
 import skyhannibuildsystem.DownloadBackupRepo
 import skyhannibuildsystem.PublishToModrinth
 
 plugins {
     idea
     java
-    id("com.gradleup.shadow") version "8.3.4"
-    id("fabric-loom")
-    id("com.github.SkyHanniStudios.SkyHanni-Preprocessor")
+    id("com.gradleup.shadow") version "9.3.1"
+    id("net.fabricmc.fabric-loom-remap")
     kotlin("jvm")
     id("com.google.devtools.ksp")
     kotlin("plugin.power-assert")
@@ -43,18 +39,18 @@ runDirectory.mkdirs()
 
 // Minecraft configuration:
 loom {
-    val accessWidenerFile = when (target) {
-        ProjectTarget.MODERN_12105 -> rootProject.file("src/main/resources/skyhanni.accesswidener")
-        else -> file("src/main/resources/skyhanni.accesswidener")
-    }
-    if (accessWidenerFile.exists()) {
-        accessWidenerPath = accessWidenerFile
-    }
-    @Suppress("UnstableApiUsage")
-    mixin {
-        useLegacyMixinAp.set(true)
-        defaultRefmapName.set("mixins.skyhanni.refmap.json")
+    val classTweakerFile = sc.process(
+        rootProject.file("src/main/resources/skyhanni.classtweaker"),
+        "build/skyhanni.classtweaker",
+    )
+    if (classTweakerFile.exists()) {
+        accessWidenerPath = classTweakerFile
+    } else {
+        println("No classTweaker file for ${target.minecraftVersion}")
     }
+
+    fabricModJsonPath = rootProject.file("src/main/resources/fabric.mod.json")
+
     runs {
         named("client") {
             isIdeConfigGenerated = true
@@ -96,10 +92,6 @@ val includeBackupNeuRepo by tasks.registering(DownloadBackupRepo::class) {
     this.outputDirectory.set(layout.buildDirectory.dir("downloadedNeuRepo"))
 }
 
-val cleanupMappingFiles by tasks.registering(CleanupMappingFiles::class) {
-    this.mappingsDirectory.set(layout.projectDirectory.asFile.parentFile)
-}
-
 val publishToModrinth by tasks.registering(PublishToModrinth::class)
 
 tasks.runClient {
@@ -120,7 +112,12 @@ dependencies {
     val versionName = target.minecraftVersion.versionNameOverride ?: target.minecraftVersion.versionName
     minecraft("com.mojang:minecraft:$versionName")
     if (target.mappingDependency == "official") {
-        mappings(loom.officialMojangMappings())
+        mappings(loom.layered {
+            officialMojangMappings()
+            if (versionName == "1.21.10") {
+                mappings("dev.lambdaurora:yalmm-mojbackward:1.21.10+build.3")
+            }
+        })
     } else {
         mappings(target.mappingDependency)
     }
@@ -153,6 +150,7 @@ dependencies {
     }
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.11.0")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("io.mockk:mockk:1.12.5")
 
     modImplementation(libs.hypixelmodapi)
@@ -173,6 +171,8 @@ dependencies {
     detektPlugins("org.notenoughupdates:detektrules:1.0.0")
     detektPlugins(project(":detekt"))
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7")
+
+    if (target != ProjectTarget.MODERN_12110) shadowImpl("org.apache.httpcomponents:httpclient:4.5.14")
 }
 
 fun DependencyHandler.includeImplementation(dep: Any) {
@@ -184,10 +184,11 @@ afterEvaluate {
     loom.runs.named("client") {
         programArgs("--quickPlayMultiplayer", "hypixel.net")
     }
-    tasks.named("kspKotlin", KspTaskJvm::class) {
-        this.options.add(SubpluginOption("apoption", "skyhanni.modver=$version"))
-        this.options.add(SubpluginOption("apoption", "skyhanni.mcver=${target.minecraftVersion.versionName}"))
-        this.options.add(SubpluginOption("apoption", "skyhanni.buildpaths=${project.file("buildpaths-excluded.txt").absolutePath}"))
+
+    ksp {
+        arg("skyhanni.modver", version.toString())
+        arg("skyhanni.mcver", target.minecraftVersion.versionName)
+        arg("skyhanni.buildpaths", project.file("buildpaths-excluded.txt").absolutePath)
     }
 }
 
@@ -211,13 +212,21 @@ kotlin {
 tasks.processResources {
     from(includeBackupRepo)
     from(includeBackupNeuRepo)
-    inputs.property("version", version)
+    val fapiVersion = target.fabricApiVersion?.split(":")?.last() ?: ""
+    val props = buildMap {
+        put("version", version)
+        put("minecraft", target.minecraftVersion.versionName)
+        put("fapi", fapiVersion)
+    }
+
+    props.forEach(inputs::property)
+
     filesMatching("fabric.mod.json") {
-        expand("version" to version)
+        expand(props)
     }
 }
 
-if (target == ProjectTarget.MODERN_12105) {
+if (target == ProjectTarget.MODERN_12110) {
     fabricApi {
         configureTests {
             modId = "skyhanni"
@@ -259,16 +268,6 @@ tasks.withType<KotlinCompile> {
     compilerOptions.jvmTarget.set(JvmTarget.fromTarget(target.minecraftVersion.formattedJavaLanguageVersion))
 }
 
-if (target.parent == ProjectTarget.MODERN_12105) {
-    val mainRes = project(ProjectTarget.MODERN_12105.projectPath).tasks.getAt("processResources")
-    tasks.named("processResources") {
-        dependsOn(mainRes)
-    }
-    tasks.named("preprocessCode") {
-        dependsOn(mainRes)
-    }
-}
-
 tasks.withType(JavaCompile::class) {
     options.encoding = "UTF-8"
 }
@@ -277,9 +276,6 @@ tasks.withType(org.gradle.jvm.tasks.Jar::class) {
     archiveBaseName.set("SkyHanni")
     archiveVersion.set("$version-mc${target.minecraftVersion.versionName}")
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE // Why do we have this here? This only *hides* errors.
-    manifest.attributes.run {
-        this["Main-Class"] = "SkyHanniInstallerFrame"
-    }
 }
 
 val remapJar by tasks.named<net.fabricmc.loom.task.RemapJarTask>("remapJar") {
@@ -293,11 +289,6 @@ tasks.shadowJar {
     destinationDirectory.set(layout.buildDirectory.dir("badjars"))
     archiveClassifier.set("all-dev")
     configurations = listOf(shadowImpl, shadowModImpl)
-    doLast {
-        configurations.forEach {
-            println("Config: ${it.files}")
-        }
-    }
     exclude("META-INF/versions/**")
     mergeServiceFiles()
     relocate("io.github.notenoughupdates.moulconfig", "at.hannibal2.skyhanni.deps.moulconfig")
@@ -331,12 +322,6 @@ if (!MultiVersionStage.activeState.shouldCompile(target)) {
     }
 }
 
-preprocess {
-    vars.put("MC", target.minecraftVersion.versionNumber)
-    vars.put("JAVA", target.minecraftVersion.javaVersion)
-    vars.put("TODO", 0)
-}
-
 val sourcesJar by tasks.registering(Jar::class) {
     destinationDirectory.set(layout.buildDirectory.dir("badjars"))
     archiveClassifier.set("src")
@@ -372,7 +357,7 @@ detekt {
 
 tasks.withType<Detekt>().configureEach {
     onlyIf {
-        target == ProjectTarget.MODERN_12105 && project.findProperty("skipDetekt") != "true"
+        target == ProjectTarget.MODERN_12110 && project.findProperty("skipDetekt") != "true"
     }
     jvmTarget = target.minecraftVersion.formattedJavaLanguageVersion
     outputs.cacheIf { false } // Custom rules won't work if cached
@@ -399,10 +384,13 @@ tasks.withType<DetektCreateBaselineTask>().configureEach {
     outputs.cacheIf { false } // Custom rules won't work if cached
     onlyIf {
         // We only need one baseline for the main source set
-        target == ProjectTarget.MODERN_12105
+        target == ProjectTarget.MODERN_12110
     }
 
     val isMainBaseline = (this.name == "detektBaselineMain")
     val outputFileName = if (isMainBaseline) "baseline-main" else "baseline"
     baseline.set(file(rootProject.layout.projectDirectory.file("detekt/$outputFileName.xml")))
 }
+repositories {
+    mavenCentral()
+}

build.gradle.kts

@@ -1 +1 @@
-6.5.0
+6.17.0