From 76fb4b9dc26f77841209f20ff0a0115434908fdf Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Fri, 17 Nov 2023 20:56:38 +0800 Subject: [PATCH] code clean up --- .../mechanic/competition/actionbar/ActionBarSender.java | 2 +- .../mechanic/competition/bossbar/BossBarSender.java | 2 +- .../customfishing/mechanic/fishing/FishingManagerImpl.java | 2 -- .../customfishing/mechanic/item/ItemManagerImpl.java | 7 +++++-- .../net/momirealms/customfishing/util/ConfigUtils.java | 2 +- .../java/net/momirealms/customfishing/util/ItemUtils.java | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/actionbar/ActionBarSender.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/actionbar/ActionBarSender.java index b6425379..a407da0d 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/actionbar/ActionBarSender.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/actionbar/ActionBarSender.java @@ -22,8 +22,8 @@ import net.momirealms.customfishing.api.CustomFishingPlugin; import net.momirealms.customfishing.api.mechanic.competition.ActionBarConfig; import net.momirealms.customfishing.api.scheduler.CancellableTask; import net.momirealms.customfishing.mechanic.competition.Competition; -import net.momirealms.customfishing.setting.CFLocale; import net.momirealms.customfishing.mechanic.misc.DynamicText; +import net.momirealms.customfishing.setting.CFLocale; import org.bukkit.entity.Player; import java.util.HashMap; diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/bossbar/BossBarSender.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/bossbar/BossBarSender.java index d1223a7f..7ea0ab98 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/bossbar/BossBarSender.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/competition/bossbar/BossBarSender.java @@ -30,8 +30,8 @@ import net.momirealms.customfishing.api.mechanic.competition.BossBarConfig; import net.momirealms.customfishing.api.scheduler.CancellableTask; import net.momirealms.customfishing.api.util.ReflectionUtils; import net.momirealms.customfishing.mechanic.competition.Competition; -import net.momirealms.customfishing.setting.CFLocale; import net.momirealms.customfishing.mechanic.misc.DynamicText; +import net.momirealms.customfishing.setting.CFLocale; import org.bukkit.boss.BarColor; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java index 3e48792e..fa372768 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java @@ -20,7 +20,6 @@ package net.momirealms.customfishing.mechanic.fishing; import com.destroystokyo.paper.event.player.PlayerJumpEvent; import de.tr7zw.changeme.nbtapi.NBTCompound; import de.tr7zw.changeme.nbtapi.NBTItem; -import io.lumine.mythic.lib.api.event.PlayerAttackEvent; import net.kyori.adventure.key.Key; import net.kyori.adventure.sound.Sound; import net.momirealms.customfishing.CustomFishingPluginImpl; @@ -70,7 +69,6 @@ import java.util.Objects; import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ThreadLocalRandom; public class FishingManagerImpl implements Listener, FishingManager { diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/item/ItemManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/item/ItemManagerImpl.java index 6d581b1a..c0636ac6 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/item/ItemManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/item/ItemManagerImpl.java @@ -34,12 +34,12 @@ import net.momirealms.customfishing.api.mechanic.item.BuildableItem; import net.momirealms.customfishing.api.mechanic.item.ItemBuilder; import net.momirealms.customfishing.api.mechanic.item.ItemLibrary; import net.momirealms.customfishing.api.mechanic.loot.Loot; +import net.momirealms.customfishing.api.mechanic.misc.Value; import net.momirealms.customfishing.api.util.LogUtils; import net.momirealms.customfishing.api.util.WeightUtils; import net.momirealms.customfishing.compatibility.item.CustomFishingItemImpl; import net.momirealms.customfishing.compatibility.item.VanillaItemImpl; import net.momirealms.customfishing.compatibility.papi.PlaceholderManagerImpl; -import net.momirealms.customfishing.api.mechanic.misc.Value; import net.momirealms.customfishing.setting.CFConfig; import net.momirealms.customfishing.util.ConfigUtils; import net.momirealms.customfishing.util.ItemUtils; @@ -59,7 +59,10 @@ import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryPickupItemEvent; import org.bukkit.event.inventory.PrepareAnvilEvent; -import org.bukkit.event.player.*; +import org.bukkit.event.player.PlayerAttemptPickupItemEvent; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.event.player.PlayerItemConsumeEvent; +import org.bukkit.event.player.PlayerItemMendEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; diff --git a/plugin/src/main/java/net/momirealms/customfishing/util/ConfigUtils.java b/plugin/src/main/java/net/momirealms/customfishing/util/ConfigUtils.java index f88539e3..0cab3ded 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/util/ConfigUtils.java +++ b/plugin/src/main/java/net/momirealms/customfishing/util/ConfigUtils.java @@ -20,11 +20,11 @@ package net.momirealms.customfishing.util; import net.momirealms.customfishing.api.common.Pair; import net.momirealms.customfishing.api.common.Tuple; import net.momirealms.customfishing.api.mechanic.loot.WeightModifier; +import net.momirealms.customfishing.api.mechanic.misc.Value; import net.momirealms.customfishing.api.util.LogUtils; import net.momirealms.customfishing.compatibility.papi.PlaceholderManagerImpl; import net.momirealms.customfishing.mechanic.misc.value.ExpressionValue; import net.momirealms.customfishing.mechanic.misc.value.PlainValue; -import net.momirealms.customfishing.api.mechanic.misc.Value; import net.objecthunter.exp4j.ExpressionBuilder; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/plugin/src/main/java/net/momirealms/customfishing/util/ItemUtils.java b/plugin/src/main/java/net/momirealms/customfishing/util/ItemUtils.java index 9d1ed965..142e8ca6 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/util/ItemUtils.java +++ b/plugin/src/main/java/net/momirealms/customfishing/util/ItemUtils.java @@ -20,7 +20,6 @@ package net.momirealms.customfishing.util; import de.tr7zw.changeme.nbtapi.NBTCompound; import de.tr7zw.changeme.nbtapi.NBTItem; import de.tr7zw.changeme.nbtapi.NBTList; -import net.Indyuce.mmoitems.api.interaction.util.DurabilityItem; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.ScoreComponent; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;