From 123ae0b039c77b2cf9d608f6800cd8359ff668a1 Mon Sep 17 00:00:00 2001 From: CarmJos Date: Thu, 6 Jan 2022 14:22:42 +0800 Subject: [PATCH] =?UTF-8?q?[v1.2.0]=20=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=20-=20`[U]`=20=E9=87=87=E7=94=A8=E6=9C=80=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=20EasyPlugin=20-=20`[U]`=20=E4=BB=A4=E5=AE=89?= =?UTF-8?q?=E9=9D=99=E6=A8=A1=E5=BC=8F=E7=9A=84=E6=9D=83=E9=99=90=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=8D=E7=94=9F=E6=95=88=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++----- .../carm/plugin/ultradepository/UltraDepository.java | 6 +++--- .../ultradepository/configuration/PluginConfig.java | 5 +++-- .../carm/plugin/ultradepository/ui/DepositoryGUI.java | 10 ++++++---- .../cc/carm/plugin/ultradepository/ui/SellItemGUI.java | 9 +++++---- src/main/resources/plugin.yml | 1 + 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 794511b..c34f04d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,13 +9,13 @@ 11 UTF-8 UTF-8 - 1.1.0 + 1.1.2 cc.carm.plugin ultradepository jar - 1.1.8 + 1.2.0 UltraDepository 超级仓库插件，支持设定不同物品的存储仓库。 @@ -261,9 +261,6 @@ src/main/resources true - - LICENSE - diff --git a/src/main/java/cc/carm/plugin/ultradepository/UltraDepository.java b/src/main/java/cc/carm/plugin/ultradepository/UltraDepository.java index 149c13f..f3c01b9 100644 --- a/src/main/java/cc/carm/plugin/ultradepository/UltraDepository.java +++ b/src/main/java/cc/carm/plugin/ultradepository/UltraDepository.java @@ -36,7 +36,7 @@ public class UltraDepository extends EasyPlugin { } @Override - public void load() { + protected void load() { instance = this; log("加载配置文件..."); @@ -46,7 +46,7 @@ public class UltraDepository extends EasyPlugin { } @Override - public boolean initialize() { + protected boolean initialize() { log("初始化存储方式..."); StorageMethod storageMethod = PluginConfig.STORAGE_METHOD.get(); @@ -113,7 +113,7 @@ public class UltraDepository extends EasyPlugin { } @Override - public void shutdown() { + protected void shutdown() { if (!isInitialized()) return; log("保存现有用户数据..."); diff --git a/src/main/java/cc/carm/plugin/ultradepository/configuration/PluginConfig.java b/src/main/java/cc/carm/plugin/ultradepository/configuration/PluginConfig.java index e5c3feb..c1bdb4d 100644 --- a/src/main/java/cc/carm/plugin/ultradepository/configuration/PluginConfig.java +++ b/src/main/java/cc/carm/plugin/ultradepository/configuration/PluginConfig.java @@ -1,13 +1,14 @@ package cc.carm.plugin.ultradepository.configuration; +import cc.carm.lib.easyplugin.configuration.cast.ConfigStringCast; import cc.carm.lib.easyplugin.configuration.impl.ConfigSound; -import cc.carm.lib.easyplugin.configuration.impl.ConfigStringCast; import cc.carm.lib.easyplugin.configuration.message.ConfigMessage; import cc.carm.lib.easyplugin.configuration.message.ConfigMessageList; import cc.carm.lib.easyplugin.configuration.values.ConfigValue; import cc.carm.plugin.ultradepository.manager.ConfigManager; import cc.carm.plugin.ultradepository.storage.StorageMethod; import org.bukkit.Material; +import org.bukkit.Sound; public class PluginConfig { @@ -44,7 +45,7 @@ public class PluginConfig { public static class Sounds { - public static final ConfigSound COLLECT = new ConfigSound("sounds.collect"); + public static final ConfigSound COLLECT = new ConfigSound("sounds.collect", Sound.ENTITY_VILLAGER_CELEBRATE); public static final ConfigSound SELL_SUCCESS = new ConfigSound("sounds.sell-success"); public static final ConfigSound SELL_FAIL = new ConfigSound("sounds.sell-fail"); public static final ConfigSound GUI_CLICK = new ConfigSound("sounds.gui-click"); diff --git a/src/main/java/cc/carm/plugin/ultradepository/ui/DepositoryGUI.java b/src/main/java/cc/carm/plugin/ultradepository/ui/DepositoryGUI.java index 29998f1..05f89ad 100644 --- a/src/main/java/cc/carm/plugin/ultradepository/ui/DepositoryGUI.java +++ b/src/main/java/cc/carm/plugin/ultradepository/ui/DepositoryGUI.java @@ -42,12 +42,12 @@ public class DepositoryGUI extends GUI { private GUIItem createGUIItem(DepositoryItem item) { DepositoryItemData itemData = userData.getItemData(item); - int remain = item.getLimit() - itemData.getSold(); + int canSell = item.getLimit() - itemData.getSold(); ItemStackFactory factory = new ItemStackFactory(item.getDisplayItem()); List additionalLore = PluginConfig.General.ADDITIONAL_LORE.get(player, new Object[]{ item.getName(), itemData.getAmount(), item.getPrice(), - itemData.getSold(), remain, item.getLimit() + itemData.getSold(), canSell, item.getLimit() }); additionalLore.forEach(factory::addLore); @@ -65,10 +65,12 @@ public class DepositoryGUI extends GUI { } if (type == ClickType.LEFT) { - if (remain >= 1) { + if (canSell >= 1) { SellItemGUI.open(player, userData, itemData, depository, item); } else { - PluginMessages.ITEM_SOLD_LIMIT.send(player, new Object[]{remain, item.getLimit()}); + PluginConfig.Sounds.SELL_FAIL.play(player); + PluginMessages.ITEM_SOLD_LIMIT.send(player, new Object[]{canSell, item.getLimit()}); + player.closeInventory(); } } else if (type == ClickType.RIGHT) { diff --git a/src/main/java/cc/carm/plugin/ultradepository/ui/SellItemGUI.java b/src/main/java/cc/carm/plugin/ultradepository/ui/SellItemGUI.java index 5cda1ea..2e38048 100644 --- a/src/main/java/cc/carm/plugin/ultradepository/ui/SellItemGUI.java +++ b/src/main/java/cc/carm/plugin/ultradepository/ui/SellItemGUI.java @@ -11,6 +11,7 @@ import cc.carm.plugin.ultradepository.configuration.depository.Depository; import cc.carm.plugin.ultradepository.configuration.depository.DepositoryItem; import cc.carm.plugin.ultradepository.data.DepositoryItemData; import cc.carm.plugin.ultradepository.data.UserData; +import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; @@ -73,7 +74,7 @@ public class SellItemGUI extends GUI { } private GUIItem getAddItem(int amount) { - ItemStackFactory factory = new ItemStackFactory(Add.TYPE.get()); + ItemStackFactory factory = new ItemStackFactory(Add.TYPE.getOptional().orElse(Material.STONE)); factory.setDurability(Add.DATA.get()); factory.setDisplayName(Add.NAME.get(player, new Object[]{ getItemName(), amount @@ -93,7 +94,7 @@ public class SellItemGUI extends GUI { } private GUIItem getRemoveItem(int amount) { - ItemStackFactory factory = new ItemStackFactory(Remove.TYPE.get()); + ItemStackFactory factory = new ItemStackFactory(Remove.TYPE.getOptional().orElse(Material.STONE)); factory.setDurability(Remove.DATA.get()); factory.setDisplayName(Remove.NAME.get(player, new Object[]{ getItemName(), amount @@ -112,7 +113,7 @@ public class SellItemGUI extends GUI { } private GUIItem getConfirmItem() { - ItemStackFactory factory = new ItemStackFactory(Confirm.TYPE.get()); + ItemStackFactory factory = new ItemStackFactory(Confirm.TYPE.getOptional().orElse(Material.STONE)); factory.setDurability(Confirm.DATA.get()); factory.setDisplayName(Confirm.NAME.get(player, new Object[]{ getItemName(), getCurrentAmount(), getTotalMoney() @@ -131,7 +132,7 @@ public class SellItemGUI extends GUI { } private GUIItem getCancelItem() { - ItemStackFactory factory = new ItemStackFactory(Cancel.TYPE.get()); + ItemStackFactory factory = new ItemStackFactory(Cancel.TYPE.getOptional().orElse(Material.STONE)); factory.setDurability(Cancel.DATA.get()); factory.setDisplayName(Cancel.NAME.get()); factory.setLore(Cancel.LORE.get()); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 381e305..1233415 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -32,6 +32,7 @@ permissions: "UltraDepository.silent": description: "超级仓库的安静模式权限，拥有该权限将不再接收到放入背包的提示。" + default: false "UltraDepository.auto": description: "超级仓库的自动收集权限"