diff --git a/eco-api/src/main/java/com/willfp/eco/core/PluginProps.java b/eco-api/src/main/java/com/willfp/eco/core/PluginProps.java index 073b39b3..76816079 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/PluginProps.java +++ b/eco-api/src/main/java/com/willfp/eco/core/PluginProps.java @@ -221,7 +221,7 @@ public final class PluginProps { /** * Create new props from known values. - * + *

* Marked as internal as this method will break whenever the properties themselves * are updated (e.g. if a new property is added) - so to prevent any potential * backwards-compatibility bugs, this method cannot be invoked outside eco itself. diff --git a/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java b/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java index 2ccc0cb7..40ad47b7 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java +++ b/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKey.java @@ -134,7 +134,7 @@ public final class PersistentDataKey { if (this == o) { return true; } - if (!(o instanceof PersistentDataKey that)) { + if (!(o instanceof PersistentDataKey that)) { return false; } return Objects.equals(this.getKey(), that.getKey()); diff --git a/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java b/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java index 8c3e089a..fe996f65 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java +++ b/eco-api/src/main/java/com/willfp/eco/core/data/keys/PersistentDataKeyType.java @@ -99,7 +99,7 @@ public final class PersistentDataKeyType { if (this == that) { return true; } - if (!(that instanceof PersistentDataKeyType type)) { + if (!(that instanceof PersistentDataKeyType type)) { return false; } return Objects.equals(this.name, type.name); diff --git a/eco-api/src/main/java/com/willfp/eco/util/DurabilityUtils.java b/eco-api/src/main/java/com/willfp/eco/util/DurabilityUtils.java index bf2d26e1..75a6ee16 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/DurabilityUtils.java +++ b/eco-api/src/main/java/com/willfp/eco/util/DurabilityUtils.java @@ -16,6 +16,8 @@ import org.jetbrains.annotations.NotNull; /** * Utilities / API methods for item durability. */ +// Have to suppress casts to ItemMeta because the methods don't exist for some older versions that eco supports. +@SuppressWarnings("RedundantCast") public final class DurabilityUtils { /** * Damage an item in a player's inventory. diff --git a/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java b/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java index ae6be762..49ed8e40 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java +++ b/eco-api/src/main/java/com/willfp/eco/util/StringUtils.java @@ -579,7 +579,7 @@ public final class StringUtils { * * @param lookup The lookup string. * @return An array of tokens to be processed. - * @author Shawn (https://stackoverflow.com/questions/70606170/split-a-list-on-spaces-and-group-quoted-characters/70606653#70606653) + * @author Shawn (...) */ @NotNull public static String[] parseTokens(@NotNull final String lookup) { diff --git a/eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt b/eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt index 1d3acf6c..f85a351b 100644 --- a/eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt +++ b/eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt @@ -83,7 +83,6 @@ fun SlotBuilder.setCaptiveFilter(test: (Player, Menu, ItemStack?) -> Boolean): S * @deprecated Use SlotUpdater instead. */ @Deprecated("Use SlotUpdater instead") -@Suppress("DEPRECATION") fun SlotBuilder.setModifier(action: (Player, Menu, item: ItemStack) -> Unit): SlotBuilder = this.setUpdater { a, b, c -> c.apply { action(a, b, c) } } diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/ConfigUtils.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/ConfigUtils.kt index 54158593..410f7c5f 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/ConfigUtils.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/ConfigUtils.kt @@ -77,7 +77,7 @@ private abstract class ConfigTypeHandler( val type: ConfigType ) { fun toMap(input: String?): Map { - if (input == null || input.isBlank()) { + if (input.isNullOrBlank()) { return emptyMap() } diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfigSection.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfigSection.kt index 083cb565..82b28335 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfigSection.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfigSection.kt @@ -3,7 +3,6 @@ package com.willfp.eco.internal.config import com.willfp.eco.core.config.ConfigType import com.willfp.eco.core.placeholder.InjectablePlaceholder -@Suppress("UNCHECKED_CAST") class EcoConfigSection( type: ConfigType, values: Map = emptyMap(), diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserName.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserName.kt index abaee1cd..554b23a1 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserName.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/items/ArgParserName.kt @@ -21,7 +21,8 @@ object ArgParserName : LookupArgParser { val formatted = StringUtils.format(name) - @Suppress("UsePropertyAccessSyntax") + // I don't know why it says it's redundant, the compiler yells at me + @Suppress("UsePropertyAccessSyntax", "RedundantSuppression") meta.setDisplayName(formatted) return Predicate { diff --git a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/entity/InteractGoalFactory.kt b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/entity/InteractGoalFactory.kt index dc938515..2f30b137 100644 --- a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/entity/InteractGoalFactory.kt +++ b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/entity/InteractGoalFactory.kt @@ -39,7 +39,6 @@ private class EnhancedInteractGoal( return if (mob.random.nextFloat() >= probability) { false } else { - @Suppress("SENSELESS_COMPARISON") if (mob.target != null) { lookAt = mob.target } diff --git a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/target/HurtByGoalFactory.kt b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/target/HurtByGoalFactory.kt index 27bbe823..fa8d293f 100644 --- a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/target/HurtByGoalFactory.kt +++ b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/ai/target/HurtByGoalFactory.kt @@ -32,7 +32,6 @@ private class EnhancedHurtByTargetGoal( return false } - @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") return super.canAttack(target, targetPredicate) } } diff --git a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt index d7ed6e56..576a6dde 100644 --- a/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt +++ b/eco-core/core-nms/nms-common/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/common/item/EcoFastItemStack.kt @@ -192,7 +192,7 @@ class EcoFastItemStack( apply() } - @Suppress("UNNECESSARY_NOT_NULL_ASSERTION") + @Suppress("RedundantSuppression", "UNNECESSARY_NOT_NULL_ASSERTION") private var flagBits: Byte get() = if (handle.hasTag() && handle.getTag()!!.contains( @@ -255,7 +255,7 @@ class EcoFastItemStack( } override fun hashCode(): Int { - @Suppress("UNNECESSARY_SAFE_CALL") + @Suppress("RedundantSuppression", "UNNECESSARY_SAFE_CALL") return handle.getTag()?.hashCode() ?: (0b00010101 * 31 + Item.getId(handle.getItem())) } diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/ExtendedPersistentDataContainerFactory.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/ExtendedPersistentDataContainerFactory.kt index d77ed801..7f7aed63 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/ExtendedPersistentDataContainerFactory.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/ExtendedPersistentDataContainerFactory.kt @@ -12,7 +12,6 @@ import org.bukkit.persistence.PersistentDataContainer import org.bukkit.persistence.PersistentDataType class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy { - @Suppress("UNCHECKED_CAST") private val registry: CraftPersistentDataTypeRegistry init { @@ -38,7 +37,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa } inner class EcoPersistentDataContainer( - val handle: CraftPersistentDataContainer + private val handle: CraftPersistentDataContainer ) : ExtendedPersistentDataContainer { @Suppress("UNCHECKED_CAST") private val customDataTags: MutableMap = diff --git a/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/ExtendedPersistentDataContainerFactory.kt b/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/ExtendedPersistentDataContainerFactory.kt index cd9bf0bf..404c083d 100644 --- a/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/ExtendedPersistentDataContainerFactory.kt +++ b/eco-core/core-nms/v1_18_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R1/ExtendedPersistentDataContainerFactory.kt @@ -12,7 +12,6 @@ import org.bukkit.persistence.PersistentDataContainer import org.bukkit.persistence.PersistentDataType class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy { - @Suppress("UNCHECKED_CAST") private val registry: CraftPersistentDataTypeRegistry init { @@ -38,7 +37,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa } inner class EcoPersistentDataContainer( - val handle: CraftPersistentDataContainer + private val handle: CraftPersistentDataContainer ) : ExtendedPersistentDataContainer { @Suppress("UNCHECKED_CAST") private val customDataTags: MutableMap = diff --git a/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/ExtendedPersistentDataContainerFactory.kt b/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/ExtendedPersistentDataContainerFactory.kt index b3ff5f5e..5618882e 100644 --- a/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/ExtendedPersistentDataContainerFactory.kt +++ b/eco-core/core-nms/v1_18_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_18_R2/ExtendedPersistentDataContainerFactory.kt @@ -12,7 +12,6 @@ import org.bukkit.persistence.PersistentDataContainer import org.bukkit.persistence.PersistentDataType class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy { - @Suppress("UNCHECKED_CAST") private val registry: CraftPersistentDataTypeRegistry init { @@ -38,7 +37,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa } inner class EcoPersistentDataContainer( - val handle: CraftPersistentDataContainer + private val handle: CraftPersistentDataContainer ) : ExtendedPersistentDataContainer { @Suppress("UNCHECKED_CAST") private val customDataTags: MutableMap = diff --git a/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/ExtendedPersistentDataContainerFactory.kt b/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/ExtendedPersistentDataContainerFactory.kt index c6d8c35e..70cd5024 100644 --- a/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/ExtendedPersistentDataContainerFactory.kt +++ b/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R1/ExtendedPersistentDataContainerFactory.kt @@ -12,7 +12,6 @@ import org.bukkit.persistence.PersistentDataContainer import org.bukkit.persistence.PersistentDataType class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy { - @Suppress("UNCHECKED_CAST") private val registry: CraftPersistentDataTypeRegistry init { @@ -38,7 +37,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa } inner class EcoPersistentDataContainer( - val handle: CraftPersistentDataContainer + private val handle: CraftPersistentDataContainer ) : ExtendedPersistentDataContainer { @Suppress("UNCHECKED_CAST") private val customDataTags: MutableMap = diff --git a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/CommonsInitializer.kt b/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/CommonsInitializer.kt index 1d4c7db3..e3588859 100644 --- a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/CommonsInitializer.kt +++ b/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/CommonsInitializer.kt @@ -4,7 +4,6 @@ import com.willfp.eco.internal.spigot.proxy.CommonsInitializerProxy import com.willfp.eco.internal.spigot.proxy.common.CommonsProvider import com.willfp.eco.internal.spigot.proxy.common.toResourceLocation import net.minecraft.core.registries.BuiltInRegistries -import net.minecraft.core.registries.Registries import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.Tag import net.minecraft.resources.ResourceLocation @@ -126,7 +125,7 @@ class CommonsInitializer : CommonsInitializerProxy { tag.merge(container.toTag()) } else { - item.setTag(null) + item.tag = null } } else { if (container != null && !container.isEmpty) { diff --git a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/ExtendedPersistentDataContainerFactory.kt b/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/ExtendedPersistentDataContainerFactory.kt index ce011f14..07105f99 100644 --- a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/ExtendedPersistentDataContainerFactory.kt +++ b/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_19_R2/ExtendedPersistentDataContainerFactory.kt @@ -12,7 +12,6 @@ import org.bukkit.persistence.PersistentDataContainer import org.bukkit.persistence.PersistentDataType class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFactoryProxy { - @Suppress("UNCHECKED_CAST") private val registry: CraftPersistentDataTypeRegistry init { @@ -38,7 +37,7 @@ class ExtendedPersistentDataContainerFactory : ExtendedPersistentDataContainerFa } inner class EcoPersistentDataContainer( - val handle: CraftPersistentDataContainer + private val handle: CraftPersistentDataContainer ) : ExtendedPersistentDataContainer { @Suppress("UNCHECKED_CAST") private val customDataTags: MutableMap = diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt index bbfc7d4d..f62e7901 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt @@ -87,6 +87,7 @@ import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogX import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCombatLogXV11 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefCrashClaim import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefDeluxeCombat +import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefFabledSkyBlock import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefFactionsUUID import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefGriefPrevention import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefIridiumSkyblock @@ -285,6 +286,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() { } }, IntegrationLoader("PvPManager") { AntigriefManager.register(AntigriefPvPManager()) }, + IntegrationLoader("FabledSkyblock") { AntigriefManager.register(AntigriefFabledSkyBlock()) }, // Anticheat IntegrationLoader("AAC5") { AnticheatManager.register(AnticheatAAC()) }, diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFabledSkyBlock.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFabledSkyBlock.kt index 22100e47..f73b416e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFabledSkyBlock.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFabledSkyBlock.kt @@ -9,7 +9,6 @@ import org.bukkit.entity.Monster import org.bukkit.entity.Player class AntigriefFabledSkyBlock : AntigriefIntegration { - override fun getPluginName(): String { return "FabledSkyBlock" } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefPvPManager.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefPvPManager.kt index de0a4c97..c1280c54 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefPvPManager.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefPvPManager.kt @@ -1,11 +1,11 @@ package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration +import me.NoChance.PvPManager.PvPlayer import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player -import me.NoChance.PvPManager.PvPlayer class AntigriefPvPManager: AntigriefIntegration { override fun getPluginName(): String { @@ -27,7 +27,7 @@ class AntigriefPvPManager: AntigriefIntegration { override fun canInjure(player: Player, victim: LivingEntity): Boolean { return when(victim) { is Player -> { - (PvPlayer.get(victim).isInCombat())} + (PvPlayer.get(victim).isInCombat)} else -> true } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/bstats/Metrics.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/bstats/Metrics.kt index 29e699c3..de3ebcae 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/bstats/Metrics.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/bstats/Metrics.kt @@ -19,7 +19,6 @@ import java.util.logging.Level import java.util.zip.GZIPOutputStream import javax.net.ssl.HttpsURLConnection -@Suppress("UNCHECKED_CAST") class Metrics(private val plugin: EcoPlugin) { private val metricsBase: MetricsBase diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/entitylookup/EntityLookupModelEngine.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/entitylookup/EntityLookupModelEngine.kt index 1b3db14b..8f1185e9 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/entitylookup/EntityLookupModelEngine.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/entitylookup/EntityLookupModelEngine.kt @@ -41,11 +41,7 @@ object EntityLookupModelEngine : Integration { return EntityArgParseResult( { - val modelled = ModelEngineAPI.getModeledEntity(it.uniqueId) - - if (modelled == null) { - return@EntityArgParseResult false - } + val modelled = ModelEngineAPI.getModeledEntity(it.uniqueId) ?: return@EntityArgParseResult false modelled.models.containsKey(id) }, diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt index cc1bd356..7a78eb3a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt @@ -6,7 +6,6 @@ import eu.decentsoftware.holograms.api.DHAPI import org.bukkit.Location import java.util.UUID -@Suppress("DEPRECATION") class HologramDecentHolograms : HologramIntegration { override fun createHologram(location: Location, contents: MutableList): Hologram { val id = UUID.randomUUID().toString() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt index 961447f9..50feb24f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt @@ -6,7 +6,6 @@ import me.gholo.api.GHoloAPI import org.bukkit.Location import java.util.UUID -@Suppress("DEPRECATION") class HologramGHolo : HologramIntegration { companion object { private val api = GHoloAPI() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/StackedRecipeListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/StackedRecipeListener.kt index 417790cb..3bcccb32 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/StackedRecipeListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/recipes/StackedRecipeListener.kt @@ -42,7 +42,6 @@ class StackedRecipeListener( val recipe = Recipes.getMatch(matrix) ?: return // Get the handler for the type of recipe - @Suppress("UNCHECKED_CAST") val handler = handlers.firstOrNull { recipe::class.java.isAssignableFrom(it.recipeType) } ?: return var isStackedRecipe = false