SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Thank you Eutherin for the reminder to break async!

Browse Source
This commit is contained in:
libraryaddict 2020-08-13 12:14:00 +12:00
parent 93936c3628
commit 9b7b232fbe
2 changed files with 42 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
View File

@ -380,8 +380,8 @@ public class DisguiseConfig {
public static void saveInternalConfig() { public static void saveInternalConfig() {
File internalFile = new File(LibsDisguises.getInstance().getDataFolder(), "internal.yml"); File internalFile = new File(LibsDisguises.getInstance().getDataFolder(), "internal.yml");
String internalConfig = ReflectionManager String internalConfig =
.getResourceAsString(LibsDisguises.getInstance().getFile(), "internal.yml"); ReflectionManager.getResourceAsString(LibsDisguises.getInstance().getFile(), "internal.yml");
// Bisect hosted, server ip, release builds // Bisect hosted, server ip, release builds
for (Object s : new Object[]{isBisectHosted(), getSavedServerIp(), isUsingReleaseBuild(), for (Object s : new Object[]{isBisectHosted(), getSavedServerIp(), isUsingReleaseBuild(),
@ -393,15 +393,13 @@ public class DisguiseConfig {
try { try {
internalFile.createNewFile(); internalFile.createNewFile();
} } catch (IOException e) {
catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
try (PrintWriter writer = new PrintWriter(internalFile, "UTF-8")) { try (PrintWriter writer = new PrintWriter(internalFile, "UTF-8")) {
writer.write(internalConfig); writer.write(internalConfig);
} } catch (FileNotFoundException | UnsupportedEncodingException e) {
catch (FileNotFoundException | UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -439,9 +437,7 @@ public class DisguiseConfig {
public static Entry<DisguisePerm, Disguise> getCustomDisguise(String disguise) { public static Entry<DisguisePerm, Disguise> getCustomDisguise(String disguise) {
if (!Bukkit.isPrimaryThread()) { if (!Bukkit.isPrimaryThread()) {
DisguiseUtilities.getLogger().warning( throw new IllegalStateException("Custom Disguises should not be called async!");
"Custom Disguises should not be called async! This operation will become impossible in the " +
"future!");
} }
Entry<DisguisePerm, String> entry = getRawCustomDisguise(disguise); Entry<DisguisePerm, String> entry = getRawCustomDisguise(disguise);
@ -452,8 +448,7 @@ public class DisguiseConfig {
try { try {
return new HashMap.SimpleEntry(entry.getKey(), DisguiseParser.parseDisguise(entry.getValue())); return new HashMap.SimpleEntry(entry.getKey(), DisguiseParser.parseDisguise(entry.getValue()));
} } catch (IllegalAccessException | InvocationTargetException | DisguiseParseException e) {
catch (IllegalAccessException | InvocationTargetException | DisguiseParseException e) {
DisguiseUtilities.getLogger().warning("Error when attempting to grab the custom disguise " + disguise); DisguiseUtilities.getLogger().warning("Error when attempting to grab the custom disguise " + disguise);
e.printStackTrace(); e.printStackTrace();
} }
@ -461,12 +456,10 @@ public class DisguiseConfig {
return null; return null;
} }
public static Entry<DisguisePerm, Disguise> getCustomDisguise(Entity target, public static Entry<DisguisePerm, Disguise> getCustomDisguise(Entity target, String disguise)
String disguise) throws IllegalAccessException, DisguiseParseException, InvocationTargetException { throws IllegalAccessException, DisguiseParseException, InvocationTargetException {
if (!Bukkit.isPrimaryThread()) { if (!Bukkit.isPrimaryThread()) {
DisguiseUtilities.getLogger().warning( throw new IllegalStateException("Custom Disguises should not be called async!");
"Custom Disguises should not be called async! This operation will become impossible in the " +
"future!");
} }
Entry<DisguisePerm, String> entry = getRawCustomDisguise(disguise); Entry<DisguisePerm, String> entry = getRawCustomDisguise(disguise);
@ -479,12 +472,10 @@ public class DisguiseConfig {
DisguiseParser.parseDisguise(Bukkit.getConsoleSender(), target, entry.getValue())); DisguiseParser.parseDisguise(Bukkit.getConsoleSender(), target, entry.getValue()));
} }
public static Entry<DisguisePerm, Disguise> getCustomDisguise(CommandSender invoker, Entity target, public static Entry<DisguisePerm, Disguise> getCustomDisguise(CommandSender invoker, Entity target, String disguise)
String disguise) throws IllegalAccessException, DisguiseParseException, InvocationTargetException { throws IllegalAccessException, DisguiseParseException, InvocationTargetException {
if (!Bukkit.isPrimaryThread()) { if (!Bukkit.isPrimaryThread()) {
DisguiseUtilities.getLogger().warning( throw new IllegalStateException("Custom Disguises should not be called async!");
"Custom Disguises should not be called async! This operation will become impossible in the " +
"future!");
} }
Entry<DisguisePerm, String> entry = getRawCustomDisguise(disguise); Entry<DisguisePerm, String> entry = getRawCustomDisguise(disguise);
@ -504,8 +495,9 @@ public class DisguiseConfig {
for (DisguisePerm entry : customDisguises.keySet()) { for (DisguisePerm entry : customDisguises.keySet()) {
String name = entry.toReadable(); String name = entry.toReadable();
if (!name.equalsIgnoreCase(disguise) && !name.replaceAll("_", "").equalsIgnoreCase(disguise)) if (!name.equalsIgnoreCase(disguise) && !name.replaceAll("_", "").equalsIgnoreCase(disguise)) {
continue; continue;
}
customDisguises.remove(entry); customDisguises.remove(entry);
break; break;
@ -516,8 +508,9 @@ public class DisguiseConfig {
for (Entry<DisguisePerm, String> entry : customDisguises.entrySet()) { for (Entry<DisguisePerm, String> entry : customDisguises.entrySet()) {
String name = entry.getKey().toReadable(); String name = entry.getKey().toReadable();
if (!name.equalsIgnoreCase(disguise) && !name.replaceAll("_", "").equalsIgnoreCase(disguise)) if (!name.equalsIgnoreCase(disguise) && !name.replaceAll("_", "").equalsIgnoreCase(disguise)) {
continue; continue;
}
return entry; return entry;
} }
@ -533,8 +526,8 @@ public class DisguiseConfig {
public static void saveDefaultConfig() { public static void saveDefaultConfig() {
DisguiseUtilities.getLogger().info("Config is out of date! Now updating it!"); DisguiseUtilities.getLogger().info("Config is out of date! Now updating it!");
String[] string = ReflectionManager.getResourceAsString(LibsDisguises.getInstance().getFile(), "config.yml") String[] string =
.split("\n"); ReflectionManager.getResourceAsString(LibsDisguises.getInstance().getFile(), "config.yml").split("\n");
FileConfiguration savedConfig = LibsDisguises.getInstance().getConfig(); FileConfiguration savedConfig = LibsDisguises.getInstance().getConfig();
StringBuilder section = new StringBuilder(); StringBuilder section = new StringBuilder();
@ -591,8 +584,7 @@ public class DisguiseConfig {
try (PrintWriter out = new PrintWriter(config)) { try (PrintWriter out = new PrintWriter(config)) {
out.write(StringUtils.join(string, "\n")); out.write(StringUtils.join(string, "\n"));
} }
} } catch (IOException e) {
catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -620,8 +612,7 @@ public class DisguiseConfig {
out.println("This folder is used to store .png files for uploading with the /savedisguise or " + out.println("This folder is used to store .png files for uploading with the /savedisguise or " +
"/grabskin " + "commands"); "/grabskin " + "commands");
} }
} } catch (IOException e) {
catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -700,8 +691,7 @@ public class DisguiseConfig {
try { try {
setPlayerNameType(PlayerNameType.valueOf(config.getString("PlayerNames").toUpperCase())); setPlayerNameType(PlayerNameType.valueOf(config.getString("PlayerNames").toUpperCase()));
} } catch (Exception ex) {
catch (Exception ex) {
DisguiseUtilities.getLogger().warning( DisguiseUtilities.getLogger().warning(
"Cannot parse '" + config.getString("PlayerNames") + "' to a valid option for PlayerNames"); "Cannot parse '" + config.getString("PlayerNames") + "' to a valid option for PlayerNames");
} }
@ -716,46 +706,42 @@ public class DisguiseConfig {
setNotifyBar(NotifyBar.ACTION_BAR); setNotifyBar(NotifyBar.ACTION_BAR);
} }
} } catch (Exception ex) {
catch (Exception ex) {
DisguiseUtilities.getLogger() DisguiseUtilities.getLogger()
.warning("Cannot parse '" + config.getString("NotifyBar") + "' to a valid option for NotifyBar"); .warning("Cannot parse '" + config.getString("NotifyBar") + "' to a valid option for NotifyBar");
} }
try { try {
setBossBarColor(BarColor.valueOf(config.getString("BossBarColor").toUpperCase())); setBossBarColor(BarColor.valueOf(config.getString("BossBarColor").toUpperCase()));
} } catch (Exception ex) {
catch (Exception ex) {
DisguiseUtilities.getLogger().warning( DisguiseUtilities.getLogger().warning(
"Cannot parse '" + config.getString("BossBarColor") + "' to a valid option for BossBarColor"); "Cannot parse '" + config.getString("BossBarColor") + "' to a valid option for BossBarColor");
} }
try { try {
setBossBarStyle(BarStyle.valueOf(config.getString("BossBarStyle").toUpperCase())); setBossBarStyle(BarStyle.valueOf(config.getString("BossBarStyle").toUpperCase()));
} } catch (Exception ex) {
catch (Exception ex) {
DisguiseUtilities.getLogger().warning( DisguiseUtilities.getLogger().warning(
"Cannot parse '" + config.getString("BossBarStyle") + "' to a valid option for BossBarStyle"); "Cannot parse '" + config.getString("BossBarStyle") + "' to a valid option for BossBarStyle");
} }
try { try {
setUpdatesBranch(UpdatesBranch.valueOf(config.getString("UpdatesBranch").toUpperCase())); setUpdatesBranch(UpdatesBranch.valueOf(config.getString("UpdatesBranch").toUpperCase()));
} } catch (Exception ex) {
catch (Exception ex) {
DisguiseUtilities.getLogger().warning( DisguiseUtilities.getLogger().warning(
"Cannot parse '" + config.getString("UpdatesBranch") + "' to a valid option for UpdatesBranch"); "Cannot parse '" + config.getString("UpdatesBranch") + "' to a valid option for UpdatesBranch");
} }
try { try {
String option = config.getString("SelfDisguisesScoreboard", DisguisePushing.MODIFY_SCOREBOARD.name()) String option =
.toUpperCase(); config.getString("SelfDisguisesScoreboard", DisguisePushing.MODIFY_SCOREBOARD.name()).toUpperCase();
if (!option.endsWith("_SCOREBOARD")) if (!option.endsWith("_SCOREBOARD")) {
option += "_SCOREBOARD"; option += "_SCOREBOARD";
}
pushingOption = DisguisePushing.valueOf(option); pushingOption = DisguisePushing.valueOf(option);
} } catch (Exception ex) {
catch (Exception ex) {
DisguiseUtilities.getLogger().warning("Cannot parse '" + config.getString("SelfDisguisesScoreboard") + DisguiseUtilities.getLogger().warning("Cannot parse '" + config.getString("SelfDisguisesScoreboard") +
"' to a valid option for SelfDisguisesScoreboard"); "' to a valid option for SelfDisguisesScoreboard");
} }
@ -843,8 +829,9 @@ public class DisguiseConfig {
public static void loadModdedDisguiseTypes() { public static void loadModdedDisguiseTypes() {
File disguisesFile = new File("plugins/LibsDisguises/disguises.yml"); File disguisesFile = new File("plugins/LibsDisguises/disguises.yml");
if (!disguisesFile.exists()) if (!disguisesFile.exists()) {
return; return;
}
YamlConfiguration config = YamlConfiguration.loadConfiguration(disguisesFile); YamlConfiguration config = YamlConfiguration.loadConfiguration(disguisesFile);
@ -914,8 +901,7 @@ public class DisguiseConfig {
DisguiseUtilities.getLogger() DisguiseUtilities.getLogger()
.info("Modded entity " + name + " has been " + (register ? "registered" : "added")); .info("Modded entity " + name + " has been " + (register ? "registered" : "added"));
} } catch (Exception ex) {
catch (Exception ex) {
DisguiseUtilities.getLogger().severe("Error while trying to register modded entity " + name); DisguiseUtilities.getLogger().severe("Error while trying to register modded entity " + name);
ex.printStackTrace(); ex.printStackTrace();
} }
@ -973,8 +959,9 @@ public class DisguiseConfig {
File disguisesFile = new File("plugins/LibsDisguises/disguises.yml"); File disguisesFile = new File("plugins/LibsDisguises/disguises.yml");
if (!disguisesFile.exists()) if (!disguisesFile.exists()) {
return; return;
}
YamlConfiguration disguisesConfig = YamlConfiguration.loadConfiguration(disguisesFile); YamlConfiguration disguisesConfig = YamlConfiguration.loadConfiguration(disguisesFile);
@ -996,8 +983,7 @@ public class DisguiseConfig {
try { try {
addCustomDisguise(key, toParse); addCustomDisguise(key, toParse);
} } catch (Exception e) {
catch (Exception e) {
failedCustomDisguises++; failedCustomDisguises++;
if (e instanceof DisguiseParseException) { if (e instanceof DisguiseParseException) {
@ -1024,9 +1010,7 @@ public class DisguiseConfig {
public static void addCustomDisguise(String disguiseName, String toParse) throws DisguiseParseException { public static void addCustomDisguise(String disguiseName, String toParse) throws DisguiseParseException {
if (!Bukkit.isPrimaryThread()) { if (!Bukkit.isPrimaryThread()) {
DisguiseUtilities.getLogger().warning( throw new IllegalStateException("Custom Disguises should not be called async!");
"Custom Disguises should not be called async! This operation will become impossible in the " +
"future!");
} }
if (getRawCustomDisguise(toParse) != null) { if (getRawCustomDisguise(toParse) != null) {
@ -1044,12 +1028,10 @@ public class DisguiseConfig {
customDisguises.put(perm, toParse); customDisguises.put(perm, toParse);
DisguiseUtilities.getLogger().info("Loaded custom disguise " + disguiseName); DisguiseUtilities.getLogger().info("Loaded custom disguise " + disguiseName);
} } catch (DisguiseParseException e) {
catch (DisguiseParseException e) {
throw new DisguiseParseException(LibsMsg.ERROR_LOADING_CUSTOM_DISGUISE, disguiseName, throw new DisguiseParseException(LibsMsg.ERROR_LOADING_CUSTOM_DISGUISE, disguiseName,
(e.getMessage() == null ? "" : ": " + e.getMessage())); (e.getMessage() == null ? "" : ": " + e.getMessage()));
} } catch (IllegalAccessException | InvocationTargetException e) {
catch (IllegalAccessException | InvocationTargetException e) {
e.printStackTrace(); e.printStackTrace();
throw new DisguiseParseException(LibsMsg.ERROR_LOADING_CUSTOM_DISGUISE, disguiseName, ""); throw new DisguiseParseException(LibsMsg.ERROR_LOADING_CUSTOM_DISGUISE, disguiseName, "");
} }

4
src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
View File

@ -641,8 +641,8 @@ public class DisguiseParser {
DisguisePermissions permissions) throws DisguiseParseException, IllegalAccessException, DisguisePermissions permissions) throws DisguiseParseException, IllegalAccessException,
InvocationTargetException { InvocationTargetException {
if (!Bukkit.isPrimaryThread()) { if (!Bukkit.isPrimaryThread()) {
DisguiseUtilities.getLogger().warning( throw new IllegalStateException(
"DisguiseParser should not be called async! This operation will become impossible in the future!"); "DisguiseParser should not be called async!");
} }
if (sender instanceof Player) { if (sender instanceof Player) {