Update InventoryGUI to version 1.1.5-SNAPSHOT and refine Nicknames GUI handling logic.
This commit is contained in:
parent
7f00bc104b
commit
c48d4f5c86
|
|
@ -14,7 +14,7 @@ dependencies {
|
||||||
compileOnly("com.gitlab.ruany:LiteBansAPI:0.6.1") // move to proxy
|
compileOnly("com.gitlab.ruany:LiteBansAPI:0.6.1") // move to proxy
|
||||||
compileOnly("org.apache.commons:commons-lang3:3.17.0") // needs an alternative, already removed from upstream api and will be removed in server
|
compileOnly("org.apache.commons:commons-lang3:3.17.0") // needs an alternative, already removed from upstream api and will be removed in server
|
||||||
compileOnly("net.luckperms:api:5.5") // Luckperms
|
compileOnly("net.luckperms:api:5.5") // Luckperms
|
||||||
implementation("com.alttd.inventory_gui:InventoryGUI:1.1.3-SNAPSHOT")
|
implementation("com.alttd.inventory_gui:InventoryGUI:1.1.5-SNAPSHOT")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
|
|
|
||||||
|
|
@ -98,10 +98,6 @@ public class NicknamesGui implements Listener {
|
||||||
private void handleInventoryClick(Nick nick, InventoryClickEvent inventoryClickEvent, MiniMessage miniMessage, ItemStack playerSkull) {
|
private void handleInventoryClick(Nick nick, InventoryClickEvent inventoryClickEvent, MiniMessage miniMessage, ItemStack playerSkull) {
|
||||||
final Player playerWhoClicked = (Player) inventoryClickEvent.getWhoClicked();
|
final Player playerWhoClicked = (Player) inventoryClickEvent.getWhoClicked();
|
||||||
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(nick.getUuid());
|
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(nick.getUuid());
|
||||||
if (offlinePlayer.getName() == null) {
|
|
||||||
playerWhoClicked.sendRichMessage(Config.NICK_PLAYER_NOT_ONLINE, Placeholder.parsed("player", getOfflinePlayerName(offlinePlayer)));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Component offlinePlayerName = miniMessage.deserialize(getOfflinePlayerName(offlinePlayer));
|
Component offlinePlayerName = miniMessage.deserialize(getOfflinePlayerName(offlinePlayer));
|
||||||
if (!nick.hasRequest()) {
|
if (!nick.hasRequest()) {
|
||||||
playerWhoClicked.sendRichMessage(Config.NICK_ALREADY_HANDLED,
|
playerWhoClicked.sendRichMessage(Config.NICK_ALREADY_HANDLED,
|
||||||
|
|
@ -158,10 +154,9 @@ public class NicknamesGui implements Listener {
|
||||||
ItemStack completedNickRequestItem = createCompletedNickRequestItem(offlinePlayerName, playerSkull);
|
ItemStack completedNickRequestItem = createCompletedNickRequestItem(offlinePlayerName, playerSkull);
|
||||||
inventoryClickEvent.getInventory().setItem(inventoryClickEvent.getSlot(), completedNickRequestItem);
|
inventoryClickEvent.getInventory().setItem(inventoryClickEvent.getSlot(), completedNickRequestItem);
|
||||||
nicknamesGui.render(playerWhoClicked);
|
nicknamesGui.render(playerWhoClicked);
|
||||||
playerWhoClicked.updateInventory();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void handleLeftClickPlayerSkull(Nick nick, InventoryClickEvent inventoryClickEvent, OfflinePlayer offlinePlayer, Player playerWhoClicked, Component offlinePlayerName, ItemStack playerSkull) {
|
private void handleLeftClickPlayerSkull(Nick nick, InventoryClickEvent inventoryClickEvent, OfflinePlayer offlinePlayer, Player playerWhoClicked, Component offlinePlayerName, ItemStack playerSkull) {
|
||||||
Queries.acceptNewNickname(nick.getUuid(), nick.getNewNick());
|
Queries.acceptNewNickname(nick.getUuid(), nick.getNewNick());
|
||||||
|
|
||||||
String newNick = nick.getNewNick();
|
String newNick = nick.getNewNick();
|
||||||
|
|
@ -195,7 +190,7 @@ public class NicknamesGui implements Listener {
|
||||||
|
|
||||||
ItemStack completedNickRequestItem = createCompletedNickRequestItem(offlinePlayerName, playerSkull);
|
ItemStack completedNickRequestItem = createCompletedNickRequestItem(offlinePlayerName, playerSkull);
|
||||||
inventoryClickEvent.getInventory().setItem(inventoryClickEvent.getSlot(), completedNickRequestItem);
|
inventoryClickEvent.getInventory().setItem(inventoryClickEvent.getSlot(), completedNickRequestItem);
|
||||||
playerWhoClicked.updateInventory();
|
nicknamesGui.render(playerWhoClicked);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ItemStack createCompletedNickRequestItem(Component offlinePlayerName, ItemStack playerSkull) {
|
private static ItemStack createCompletedNickRequestItem(Component offlinePlayerName, ItemStack playerSkull) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user