update gradle

WeaponMechanics · Feb 3, 2024 · f1831a9 · f1831a9
1 parent ed0ab98
commit f1831a9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 72 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 group = "com.cjcrafter"
@@ -7,13 +6,9 @@ version = "3.0.2"
 plugins {
     `java-library`
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "7.1.0"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
     id("net.minecrell.plugin-yml.bukkit") version "0.5.2"
-    kotlin("jvm") version "1.7.20-RC"
-}
-
-configurations {
-    compileClasspath.get().extendsFrom(create("shadeOnly"))
+    kotlin("jvm") version "1.9.21"
 }
 
 // See https://github.com/Minecrell/plugin-yml
@@ -29,66 +24,37 @@ bukkit {
 repositories {
     mavenCentral()
 
-    maven {
-        url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
-    }
-
-    maven {
-        name = "GitHubPackages"
-        url = uri("https://maven.pkg.github.com/WeaponMechanics/MechanicsMain")
-        credentials {
-            username = findProperty("user").toString()
-            password = findProperty("pass").toString() // Check WeaponMechanics wiki on how to use this in your repo!
-        }
-    }
-
-    maven {
-        name = "GitHubPackages"
-        url = uri("https://maven.pkg.github.com/WeaponMechanics/MechanicsAutoDownload")
-        credentials {
-            username = findProperty("user").toString()
-            password = findProperty("pass").toString() // Check WeaponMechanics wiki on how to use this in your repo!
-        }
-    }
-
-    maven {
-        name = "lumine-repo"
-        url = uri("http://mvn.lumine.io/repository/maven-public/")
-        isAllowInsecureProtocol = true
-    }
+    maven(url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // Spigot
+    maven(url = "https://mvn.lumine.io/repository/maven-public/") // MythicMobs
+    maven(url = "https://repo.jeff-media.com/public/") // SpigotUpdateChecker
 }
 
 dependencies {
-    compileOnly("org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT")
-    compileOnly("io.lumine:Mythic-Dist:5.0.1-SNAPSHOT")
-    compileOnly("me.deecaad:mechanicscore:3.0.0")
-    compileOnly("me.deecaad:weaponmechanics:3.0.0")
     implementation("org.bstats:bstats-bukkit:3.0.1")
-    implementation("me.cjcrafter:mechanicsautodownload:1.1.2")
+    implementation("com.jeff_media:SpigotUpdateChecker:3.0.3")
+
+    compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
+    compileOnly("io.lumine:Mythic-Dist:5.3.5")
+    compileOnly("com.cjcrafter:mechanicscore:3.2.5")
+    compileOnly("com.cjcrafter:weaponmechanics:3.2.6")
 }
 
-tasks.named<ShadowJar>("shadowJar") {
-    classifier = null
+tasks.shadowJar {
     archiveFileName.set("ArmorMechanics-${project.version}.jar")
-    configurations = listOf(project.configurations["shadeOnly"], project.configurations["runtimeClasspath"])
 
     dependencies {
-        relocate ("org.bstats", "me.cjcrafter.armormechanics.lib.bstats") {
+        relocate ("org.bstats", "com.cjcrafter.armormechanics.lib.bstats") {
             include(dependency("org.bstats:"))
         }
-        relocate ("me.cjcrafter.auto", "me.cjcrafter.armormechanics.lib.auto") {
-            include(dependency("me.cjcrafter:mechanicsautodownload"))
+        relocate("com.jeff_media", "com.cjcrafter.armormechanics.lib") {
+            include(dependency("com.jeff_media:"))
         }
         relocate ("kotlin.", "com.cjcrafter.armormechanics.lib.kotlin.") {
             include(dependency("org.jetbrains.kotlin:"))
         }
     }
 }
 
-tasks.named("assemble").configure {
-    dependsOn("shadowJar")
-}
-
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/cjcrafter/armormechanics/ArmorMechanics.kt b/src/main/java/com/cjcrafter/armormechanics/ArmorMechanics.kt
@@ -2,9 +2,10 @@ package com.cjcrafter.armormechanics
 
 import com.cjcrafter.armormechanics.commands.Command
 import com.cjcrafter.armormechanics.listeners.*
+import com.jeff_media.updatechecker.UpdateCheckSource
+import com.jeff_media.updatechecker.UpdateChecker
+import com.jeff_media.updatechecker.UserAgentBuilder
 import listeners.ArmorEquipListener
-import me.cjcrafter.auto.UpdateChecker
-import me.cjcrafter.auto.UpdateInfo
 import me.deecaad.core.events.QueueSerializerEvent
 import me.deecaad.core.file.BukkitConfig
 import me.deecaad.core.file.SerializeData
@@ -16,22 +17,19 @@ import me.deecaad.core.utils.LogLevel
 import me.deecaad.core.utils.ReflectionUtil
 import org.bstats.bukkit.Metrics
 import org.bstats.charts.SimplePie
-import org.bukkit.Bukkit
-import org.bukkit.ChatColor
 import org.bukkit.configuration.file.FileConfiguration
 import org.bukkit.configuration.file.YamlConfiguration
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
-import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.inventory.ItemStack
 import org.bukkit.plugin.java.JavaPlugin
 import java.io.File
 import java.util.concurrent.Callable
 
 class ArmorMechanics : JavaPlugin() {
+
     lateinit var debug: Debugger
     private var metrics: Metrics? = null
-    private var update: UpdateChecker? = null
     val effects: MutableMap<String, BonusEffect> = HashMap()
     val armors: MutableMap<String, ItemStack> = HashMap()
     val sets: MutableMap<String, ArmorSet> = HashMap()
@@ -182,22 +180,12 @@ class ArmorMechanics : JavaPlugin() {
     }
 
     private fun registerUpdateChecker() {
-        update = UpdateChecker(this, UpdateChecker.github("WeaponMechanics", "ArmorMechanics"))
-        val listener: Listener = object : Listener {
-            @EventHandler
-            fun onJoin(event: PlayerJoinEvent) {
-                if (event.player.isOp) {
-                    TaskChain(this@ArmorMechanics)
-                        .thenRunAsync { callback: Any? -> update!!.hasUpdate() }
-                        .thenRunSync { callback: Any? ->
-                            val update = callback as UpdateInfo?
-                            if (callback != null) event.player.sendMessage(ChatColor.RED.toString() + "ArmorMechanics is out of date! " + update!!.current + " -> " + update.newest)
-                            null
-                        }
-                }
-            }
-        }
-        Bukkit.getPluginManager().registerEvents(listener, this)
+        debug.debug("Registering SpigotUpdateChecker")
+        UpdateChecker(this, UpdateCheckSource.SPIGOT, "103179")
+            .setNotifyOpsOnJoin(true)
+            .setUserAgent(UserAgentBuilder().addPluginNameAndVersion())
+            .checkEveryXHours(24.0)
+            .checkNow()
     }
 
     companion object {