-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
拡張関数の追加、コードのクリーンアップ
- Loading branch information
Showing
20 changed files
with
776 additions
and
1,033 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
254 changes: 95 additions & 159 deletions
254
src/main/kotlin/net/hinyari/plugin/storagebox/Command.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,214 +1,150 @@ | ||
| package net.hinyari.plugin.storagebox | ||
|
|
||
| import net.hinyari.plugin.storagebox.extensions.* | ||
| import net.hinyari.plugin.storagebox.util.SBUtil | ||
| import org.bukkit.Bukkit | ||
| import org.bukkit.Material | ||
| import org.bukkit.command.Command | ||
| import org.bukkit.command.CommandExecutor | ||
| import org.bukkit.command.CommandSender | ||
| import org.bukkit.entity.Player | ||
| import org.bukkit.inventory.ItemStack | ||
|
|
||
| class Command : CommandExecutor { | ||
|
|
||
| private val plugin: StorageBoxMain = StorageBoxMain.instance | ||
|
|
||
|
|
||
| class Command constructor(val plugin: StorageBoxMain) : CommandExecutor { | ||
|
|
||
| override fun onCommand(sender: CommandSender, cmd: Command, label: String, | ||
| args: Array<out String>): Boolean { | ||
|
|
||
|
|
||
| if (!cmd.name.equalsIgnoreCase("storagebox")) { | ||
| return true | ||
| } | ||
|
|
||
| // プレイヤー以外は受け付けない | ||
| if (sender !is Player) { | ||
| sender.sendMessage("${SBUtil.errorPrefix}ゲーム内で実行して下さい。") | ||
| return sender.sendMessageWithErrorPrefix("ゲーム内で実行して下さい。") | ||
| } | ||
|
|
||
| val player: Player = sender as Player | ||
| val player: Player = sender | ||
|
|
||
| if (cmd.name.equals("storagebox", true)) { | ||
|
|
||
| if (args.isEmpty()) { | ||
| plugin.logger.info("args isempty") | ||
| return false // ヘルプを表示する // TODO usageの整備 | ||
| } | ||
|
|
||
| val item = player.inventory.itemInMainHand | ||
|
|
||
| /* | ||
| if (item == null || item.type == Material.AIR) { | ||
| player.sendMessage("${plugin.errorPrefix}アイテムを手に持った状態で実行して下さい！") | ||
| return true | ||
| } | ||
| */ | ||
|
|
||
| if (args[0].equals("create", true)) { | ||
| if (player.hasPermission("sb.create")) { | ||
|
|
||
| if (args.size == 1) { | ||
| if (args.isEmpty()) { | ||
| plugin.logger.info("args isempty") | ||
| return false // ヘルプを表示する // TODO usageの整備 | ||
| } | ||
|
|
||
| return if (!SBUtil.isStorageBox(item)) { // ストレージボックスを持っていない場合（正常） | ||
| val item = player.itemInMainHand | ||
|
|
||
| player.itemOnCursor.itemMeta = SBUtil.createStorageBox( | ||
| item, item.amount, player | ||
| ).itemMeta | ||
| when (args[0].toUpperCase()) { | ||
| "CREATE" -> { | ||
| if (!player.hasPermission("sb.create")) { | ||
| return player.sendMessageWithErrorPrefix(SBUtil.noPermission) | ||
| } | ||
|
|
||
| when (args.size) { | ||
| 1 -> { | ||
| if (item.type == Material.AIR) { | ||
| return player.sendMessageWithErrorPrefix("手にアイテムを持って実行して下さい。") | ||
| } | ||
|
|
||
| return if (item.isNotStorageBox()) { | ||
| player.itemInMainHand.itemMeta = item.toStorageBox(item.amount).itemMeta | ||
|
|
||
| player.itemOnCursor.amount = 1 | ||
| player.itemInMainHand.amount = 1 | ||
| player.updateInventory() | ||
|
|
||
| player.sendMessage("${SBUtil.prefix}StorageBoxを作成しました！") | ||
|
|
||
| true | ||
| player.sendMessageWithPrefix("StorageBoxを作成しました!") | ||
| } else { | ||
| player.sendMessage("${SBUtil.errorPrefix}既にStorageBoxは作成されています！") | ||
|
|
||
| true | ||
| player.sendMessageWithErrorPrefix("StorageBoxは既に作成されています!") | ||
| } | ||
| } | ||
|
|
||
| } else if (args.size == 3) { | ||
|
|
||
| if (player.hasPermission("sb.create.infinity")) { | ||
| val material = Material.getMaterial(args[1].toUpperCase()) | ||
|
|
||
| // マテリアルがない | ||
| if (material == null || material == Material.AIR) { | ||
| player.sendMessage("${SBUtil.errorPrefix}そのようなアイテム名は存在しません！") | ||
| player.sendMessage("/$label create <Material> <数量>") | ||
| return true | ||
| } | ||
|
|
||
| val amount = if (SBUtil.isNumeric(args[2])) args[2].toInt() else -1 | ||
|
|
||
| // 数がおかしい | ||
| if (amount < 0) { | ||
| player.sendMessage("${SBUtil.errorPrefix}0以上のs数字を入力して下さい！") | ||
| player.sendMessage("/$label create <Material> <数量>") | ||
| return true | ||
| } | ||
| 3 -> { | ||
| if (!player.hasPermission("sb.create.infinity")) { | ||
| return player.sendMessageWithErrorPrefix(SBUtil.noPermission) | ||
| } | ||
|
|
||
| player.inventory.addItem(SBUtil.createStorageBox(ItemStack(material), amount, player)) | ||
| player.sendMessage("${SBUtil.prefix}${material}のStorageBoxを作成しました。") | ||
| val material = Material.getMaterial(args[1].toUpperCase()) | ||
|
|
||
| } else { | ||
| player.sendMessage(SBUtil.noPermission) | ||
| // Materialがみつからない | ||
| if (material == null || material == Material.AIR) { | ||
| player.sendMessageWithErrorPrefix("そのようなアイテム名は存在しません。") | ||
| return player.sendMessageWithPrefix("/$label create <Material> <数量>") | ||
| } | ||
| } else { | ||
| // ヘルプでも表示させとく | ||
| return false | ||
| } | ||
|
|
||
| } else { // 権限がない | ||
| val amount = if (args[2].isNumeric()) args[2].toInt() else -1 | ||
|
|
||
| player.sendMessage(SBUtil.noPermission) | ||
| // 数がおかしいンゴ | ||
| if (amount < 0) { | ||
| return player.sendMessageWithErrorPrefix("0以上の数字を入力してください。") | ||
| } | ||
|
|
||
| } | ||
| } else if (args[0].equals("info", true)) { | ||
| if (player.hasPermission("sb.info")) { | ||
|
|
||
| if (SBUtil.isStorageBox(item)) { // ストレージボックスを持っている場合 | ||
| player.sendMessage("§6---- §rStorageBox Information §6----") | ||
| player.sendMessage("Material: ${item.type}") | ||
| player.sendMessage("Amount: ${SBUtil.getAmountOfStorageBox(item)}") | ||
| //player.sendMessage("Owner: ${SBUtil.getOwnerOfStorageBox(item)?.name}") | ||
| } else { | ||
| player.sendMessage("${SBUtil.errorPrefix}StorageBoxを手に持って実行して下さい！") | ||
| player.inventory.addItem(ItemStack(material).toStorageBox(amount)) | ||
| player.sendMessageWithPrefix("${material}のStorageBoxを作成しました。") | ||
| } | ||
|
|
||
| } else { | ||
| player.sendMessage(SBUtil.noPermission) | ||
| else -> return false | ||
| } | ||
| } else if (args[0].equals("take", true)) { | ||
|
|
||
| if (player.hasPermission("sb.take")) { | ||
| if (args.size < 2) { // sb takeだけだった | ||
| player.sendMessage("${SBUtil.errorPrefix}数量を指定して下さい。") | ||
| return true | ||
| } | ||
|
|
||
| // sb take 数列 であるかを判断 | ||
| if (SBUtil.isNumeric(args[1])) { | ||
| val wantAmount = args[1].toInt() | ||
|
|
||
| // ストレージボックスを手に持っているか | ||
| if (SBUtil.isStorageBox(item)) { | ||
| } | ||
|
|
||
| // ゼロ以下 | ||
| if (wantAmount <= 0) { | ||
| player.sendMessage("${SBUtil.errorPrefix}1以上の数字を入力して下さい！") | ||
| return true | ||
| } | ||
| "INFO" -> { | ||
| if (!player.hasPermission("sb.info")) { | ||
| return player.sendMessageWithErrorPrefix(SBUtil.noPermission) | ||
| } | ||
|
|
||
| if (item.isNotStorageBox()) { | ||
| return player.sendMessageWithErrorPrefix("StorageBoxを手に持って実行して下さい。") | ||
| } | ||
|
|
||
| // 求める数量にStorageBox内の数量が満たない | ||
| if (wantAmount > SBUtil.getAmountOfStorageBox(item)) { | ||
| player.sendMessage("${SBUtil.errorPrefix}指定した数量のアイテムがありません！") | ||
| return true | ||
| } | ||
| player.sendMessage("§6---- §rStorageBox Information §6----") | ||
| player.sendMessage("Material: ${item.type}") | ||
| player.sendMessage("Amount: ${SBUtil.getAmountOfStorageBox(item)}") | ||
| } | ||
|
|
||
| // 求める数量とStorageBox内の数量が同じ | ||
| if (wantAmount == SBUtil.getAmountOfStorageBox(item)) { | ||
| // StorageBoxを消す | ||
| player.inventory.remove(item) | ||
| "TAKE" -> { | ||
| if (!player.hasPermission("sb.take")) { | ||
| return player.sendMessageWithErrorPrefix(SBUtil.noPermission) | ||
| } | ||
|
|
||
| } else { // 求める数量よりStorageBox内の数量の方が少ない | ||
| val aftertaken = SBUtil.getAmountOfStorageBox(item) - wantAmount | ||
| if (item.isNotStorageBox()) { | ||
| return player.sendMessageWithErrorPrefix("StorageBoxを手に持って実行して下さい。") | ||
| } | ||
|
|
||
| // StorageBoxの数量を変えたStorageBoxを付与する | ||
| player.inventory.itemInMainHand = | ||
| SBUtil.createStorageBox(item, aftertaken, player) | ||
| when (args.size) { | ||
| 1 -> { | ||
| return player.sendMessageWithErrorPrefix("数量を指定して下さい。") | ||
| } | ||
|
|
||
| } | ||
| 2 -> { | ||
| // 数列でなければリターン | ||
| if (!args[1].isNumeric() || args[1].toInt() <= 0) { | ||
| return player.sendMessageWithErrorPrefix("1以上の整数を入力して下さい。") | ||
| } | ||
|
|
||
| // プレイヤーにアイテムを渡す | ||
| SBUtil.giveItemToPlayer(player, item, wantAmount) | ||
| player.sendMessage("${SBUtil.prefix}${wantAmount}個のアイテムをStorageBoxから取り出しました。") | ||
| val taken = SBUtil.getAmountOfStorageBox(item) - args[1].toInt() | ||
| if (taken < 0) { | ||
| return player.sendMessageWithErrorPrefix("指定した数量のアイテムがありません!") | ||
| } | ||
|
|
||
| // 求める数量とStorageBox内の数量が同じ | ||
| if (taken == 0) { | ||
| player.inventory.remove(item) | ||
| } else { | ||
| player.sendMessage("${SBUtil.errorPrefix}StorageBoxを手に持って実行して下さい！") | ||
| player.itemInMainHand = item.toStorageBox(taken) | ||
| } | ||
| } else { | ||
| player.sendMessage("${SBUtil.errorPrefix}1以上の整数を入力して下さい！") | ||
|
|
||
| player.giveItem(item.reset(), taken) | ||
| return player.sendMessageWithPrefix("$taken 個のアイテムを取り出しました。") | ||
| } | ||
| } else { | ||
| player.sendMessage(SBUtil.noPermission) | ||
| } | ||
| } | ||
|
|
||
| } else if (args[0].equals("owner", true)) { | ||
| if (!SBUtil.isStorageBox(item)) { | ||
| player.sendMessage("${SBUtil.errorPrefix}所有者を変更したいStorageBoxを手に持って実行して下さい!") | ||
| return true | ||
| } | ||
|
|
||
| if (args.size < 2) { | ||
| player.sendMessage("/$label owner <所有者名>") | ||
| return true | ||
| } | ||
|
|
||
| if (Bukkit.getPlayer(args[1]) != null) { | ||
| player.inventory.itemInMainHand = | ||
| SBUtil.setOwnerOfStorageBox(item, Bukkit.getPlayer(args[1])) | ||
| player.sendMessage("${SBUtil.prefix}所有者を${args[1]}に変更しました！") | ||
| } else { | ||
| player.sendMessage("${SBUtil.errorPrefix}プレイヤー名は存在しません!") | ||
| } | ||
|
|
||
|
|
||
| } else if (args[0].equals("recipe", true)) { | ||
| if (player.hasPermission("sb.modifyrecipe")) { | ||
| player.openInventory(plugin.inventoryUtil.recipeRegister) | ||
| } else { | ||
| player.sendMessage(SBUtil.noPermission) | ||
| "RECIPE" -> { | ||
| if (!player.hasPermission("sb.modifyrecipe")) { | ||
| return player.sendMessageWithErrorPrefix(SBUtil.noPermission) | ||
| } | ||
| player.openInventory(plugin.inventoryUtil.recipeRegister) | ||
| } | ||
| } | ||
|
|
||
| return true | ||
| } | ||
|
|
||
|
|
||
| fun onTabComplete(player: Player, args: Array<out String>): MutableList<String>? { | ||
| if (args.size == 1) { | ||
| return mutableListOf("create", "take", "info").filter { s -> s.startsWith(args[0]) }.toMutableList() | ||
| } | ||
|
|
||
| return null | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.