Cleaned up dependencies

build.gradle

@@ -51,9 +51,6 @@ allprojects {
 
         // CombatLogX
         maven { url 'https://nexus.sirblobman.xyz/repository/public/' }
-
-        // Head Database
-        maven { url 'https://mvn.intellectualsites.com/content/groups/public/' }
     }
 
     dependencies {
@@ -87,7 +84,7 @@ allprojects {
 
     shadowJar {
         relocate('org.bstats', 'com.willfp.eco.shaded.bstats')
-        relocate('net.kyori.adventure', 'com.willfp.eco.shaded.adventure')
+        relocate('net.kyori.adventure.text.minimessage', 'com.willfp.eco.shaded.minimessage')
     }
 
     jar {

eco-api/build.gradle

@@ -6,14 +6,18 @@ group 'com.willfp'
 version rootProject.version
 
 dependencies {
+    // Adventure
+    compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
+    compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
+    compileOnly 'net.kyori:adventure-api:4.9.1'
+    compileOnly 'net.kyori:adventure-text-serializer-gson:4.8.1'
+    compileOnly 'net.kyori:adventure-text-serializer-legacy:4.8.1'
+
+    // Other
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
     compileOnly 'org.apache.maven:maven-artifact:3.0.3'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.0-SNAPSHOT'
     compileOnly 'com.google.code.gson:gson:2.8.7'
-    compileOnly 'net.kyori:adventure-text-serializer-gson:4.8.1'
-    compileOnly 'net.kyori:adventure-text-serializer-legacy:4.8.1'
-    compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
-    compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
 }
 
 java {

eco-api/src/main/java/com/willfp/eco/core/Handler.java

@@ -210,6 +210,6 @@ public interface Handler {
      *
      * @return The audiences.
      */
-    @NotNull
+    @Nullable
     BukkitAudiences getAdventure();
 }

eco-api/src/main/java/com/willfp/eco/util/PlayerUtils.java

@@ -1,8 +1,10 @@
 package com.willfp.eco.util;
 
 import com.willfp.eco.core.Eco;
+import com.willfp.eco.core.Prerequisite;
 import lombok.experimental.UtilityClass;
 import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -20,7 +22,21 @@ public class PlayerUtils {
      */
     @NotNull
     public Audience getAudience(@NotNull final Player player) {
-        return Eco.getHandler().getAdventure().player(player);
+        BukkitAudiences adventure = Eco.getHandler().getAdventure();
+
+        if (Prerequisite.HAS_PAPER.isMet()) {
+            if (player instanceof Audience) {
+                return (Audience) player;
+            } else {
+                return Audience.empty();
+            }
+        } else {
+            if (adventure == null) {
+                return Audience.empty();
+            } else {
+                return adventure.player(player);
+            }
+        }
     }
 
     /**
@@ -31,6 +47,20 @@ public class PlayerUtils {
      */
     @NotNull
     public Audience getAudience(@NotNull final CommandSender sender) {
-        return Eco.getHandler().getAdventure().sender(sender);
+        BukkitAudiences adventure = Eco.getHandler().getAdventure();
+
+        if (Prerequisite.HAS_PAPER.isMet()) {
+            if (sender instanceof Audience) {
+                return (Audience) sender;
+            } else {
+                return Audience.empty();
+            }
+        } else {
+            if (adventure == null) {
+                return Audience.empty();
+            } else {
+                return adventure.sender(sender);
+            }
+        }
     }
 }

eco-api/src/main/java/com/willfp/eco/util/StringUtils.java

@@ -1,6 +1,7 @@
 package com.willfp.eco.util;
 
 import com.google.common.collect.ImmutableList;
+import com.willfp.eco.core.Prerequisite;
 import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
 import lombok.experimental.UtilityClass;
 import net.kyori.adventure.text.Component;
@@ -251,9 +252,11 @@ public class StringUtils {
             processedMessage = PlaceholderManager.translatePlaceholders(processedMessage, player);
         }
         processedMessage = translateGradients(processedMessage);
-        processedMessage = translateMiniMessage(processedMessage);
         processedMessage = translateHexColorCodes(processedMessage);
         processedMessage = ChatColor.translateAlternateColorCodes('&', processedMessage);
+        if (Prerequisite.HAS_PAPER.isMet()) {
+            processedMessage = translateMiniMessage(processedMessage);
+        }
         return processedMessage;
     }
 

eco-core/core-plugin/build.gradle

@@ -3,12 +3,13 @@ version rootProject.version
 
 dependencies {
     implementation 'org.bstats:bstats-bukkit:1.7'
-    implementation 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
+    implementation('net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT') {
-    implementation 'net.kyori:adventure-platform-bukkit:4.0.0'
+        exclude group: 'net.kyori', module: 'adventure-api'
-    implementation 'net.kyori:adventure-api:4.9.1'
+    }
-    implementation 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
+    compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
-    implementation 'net.kyori:adventure-text-serializer-gson:4.8.1'
+    compileOnly 'net.kyori:adventure-api:4.9.1'
-    implementation 'net.kyori:adventure-text-serializer-legacy:4.8.1'
+    compileOnly 'net.kyori:adventure-text-serializer-gson:4.8.1'
+    compileOnly 'net.kyori:adventure-text-serializer-legacy:4.8.1'
     compileOnly 'org.apache.maven:maven-artifact:3.0.3'
     compileOnly 'com.google.code.gson:gson:2.8.7'
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
@@ -28,7 +29,6 @@ dependencies {
     compileOnly 'com.willfp:Oraxen:e1f4003d8d'
     compileOnly 'com.github.brcdev-minecraft:shopgui-api:2.2.0'
     compileOnly 'com.github.LoneDev6:API-ItemsAdder:2.4.7'
-    compileOnly 'me.arcaniax:HeadDatabase-API:1.2.0'
 
     // CombatLogX V10 + NewbieHelper Expansion
     compileOnly 'com.SirBlobman.combatlogx:CombatLogX-API:10.0.0.0-SNAPSHOT'

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt

@@ -43,7 +43,7 @@ import java.util.logging.Logger
 class EcoHandler : EcoSpigotPlugin(), Handler {
     private val cleaner = EcoCleaner()
     private val requirementFactory = EcoRequirementFactory()
-    private lateinit var adventure: BukkitAudiences
+    private var adventure: BukkitAudiences? = null
 
     override fun createScheduler(plugin: EcoPlugin): Scheduler {
         return EcoScheduler(plugin)
@@ -129,7 +129,7 @@ class EcoHandler : EcoSpigotPlugin(), Handler {
         return requirementFactory
     }
 
-    override fun getAdventure(): BukkitAudiences {
+    override fun getAdventure(): BukkitAudiences? {
         return adventure
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt

@@ -3,6 +3,7 @@ package com.willfp.eco.spigot
 import com.willfp.eco.core.AbstractPacketAdapter
 import com.willfp.eco.core.Eco
 import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.Prerequisite
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.integrations.IntegrationLoader
 import com.willfp.eco.core.integrations.anticheat.AnticheatManager
@@ -69,7 +70,10 @@ abstract class EcoSpigotPlugin : EcoPlugin(
 
     override fun handleEnable() {
         CollatedRunnable(this)
-        (Eco.getHandler() as EcoHandler).adventure = BukkitAudiences.create(this)
+
+        if (!Prerequisite.HAS_PAPER.isMet) {
+            (Eco.getHandler() as EcoHandler).setAdventure(BukkitAudiences.create(this))
+        }
 
         this.logger.info("Ignore messages about deprecated events!")
 
@@ -91,7 +95,7 @@ abstract class EcoSpigotPlugin : EcoPlugin(
     }
 
     override fun handleDisable() {
-        Eco.getHandler().adventure.close()
+        Eco.getHandler().adventure?.close()
     }
 
     override fun handleReload() {
@@ -109,7 +113,6 @@ abstract class EcoSpigotPlugin : EcoPlugin(
             // AntiGrief
             IntegrationLoader("WorldGuard") { AntigriefManager.register(AntigriefWorldGuard()) },
             IntegrationLoader("GriefPrevention") { AntigriefManager.register(AntigriefGriefPrevention()) },
-            IntegrationLoader("GriefDefender") { AntigriefManager.register(AntigriefGriefDefender()) },
             IntegrationLoader("FactionsUUID") { AntigriefManager.register(AntigriefFactionsUUID()) },
             IntegrationLoader("Towny") { AntigriefManager.register(AntigriefTowny()) },
             IntegrationLoader("Lands") { AntigriefManager.register(AntigriefLands(this)) },

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefGriefDefender.kt

@@ -1,81 +0,0 @@
-package com.willfp.eco.spigot.integrations.antigrief
-
-import com.flowpowered.math.vector.Vector3i
-import com.griefdefender.api.GriefDefender
-import com.griefdefender.api.data.PlayerData
-import com.griefdefender.api.permission.flag.Flags
-import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper
-import org.bukkit.Location
-import org.bukkit.block.Block
-import org.bukkit.entity.LivingEntity
-import org.bukkit.entity.Player
-import java.util.*
-
-class AntigriefGriefDefender : AntigriefWrapper {
-    override fun canBreakBlock(player: Player, block: Block): Boolean {
-        val data = GriefDefender.getCore().getPlayerData(player.world.uid, player.uniqueId) ?: return true
-
-        val claim = GriefDefender.getCore().getClaimAt(Vector3i(block.location.x, block.location.y, block.location.z))
-            ?: return true
-
-        return if (data.canIgnoreClaim(claim)) {
-            true
-        } else {
-            claim.getActiveFlagPermissionValue(Flags.BLOCK_BREAK, data.user, Collections.emptySet(), true).asBoolean()
-        }
-    }
-
-    override fun canCreateExplosion(player: Player, location: Location): Boolean {
-        val data = GriefDefender.getCore().getPlayerData(player.world.uid, player.uniqueId) ?: return true
-
-        val claim = GriefDefender.getCore().getClaimAt(Vector3i(location.x, location.y, location.z)) ?: return true
-
-        return if (data.canIgnoreClaim(claim)) {
-            true
-        } else {
-            claim.getActiveFlagPermissionValue(Flags.EXPLOSION_BLOCK, data.user, Collections.emptySet(), true)
-                .asBoolean()
-        }
-    }
-
-    override fun canPlaceBlock(player: Player, block: Block): Boolean {
-
-        val data: PlayerData = GriefDefender.getCore().getPlayerData(player.world.uid, player.uniqueId) ?: return true
-
-        val claim =
-            GriefDefender.getCore().getClaimAt(Vector3i(block.location.x, block.location.y, block.location.z))
-                ?: return true
-
-        return if (data.canIgnoreClaim(claim)) {
-            true
-        } else {
-            claim.getActiveFlagPermissionValue(Flags.BLOCK_PLACE, data.user, Collections.emptySet(), true)
-                .asBoolean()
-        }
-    }
-
-    override fun canInjure(player: Player, victim: LivingEntity): Boolean {
-
-        val data = GriefDefender.getCore().getPlayerData(player.world.uid, player.uniqueId) ?: return true
-
-        if (data.canIgnoreClaim(data.currentClaim)) {
-            return true
-        }
-
-        return if (victim is Player) {
-            val vicData = GriefDefender.getCore().getPlayerData(victim.world.uid, victim.uniqueId)
-            if (vicData != null) {
-                data.canPvp(data.currentClaim) && data.canPvp(vicData.currentClaim)
-            } else data.canPvp(data.currentClaim)
-        } else {
-            val claim =
-                GriefDefender.getCore().getClaimAt(Vector3i(victim.location.x, victim.location.y, victim.location.z))
-            claim?.getActiveFlagPermissionValue(Flags.ENTITY_DAMAGE, data.user, Collections.emptySet(), true)
-                ?.asBoolean() ?: true
-        }
-    }
-
-    override fun getPluginName(): String {
-        return "GriefDefender"
-    }
-}

eco-core/core-plugin/src/main/resources/plugin.yml

@@ -24,9 +24,11 @@ softdepend:
   - ShopGUIPlus
   - ItemsAdder
   - Oraxen
-  - HeadDatabase
-  - GriefDefender
 libraries:
-  - org.reflections:reflections:0.9.12
+  - 'org.reflections:reflections:0.9.12'
-  - org.apache.maven:maven-artifact:3.0.3
+  - 'org.apache.maven:maven-artifact:3.0.3'
-  - org.jetbrains.kotlin:kotlin-stdlib:1.5.31
+  - 'org.jetbrains.kotlin:kotlin-stdlib:1.5.31'
+  - 'net.kyori:adventure-platform-bukkit:4.0.0'
+  - 'net.kyori:adventure-api:4.9.1'
+  - 'net.kyori:adventure-text-serializer-gson:4.8.1'
+  - 'net.kyori:adventure-text-serializer-legacy:4.8.1'

gradle.properties

@@ -1,2 +1,2 @@
-version = 6.9.1
+version = 6.9.4
 plugin-name = eco