Merge pull request #31 from SLNE-Development/feat/nether-end-protections

feat: enhance protection pricing logic for Nether and The End environ…

Author: twisti-dev

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=3.2.4
+version=3.2.5

src/main/kotlin/dev/slne/surf/protect/paper/config/ProtectionConfig.kt

@@ -1,8 +1,10 @@
 package dev.slne.surf.protect.paper.config
 
+import dev.slne.surf.api.core.config.constraints.Range
 import dev.slne.surf.api.paper.extensions.server
 import dev.slne.surf.transaction.api.currency.Currency
 import org.bukkit.Location
+import org.bukkit.World
 import org.bukkit.block.BlockType
 import org.bukkit.block.data.BlockData
 import org.bukkit.inventory.ItemStack
@@ -30,7 +32,8 @@ data class ProtectionConfig(
     data class ProtectionSettings(
         val maxDistanceFromStart: Double = 100.0,
         val retailPercent: Int = 65,
-        val renamePrice: Int = 2_500
+        val renamePrice: Int = 2_500,
+        val protectOnlyAboveNetherRoofInNether: Boolean = true,
     ) {
         val retailModifier: Double
             get() = retailPercent / 100.0
@@ -73,21 +76,24 @@ data class ProtectionConfig(
     data class PricingSettings(
         val minPerBlock: Double = 4.0,
         val spawnProtectionPerBlock: Double = 200.0,
-        val discountPercent: Int = 20
+
+        @Range(min = 0.0, max = 100.0)
+        val discountPercent: Int = 20,
+
+        val environmentMultiplier: Map<World.Environment, Double> = mapOf(
+            World.Environment.NORMAL to 1.0,
+            World.Environment.NETHER to 2.5,
+        )
     ) {
         val discountModifier: Double
             get() = 1.0 - (discountPercent / 100.0)
-
-        init {
-            require(discountPercent in 0..100) { "Discount percent must be between 0 and 100" }
-        }
     }
 
     @ConfigSerializable
     data class CurrencyConfig(
         val name: String = "CastCoin"
     ) {
-        val currency: Currency = Currency[name] ?: error("Currency with name '$name' not found")
+        val currency: Currency get() = Currency[name] ?: error("Currency with name '$name' not found")
     }
 
     @ConfigSerializable

src/main/kotlin/dev/slne/surf/protect/paper/listener/listeners/ProtectionModeListener.kt

@@ -196,7 +196,7 @@ object ProtectionModeListener : Listener {
         .contains("SHULKER_BOX")
         .contains("BARREL")
         .contains("BEACON")
-        .contains("BED")
+        .contains("BED").not(Material.BEDROCK) // BEDROCK is not a bed
         .contains("CAULDRON")
         .contains("COMPARATOR")
         .contains("DAYLIGHT_DETECTOR")
@@ -211,5 +211,6 @@ object ProtectionModeListener : Listener {
         .add(Material.REPEATER)
         .add(Material.OBSERVER)
         .add(Material.CHISELED_BOOKSHELF)
+        .add(Material.CRAFTER)
         .lock()
 }

src/main/kotlin/dev/slne/surf/protect/paper/math/Mth.kt

@@ -48,7 +48,7 @@ object Mth {
     }
 
     @JvmStatic
-    fun calculatePricePerBlock(distance: Double): Double {
+    fun calculatePricePerBlock(distance: Float): Double {
         val raw = PRICE_GRADIENT * distance + PRICE_INTERCEPT
         val rounded = (raw * 100.0).roundToInt() / 100.0
         return max(config.pricing.minPerBlock, rounded)
@@ -105,7 +105,7 @@ object Mth {
     data class EffectiveCostResult(
         val effectiveCost: Double,
         val pricePerBlock: Double,
-        val spawnDistance: Double,
+        val spawnDistance: Float,
         val discountFactor: Double = 1.0
     ) {
         val hasDiscount: Boolean get() = discountFactor < 1.0

src/main/kotlin/dev/slne/surf/protect/paper/menu/util/view-util.kt

@@ -120,6 +120,12 @@ fun createRegionItem(protection: RegionInfo, showMoreInfo: Boolean = true) =
                 white("Id: ".toSmallCaps())
                 variableValue(protection.region.id.toSmallCaps())
             }
+            line {
+                appendBlob()
+                appendSpace()
+                white("Welt: ".toSmallCaps())
+                variableValue(protection.world?.key()?.asMinimalString()?.toSmallCaps() ?: "Unbekannt".toSmallCaps())
+            }
             line {
                 appendBlob()
                 appendSpace()

src/main/kotlin/dev/slne/surf/protect/paper/message/Messages.kt

@@ -197,6 +197,11 @@ object Messages {
             error("Bitte gedulde dich einen Moment.")
         }
 
+        val canOnlyProtectAboveNetherRoofInNether = buildText { // TODO: better message
+            appendErrorPrefix()
+            error("Du kannst nur über dem Nether-Dach schützen.")
+        }
+
         /**
          * Generates a message indicating how many more markers need to be placed to meet the minimum required amount.
          *
@@ -231,7 +236,7 @@ object Messages {
             effectiveCost: Double,
             currency: Currency,
             pricePerBlock: Double,
-            distanceToSpawn: Double,
+            distanceToSpawn: Float,
             discountFactor: Double = 1.0
         ) = buildText {
             val distanceToSpawn = (distanceToSpawn * 100).roundToInt() / 100.0

src/main/kotlin/dev/slne/surf/protect/paper/region/ProtectionRegion.kt

@@ -44,6 +44,7 @@ import kotlinx.coroutines.withContext
 import org.apache.commons.lang3.RandomStringUtils
 import org.bukkit.Chunk
 import org.bukkit.ChunkSnapshot
+import org.bukkit.World
 import org.bukkit.block.data.BlockData
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
@@ -119,7 +120,15 @@ class ProtectionRegion(
     }
 
     fun createMarker(pos: BlockPosition, previousData: BlockData, isExpanding: Boolean): Marker? {
-        val candidate = Marker(WeakReference(player.world), this, pos, previousData)
+        val world = player.world
+        if (world.environment == World.Environment.NETHER && config.protection.protectOnlyAboveNetherRoofInNether) {
+            if (pos.y() < world.logicalHeight) {
+                player.sendMessage(Messages.Protecting.canOnlyProtectAboveNetherRoofInNether)
+                return null
+            }
+        }
+
+        val candidate = Marker(WeakReference(world), this, pos, previousData)
         if (!updateHullPreview(candidate)) return null
 
         // Check overlap state when not expanding
@@ -191,8 +200,8 @@ class ProtectionRegion(
             region = ProtectedPolygonalRegion(
                 expandingProtection.id,
                 vectors,
-                world.minHeight,
-                world.maxHeight - 1
+                expandingProtection.minimumPoint.y(),
+                expandingProtection.maximumPoint.y()
             )
             region.copyFrom(expandingProtection)
         } else {
@@ -203,7 +212,7 @@ class ProtectionRegion(
             region = ProtectedPolygonalRegion(
                 name,
                 vectors,
-                world.minHeight,
+                if (world.environment == World.Environment.NETHER && config.protection.protectOnlyAboveNetherRoofInNether) world.logicalHeight else world.minHeight,
                 world.maxHeight - 1
             )
             region.owners.addPlayer(protectionUser.localPlayer)

src/main/kotlin/dev/slne/surf/protect/paper/region/info/RegionInfo.kt

@@ -8,6 +8,8 @@ import dev.slne.surf.protect.paper.region.flags.ProtectionFlagsRegistry
 import dev.slne.surf.protect.paper.util.fixedVolume
 import dev.slne.surf.protect.paper.util.getRegionManagerOrNull
 import dev.slne.surf.protect.paper.util.toLocalPlayer
+import org.bukkit.Bukkit
+import org.bukkit.World
 
 
 data class RegionInfo(val region: ProtectedRegion) {
@@ -21,6 +23,7 @@ data class RegionInfo(val region: ProtectedRegion) {
     val regionManager get() = region.getRegionManagerOrNull()
     val owners get() = region.owners.uniqueIds.mapTo(mutableObjectListOf()) { it.toLocalPlayer() }
     val members get() = region.members.uniqueIds.mapTo(mutableObjectListOf()) { it.toLocalPlayer() }
+    val world: World? get() = regionManager?.name?.let { Bukkit.getWorld(it) }
 
     init {
         val flagInfo = region.getFlag(ProtectionFlagsRegistry.SURF_PROTECT_FLAG)

src/main/kotlin/dev/slne/surf/protect/paper/region/utils.kt

@@ -3,37 +3,61 @@ package dev.slne.surf.protect.paper.region
 import com.sk89q.worldedit.util.Location
 import dev.slne.surf.protect.paper.config
 import dev.slne.surf.protect.paper.math.Mth
-import org.bukkit.util.Vector
-
-fun Location.getProtectionPricePerBlock(): PricePerBlockResult {
-    val spawns = listOf(
-        Vector(0, 0, 0),
-        Vector(0, 0, -25000),
-        Vector(25000, 0, -25000),
-        Vector(-25000, 0, -25000),
-        Vector(0, 0, 25000),
-        Vector(25000, 0, 25000),
-        Vector(-25000, 0, 25000),
-        Vector(25000, 0, 0),
-        Vector(-25000, 0, 0)
+import dev.slne.surf.protect.paper.util.bukkitWorld
+import org.bukkit.World
+import org.spongepowered.math.vector.Vector2i
+
+private val spawnPositionsByEnvironment = mapOf(
+    World.Environment.NETHER to listOf(
+        Vector2i(0, 0),
+        Vector2i(0, -3125),
+        Vector2i(3125, -3125),
+        Vector2i(-3125, -3125),
+        Vector2i(0, 3125),
+        Vector2i(3125, 3125),
+        Vector2i(-3125, 3125),
+        Vector2i(3125, 0),
+        Vector2i(-3125, 0)
+    ),
+    World.Environment.THE_END to listOf(Vector2i.ZERO),
+    World.Environment.NORMAL to listOf(
+        Vector2i(0, 0),
+        Vector2i(0, -25000),
+        Vector2i(25000, -25000),
+        Vector2i(-25000, -25000),
+        Vector2i(0, 25000),
+        Vector2i(25000, 25000),
+        Vector2i(-25000, 25000),
+        Vector2i(25000, 0),
+        Vector2i(-25000, 0)
     )
+)
 
-    val pos = Vector(blockX.toDouble(), 0.0, blockZ.toDouble())
-
-    val nearestSpawn = spawns.minBy {
-        pos.distance(it)
-    }
+fun Location.getProtectionPricePerBlock(): PricePerBlockResult {
+    val environment = this.bukkitWorld.environment
+    val spawns = spawnPositionsByEnvironment[environment] ?: return PricePerBlockResult.EMPTY
+    val pos = Vector2i(blockX, blockZ)
 
+    val nearestSpawn = spawns.minBy { pos.distanceSquared(it) }
     val distance = pos.distance(nearestSpawn)
 
     if (distance < config.pricing.spawnProtectionPerBlock) {
         return PricePerBlockResult(Double.MAX_VALUE, distance)
     }
 
-    return PricePerBlockResult(Mth.calculatePricePerBlock(distance), distance)
+    val multiplier = config.pricing.environmentMultiplier[environment] ?: 1.0
+
+    return PricePerBlockResult(
+        Mth.calculatePricePerBlock(distance) * multiplier,
+        distance
+    )
 }
 
 data class PricePerBlockResult(
     val pricePerBlock: Double,
-    val spawnDistance: Double
-)
+    val spawnDistance: Float
+) {
+    companion object {
+        val EMPTY = PricePerBlockResult(Double.MAX_VALUE, Float.MAX_VALUE)
+    }
+}

src/main/kotlin/dev/slne/surf/protect/paper/util/util.kt

@@ -222,6 +222,9 @@ fun Location.isGlobalRegion(): Boolean {
 val WorldEditLocation.world: WorldEditWorld
     get() = this.extent as? WorldEditWorld ?: error("Extent is not a World: $extent")
 
+val WorldEditLocation.bukkitWorld
+    get() = BukkitAdapter.adapt(world)!!
+
 /**
  * Checks if the player is currently standing in the specified protected region.
  *