Merge pull request #365 from Exanthiax/develop

build.gradle.kts

@@ -97,6 +97,9 @@ allprojects {
 
         // HuskPlugins
         maven("https://repo.william278.net/releases")
+
+        // FancyHolograms
+        maven("https://repo.fancyplugins.de/releases")
     }
 
     dependencies {

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

@@ -1,5 +1,6 @@
 package com.willfp.eco.core;
 
+import com.google.common.collect.ImmutableList;
 import com.willfp.eco.core.command.impl.PluginCommand;
 import com.willfp.eco.core.config.base.ConfigYml;
 import com.willfp.eco.core.config.base.LangYml;
@@ -36,6 +37,8 @@ import org.jetbrains.annotations.Nullable;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -120,9 +123,17 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
 
     /**
      * The display module for the plugin.
+     *
+     * @deprecated Plugins can now have multiple display modules.
      */
+    @Deprecated(since = "6.72.0")
     private DisplayModule displayModule;
 
+    /**
+     * The display modules for the plugin.
+     */
+    private List<DisplayModule> displayModules = new ArrayList<>();
+
     /**
      * The logger for the plugin.
      */
@@ -555,10 +566,15 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
      * Default code to be executed after the server is up.
      */
     public final void afterLoad() {
-        this.displayModule = createDisplayModule();
+        DisplayModule module = createDisplayModule();
+        if (module != null) {
+            Display.registerDisplayModule(module);
+            this.displayModules.add(module);
+        }
 
-        if (this.getDisplayModule() != null) {
+        for (DisplayModule displayModule : this.loadDisplayModules()) {
-            Display.registerDisplayModule(this.getDisplayModule());
+            Display.registerDisplayModule(displayModule);
+            this.displayModules.add(displayModule);
         }
 
         if (Prerequisite.HAS_PROTOCOLLIB.isMet()) {
@@ -899,14 +915,25 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
      * Create the display module for the plugin.
      *
      * @return The display module, or null.
+     * @deprecated Use {@link #loadDisplayModules()} instead.
      */
     @Nullable
+    @Deprecated(since = "6.72.0")
     protected DisplayModule createDisplayModule() {
         Validate.isTrue(this.getDisplayModule() == null, "Display module exists!");
 
         return null;
     }
 
+    /**
+     * Load display modules.
+     *
+     * @return The display modules.
+     */
+    protected List<DisplayModule> loadDisplayModules() {
+        return new ArrayList<>();
+    }
+
     /**
      * Get the minimum version of eco to use the plugin.
      *
@@ -1156,12 +1183,23 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike, Regist
      * Get the plugin's display module.
      *
      * @return The display module.
+     * @deprecated Use {@link #getDisplayModules()} instead.
      */
     @Nullable
+    @Deprecated(since = "6.72.0", forRemoval = true)
     public DisplayModule getDisplayModule() {
         return this.displayModule;
     }
 
+    /**
+     * Get the plugin's display modules.
+     *
+     * @return The display modules.
+     */
+    public List<DisplayModule> getDisplayModules() {
+        return ImmutableList.copyOf(this.displayModules);
+    }
+
     /**
      * Get if the plugin is outdated.
      *

eco-api/src/main/java/com/willfp/eco/core/display/Display.java

@@ -211,12 +211,22 @@ public final class Display {
                 new ArrayList<>()
         );
 
-        modules.removeIf(it -> it.getPluginName().equalsIgnoreCase(module.getPluginName()));
         modules.add(module);
 
         REGISTERED_MODULES.put(module.getWeight(), modules);
     }
 
+    /**
+     * Unregister a display module.
+     *
+     * @param module The module.
+     */
+    public static void unregisterDisplayModule(@NotNull final DisplayModule module) {
+        for (List<DisplayModule> modules : REGISTERED_MODULES.values()) {
+            modules.remove(module);
+        }
+    }
+
     private Display() {
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }

eco-core/core-backend-modern/src/main/kotlin/com/willfp/eco/internal/compat/modern/recipes/AutocrafterPatchImpl.kt

@@ -0,0 +1,19 @@
+@file:Suppress("UnstableApiUsage")
+
+package com.willfp.eco.internal.compat.modern.recipes
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.internal.recipes.AutocrafterPatch
+import org.bukkit.event.EventHandler
+import org.bukkit.event.block.CrafterCraftEvent
+
+class AutocrafterPatchImpl: AutocrafterPatch {
+    @EventHandler
+    fun preventEcoRecipes(event: CrafterCraftEvent) {
+        if (!EcoPlugin.getPluginNames().contains(event.recipe.key.namespace)) {
+            return
+        }
+
+        event.isCancelled = true
+    }
+}

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/command/HandledCommand.kt

@@ -126,14 +126,19 @@ abstract class HandledCommand(
      * @return The tab completion results.
      */
     private fun CommandBase.handleTabComplete(sender: CommandSender, args: List<String>): List<String> {
-        if (!sender.hasPermission(permission)) return emptyList()
+        if (!sender.hasPermission(permission)) {
+            return emptyList()
+        }
 
         if (args.size == 1) {
-            val completions = subcommands.filter { sender.hasPermission(it.permission) }.map { it.name }
+            val completions = mutableListOf<String>()
 
-            val list = mutableListOf<String>()
+            StringUtil.copyPartialMatches(
+                args[0],
+                subcommands.filter { sender.hasPermission(it.permission) }.map { it.name },
+                completions
+            )
 
-            StringUtil.copyPartialMatches(args[0], completions, list)
             if (completions.isNotEmpty()) {
                 return completions
             }
@@ -156,9 +161,11 @@ abstract class HandledCommand(
         }
 
         val completions = tabComplete(sender, args).toMutableList()
+
         if (sender is Player) {
             completions.addAll(tabComplete(sender, args))
         }
+
         return completions.sorted()
     }
 }

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/particle/ParticleFactoryRGB.kt

@@ -12,7 +12,7 @@ object ParticleFactoryRGB : ParticleFactory {
         if (Prerequisite.HAS_1_20_5.isMet) {
             Particle.valueOf("DUST")
         } else {
-            Particle.valueOf("REDSTONE_DUST")
+            Particle.valueOf("REDSTONE")
         }
     }.getOrNull()
 

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/price/PriceFactoryXP.kt

@@ -8,6 +8,11 @@ import org.bukkit.entity.Player
 import java.util.UUID
 import kotlin.math.roundToInt
 
+private fun getXPNeededForLevel(level: Int): Int {
+    // XP Formula from NMS Player
+    return if (level >= 30) 112 + (level - 30) * 9 else (if (level >= 15) 37 + (level - 15) * 5 else 7 + level * 2)
+}
+
 object PriceFactoryXP : PriceFactory {
     override fun getNames() = listOf(
         "xp",
@@ -25,15 +30,37 @@ object PriceFactoryXP : PriceFactory {
     ) : Price {
         private val multipliers = mutableMapOf<UUID, Double>()
 
-        override fun canAfford(player: Player, multiplier: Double): Boolean =
+        override fun canAfford(player: Player, multiplier: Double): Boolean {
-            player.totalExperience >= getValue(player, multiplier)
+            var totalExperience = 0
+            for (level in 0 until player.level) {
+                totalExperience += getXPNeededForLevel(level)
+            }
+
+            totalExperience += (player.exp * getXPNeededForLevel(player.level)).toInt()
+
+            return totalExperience >= getValue(player, multiplier).roundToInt()
+        }
 
         override fun pay(player: Player, multiplier: Double) {
-            player.totalExperience -= getValue(player, multiplier).roundToInt()
+            takeXP(player, getValue(player, multiplier).roundToInt())
+        }
+
+        private fun takeXP(player: Player, amount: Int) {
+            val currentLevel = player.level
+            val currentExp = player.exp * getXPNeededForLevel(currentLevel)
+
+            if (currentExp >= amount) {
+                player.exp = (currentExp - amount) / getXPNeededForLevel(currentLevel)
+            } else {
+                // Handle recursive level down
+                player.exp = 1f
+                player.level = (currentLevel - 1).coerceAtLeast(0)
+                takeXP(player, (amount - currentExp).toInt())
+            }
         }
 
         override fun giveTo(player: Player, multiplier: Double) {
-            player.totalExperience += getValue(player, multiplier).roundToInt()
+            player.giveExp(getValue(player, multiplier).roundToInt())
         }
 
         override fun getValue(player: Player, multiplier: Double): Double {

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/recipes/AutocrafterPatch.kt

@@ -0,0 +1,7 @@
+package com.willfp.eco.internal.recipes
+
+import com.willfp.eco.internal.compat.ModernCompatibilityProxy
+import org.bukkit.event.Listener
+
+@ModernCompatibilityProxy("recipes.AutocrafterPatchImpl")
+interface AutocrafterPatch: Listener

eco-core/core-nms/v1_21/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_21/DisplayName.kt

@@ -43,15 +43,13 @@ class DisplayName : DisplayNameProxy {
         val nmsComponent = displayName.toNMS()
 
         val nmsEntity = entity.handle
-        nmsEntity.isCustomNameVisible
-        val entityData = SynchedEntityData.Builder(nmsEntity).build()
-
-        entityData.set(displayNameAccessor, Optional.of(nmsComponent), true)
-        entityData.set(customNameVisibleAccessor, visible, true)
 
         val packet = ClientboundSetEntityDataPacket(
             nmsEntity.id,
-            entityData.packDirty() ?: throw IllegalStateException("No packed entity data")
+            listOf(
+                SynchedEntityData.DataValue.create(displayNameAccessor, Optional.of(nmsComponent)),
+                SynchedEntityData.DataValue.create(customNameVisibleAccessor, visible)
+            )
         )
 
         player.sendPacket(Packet(packet))

eco-core/core-nms/v1_21/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_21/ExtendedPersistentDataContainerFactory.kt

@@ -10,6 +10,7 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry
 import org.bukkit.inventory.ItemStack
 import org.bukkit.persistence.PersistentDataContainer
 import org.bukkit.persistence.PersistentDataType
+import java.lang.reflect.Field
 
 class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy {
     private val registry: CraftPersistentDataTypeRegistry
@@ -21,7 +22,15 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa
          */
         val item = CraftItemStack.asCraftCopy(ItemStack(Material.STONE))
         val pdc = item.itemMeta!!.persistentDataContainer
-        this.registry = CraftPersistentDataContainer::class.java.getDeclaredField("registry")
+
+        // Cross-version compatibility:
+        val registryField: Field = try {
+            CraftPersistentDataContainer::class.java.getDeclaredField("registry")
+        } catch (e: NoSuchFieldException) {
+            CraftPersistentDataContainer::class.java.superclass.getDeclaredField("registry")
+        }
+
+        this.registry = registryField
             .apply { isAccessible = true }.get(pdc) as CraftPersistentDataTypeRegistry
     }
 

eco-core/core-plugin/build.gradle.kts

@@ -66,6 +66,7 @@ dependencies {
     compileOnly("net.william278.huskclaims:huskclaims-bukkit:1.0.1")
     compileOnly("net.william278:husktowns:2.6.1")
     compileOnly("com.github.jojodmo:ItemBridge:b0054538c1")
+    compileOnly("de.oliver:FancyHolograms:2.3.0")
 
     compileOnly(fileTree("../../lib") {
         include("*.jar")

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

@@ -58,6 +58,7 @@ import com.willfp.eco.internal.particle.ParticleFactoryRGB
 import com.willfp.eco.internal.price.PriceFactoryEconomy
 import com.willfp.eco.internal.price.PriceFactoryXP
 import com.willfp.eco.internal.price.PriceFactoryXPLevels
+import com.willfp.eco.internal.recipes.AutocrafterPatch
 import com.willfp.eco.internal.spigot.arrows.ArrowDataListener
 import com.willfp.eco.internal.spigot.data.DataListener
 import com.willfp.eco.internal.spigot.data.DataYml
@@ -114,6 +115,7 @@ import com.willfp.eco.internal.spigot.integrations.economy.EconomyVault
 import com.willfp.eco.internal.spigot.integrations.entitylookup.EntityLookupModelEngine
 import com.willfp.eco.internal.spigot.integrations.hologram.HologramCMI
 import com.willfp.eco.internal.spigot.integrations.hologram.HologramDecentHolograms
+import com.willfp.eco.internal.spigot.integrations.hologram.HologramFancyHolograms
 import com.willfp.eco.internal.spigot.integrations.hologram.HologramHolographicDisplays
 import com.willfp.eco.internal.spigot.integrations.mcmmo.McmmoIntegrationImpl
 import com.willfp.eco.internal.spigot.integrations.multiverseinventories.MultiverseInventoriesIntegration
@@ -369,6 +371,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             IntegrationLoader("CMI") { HologramManager.register(HologramCMI()) },
             IntegrationLoader("DecentHolograms") { HologramManager.register(HologramDecentHolograms()) },
             //IntegrationLoader("GHolo") { HologramManager.register(HologramGHolo()) },
+            IntegrationLoader("FancyHolograms") { HologramManager.register(HologramFancyHolograms()) },
 
             // AFK
             IntegrationLoader("Essentials") { AFKManager.register(AFKIntegrationEssentials()) },
@@ -433,6 +436,10 @@ abstract class EcoSpigotPlugin : EcoPlugin() {
             listeners.add(NaturalExpGainListenersSpigot())
         }
 
+        ifModern {
+            listeners += loadProxy<AutocrafterPatch>()
+        }
+
         return listeners
     }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramFancyHolograms.kt

@@ -0,0 +1,45 @@
+package com.willfp.eco.internal.spigot.integrations.hologram
+
+import com.willfp.eco.core.integrations.hologram.Hologram
+import com.willfp.eco.core.integrations.hologram.HologramIntegration
+import de.oliver.fancyholograms.api.FancyHologramsPlugin
+import de.oliver.fancyholograms.api.data.TextHologramData
+import org.bukkit.Location
+import java.util.UUID
+import kotlin.jvm.optionals.getOrNull
+
+class HologramFancyHolograms : HologramIntegration {
+    private val manager = FancyHologramsPlugin.get().hologramManager
+
+    override fun createHologram(location: Location, contents: List<String>): Hologram {
+        val id = UUID.randomUUID().toString()
+
+        val data = TextHologramData(id, location)
+        data.text = contents
+        data.isPersistent = false
+
+        val holo = manager.create(data)
+        FancyHologramsPlugin.get().hologramManager.addHologram(holo)
+
+        return HologramImplFancyHolograms(id)
+    }
+
+    override fun getPluginName(): String {
+        return "FancyHolograms"
+    }
+
+    inner class HologramImplFancyHolograms(
+        private val id: String,
+    ) : Hologram {
+        override fun remove() {
+            val hologram = manager.getHologram(id).getOrNull() ?: return
+            manager.removeHologram(hologram)
+        }
+
+        override fun setContents(contents: List<String>) {
+            val hologram = manager.getHologram(id).getOrNull() ?: return
+            val data = hologram.data as? TextHologramData ?: return
+            data.text = contents
+        }
+    }
+}

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/CraftingRecipeListener.kt

@@ -1,10 +1,8 @@
 package com.willfp.eco.internal.spigot.recipes
 
-import com.willfp.eco.core.Eco
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.recipe.Recipes
 import org.bukkit.Keyed
-import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.inventory.CraftItemEvent
@@ -17,6 +15,7 @@ class CraftingRecipeListener(val plugin: EcoPlugin) : Listener {
         if (!EcoPlugin.getPluginNames().contains(event.recipe.namespace)) {
             return
         }
+
         if (event.recipe.key.contains("_displayed")) {
             event.isCancelled = true
         }

eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/CraftingRecipes.kt

@@ -59,4 +59,4 @@ class WrappedCraftItemEvent(
         event.result = Event.Result.DENY
         event.isCancelled = true
     }
-}
+}

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

@@ -61,3 +61,4 @@ softdepend:
   - PlayerPoints
   - Denizen
   - RoyaleEconomy
+  - FancyHolograms

gradle.properties

@@ -1,2 +1,2 @@
-version = 6.71.4
+version = 6.72.0
 kotlin.incremental.useClasspathSnapshot=false