Move shaded dependencies

This commit is contained in:
rockyhawk64 2024-02-04 22:44:22 +11:00
parent 1cf7d0a4e0
commit b47857cb14
3 changed files with 3 additions and 15 deletions

View File

@ -45,11 +45,11 @@
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.bstats</pattern> <pattern>org.bstats</pattern>
<shadedPattern>me.rockyhawk.commandpanels</shadedPattern> <shadedPattern>me.rockyhawk.commandpanels.bstats</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>de.tr7zw.changeme.nbtapi</pattern> <pattern>de.tr7zw.changeme.nbtapi</pattern>
<shadedPattern>me.rockyhawk.commandpanels</shadedPattern> <shadedPattern>me.rockyhawk.commandpanels.nbtapi</shadedPattern>
</relocation> </relocation>
</relocations> </relocations>
</configuration> </configuration>

View File

@ -123,18 +123,6 @@ public class Utils implements Listener {
if(panel.getConfig().contains("item." + clickedSlot + section + ".commands")) { if(panel.getConfig().contains("item." + clickedSlot + section + ".commands")) {
List<String> commands = panel.getConfig().getStringList("item." + clickedSlot + section + ".commands"); List<String> commands = panel.getConfig().getStringList("item." + clickedSlot + section + ".commands");
if (!commands.isEmpty()) { if (!commands.isEmpty()) {
//this will replace a sequence tag command with the commands from the sequence
List<String> commandsAfterSequence = commands;
for (int i = 0; commands.size() - 1 >= i; i++) {
if(commands.get(i).startsWith("sequence=")){
String locationOfSequence = commands.get(i).split("\\s")[1];
List<String> commandsSequence = panel.getConfig().getStringList(locationOfSequence);
commandsAfterSequence.remove(i);
commandsAfterSequence.addAll(i,commandsSequence);
}
}
commands = commandsAfterSequence;
for (int i = 0; commands.size() > i; i++) { for (int i = 0; commands.size() > i; i++) {
try { try {
commands.set(i, commands.get(i).replaceAll("%cp-clicked%", e.getCurrentItem().getType().toString())); commands.set(i, commands.get(i).replaceAll("%cp-clicked%", e.getCurrentItem().getType().toString()));

View File

@ -64,7 +64,7 @@ public class Commandpanelrefresher implements Listener {
int animatecount = 0; int animatecount = 0;
@Override @Override
public void run() { public void run() {
//counter counts to refresh delay (in seconds) then restarts //counter counts to refresh delay (in ticks) then restarts
if(c < refreshDelay){ if(c < refreshDelay){
c+=1; c+=1;
}else{ }else{