Merge branch 'beta' into feature/tentacles

.github/workflows/illegal-imports.txt

@@ -5,7 +5,8 @@
 
 at/hannibal2/skyhanni/ scala.
 at/hannibal2/skyhanni/ jline.
-at/hannibal2/skyhanni/ io.github.moulberry.notenoughupdates.util.Constants
 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

.gitignore

@@ -3,6 +3,7 @@
 !.idea/icon.svg
 !.idea/dictionaries/default_user.xml
 !.idea/scopes/Mixins.xml
+!.idea/liveTemplates/SkyHanni.xml
 .vscode/
 run/
 build/

build.gradle.kts

@@ -18,6 +18,7 @@ plugins {
     kotlin("plugin.power-assert")
     `maven-publish`
     id("moe.nea.shot") version "1.0.0"
+    id("net.kyori.blossom")
 }
 
 val target = ProjectTarget.values().find { it.projectPath == project.path }!!
@@ -159,9 +160,9 @@ dependencies {
         exclude(module = "unspecified")
         isTransitive = false
     }
-    // June 3, 2024, 9:30 PM AEST
-    // https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.3.0
-    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.3.0:all") {
+    // August 27, 2024, 4:30 PM AEST
+    // https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.3.3
+    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.3.3:all") {
         exclude(module = "unspecified")
         isTransitive = false
     }
@@ -312,12 +313,18 @@ if (!MultiVersionStage.activeState.shouldCompile(target)) {
         onlyIf { false }
     }
 }
+
 preprocess {
     vars.put("MC", target.minecraftVersion.versionNumber)
     vars.put("FORGE", if (target.forgeDep != null) 1 else 0)
     vars.put("JAVA", target.minecraftVersion.javaVersion)
     patternAnnotation.set("at.hannibal2.skyhanni.utils.compat.Pattern")
 }
+
+blossom {
+    replaceToken("@MOD_VERSION@", version)
+}
+
 val sourcesJar by tasks.creating(Jar::class) {
     destinationDirectory.set(layout.buildDirectory.dir("badjars"))
     archiveClassifier.set("src")