fix durability

clean code
This commit is contained in:
tony_all 2022-07-04 15:57:21 +08:00
parent b3f020598f
commit 86cd35915a
7 changed files with 9 additions and 18 deletions

View File

@ -3,11 +3,10 @@ package work.microhand.sanseyooyea.sansefish
import org.bukkit.NamespacedKey
import taboolib.common.platform.Plugin
import taboolib.common.platform.function.info
import taboolib.module.configuration.Config
import taboolib.module.configuration.Configuration
import taboolib.platform.BukkitPlugin
import work.microhand.sanseyooyea.sansefish.command.registerCommand
import work.microhand.sanseyooyea.sansefish.command.StorageCommand
import work.microhand.sanseyooyea.sansefish.command.registerCommand
import work.microhand.sanseyooyea.sansefish.command.registerReload
import work.microhand.sanseyooyea.sansefish.manager.BaitManager
import work.microhand.sanseyooyea.sansefish.manager.RodManager
@ -20,6 +19,7 @@ object SanseFish : Plugin() {
info("§a| §7作者QQ: 1187586838")
registerCommand()
StorageCommand.registerCommand()
registerReload()
BaitManager
RodManager
info("§a| §7插件加载完成.")

View File

@ -4,9 +4,7 @@ import org.bukkit.Bukkit
import org.bukkit.command.CommandSender
import org.bukkit.entity.Player
import taboolib.common.platform.command.command
import taboolib.library.xseries.setItemStack
import taboolib.platform.util.giveItem
import work.microhand.sanseyooyea.sansefish.SanseFish
import work.microhand.sanseyooyea.sansefish.manager.BaitManager
import work.microhand.sanseyooyea.sansefish.manager.RodManager
@ -25,7 +23,7 @@ fun registerCommand() = command("giveRod", permission = "sansefish.giverod") {
execute<CommandSender> { sender, ctx, arg ->
val target =
Bukkit.getPlayerExact(ctx.argument(-1))!!
val rod = RodManager.rods[arg]?: return@execute sender.sendMessage("§c| §7该鱼竿不存在")
val rod = RodManager.rods[arg] ?: return@execute sender.sendMessage("§c| §7该鱼竿不存在")
target.giveItem(rod.buildFishingRod())
}
}

View File

@ -7,7 +7,6 @@ import org.bukkit.event.player.PlayerInteractEvent
import org.bukkit.inventory.ItemStack
import org.bukkit.persistence.PersistentDataType
import taboolib.common.platform.event.SubscribeEvent
import taboolib.platform.util.ItemBuilder
import work.microhand.sanseyooyea.sansefish.SanseFish
import work.microhand.sanseyooyea.sansefish.manager.RodManager
import work.microhand.sanseyooyea.sansefish.ui.BaitUI
@ -42,9 +41,8 @@ object FishListener {
) return player.sendMessage("§e| §7该鱼竿未安装鱼饵. 请手持鱼竿左键安装.").also { fishEvent.isCancelled = true }
}
if (fishEvent.state != PlayerFishEvent.State.BITE) rod.durability--
if (fishEvent.state == PlayerFishEvent.State.CAUGHT_FISH) {
rod.durability--
rod.handleFished(fishEvent)
}

View File

@ -28,7 +28,7 @@ object BaitManager {
}
private fun init() {
val folder = File(getDataFolder(),"baits").apply {
val folder = File(getDataFolder(), "baits").apply {
if (exists()) return@apply
mkdirs()
BukkitPlugin.getInstance().saveResource("baits${File.separator}default.yml", false)
@ -36,8 +36,8 @@ object BaitManager {
// load baits.
folder.listFiles()?.forEach { file ->
val config = Configuration.loadFromFile(file)
val key = config.getString("item")?: return@forEach warning("鱼饵 ${file.nameWithoutExtension} 未配置物品.")
val item = StorageCommand.itemStorage.getItemStack(key)?: throw IllegalArgumentException("物品 $key 不存在.")
val key = config.getString("item") ?: return@forEach warning("鱼饵 ${file.nameWithoutExtension} 未配置物品.")
val item = StorageCommand.itemStorage.getItemStack(key) ?: throw IllegalArgumentException("物品 $key 不存在.")
val rewards = BaitReward(config)
baits[file.nameWithoutExtension] = Bait(file.nameWithoutExtension, item, rewards, config)
}

View File

@ -5,9 +5,8 @@ import taboolib.common.platform.function.getDataFolder
import taboolib.module.configuration.Configuration
import taboolib.platform.BukkitPlugin
import taboolib.platform.util.ItemBuilder
import work.microhand.sanseyooyea.sansefish.SanseFish
import work.microhand.sanseyooyea.sansefish.misc.FishingRodInstance
import work.microhand.sanseyooyea.sansefish.misc.FishRod
import work.microhand.sanseyooyea.sansefish.misc.FishingRodInstance
import java.io.File
object RodManager {

View File

@ -7,7 +7,6 @@ import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.meta.Damageable
import org.bukkit.persistence.PersistentDataType
import taboolib.platform.BukkitPlugin
import taboolib.platform.util.ItemBuilder
import taboolib.platform.util.buildItem
import work.microhand.sanseyooyea.sansefish.SanseFish
import work.microhand.sanseyooyea.sansefish.manager.BaitManager

View File

@ -1,11 +1,8 @@
package work.microhand.sanseyooyea.sansefish.ui
import org.bukkit.entity.Player
import org.bukkit.inventory.PlayerInventory
import org.bukkit.persistence.PersistentDataType
import taboolib.common.platform.function.console
import taboolib.module.ui.buildMenu
import taboolib.module.ui.type.Basic
import taboolib.module.ui.type.Linked
import work.microhand.sanseyooyea.sansefish.SanseFish
import work.microhand.sanseyooyea.sansefish.manager.BaitManager