chore: bump dependency versions

GuizhanCraft · Oct 27, 2024 · e295464 · e295464
1 parent 2edc710
commit e295464
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 15 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,20 +15,29 @@ val mainPackage = "net.guizhanss.infinityexpansion2"
 
 repositories {
     mavenCentral()
-    maven("https://repo.papermc.io/repository/maven-public/")
-    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-    maven("https://repo.alessiodp.com/releases/")
-    maven("https://jitpack.io")
+    maven("https://repo.papermc.io/repository/maven-public/") {
+        name = "papermc"
+    }
+    maven("https://s01.oss.sonatype.org/content/groups/public/") {
+        name = "sonatype"
+    }
+    maven("https://repo.alessiodp.com/releases/") {
+        name = "alessiodp"
+    }
+    maven("https://jitpack.io") {
+        name = "jitpack"
+    }
 }
 
 dependencies {
-    compileOnly(kotlin("stdlib"))
-    compileOnly(kotlin("reflect"))
+    compileOnly(kotlin("stdlib")) // loaded during server startup
+    compileOnly(kotlin("reflect")) // loaded during server startup
     compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
     compileOnly("com.github.Slimefun:Slimefun4:e02a0f61d1")
     compileOnly("net.guizhanss:SlimefunTranslation:e03b01a7b7")
+    compileOnly("com.github.schntgaispock:SlimeHUD:1.3.0")
     implementation("net.byteflux:libby-bukkit:1.3.1")
-    implementation("net.guizhanss:GuizhanLib-api:1.8.1")
+    implementation("net.guizhanss:guizhanlib-all:2.1.0")
     implementation("org.bstats:bstats-bukkit:3.1.0")
 }
 
@@ -63,7 +72,7 @@ bukkit {
     authors = listOf("ybw0014")
     description = "More Slimefun content"
     depend = listOf("Slimefun")
-    softDepend = listOf("GuizhanLibPlugin", "SlimefunTranslation", "InfinityExpansion")
+    softDepend = listOf("GuizhanLibPlugin", "SlimefunTranslation", "InfinityExpansion", "SlimeHUD")
     loadBefore = listOf("SlimeCustomizer", "RykenSlimeCustomizer")
 
     commands {

diff --git a/src/main/kotlin/net/guizhanss/infinityexpansion2/InfinityExpansion2.kt b/src/main/kotlin/net/guizhanss/infinityexpansion2/InfinityExpansion2.kt
@@ -129,7 +129,7 @@ class InfinityExpansion2 : AbstractAddon(
                 updaterStart.invoke(null, this, file, githubUser, githubRepo, githubBranch)
             } catch (ignored: Exception) {
                 // use updater in lib
-                GuizhanBuildsUpdater(this, file, githubUser, githubRepo, githubBranch).start()
+                GuizhanBuildsUpdater.start(this, file, githubUser, githubRepo, githubBranch)
             }
         }
     }

diff --git a/...otlin/net/guizhanss/infinityexpansion2/implementation/items/generators/EnergyGenerator.kt b/...otlin/net/guizhanss/infinityexpansion2/implementation/items/generators/EnergyGenerator.kt
@@ -10,7 +10,7 @@ import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType
 import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetProvider
 import io.github.thebusybiscuit.slimefun4.core.handlers.BlockUseHandler
 import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config
-import net.guizhanss.guizhanlib.utils.StringUtil
+import net.guizhanss.guizhanlib.common.utils.StringUtil
 import net.guizhanss.infinityexpansion2.InfinityExpansion2
 import net.guizhanss.infinityexpansion2.core.items.attributes.CustomTickRateMachine
 import net.guizhanss.infinityexpansion2.core.items.attributes.EnergyProducer

diff --git a/src/main/kotlin/net/guizhanss/infinityexpansion2/implementation/items/tools/StrainerBase.kt b/src/main/kotlin/net/guizhanss/infinityexpansion2/implementation/items/tools/StrainerBase.kt
@@ -11,8 +11,8 @@ import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset
 import me.mrCookieSlime.Slimefun.api.inventory.DirtyChestMenu
+import net.guizhanss.guizhanlib.common.utils.RandomUtil
 import net.guizhanss.guizhanlib.slimefun.machines.TickingMenuBlock
-import net.guizhanss.guizhanlib.utils.RandomUtil
 import net.guizhanss.infinityexpansion2.InfinityExpansion2
 import net.guizhanss.infinityexpansion2.core.items.attributes.InformationalRecipeDisplayItem
 import net.guizhanss.infinityexpansion2.core.menu.MenuLayout

diff --git a/src/main/kotlin/net/guizhanss/infinityexpansion2/implementation/setup/MobSimulationSetup.kt b/src/main/kotlin/net/guizhanss/infinityexpansion2/implementation/setup/MobSimulationSetup.kt
@@ -2,7 +2,7 @@
 
 package net.guizhanss.infinityexpansion2.implementation.setup
 
-import net.guizhanss.guizhanlib.utils.StringUtil
+import net.guizhanss.guizhanlib.common.utils.StringUtil
 import net.guizhanss.infinityexpansion2.InfinityExpansion2
 import net.guizhanss.infinityexpansion2.api.InfinityExpansion2API
 import net.guizhanss.infinityexpansion2.api.mobsim.MobDataCardProps

diff --git a/src/main/kotlin/net/guizhanss/infinityexpansion2/utils/FileExt.kt b/src/main/kotlin/net/guizhanss/infinityexpansion2/utils/FileExt.kt
@@ -1,6 +1,6 @@
 package net.guizhanss.infinityexpansion2.utils
 
-import net.guizhanss.guizhanlib.utils.FileUtil
+import net.guizhanss.guizhanlib.common.utils.FileUtil
 import java.io.File
 import java.io.IOException
 import java.util.jar.JarEntry

diff --git a/src/main/kotlin/net/guizhanss/infinityexpansion2/utils/GeneralExt.kt b/src/main/kotlin/net/guizhanss/infinityexpansion2/utils/GeneralExt.kt
@@ -1,6 +1,6 @@
 package net.guizhanss.infinityexpansion2.utils
 
-import net.guizhanss.guizhanlib.utils.StringUtil
+import net.guizhanss.guizhanlib.common.utils.StringUtil
 
 inline fun <reified T : Enum<T>> valueOfOrNull(name: String): T? = enumValues<T>().firstOrNull { it.name == name }
 

diff --git a/src/main/kotlin/net/guizhanss/infinityexpansion2/utils/bukkitext/NamespacedKeyExt.kt b/src/main/kotlin/net/guizhanss/infinityexpansion2/utils/bukkitext/NamespacedKeyExt.kt
@@ -1,6 +1,6 @@
 package net.guizhanss.infinityexpansion2.utils.bukkitext
 
-import net.guizhanss.guizhanlib.utils.StringUtil
+import net.guizhanss.guizhanlib.common.utils.StringUtil
 import net.guizhanss.infinityexpansion2.InfinityExpansion2
 import org.bukkit.NamespacedKey
 import java.util.Locale