mirror of
https://github.com/CarmJos/UserPrefix.git
synced 2026-06-05 09:01:39 +08:00
chore(item): 更换物品的配置逻辑,支持跨版本的物品读取、保存。
BREAKING-CHANGE: 旧的配置文件需要进行变更。
This commit is contained in:
@@ -87,7 +87,6 @@ public class PrefixConfig {
|
||||
|
||||
@Contract("_,!null->!null")
|
||||
protected @Nullable ItemStack getItem(@Nullable Player player, @Nullable ItemStack item) {
|
||||
if (item == null) return null;
|
||||
return PreparedItem.of(item).get(player);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ import org.bukkit.event.inventory.ClickType;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public class PrefixSelectGUI extends AutoPagedGUI {
|
||||
|
||||
@@ -49,7 +50,10 @@ public class PrefixSelectGUI extends AutoPagedGUI {
|
||||
|
||||
for (PrefixConfig prefix : prefixList) {
|
||||
if (prefix.getIdentifier().equals(usingPrefix.getIdentifier())) {
|
||||
addItem(new GUIItem(prefix.getItemWhenUsing(player) != null ? prefix.getItemWhenUsing(player) : prefix.getItemHasPermission(player)));
|
||||
addItem(new GUIItem(Optional
|
||||
.ofNullable(prefix.getItemWhenUsing(player))
|
||||
.orElse(prefix.getItemHasPermission(player))
|
||||
));
|
||||
} else if (prefix.checkPermission(player)) {
|
||||
addItem(new GUIItem(prefix.getItemHasPermission(player)) {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user