From 4dc876593e6f019684e5b79520ae1b869adc442f Mon Sep 17 00:00:00 2001 From: AverageGithub Date: Fri, 19 Jul 2024 14:29:41 +0200 Subject: [PATCH] Fixes --- .../axminions/api/minions/utils/ChunkPos.kt | 4 ++-- build.gradle | 4 ++-- .../artillexstudios/axminions/AxMinionsPlugin.kt | 6 +++--- .../axminions/commands/AxMinionsCommand.kt | 16 ---------------- .../axminions/listeners/MinionDamageListener.kt | 2 +- .../artillexstudios/axminions/minions/Minion.kt | 4 ++-- .../minions/miniontype/MinerMinionType.kt | 2 +- 7 files changed, 11 insertions(+), 27 deletions(-) diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/minions/utils/ChunkPos.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/minions/utils/ChunkPos.kt index c8ccbc7..58cc711 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/minions/utils/ChunkPos.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/minions/utils/ChunkPos.kt @@ -18,11 +18,11 @@ data class ChunkPos(val world: World, val x: Int, val z: Int, @Volatile @JvmFiel } fun setTicking(ticking: Boolean) { - this.ticking = ticking - minions.forEach { it.setTicking(true) } + + this.ticking = ticking } override fun toString(): String { diff --git a/build.gradle b/build.gradle index c68270f..838dd4c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.artillexstudios.axminions' -version = '1.0.11' +version = '1.0.12' repositories { mavenCentral() @@ -138,7 +138,7 @@ allprojects { compileOnly 'com.github.LoneDev6:api-itemsadder:3.6.1' compileOnly 'com.palmergames.bukkit.towny:towny:0.100.1.0' implementation platform('com.intellectualsites.bom:bom-newest:1.35') - implementation("com.artillexstudios.axapi:axapi:1.4.269:all") + implementation("com.artillexstudios.axapi:axapi:1.4.295:all") implementation("com.zaxxer:HikariCP:5.1.0") implementation("org.bstats:bstats-bukkit:3.0.2") compileOnly 'org.black_ixx:playerpoints:3.2.6' diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt b/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt index 2b68044..2e1496b 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/AxMinionsPlugin.kt @@ -54,9 +54,9 @@ class AxMinionsPlugin : AxPlugin() { init { val manager = BukkitLibraryManager(this) val stdLib = Library.builder().groupId("org{}jetbrains{}kotlin").artifactId("kotlin-stdlib").version("1.9.22") - .relocate("org{}jetbrains{}kotlin", "com{}artillexstudios{}axminions{}libs{}kotlin").build() + .relocate("org{}jetbrains{}kotlin", "com.artillexstudios.axminions.libs.kotlin").build() val h2 = Library.builder().groupId("com{}h2database").artifactId("h2").version("2.2.220") - .relocate("org{}h2", "com{}artillexstudios{}axminions{}libs{}h2").build() + .relocate("org{}h2", "com.artillexstudios.axminions.libs.h2").build() manager.addMavenCentral() manager.loadLibrary(stdLib) manager.loadLibrary(h2) @@ -138,7 +138,7 @@ class AxMinionsPlugin : AxPlugin() { MinionTicker.startTicking() - Scheduler.get().runTimer({ + Scheduler.get().runTimer({ task -> dataQueue.submit { Minions.get { it.fastFor { pos -> diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt b/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt index 64c612d..9bc5639 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/commands/AxMinionsCommand.kt @@ -62,22 +62,6 @@ class AxMinionsCommand { AxMinionsPlugin.config.getConfig().save() } - - @Subcommand("reset") - @CommandPermission("axminions.command.reset") - @Description("Reset player's minion") - @AutoComplete("*") - fun reset( - sender: CommandSender, - receiver: Player - ) { - AxMinionsAPI.INSTANCE.getMinions().fastFor { - if (it.getOwnerUUID() == receiver.uniqueId) { - it.remove() - } - } - } - @Subcommand("reload") @CommandPermission("axminions.command.reload") @Description("Reload the configurations of the plugin") diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionDamageListener.kt b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionDamageListener.kt index b04fd35..0ab679d 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionDamageListener.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/listeners/MinionDamageListener.kt @@ -29,7 +29,7 @@ class MinionDamageListener : Listener { ) event.minion.setStorage(coerced) - Scheduler.get().runLaterAt(event.target.location, { + Scheduler.get().runLaterAt(event.target.location, { task -> event.target.location.world!!.getNearbyEntities(event.target.location, 4.0, 4.0, 4.0) .filterIsInstance().fastFor { item -> if (event.minion.getLinkedInventory()?.firstEmpty() == -1) { diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/minions/Minion.kt b/common/src/main/kotlin/com/artillexstudios/axminions/minions/Minion.kt index 26f43f3..fe4186a 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/minions/Minion.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/minions/Minion.kt @@ -126,7 +126,7 @@ class Minion( broken.set(true) } - Scheduler.get().runAt(location) { + Scheduler.get().runAt(location) { task -> val canBuildAt = AxMinionsPlugin.integrations.getProtectionIntegration().canBuildAt( event.player, event.packetEntity.location() @@ -653,7 +653,7 @@ class Minion( if (linkedChest == null) return if (ticking) { - Scheduler.get().runAt(linkedChest) { + Scheduler.get().executeAt(linkedChest) { if (linkedChest!!.world!!.isChunkLoaded(linkedChest!!.blockX shr 4, linkedChest!!.blockZ shr 4)) { linkedInventory = (linkedChest?.block?.state as? Container)?.inventory } diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/MinerMinionType.kt b/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/MinerMinionType.kt index 3cdccd0..8bdf991 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/MinerMinionType.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/minions/miniontype/MinerMinionType.kt @@ -175,7 +175,7 @@ class MinerMinionType : MinionType("miner", AxMinionsPlugin.INSTANCE.getResource } if (canBreak) { - Scheduler.get().run { + Scheduler.get().run { task -> val block = location.block val drops = block.getDrops(minion.getTool()) xp += NMSHandler.get().getExp(block, minion.getTool() ?: return@run)