From 9693bc6b8abc99472704c9a64e8a6c0b497f8ce4 Mon Sep 17 00:00:00 2001 From: carm Date: Fri, 1 Jul 2022 20:36:32 +0800 Subject: [PATCH] =?UTF-8?q?fix(gui):=20=E4=BF=AE=E5=A4=8DGUI=E7=89=A9?= =?UTF-8?q?=E5=93=81=E6=97=A0=E6=B3=95=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../cc/carm/plugin/userprefix/configuration/PluginConfig.java | 2 +- .../plugin/userprefix/configuration/reader/GUIItemReader.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 60ebc5b..8904262 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 UTF-8 - 1.4.9 + 1.4.10 2.0.1 diff --git a/src/main/java/cc/carm/plugin/userprefix/configuration/PluginConfig.java b/src/main/java/cc/carm/plugin/userprefix/configuration/PluginConfig.java index d663e58..efce420 100644 --- a/src/main/java/cc/carm/plugin/userprefix/configuration/PluginConfig.java +++ b/src/main/java/cc/carm/plugin/userprefix/configuration/PluginConfig.java @@ -122,7 +122,7 @@ public class PluginConfig extends ConfigurationRoot { .serializeValue(GUIItemConfiguration::serialize) .parseValue((v, d) -> GUIItemReader.readFrom(v)) .defaults(new GUIItemConfiguration( - Material.BARRIER, 0, "&c&l返回", + Material.BARRIER, 1, 0, "&c&l返回", Collections.singletonList("&f点击即可返回上一菜单"), Collections.singletonList(GUIActionConfiguration.of(GUIActionType.CHAT, "/menu")), Collections.singletonList(49) diff --git a/src/main/java/cc/carm/plugin/userprefix/configuration/reader/GUIItemReader.java b/src/main/java/cc/carm/plugin/userprefix/configuration/reader/GUIItemReader.java index 7bd6775..effe75f 100644 --- a/src/main/java/cc/carm/plugin/userprefix/configuration/reader/GUIItemReader.java +++ b/src/main/java/cc/carm/plugin/userprefix/configuration/reader/GUIItemReader.java @@ -18,6 +18,7 @@ public class GUIItemReader { String material = Optional.ofNullable(section.getString("type")).orElse("STONE"); Material type = Optional.ofNullable(Material.matchMaterial(material)).orElse(Material.STONE); int data = section.getInt("data", 0); + int amount = section.getInt("amount", 1); String name = section.getString("name"); List lore = section.getStringList("lore"); @@ -33,7 +34,7 @@ public class GUIItemReader { } return new GUIItemConfiguration( - type, data, name, lore, actions, + type, amount, data, name, lore, actions, slots.size() > 0 ? slots : Collections.singletonList(slot) ); }