From 4ee0645a4ee78f78dd64d4acd45d744cd3cecc3c Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 3 Feb 2022 12:57:29 +0000 Subject: [PATCH] Codestyle --- build.gradle.kts | 2 +- .../java/com/willfp/eco/core/config/interfaces/Config.java | 2 +- eco-api/src/main/kotlin/com/willfp/eco/core/gui/GUIHelpers.kt | 2 +- eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt | 2 +- .../kotlin/com/willfp/eco/internal/drops/impl/EcoDropQueue.kt | 1 - .../com/willfp/eco/internal/entities/EntityArgParserSilent.kt | 1 - .../willfp/eco/internal/spigot/proxy/v1_16_R3/VillagerTrade.kt | 3 +-- .../internal/spigot/proxy/v1_17_R1/fast/NMSFastItemStack.kt | 1 + 8 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 00612c98..c5414d54 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,7 +76,7 @@ allprojects { compileOnly("org.jetbrains:annotations:23.0.0") // Test - testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") // Adventure diff --git a/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java index 9fbe67cb..e03caa87 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java +++ b/eco-api/src/main/java/com/willfp/eco/core/config/interfaces/Config.java @@ -235,7 +235,7 @@ public interface Config extends Cloneable { */ @NotNull default String getString(@NotNull String path) { - return getString(path, false); + return getString(path, false, StringUtils.FormatOption.WITHOUT_PLACEHOLDERS); } /** 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 3b753125..fb2cb19c 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 @@ -48,7 +48,7 @@ fun SlotBuilder.onMiddleClick(action: (InventoryClickEvent, Slot, Menu) -> Unit) @Deprecated("Use SlotUpdater instead") @Suppress("DEPRECATION") fun SlotBuilder.setModifier(action: (Player, Menu, ItemStack) -> Unit): SlotBuilder = - this.setModifier { a, b, c -> action(a, b, c) } + this.setUpdater { a, b, c -> c.apply { action(a, b, c) } } /** * @see SlotBuilder.setUpdater diff --git a/eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt b/eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt index 0489f684..01d802a1 100644 --- a/eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt +++ b/eco-api/src/main/kotlin/com/willfp/eco/util/StringUtils.kt @@ -35,7 +35,7 @@ fun String.formatEco( fun List.formatEco( player: Player? = null, formatPlaceholders: Boolean = false -) = StringUtils.formatList( +): List = StringUtils.formatList( this, player, if (formatPlaceholders) StringUtils.FormatOption.WITH_PLACEHOLDERS else StringUtils.FormatOption.WITHOUT_PLACEHOLDERS diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/drops/impl/EcoDropQueue.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/drops/impl/EcoDropQueue.kt index 93c872f1..841621c4 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/drops/impl/EcoDropQueue.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/drops/impl/EcoDropQueue.kt @@ -10,7 +10,6 @@ import org.bukkit.Material import org.bukkit.entity.EntityType import org.bukkit.entity.ExperienceOrb import org.bukkit.entity.Player -import org.bukkit.event.player.PlayerExpChangeEvent import org.bukkit.inventory.ItemStack import org.bukkit.util.Vector diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserSilent.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserSilent.kt index db3c980a..dfb2ec09 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserSilent.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/entities/EntityArgParserSilent.kt @@ -2,7 +2,6 @@ package com.willfp.eco.internal.entities import com.willfp.eco.core.entities.args.EntityArgParseResult import com.willfp.eco.core.entities.args.EntityArgParser -import org.bukkit.entity.Animals class EntityArgParserSilent : EntityArgParser { override fun parseArguments(args: Array): EntityArgParseResult? { diff --git a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/VillagerTrade.kt b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/VillagerTrade.kt index ed19b9f6..c96e1f86 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/VillagerTrade.kt +++ b/eco-core/core-nms/v1_16_R3/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_16_R3/VillagerTrade.kt @@ -8,7 +8,7 @@ import org.bukkit.inventory.MerchantRecipe import java.lang.reflect.Field class VillagerTrade : VillagerTradeProxy { - private var handle: Field + private val handle: Field = CraftMerchantRecipe::class.java.getDeclaredField("handle") override fun displayTrade( recipe: MerchantRecipe, @@ -35,7 +35,6 @@ class VillagerTrade : VillagerTradeProxy { } init { - handle = CraftMerchantRecipe::class.java.getDeclaredField("handle") handle.isAccessible = true } } \ No newline at end of file diff --git a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/NMSFastItemStack.kt b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/NMSFastItemStack.kt index bc9943f9..66682147 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/NMSFastItemStack.kt +++ b/eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_17_R1/fast/NMSFastItemStack.kt @@ -176,6 +176,7 @@ class NMSFastItemStack(itemStack: org.bukkit.inventory.ItemStack) : EcoFastItemS } override fun hashCode(): Int { + @Suppress("KotlinDeprecation") return handle.tag?.hashCode() ?: (0b00010101 * 31 + Item.getId(handle.item)) }