Skip to content

Commit

Permalink
Merge pull request #9 from Wirlie/dev-1.0.6
Browse files Browse the repository at this point in the history 
Release 1.0.6
  • Loading branch information
@Wirlie
Wirlie authored Jun 24, 2020
2 parents 7cf9cfa + ffad998 commit 561fbce
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 48 deletions.
9 changes: 9 additions & 0 deletions .idea/EnhancedBungeeList.iml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 6 additions & 9 deletions src/dev/wirlie/bungeecord/glist/EnhancedBCL.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package dev.wirlie.bungeecord.glist;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.List;
import java.util.concurrent.TimeUnit;
Expand All @@ -29,7 +26,7 @@ public void onEnable() {
//declaration of commons variables
Logger logger = getLogger();
PluginManager pm = BungeeCord.getInstance().getPluginManager();
yamlProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);
yamlProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);

logger.info("Enabling plugin ...");
configFile = new File(this.getDataFolder() + File.separator + "Config.yml");
Expand Down Expand Up @@ -67,7 +64,7 @@ public void reloadConfig() {
public void saveConfig() {
if (config != null) {
try {
yamlProvider.save(config, configFile);
yamlProvider.save(config, new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8));
} catch (IOException e) {
e.printStackTrace();
}
Expand All @@ -89,14 +86,14 @@ private void loadConfig() {
}

try {
config = yamlProvider.load(new FileReader(configFile));
config = yamlProvider.load(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8));
} catch (FileNotFoundException e) {
e.printStackTrace();
}
}

public Configuration loadConfiguration(File file) throws IOException {
return yamlProvider.load(file);
return yamlProvider.load(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
}

private void registerListExecutor(boolean firstRegister) {
Expand Down
60 changes: 21 additions & 39 deletions src/dev/wirlie/bungeecord/glist/ListExecutor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,11 @@ private void loadFromConfig() {
public void execute(CommandSender sender, String[] args) {
boolean isPlayerExecutor = sender instanceof ProxiedPlayer;
Set<String> options = new HashSet<>();
String[] var5 = args;
int var6 = args.length;

int totalPlayers;
for(totalPlayers = 0; totalPlayers < var6; ++totalPlayers) {
String arg = var5[totalPlayers];
for(String arg : args) {
String[] backup;
boolean alreadySkipped;
int i;
int j;
String b;
if (arg.equalsIgnoreCase("-g")) {
options.add("-g");
Expand All @@ -152,7 +147,7 @@ public void execute(CommandSender sender, String[] args) {
alreadySkipped = false;
i = 0;

for(j = 0; i < args.length; ++j) {
for(int j = 0; i < args.length; ++j) {
b = backup[i];
if (b.equalsIgnoreCase("-g") && !alreadySkipped) {
alreadySkipped = true;
Expand All @@ -170,7 +165,7 @@ public void execute(CommandSender sender, String[] args) {
alreadySkipped = false;
i = 0;

for(j = 0; i < args.length; ++j) {
for(int j = 0; i < args.length; ++j) {
b = backup[i];
if (b.equalsIgnoreCase("-sp") && !alreadySkipped) {
alreadySkipped = true;
Expand All @@ -188,7 +183,7 @@ public void execute(CommandSender sender, String[] args) {
alreadySkipped = false;
i = 0;

for(j = 0; i < args.length; ++j) {
for(int j = 0; i < args.length; ++j) {
b = backup[i];
if (b.equalsIgnoreCase("-a") && !alreadySkipped) {
alreadySkipped = true;
Expand All @@ -202,8 +197,6 @@ public void execute(CommandSender sender, String[] args) {
}
}

int totalBars;
int i;
int page;
String[] partsController;
if (args.length == 0) {
Expand Down Expand Up @@ -233,38 +226,38 @@ public void execute(CommandSender sender, String[] args) {
})
.limit(this.globalListBehaviourMaxRows < 1 ? Integer.MAX_VALUE : options.contains("-g") ? Integer.MAX_VALUE : this.globalListBehaviourMaxRows).collect(Collectors.toList());
StringBuilder rowsBuilder = new StringBuilder();
totalPlayers = BungeeCord.getInstance().getPlayers().size();
int totalPlayers = BungeeCord.getInstance().getPlayers().size();
if (servers.isEmpty()) {
rowsBuilder.append(this.globalListNoServersFormat).append("\n");
} else {
page = (servers.get(0)).getPlayers().size();
Iterator var26 = servers.iterator();
Iterator<ServerInfo> serversIterator = servers.iterator();

label212:
mainWhile:
while(true) {
ServerInfo serverInfo;
do {
do {
if (!var26.hasNext()) {
break label212;
if (!serversIterator.hasNext()) {
break mainWhile;
}

serverInfo = (ServerInfo)var26.next();
float percent = totalPlayers == 0 ? 0.0F : (float)serverInfo.getPlayers().size() * 100.0F / (float)totalPlayers;
float percentGraphic = page == 0 ? 0.0F : (float)(serverInfo.getPlayers().size() * 100 / page);
serverInfo = serversIterator.next();
float percent = totalPlayers == 0 ? 0.0F : (serverInfo.getPlayers().size() * 100.0F / totalPlayers);
float percentGraphic = page == 0 ? 0.0F : (serverInfo.getPlayers().size() * 100F / page);
StringBuilder graphicBarBuilder = new StringBuilder();
float barPercent = 5.0F;
totalBars = (int)(percentGraphic / barPercent);
int totalBars = (int)(percentGraphic / barPercent);

for(i = 0; i < 20; ++i) {
for(int i = 0; i < 20; ++i) {
if (i < totalBars) {
graphicBarBuilder.append(this.globalListGraphicBarColor).append("|");
} else {
graphicBarBuilder.append(this.globalListBackgroundGraphicColor).append("|");
}
}

rowsBuilder.append(this.globalListServerRowFormat.replace("{SERVER_NAME}", globalListUpperCaseServerNames ? serverInfo.getName().toUpperCase() : serverInfo.getName()).replace("{PLAYER_AMOUNT}", String.valueOf(serverInfo.getPlayers().size())).replace("{GRAPHIC_BAR}", graphicBarBuilder.toString()).replace("{PERCENT}", this.format.format((double)percent) + "%")).append("\n");
rowsBuilder.append(this.globalListServerRowFormat.replace("{SERVER_NAME}", globalListUpperCaseServerNames ? serverInfo.getName().toUpperCase() : serverInfo.getName()).replace("{PLAYER_AMOUNT}", String.valueOf(serverInfo.getPlayers().size())).replace("{GRAPHIC_BAR}", graphicBarBuilder.toString()).replace("{PERCENT}", this.format.format(percent) + "%")).append("\n");
} while(!options.contains("-sp"));
} while(serverInfo.getPlayers().isEmpty());

Expand All @@ -283,9 +276,8 @@ public void execute(CommandSender sender, String[] args) {
String message = ChatColor.translateAlternateColorCodes('&', fullMessageCopy.replace("{SERVERS_ROWS}", rowsBuilder.toString()).replace("{NOT_DISPLAYED_AMOUNT}", String.valueOf(page)).replace("{TOTAL_PLAYER_AMOUNT}", String.valueOf(totalPlayers)).replace("{LABEL}", this.getName()));
String[] lines = message.split("\\n");
partsController = lines;
int var36 = lines.length;

for(totalBars = 0; totalBars < var36; ++totalBars) {
for(int totalBars = 0; totalBars < lines.length; ++totalBars) {
String line = partsController[totalBars];
sender.sendMessage(TextUtil.fromLegacy(line));
}
Expand Down Expand Up @@ -318,29 +310,21 @@ public void execute(CommandSender sender, String[] args) {
sender.sendMessage(TextUtil.fromLegacy(this.serverListNoPlayersFormat));
}
} else {
String[] namesData = pageData.toArray(new String[pageData.size()]);
String[] namesData = pageData.toArray(new String[0]);
String message = this.serverListFullFormat.replace("{PLAYERS_ROWS}", TextUtil.makeRows(2, 25, (page - 1) * this.serverListBehaviourPlayerPerPage + 1, ChatColor.GRAY, namesData)).replace("{SERVER_NAME}", serverListUpperCaseServerName ? serverInfo.getName().toUpperCase() : serverInfo.getName()).replace("{PLAYERS_COUNT}", String.valueOf(temporalPaginator.dataSize())).replace("{PAGE}", options.contains("-g") ? "All Pages" : String.valueOf(page)).replace("{TOTAL_PAGES}", String.valueOf(temporalPaginator.getTotalPages()));
if (options.contains("-g")) {
partsController = message.split("\\n");
String[] var37 = partsController;
totalBars = partsController.length;

for(i = 0; i < totalBars; ++i) {
String line = var37[i];
for (String line : partsController) {
if (!line.contains("{PAGINATION_CONTROLLER}")) {
sender.sendMessage(TextUtil.fromLegacy(line));
}
}
} else if (message.contains("{PAGINATION_CONTROLLER}")) {
partsController = message.split("\\{PAGINATION_CONTROLLER}");
BaseComponent mainComponent = new TextComponent();
BaseComponent[] var41 = TextUtil.fromLegacy(partsController[0]);
i = var41.length;

int var46;

for(var46 = 0; var46 < i; ++var46) {
BaseComponent bc = var41[var46];
for (BaseComponent bc : TextUtil.fromLegacy(partsController[0])) {
mainComponent.addExtra(bc);
}

Expand Down Expand Up @@ -432,19 +416,17 @@ public void execute(CommandSender sender, String[] args) {
int j;
if (cb != null) {
bcObject = cb.create();
var46 = bcObject.length;

for(j = 0; j < var46; ++j) {
for(j = 0; j < bcObject.length; ++j) {
bc = bcObject[j];
mainComponent.addExtra(bc);
}
}

if (partsController.length > 1) {
bcObject = TextUtil.fromLegacy(partsController[1]);
var46 = bcObject.length;

for(j = 0; j < var46; ++j) {
for(j = 0; j < bcObject.length; ++j) {
bc = bcObject[j];
mainComponent.addExtra(bc);
}
Expand Down

0 comments on commit 561fbce

Please sign in to comment.