Upstream/CommandPanels
2
0
Fork 1
mirror of https://github.com/rockyhawk64/CommandPanels.git synced 2025-11-18 07:14:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert duplicate to not needing toggle for commands.

Browse Source
This commit is contained in:
TinyTank800 2025-03-23 16:11:13 -07:00
parent 51e35b1c7a
commit faaa0ac07f
2 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/me/rockyhawk/commandpanels/Utils.java
View File

@ -111,16 +111,8 @@ public class Utils implements Listener {
String duplicateValue = panel.getConfig().getString("item." + item + section + ".duplicate");
// Check if the clicked slot is in the duplicate configuration
DuplicateResult result = isSlotInDuplicateConfig(clickedSlot, duplicateValue);
if(result.isInDuplicate) {
if(isSlotInDuplicate(clickedSlot, duplicateValue)) {
foundSlot = item;
// If commands shouldn't be duplicated, return early after cancelling the event
if(!result.shouldDuplicateCommands) {
e.setCancelled(true);
return;
}
break;
}
}
@ -207,39 +199,15 @@ public class Utils implements Listener {
return false;
}
// Class to hold the result of duplicate check
private static class DuplicateResult {
public boolean isInDuplicate;
public boolean shouldDuplicateCommands;
//Helper method to see if the slot is a duplicate so it can copy commands.
private boolean isSlotInDuplicate(int slot, String duplicateConfig) {
if(duplicateConfig == null) return false;
public DuplicateResult(boolean isInDuplicate, boolean shouldDuplicateCommands) {
this.isInDuplicate = isInDuplicate;
this.shouldDuplicateCommands = shouldDuplicateCommands;
}
}
// Helper method to check if a slot is included in the duplicate configuration and if commands should be duplicated
private DuplicateResult isSlotInDuplicateConfig(int slot, String duplicateConfig) {
if(duplicateConfig == null) return new DuplicateResult(false, false);
boolean shouldDuplicateCommands = false;
String[] dupeItems = duplicateConfig.split(",");
// First check if "true" is included in the config
for(String item : dupeItems) {
if(item.trim().equalsIgnoreCase("true")) {
shouldDuplicateCommands = true;
break;
}
}
// Then check if the slot is included
for(String dupeItem : dupeItems) {
dupeItem = dupeItem.trim(); // Remove any whitespace
// Skip the "true" flag, it's not a slot designation
if(dupeItem.equalsIgnoreCase("true")) continue;
if(dupeItem.contains("-")) {
// This is a range
String[] range = dupeItem.split("-");
@ -247,19 +215,19 @@ public class Utils implements Listener {
int max = Integer.parseInt(range[1]);
if(slot >= min && slot <= max) {
return new DuplicateResult(true, shouldDuplicateCommands);
return true;
}
} else {
// This is a single slot
try {
int dupeSlot = Integer.parseInt(dupeItem);
if(dupeSlot == slot) {
return new DuplicateResult(true, shouldDuplicateCommands);
return true;
}
} catch(NumberFormatException ignored) {}
}
}
return new DuplicateResult(false, shouldDuplicateCommands);
return false;
}
}

5
src/me/rockyhawk/commandpanels/openpanelsmanager/OpenGUI.java
View File

@ -85,11 +85,6 @@ public class OpenGUI {
try {
String[] duplicateItems = pconfig.getString("item." + item + section + ".duplicate").split(",");
for (String tempDupe : duplicateItems) {
//Skip the "slot" if it is just the command setting
if(tempDupe.equalsIgnoreCase("true")){
continue;
}
if (tempDupe.contains("-")) {
//if there is multiple dupe items, convert numbers to ints
int[] bothNumbers = new int[]{Integer.parseInt(tempDupe.split("-")[0]), Integer.parseInt(tempDupe.split("-")[1])};