Updated to 6.35.10

Bump io.papermc.paperweight.userdev from 1.3.5 to 1.3.6

build.gradle.kts

@@ -101,7 +101,7 @@ allprojects {
         implementation("net.kyori:adventure-text-serializer-legacy:4.10.1")
 
         // Other
-        implementation("com.github.ben-manes.caffeine:caffeine:3.0.6")
+        implementation("com.github.ben-manes.caffeine:caffeine:3.1.0")
         implementation("org.apache.maven:maven-artifact:3.8.5")
     }
 

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

@@ -43,6 +43,7 @@ public final class StringUtils {
             .add(Pattern.compile("<G#([0-9A-Fa-f]{6})>(.*?)</G#([0-9A-Fa-f]{6})>", Pattern.CASE_INSENSITIVE))
             .add(Pattern.compile("<#:([0-9A-Fa-f]{6})>(.*?)</#:([0-9A-Fa-f]{6})>"))
             .add(Pattern.compile("\\{#:([0-9A-Fa-f]{6})}(.*?)\\{/#:([0-9A-Fa-f]{6})}"))
+            .add(Pattern.compile("\\{#([0-9A-Fa-f]{6})>}(.*?)\\{#([0-9A-Fa-f]{6})<}"))
             .build();
 
     /**

eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfig.kt

@@ -103,11 +103,13 @@ open class EcoConfig(
     }
 
     override fun getSubsectionOrNull(path: String): Config? {
-        return get(path) as? Config
+        return (get(path) as? Config)?.apply { this.addInjectablePlaceholder(injections) }
     }
 
     override fun getSubsectionsOrNull(path: String): List<Config>? {
-        return (get(path) as? Iterable<Config>)?.toList()
+        return (get(path) as? Iterable<Config>)
+            ?.map { it.apply { this.addInjectablePlaceholder(injections) } }
+            ?.toList()
     }
 
     override fun getType(): ConfigType {

eco-core/core-nms/nms-common/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.3.5"
+    id("io.papermc.paperweight.userdev") version "1.3.6"
 }
 
 group = "com.willfp"

eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt

@@ -26,6 +26,8 @@ import org.bukkit.inventory.ItemFlag
 import org.bukkit.persistence.PersistentDataContainer
 import org.bukkit.persistence.PersistentDataType
 import kotlin.experimental.and
+import kotlin.experimental.inv
+import kotlin.experimental.or
 
 @Suppress("UsePropertyAccessSyntax")
 class EcoFastItemStack(
@@ -149,35 +151,29 @@ class EcoFastItemStack(
     override fun getDisplayName(): String = displayNameComponent.toLegacy()
 
     override fun addItemFlags(vararg hideFlags: ItemFlag) {
-        for (flag in hideFlags) {
-            this.flagBits = this.flagBits or getBitModifier(flag)
+        for (f in hideFlags) {
+            this.flagBits = this.flagBits or getBitModifier(f)
         }
 
         apply()
     }
 
     override fun removeItemFlags(vararg hideFlags: ItemFlag) {
-        for (flag in hideFlags) {
-            this.flagBits = this.flagBits and getBitModifier(flag)
+        for (f in hideFlags) {
+            this.flagBits = this.flagBits and getBitModifier(f).inv()
         }
 
         apply()
     }
 
-    override fun getItemFlags(): MutableSet<ItemFlag> {
-        val flags = mutableSetOf<ItemFlag>()
-
-        var flagArr: Array<ItemFlag>
-        val size = ItemFlag.values().also { flagArr = it }.size
-
-        for (i in 0 until size) {
-            val flag = flagArr[i]
-            if (this.hasItemFlag(flag)) {
-                flags.add(flag)
+    override fun getItemFlags(): Set<ItemFlag> {
+        val currentFlags = mutableSetOf<ItemFlag>()
+        for (f in ItemFlag.values()) {
+            if (hasItemFlag(f)) {
+                currentFlags.add(f)
             }
         }
-
-        return flags
+        return currentFlags
     }
 
     override fun hasItemFlag(flag: ItemFlag): Boolean {
@@ -194,15 +190,15 @@ class EcoFastItemStack(
     }
 
     @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
-    private var flagBits: Int
+    private var flagBits: Byte
         get() =
             if (handle.hasTag() && handle.getTag()!!.contains(
                     "HideFlags",
                     99
                 )
-            ) handle.getTag()!!.getInt("HideFlags") else 0
+            ) handle.getTag()!!.getInt("HideFlags").toByte() else 0
         set(value) =
-            handle.getOrCreateTag().putInt("HideFlags", value)
+            handle.getOrCreateTag().putInt("HideFlags", value.toInt())
 
     override fun getRepairCost(): Int {
         return handle.getBaseRepairCost()
@@ -268,8 +264,8 @@ class EcoFastItemStack(
         bukkit.mergeIfNeeded(handle)
     }
 
-    private fun getBitModifier(hideFlag: ItemFlag): Int {
-        return 1 shl hideFlag.ordinal
+    private fun getBitModifier(hideFlag: ItemFlag): Byte {
+        return (1 shl hideFlag.ordinal).toByte()
     }
 
     override fun unwrap(): org.bukkit.inventory.ItemStack {

eco-core/core-nms/v1_17_R1/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.3.5"
+    id("io.papermc.paperweight.userdev") version "1.3.6"
 }
 
 group = "com.willfp"

eco-core/core-nms/v1_18_R1/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.3.5"
+    id("io.papermc.paperweight.userdev") version "1.3.6"
 }
 
 group = "com.willfp"

eco-core/core-nms/v1_18_R2/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.3.5"
+    id("io.papermc.paperweight.userdev") version "1.3.6"
 }
 
 group = "com.willfp"

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

@@ -1,30 +1,20 @@
 package com.willfp.eco.internal.spigot.display
 
 import com.comphenix.protocol.PacketType
-import com.comphenix.protocol.ProtocolLibrary
 import com.comphenix.protocol.events.PacketContainer
 import com.comphenix.protocol.events.PacketEvent
-import com.google.common.util.concurrent.ThreadFactoryBuilder
 import com.willfp.eco.core.AbstractPacketAdapter
-import com.willfp.eco.core.Eco
 import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.items.HashedItem
 import com.willfp.eco.internal.spigot.display.frame.DisplayFrame
 import com.willfp.eco.internal.spigot.display.frame.lastDisplayFrame
-import com.willfp.eco.util.ServerUtils
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
 
 class PacketWindowItems(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, PacketType.Play.Server.WINDOW_ITEMS, false) {
     private val ignorePacketList = ConcurrentHashMap.newKeySet<String>()
-    private val playerRates = ConcurrentHashMap<String, Int>()
-    private val threadFactory = ThreadFactoryBuilder().setNameFormat("eco-display-thread-%d").build()
-    private val executor = Executors.newCachedThreadPool(threadFactory)
-    private val scheduledExecutor = Executors.newSingleThreadScheduledExecutor(threadFactory)
 
     override fun onSend(
         packet: PacketContainer,
@@ -44,90 +34,9 @@ class PacketWindowItems(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, Packe
 
         val itemStacks = packet.itemListModifier.read(0) ?: return
 
-        handleRateLimit(player)
-
-        if (usingAsync(player)) {
-            val newPacket = packet.deepClone()
-
-            executor.execute {
-                runCatchingWithLogs { modifyAndSend(newPacket, itemStacks, windowId, player) }
-            }
-        } else {
-            modifyPacket(packet, itemStacks, windowId, player)
-        }
-    }
-
-    private fun modifyPacket(
-        packet: PacketContainer,
-        itemStacks: MutableList<ItemStack>,
-        windowId: Int,
-        player: Player
-    ) {
         packet.itemListModifier.write(0, modifyWindowItems(itemStacks, windowId, player))
     }
 
-    private fun modifyAndSend(
-        packet: PacketContainer,
-        itemStacks: MutableList<ItemStack>,
-        windowId: Int,
-        player: Player
-    ) {
-        modifyPacket(packet, itemStacks, windowId, player)
-        ignorePacketList.add(player.name)
-        this.getPlugin().scheduler.run {
-            runCatchingWithLogs { ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet) }
-        }
-    }
-
-    private fun handleRateLimit(player: Player) {
-        fun modifyRateValueBy(player: Player, amount: Int) {
-            val name = player.name
-            val current = playerRates[name] ?: 0
-            val new = current + amount
-            if (new <= 0) {
-                playerRates.remove(name)
-            } else {
-                playerRates[name] = new
-            }
-        }
-
-        modifyRateValueBy(player, 1)
-
-        scheduledExecutor.schedule(
-            { modifyRateValueBy(player, -1) },
-            this.getPlugin().configYml.getInt("async-display.ratelimit.timeframe").toLong(),
-            TimeUnit.SECONDS
-        )
-    }
-
-    private fun usingAsync(player: Player): Boolean {
-        if (this.getPlugin().configYml.getStrings("async-display.disable-on-types")
-                .map { it.lowercase() }.contains(player.openInventory.type.name.lowercase())
-        ) {
-            return false
-        }
-
-        if (this.getPlugin().configYml.getBool("async-display.always-enabled")) {
-            return true
-        }
-
-        if (
-            this.getPlugin().configYml.getBool("async-display.emergency.enabled")
-            && ServerUtils.getTps() <= this.getPlugin().configYml.getDouble("async-display.emergency.cutoff")
-        ) {
-            return true
-        }
-
-        if (
-            this.getPlugin().configYml.getBool("async-display.ratelimit.enabled")
-            && (playerRates[player.name] ?: 0) >= this.getPlugin().configYml.getInt("async-display.ratelimit.cutoff")
-        ) {
-            return true
-        }
-
-        return false
-    }
-
     private fun modifyWindowItems(
         itemStacks: MutableList<ItemStack>,
         windowId: Int,
@@ -162,14 +71,3 @@ class PacketWindowItems(plugin: EcoPlugin) : AbstractPacketAdapter(plugin, Packe
         return itemStacks
     }
 }
-
-private inline fun <T> runCatchingWithLogs(toRun: () -> T): Result<T> {
-    return runCatching { toRun() }.onFailure {
-        if (Eco.getHandler().ecoPlugin.configYml.getBool("async-display.log-errors")) {
-            Eco.getHandler().ecoPlugin.logger.warning(
-                "Error happened in async processing! Disable async display (/plugins/eco/config.yml)" +
-                        "if this is a frequent issue. (Remember to disable ratelimit and emergency too)"
-            )
-        }
-    }
-}

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

@@ -11,10 +11,7 @@ import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
 import org.apache.commons.lang.Validate
 import org.bukkit.Location
 import org.bukkit.block.Block
-import org.bukkit.entity.Animals
-import org.bukkit.entity.LivingEntity
-import org.bukkit.entity.Monster
-import org.bukkit.entity.Player
+import org.bukkit.entity.*
 
 class AntigriefWorldGuard : AntigriefIntegration {
     override fun canBreakBlock(
@@ -85,6 +82,7 @@ class AntigriefWorldGuard : AntigriefIntegration {
             is Player -> Flags.PVP
             is Monster -> Flags.MOB_DAMAGE
             is Animals -> Flags.DAMAGE_ANIMALS
+            is ArmorStand -> Flags.INTERACT
             else -> return true
         }
 

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

@@ -56,43 +56,3 @@ use-safer-namespacedkey-creation: false
 # If the stack traces of extensions that failed to load should be logged. Disabled by
 # default to prevent users from reporting bugs. Enable if you're a developer.
 log-full-extension-errors: false
-
-# Window items packets have the option to be run asynchronously. This may cause
-# some bugs and is considered experimental, however it has been tested without
-# any apparent issues. Enable this if performance is absolutely crucial or if you
-# are experiencing severe display lag.
-async-display:
-  # If async display should always be used.
-  always-enabled: false
-
-  # Log errors that occur in async processing.
-  log-errors: true
-
-  # The inventory types that should never be processed asynchronously.
-  # A list of IDs can be found here:
-  # https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/event/inventory/InventoryType.html
-  disable-on-types:
-    - 'anvil'
-
-  # If the server is running under heavy load (below a certain TPS value), enable
-  # async display automatically. This can prevent some server crashes under load.
-  emergency:
-    # If emergency async should be used.
-    enabled: true
-    # Below this TPS value, emergency async display will be used.
-    cutoff: 17
-
-  # If players with a large amount of display packets should have their processing
-  # done asynchronously. This will help if a player is trying to crash the server
-  # by overloading the display system.
-  ratelimit:
-    # If rate limit async display should be used.
-    enabled: false
-    # The amount of window items packets per timeframe needed to enable async display
-    # for a specified player.
-    cutoff: 4
-    # The length of the timeframe in seconds.
-    # Cutoff 5, Timeframe 1 means that if there are more than 5 window items packets
-    # being sent per second for a player, then that player should have their packets
-    # handled asynchronously.
-    timeframe: 1

gradle.properties

@@ -1,3 +1,3 @@
-version = 6.35.6
+version = 6.35.10
 plugin-name = eco
 kotlin.code.style = official