From 25de30142baf52d1c7e1ebefd60feaaac556062f Mon Sep 17 00:00:00 2001 From: Exanthiax <107284021+Exanthiax@users.noreply.github.com> Date: Sat, 25 Jan 2025 21:12:29 +0000 Subject: [PATCH 1/2] Updated HuskClaims/HuskTowns Integration Updated API versions and classes to newest versions. --- eco-core/core-plugin/build.gradle.kts | 4 +- .../antigrief/AntigriefHuskClaims.kt | 53 +++++++++---------- .../antigrief/AntigriefHuskTowns.kt | 25 ++++----- 3 files changed, 39 insertions(+), 43 deletions(-) diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts index 517421ca9..ea090eef5 100644 --- a/eco-core/core-plugin/build.gradle.kts +++ b/eco-core/core-plugin/build.gradle.kts @@ -57,8 +57,8 @@ dependencies { exclude(group = "*", module = "*") } compileOnly("com.iridium:IridiumSkyblock:4.0.8") - compileOnly("net.william278.huskclaims:huskclaims-bukkit:1.0.1") - compileOnly("net.william278:husktowns:2.6.1") + compileOnly("net.william278.huskclaims:huskclaims-bukkit:1.5") + compileOnly("net.william278.husktowns:husktowns-bukkit:3.0.8") compileOnly("com.github.jojodmo:ItemBridge:b0054538c1") compileOnly("de.oliver:FancyHolograms:2.4.0") diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt index 91ff92114..964edb3f6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt @@ -1,39 +1,34 @@ package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration -import net.crashcraft.crashclaim.CrashClaim -import net.crashcraft.crashclaim.permissions.PermissionRoute -import net.william278.huskclaims.api.HuskClaimsAPI +import net.william278.huskclaims.api.BukkitHuskClaimsAPI import net.william278.huskclaims.libraries.cloplib.operation.Operation -import net.william278.huskclaims.libraries.cloplib.operation.OperationPosition import net.william278.huskclaims.libraries.cloplib.operation.OperationType import net.william278.huskclaims.position.Position -import net.william278.huskclaims.position.World import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Monster import org.bukkit.entity.Player -import kotlin.jvm.optionals.getOrElse class AntigriefHuskClaims : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block ): Boolean { - val api = HuskClaimsAPI.getInstance() ?: return true + val api = BukkitHuskClaimsAPI.getInstance() ?: return true - val user = api.getOnlineUser(player.uniqueId) ?: return true + val user = api.getOnlineUser(player) ?: return true return api.isOperationAllowed( Operation.of( user, OperationType.BLOCK_BREAK, Position.at( - block.x.toDouble(), - block.y.toDouble(), - block.z.toDouble(), - api.getWorld(block.location.world.name) + block.location.x, + block.location.y, + block.location.z, + api.getWorld(block.world) ), true ) @@ -44,9 +39,9 @@ class AntigriefHuskClaims : AntigriefIntegration { player: Player, location: Location ): Boolean { - val api = HuskClaimsAPI.getInstance() ?: return true + val api = BukkitHuskClaimsAPI.getInstance() ?: return true - val user = api.getOnlineUser(player.uniqueId) ?: return true + val user = api.getOnlineUser(player) ?: return true return api.isOperationAllowed( Operation.of( @@ -56,7 +51,7 @@ class AntigriefHuskClaims : AntigriefIntegration { location.x, location.y, location.z, - api.getWorld(location.world.name) + api.getWorld(location.world) ), true ) @@ -67,19 +62,19 @@ class AntigriefHuskClaims : AntigriefIntegration { player: Player, block: Block ): Boolean { - val api = HuskClaimsAPI.getInstance() ?: return true + val api = BukkitHuskClaimsAPI.getInstance() ?: return true - val user = api.getOnlineUser(player.uniqueId) ?: return true + val user = api.getOnlineUser(player) ?: return true return api.isOperationAllowed( Operation.of( user, OperationType.BLOCK_PLACE, Position.at( - block.x.toDouble(), - block.y.toDouble(), - block.z.toDouble(), - api.getWorld(block.location.world.name) + block.location.x, + block.location.y, + block.location.z, + api.getWorld(block.world) ), true ) @@ -90,23 +85,23 @@ class AntigriefHuskClaims : AntigriefIntegration { player: Player, victim: LivingEntity ): Boolean { - val api = HuskClaimsAPI.getInstance() ?: return true + val api = BukkitHuskClaimsAPI.getInstance() ?: return true - val user = api.getOnlineUser(player.uniqueId) ?: return true + val user = api.getOnlineUser(player) ?: return true return api.isOperationAllowed( Operation.of( user, - when (victim) { + when(victim) { is Monster -> OperationType.PLAYER_DAMAGE_MONSTER is Player -> OperationType.PLAYER_DAMAGE_PLAYER - else -> OperationType.PLAYER_DAMAGE_ENTITY + else -> OperationType.PLACE_HANGING_ENTITY }, Position.at( - victim.x, - victim.y, - victim.z, - api.getWorld(victim.location.world.name) + player.location.x, + player.location.y, + player.location.z, + api.getWorld(player.world) ), true ) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskTowns.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskTowns.kt index d94456fd6..702365a1e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskTowns.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskTowns.kt @@ -1,9 +1,10 @@ package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration -import net.william278.husktowns.api.HuskTownsAPI +import net.william278.husktowns.api.BukkitHuskTownsAPI import net.william278.husktowns.claim.Position -import net.william278.husktowns.listener.Operation +import net.william278.husktowns.libraries.cloplib.operation.Operation +import net.william278.husktowns.libraries.cloplib.operation.OperationType import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity @@ -15,14 +16,14 @@ class AntigriefHuskTowns : AntigriefIntegration { player: Player, block: Block ): Boolean { - val api = HuskTownsAPI.getInstance() ?: return true + val api = BukkitHuskTownsAPI.getInstance() ?: return true val user = api.getOnlineUser(player) ?: return true return api.isOperationAllowed( Operation.of( user, - Operation.Type.BLOCK_BREAK, + OperationType.BLOCK_BREAK, Position.at( block.location.x, block.location.y, @@ -38,14 +39,14 @@ class AntigriefHuskTowns : AntigriefIntegration { player: Player, location: Location ): Boolean { - val api = HuskTownsAPI.getInstance() ?: return true + val api = BukkitHuskTownsAPI.getInstance() ?: return true val user = api.getOnlineUser(player) ?: return true return api.isOperationAllowed( Operation.of( user, - Operation.Type.EXPLOSION_DAMAGE_ENTITY, + OperationType.EXPLOSION_DAMAGE_ENTITY, Position.at( location.x, location.y, @@ -61,14 +62,14 @@ class AntigriefHuskTowns : AntigriefIntegration { player: Player, block: Block ): Boolean { - val api = HuskTownsAPI.getInstance() ?: return true + val api = BukkitHuskTownsAPI.getInstance() ?: return true val user = api.getOnlineUser(player) ?: return true return api.isOperationAllowed( Operation.of( user, - Operation.Type.BLOCK_PLACE, + OperationType.BLOCK_PLACE, Position.at( block.location.x, block.location.y, @@ -84,7 +85,7 @@ class AntigriefHuskTowns : AntigriefIntegration { player: Player, victim: LivingEntity ): Boolean { - val api = HuskTownsAPI.getInstance() ?: return true + val api = BukkitHuskTownsAPI.getInstance() ?: return true val user = api.getOnlineUser(player) ?: return true @@ -92,9 +93,9 @@ class AntigriefHuskTowns : AntigriefIntegration { Operation.of( user, when(victim) { - is Monster -> Operation.Type.PLAYER_DAMAGE_MONSTER - is Player -> Operation.Type.PLAYER_DAMAGE_PLAYER - else -> Operation.Type.PLACE_HANGING_ENTITY + is Monster -> OperationType.PLAYER_DAMAGE_MONSTER + is Player -> OperationType.PLAYER_DAMAGE_PLAYER + else -> OperationType.PLACE_HANGING_ENTITY }, Position.at( player.location.x, From 0bcd68834525badfc67d2703584ce20952e0ce55 Mon Sep 17 00:00:00 2001 From: Exanthiax <107284021+Exanthiax@users.noreply.github.com> Date: Sun, 26 Jan 2025 18:43:51 +0000 Subject: [PATCH 2/2] fix oopsie --- .../spigot/integrations/antigrief/AntigriefHuskClaims.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt index 964edb3f6..b34c47df0 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefHuskClaims.kt @@ -95,7 +95,7 @@ class AntigriefHuskClaims : AntigriefIntegration { when(victim) { is Monster -> OperationType.PLAYER_DAMAGE_MONSTER is Player -> OperationType.PLAYER_DAMAGE_PLAYER - else -> OperationType.PLACE_HANGING_ENTITY + else -> OperationType.PLAYER_DAMAGE_ENTITY }, Position.at( player.location.x,