Merge remote-tracking branch 'origin/master'

# Conflicts: # gradle.properties
Auxilor · Dec 26, 2023 · 64647e3 · 64647e3
2 parents dba640f + c80cdf7
commit 64647e3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -89,6 +89,9 @@ allprojects {
 
         // Denizen
         maven("https://maven.citizensnpcs.co/repo")
+
+        // IridiumSkyblock
+        maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/")
     }
 
     dependencies {

diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
     compileOnly("com.github.MilkBowl:VaultAPI:1.7")
     compileOnly("com.github.WhipDevelopment:CrashClaim:f9cd7d92eb")
     compileOnly("com.wolfyscript.wolfyutilities:wolfyutilities:3.16.0.0")
-    compileOnly("com.github.decentsoftware-eu:decentholograms:2.1.2")
+    compileOnly("com.github.decentsoftware-eu:decentholograms:2.8.5")
     compileOnly("com.github.Gypopo:EconomyShopGUI-API:1.4.6")
     compileOnly("com.github.N0RSKA:ScytherAPI:55a")
     compileOnly("org.black_ixx:playerpoints:3.2.5")
@@ -62,6 +62,7 @@ dependencies {
     compileOnly("com.denizenscript:denizen:1.2.7-SNAPSHOT") {
         exclude(group = "*", module = "*")
     }
+    compileOnly("com.iridium:IridiumSkyblock:4.0.8")
 
     compileOnly(fileTree("../../lib") {
         include("*.jar")

diff --git a/.../kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt b/.../kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt
@@ -1,7 +1,7 @@
 package com.willfp.eco.internal.spigot.integrations.antigrief
 
-import com.iridium.iridiumskyblock.PermissionType
 import com.iridium.iridiumskyblock.api.IridiumSkyblockAPI
+import com.iridium.iridiumteams.PermissionType
 import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
 import org.bukkit.Location
 import org.bukkit.block.Block
@@ -49,8 +49,13 @@ class AntigriefIridiumSkyblock : AntigriefIntegration {
     }
 
     override fun canPickupItem(player: Player, location: Location): Boolean {
+        return true
+        /*
         val api = IridiumSkyblockAPI.getInstance()
         return api.getIslandPermission(api.getIslandViaLocation(location).orElse(null) ?: return true, api.getUser(player), PermissionType.PICKUP_ITEMS)
+
+        PICKUP_ITEMS was removed in Iridium v4
+         */
     }
 
     override fun getPluginName(): String {

diff --git a/...in/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt b/...in/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt
@@ -7,7 +7,7 @@ import org.bukkit.Location
 import java.util.UUID
 
 class HologramDecentHolograms : HologramIntegration {
-    override fun createHologram(location: Location, contents: MutableList<String>): Hologram {
+    override fun createHologram(location: Location, contents: List<String>): Hologram {
         val id = UUID.randomUUID().toString()
 
         DHAPI.createHologram(id, location, contents)
@@ -26,8 +26,8 @@ class HologramDecentHolograms : HologramIntegration {
             DHAPI.getHologram(id)?.destroy()
         }
 
-        override fun setContents(contents: MutableList<String>) {
+        override fun setContents(contents: List<String>) {
             DHAPI.setHologramLines(DHAPI.getHologram(id), contents)
         }
     }
-}
+}
diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml
@@ -10,13 +10,15 @@ load: STARTUP
 loadbefore:
   - Spartan
   - CustomCrafting
+  - Lands
+  - EconomyShopGUI
+  - EconomyShopGUI-Premium
 softdepend:
   - ProtocolLib
   - WorldGuard
   - GriefPrevention
   - Towny
   - FactionsUUID
-  - Lands
   - Kingdoms
   - NoCheatPlus
   - AAC
@@ -46,8 +48,6 @@ softdepend:
   - MythicMobs
   - ExecutableItems
   - RPGHorses
-  - EconomyShopGUI
-  - EconomyShopGUI-Premium
   - zShop
   - DeluxeSellwands
   - Scyther

diff --git a/lib/IridiumSkyblock-3.2.8.jar b/lib/IridiumSkyblock-3.2.8.jar