From a0c69459a509f41ceaa5f45939bb6a56a920df35 Mon Sep 17 00:00:00 2001 From: rattatwinko Date: Fri, 9 May 2025 15:56:59 +0200 Subject: [PATCH] V3 -- Comment + Small Code Clean Up ; mostly Deprecation issues -- File Update + Fmpp.kt + FMPPCommand.kt --- src/main/kotlin/org/fmpp/fmpp/FMPPCommand.kt | 65 ++++++++++---------- src/main/kotlin/org/fmpp/fmpp/Fmpp.kt | 9 ++- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/main/kotlin/org/fmpp/fmpp/FMPPCommand.kt b/src/main/kotlin/org/fmpp/fmpp/FMPPCommand.kt index 7f6edf5..292c7cb 100644 --- a/src/main/kotlin/org/fmpp/fmpp/FMPPCommand.kt +++ b/src/main/kotlin/org/fmpp/fmpp/FMPPCommand.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package org.fmpp.fmpp import org.bukkit.ChatColor @@ -47,17 +49,16 @@ class FMPPCommand(private val plugin: Fmpp) : CommandExecutor { if (vehicle is Minecart) { // Get powered minecart if this is a linked regular minecart - val poweredMinecart = if (vehicle is PoweredMinecart) { - vehicle - } else if (vehicle.hasMetadata("fmpp_linked")) { - // Find linked powered minecart - vehicle.getNearbyEntities(5.0, 5.0, 5.0) - .filterIsInstance() - .firstOrNull { it.hasMetadata("fmpp_linked_to") && - it.getMetadata("fmpp_linked_to").firstOrNull()?.asString() == vehicle.uniqueId.toString() } - } else { - null - } + val poweredMinecart = vehicle as? PoweredMinecart + ?: if (vehicle.hasMetadata("fmpp_linked")) { + // Find linked powered minecart + vehicle.getNearbyEntities(5.0, 5.0, 5.0) + .filterIsInstance() + .firstOrNull { it.hasMetadata("fmpp_linked_to") && + it.getMetadata("fmpp_linked_to").firstOrNull()?.asString() == vehicle.uniqueId.toString() } + } else { + null + } if (poweredMinecart != null) { // Boost the powered minecart in the direction it's facing @@ -83,17 +84,16 @@ class FMPPCommand(private val plugin: Fmpp) : CommandExecutor { if (vehicle is Minecart) { // Get powered minecart if this is a linked regular minecart - val poweredMinecart = if (vehicle is PoweredMinecart) { - vehicle - } else if (vehicle.hasMetadata("fmpp_linked")) { - // Find linked powered minecart - vehicle.getNearbyEntities(5.0, 5.0, 5.0) - .filterIsInstance() - .firstOrNull { it.hasMetadata("fmpp_linked_to") && - it.getMetadata("fmpp_linked_to").firstOrNull()?.asString() == vehicle.uniqueId.toString() } - } else { - null - } + val poweredMinecart = vehicle as? PoweredMinecart + ?: if (vehicle.hasMetadata("fmpp_linked")) { + // Find linked powered minecart + vehicle.getNearbyEntities(5.0, 5.0, 5.0) + .filterIsInstance() + .firstOrNull { it.hasMetadata("fmpp_linked_to") && + it.getMetadata("fmpp_linked_to").firstOrNull()?.asString() == vehicle.uniqueId.toString() } + } else { + null + } if (poweredMinecart != null) { // Set fuel via metadata as backup @@ -122,17 +122,16 @@ class FMPPCommand(private val plugin: Fmpp) : CommandExecutor { if (vehicle is Minecart) { // Get powered minecart if this is a linked regular minecart - val poweredMinecart = if (vehicle is PoweredMinecart) { - vehicle - } else if (vehicle.hasMetadata("fmpp_linked")) { - // Find linked powered minecart - vehicle.getNearbyEntities(5.0, 5.0, 5.0) - .filterIsInstance() - .firstOrNull { it.hasMetadata("fmpp_linked_to") && - it.getMetadata("fmpp_linked_to").firstOrNull()?.asString() == vehicle.uniqueId.toString() } - } else { - null - } + val poweredMinecart = vehicle as? PoweredMinecart + ?: if (vehicle.hasMetadata("fmpp_linked")) { + // Find linked powered minecart + vehicle.getNearbyEntities(5.0, 5.0, 5.0) + .filterIsInstance() + .firstOrNull { it.hasMetadata("fmpp_linked_to") && + it.getMetadata("fmpp_linked_to").firstOrNull()?.asString() == vehicle.uniqueId.toString() } + } else { + null + } if (poweredMinecart != null) { poweredMinecart.velocity = Vector(0, 0, 0) diff --git a/src/main/kotlin/org/fmpp/fmpp/Fmpp.kt b/src/main/kotlin/org/fmpp/fmpp/Fmpp.kt index 39d8221..dcd6ab5 100644 --- a/src/main/kotlin/org/fmpp/fmpp/Fmpp.kt +++ b/src/main/kotlin/org/fmpp/fmpp/Fmpp.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package org.fmpp.fmpp import org.bukkit.ChatColor @@ -13,11 +15,11 @@ import org.bukkit.event.vehicle.VehicleMoveEvent import org.bukkit.plugin.java.JavaPlugin import org.bukkit.util.Vector import kotlin.math.abs -import org.bukkit.entity.Entity import org.bukkit.event.player.PlayerInteractEntityEvent import org.bukkit.inventory.ItemStack import org.bukkit.metadata.FixedMetadataValue +@Suppress("DEPRECATION") class Fmpp : JavaPlugin() { override fun onEnable() { @@ -92,7 +94,6 @@ class Fmpp : JavaPlugin() { if (entity is Minecart && entity !is PoweredMinecart && linkedMinecarts.containsKey(entity)) { if (player.inventory.itemInMainHand.type == Material.SHEARS) { // Unlink the minecarts - val poweredMinecart = linkedMinecarts[entity] unlinkMinecarts(entity) player.sendMessage("${ChatColor.YELLOW}Unlinked minecart from powered minecart.") @@ -181,7 +182,9 @@ class Fmpp : JavaPlugin() { } } catch (e: Exception) { // Fallback if reflection doesn't work - store fuel in metadata - if (!vehicle.hasMetadata("fmpp_fuel") || vehicle.getMetadata("fmpp_fuel").firstOrNull()?.asInt() ?: 0 < 100) { + if (!vehicle.hasMetadata("fmpp_fuel") || (vehicle.getMetadata("fmpp_fuel").firstOrNull()?.asInt() + ?: 0) < 100 + ) { vehicle.setMetadata("fmpp_fuel", FixedMetadataValue(plugin, 3600)) } }