Merge remote-tracking branch 'upstream/beta' into plot-spray-fix

.editorconfig

@@ -25,6 +25,7 @@ ij_java_names_count_to_use_import_on_demand = 2147483647
 ij_java_class_count_to_use_import_on_demand = 2147483647
 ij_java_packages_to_use_import_on_demand = 2147483647
 
+# Kotlin Files
 [*.kt]
 ktlint_code_style = intellij_idea
 
@@ -59,3 +60,9 @@ ktlint_standard_final-newline = disabled
 
 ktlint_standard_no-wildcard-imports = enabled
 ktlint_standard_function-expression-body = disabled
+
+# Additional Kotlin-specific formatting for conditions and continuation
+ij_kotlin_continuation_indent_size = 4
+ij_kotlin_binary_expression_wrap = if_long
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_annotations_new_line_after_suppress = true

.github/workflows/build.yml

@@ -38,6 +38,7 @@ jobs:
                     path: versions/1.8.9/build/reports/tests/test/
 
     preprocess:
+        if: ${{ false }} # Fix github
         runs-on: ubuntu-latest
         name: "Build multi version"
         steps:

CONTRIBUTING.md

@@ -153,6 +153,7 @@ for more information and usages.
   the main thread.
 - When updating a config option variable, use the `ConfigUpdaterMigrator.ConfigFixEvent` with event.move() when moving a value, and event.transform() when updating a value. [For Example](https://github.com/hannibal002/SkyHanni/blob/e88f416c48f9659f89b7047d7629cd9a1d1535bc/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt#L276).
 - Use American English spelling conventions (e.g., "color" not "colour").
+- When creating/updating a command, move it out of the `Commands.kt` class, if it isn't already, into the class that it belongs to.
 - Avoid direct function imports. Always access functions or members through their respective namespaces or parent classes to improve readability and maintain encapsulation.
 
 ## Additional Useful Development Tools

README.md

@@ -36,7 +36,7 @@ Give feedback or just chat with others on our community Discord!
 
 * **Bug Reports:** Use the `#bug-reports` channel when you find broken features (please check out `#faq` and `#known-bugs`).
 * **Quick Help** Ask in `#support` for questions and problems with the mod or Minecraft in general.
-* **Feature Suggestions:** Feel fre to tell your ideas in `#suggestions` channel for new features and improvements to the mod. (Don't copy from existing mods or break Hypixel rules).
+* **Feature Suggestions:** Feel free to tell your ideas in `#suggestions` channel for new features and improvements to the mod. (Don't copy from existing mods or break Hypixel rules).
 * **General Chat:** Chat with other SkyHanni users in `#skyblock-general` channel about the game.
 
 **[Join the Discord!](https://discord.gg/skyhanni-997079228510117908)**

build.gradle.kts

@@ -1,8 +1,4 @@
-import at.skyhanni.sharedvariables.MinecraftVersion
-import at.skyhanni.sharedvariables.MultiVersionStage
-import at.skyhanni.sharedvariables.ProjectTarget
-import at.skyhanni.sharedvariables.SHVersionInfo
-import at.skyhanni.sharedvariables.versionString
+import at.skyhanni.sharedvariables.*
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 import moe.nea.shot.ShotParser
@@ -191,9 +187,9 @@ dependencies {
         exclude(module = "unspecified")
         isTransitive = false
     }
-    // October 3, 2024, 11:43 PM AEST
-    // https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.4.0
-    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.4.0:all") {
+    // December 29, 2024, 07:30 PM EST
+    // https://github.com/NotEnoughUpdates/NotEnoughUpdates/tree/2.5.0
+    devenvMod("com.github.NotEnoughUpdates:NotEnoughUpdates:2.5.0:all") {
         exclude(module = "unspecified")
         isTransitive = false
     }
@@ -312,7 +308,7 @@ tasks.withType(JavaCompile::class) {
 
 tasks.withType(org.gradle.jvm.tasks.Jar::class) {
     archiveBaseName.set("SkyHanni")
-    archiveAppendix.set("mc${target.minecraftVersion.versionName}")
+    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"

buildSrc/build.gradle.kts

@@ -13,5 +13,5 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib")
-    implementation("com.github.SkyHanniStudios:SkyHanniChangelogBuilder:1.0.2")
+    implementation("com.github.SkyHanniStudios:SkyHanniChangelogBuilder:1.1.0")
 }

detekt/detekt.yml

@@ -1,4 +1,3 @@
-
 config:
     validation: true
 
@@ -24,7 +23,6 @@ ImportRules:
     CustomImportOrdering:
         active: true
 
-
 style:
     MagicNumber: # I, Linnea Gräf, of sound mind and body, disagree with disabling this rule
         active: false