Fork/CommandPanels
2
0
Fork 0
forked from Upstream/CommandPanels
Code Pull Requests Actions Releases 1 Activity

3.20.1.0 #3

Browse Source
This commit is contained in:
rockyhawk64 2024-04-11 01:13:32 +10:00
parent e163347f7d
commit 3e9c40c160
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/me/rockyhawk/commandpanels/floodgatecp/OpenFloodgateGUI.java
View File

@ -18,7 +18,9 @@ import org.geysermc.floodgate.api.FloodgateApi;
import org.geysermc.floodgate.api.player.FloodgatePlayer; import org.geysermc.floodgate.api.player.FloodgatePlayer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
public class OpenFloodgateGUI implements Listener { public class OpenFloodgateGUI implements Listener {
private CommandPanels plugin; private CommandPanels plugin;
@ -71,13 +73,12 @@ public class OpenFloodgateGUI implements Listener {
} }
private List<String> processButtons(ConfigurationSection fgPanel, SimpleForm.Builder form, Panel panel, Player p) { private List<String> processButtons(ConfigurationSection fgPanel, SimpleForm.Builder form, Panel panel, Player p) {
List<String> commandsOrder = new ArrayList<>(); return fgPanel.getKeys(false).stream()
fgPanel.getKeys(false).stream()
.filter(key -> key.matches("\\d+")) .filter(key -> key.matches("\\d+"))
.sorted() .sorted(Comparator.comparingInt(Integer::parseInt)) // Ensure numeric sorting
.forEach(key -> { .map(key -> {
ConfigurationSection buttonConfig = fgPanel.getConfigurationSection(key); ConfigurationSection buttonConfig = fgPanel.getConfigurationSection(key);
if (buttonConfig == null) return; if (buttonConfig == null) return null;
String buttonContent = plugin.tex.placeholders(panel, null, p, buttonConfig.getString("text")); String buttonContent = plugin.tex.placeholders(panel, null, p, buttonConfig.getString("text"));
if (!buttonConfig.contains("icon")) { if (!buttonConfig.contains("icon")) {
@ -87,9 +88,10 @@ public class OpenFloodgateGUI implements Listener {
String texture = plugin.tex.placeholders(panel, null, p, buttonConfig.getString("icon.texture")); String texture = plugin.tex.placeholders(panel, null, p, buttonConfig.getString("icon.texture"));
form.button(buttonContent, type, texture); form.button(buttonContent, type, texture);
} }
commandsOrder.add(key); return key;
}); })
return commandsOrder; .filter(key -> key != null)
.collect(Collectors.toList());
} }
private void createAndSendCustomForm(PanelOpenedEvent e, FloodgatePlayer fgPlayer, ConfigurationSection fgPanel) { private void createAndSendCustomForm(PanelOpenedEvent e, FloodgatePlayer fgPlayer, ConfigurationSection fgPanel) {