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

Large config rewrite, updating creates incompatibility with older versions of LD. Probably need to clean up configs a bit more.

Browse Source
This commit is contained in:
libraryaddict 2021-01-31 21:28:07 +13:00
parent 7ab4a31c1f
commit bd0ca9ec8c
30 changed files with 841 additions and 703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -17,6 +17,7 @@
<filtering>true</filtering> <filtering>true</filtering>
<includes> <includes>
<include>*</include> <include>*</include>
<include>configs/*</include>
</includes> </includes>
</resource> </resource>
<resource> <resource>

18
src/main/java/me/libraryaddict/disguise/DisguiseAPI.java
View File

@ -43,9 +43,10 @@ public class DisguiseAPI {
DisguiseConfig.removeCustomDisguise(disguiseName); DisguiseConfig.removeCustomDisguise(disguiseName);
DisguiseConfig.addCustomDisguise(disguiseName, disguiseInfo); DisguiseConfig.addCustomDisguise(disguiseName, disguiseInfo);
File disguisesFile = new File("plugins/LibsDisguises/disguises.yml"); File disguisesFile = new File(LibsDisguises.getInstance().getDataFolder(), "configs/disguises.yml");
if (!disguisesFile.exists()) { if (!disguisesFile.exists()) {
disguisesFile.getParentFile().mkdirs();
disguisesFile.createNewFile(); disguisesFile.createNewFile();
} }
@ -143,9 +144,8 @@ public class DisguiseAPI {
} }
} }
for (Method method : entity.getClass().getMethods()) { for (Method method : entity.getClass().getMethods()) {
if ((doSneak || !method.getName().equals("setSneaking")) && if ((doSneak || !method.getName().equals("setSneaking")) && (doSprint || !method.getName().equals("setSprinting")) &&
(doSprint || !method.getName().equals("setSprinting")) && method.getParameterTypes().length == 0 && method.getParameterTypes().length == 0 && method.getReturnType() != void.class) {
method.getReturnType() != void.class) {
Class methodReturn = method.getReturnType(); Class methodReturn = method.getReturnType();
if (methodReturn == float.class || methodReturn == Float.class || methodReturn == Double.class) { if (methodReturn == float.class || methodReturn == Float.class || methodReturn == Double.class) {
@ -160,12 +160,11 @@ public class DisguiseAPI {
watcherMethod.getParameterTypes().length == 1) { watcherMethod.getParameterTypes().length == 1) {
int firstCapitalWatcher = firstCapital(watcherMethod.getName()); int firstCapitalWatcher = firstCapital(watcherMethod.getName());
if (firstCapitalWatcher > 0 && method.getName().substring(firstCapitalMethod) if (firstCapitalWatcher > 0 &&
.equalsIgnoreCase(watcherMethod.getName().substring(firstCapitalWatcher))) { method.getName().substring(firstCapitalMethod).equalsIgnoreCase(watcherMethod.getName().substring(firstCapitalWatcher))) {
Class methodParam = watcherMethod.getParameterTypes()[0]; Class methodParam = watcherMethod.getParameterTypes()[0];
if (methodParam == float.class || methodParam == Float.class || if (methodParam == float.class || methodParam == Float.class || methodParam == Double.class) {
methodParam == Double.class) {
methodParam = double.class; methodParam = double.class;
} else if (methodParam == AnimalColor.class) { } else if (methodParam == AnimalColor.class) {
methodParam = DyeColor.class; methodParam = DyeColor.class;
@ -190,8 +189,7 @@ public class DisguiseAPI {
value = AnimalColor.valueOf(((DyeColor) value).name()); value = AnimalColor.valueOf(((DyeColor) value).name());
} }
} }
if (value instanceof Boolean && !(Boolean) value && if (value instanceof Boolean && !(Boolean) value && watcherMethod.getDeclaringClass() == FlagWatcher.class) {
watcherMethod.getDeclaringClass() == FlagWatcher.class) {
continue; continue;
} }
} }

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

@ -4,9 +4,9 @@ import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.LibsPremium; import me.libraryaddict.disguise.utilities.LibsPremium;
import me.libraryaddict.disguise.utilities.config.ConfigLoader;
import me.libraryaddict.disguise.utilities.modded.ModdedEntity; import me.libraryaddict.disguise.utilities.modded.ModdedEntity;
import me.libraryaddict.disguise.utilities.modded.ModdedManager; import me.libraryaddict.disguise.utilities.modded.ModdedManager;
import me.libraryaddict.disguise.utilities.packets.PacketsManager; import me.libraryaddict.disguise.utilities.packets.PacketsManager;
@ -17,20 +17,15 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
import me.libraryaddict.disguise.utilities.translations.LibsMsg; import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import me.libraryaddict.disguise.utilities.translations.TranslateType; import me.libraryaddict.disguise.utilities.translations.TranslateType;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.boss.BarColor; import org.bukkit.boss.BarColor;
import org.bukkit.boss.BarStyle; import org.bukkit.boss.BarStyle;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault; import org.bukkit.permissions.PermissionDefault;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
@ -63,12 +58,6 @@ public class DisguiseConfig {
@Getter @Getter
@Setter @Setter
private static boolean collectPacketsEnabled; private static boolean collectPacketsEnabled;
/**
* No setter provided as this cannot be changed after startup
*/
@Setter(value = AccessLevel.PRIVATE)
@Getter
private static boolean disableCommands;
@Getter @Getter
@Setter @Setter
private static boolean disableFriendlyInvisibles; private static boolean disableFriendlyInvisibles;
@ -277,6 +266,12 @@ public class DisguiseConfig {
@Getter @Getter
@Setter @Setter
private static String lastPluginUpdateVersion; private static String lastPluginUpdateVersion;
@Getter
@Setter
private static boolean contactMojangServers;
@Getter
@Setter(AccessLevel.PROTECTED)
private static int disguiseRadiusMax;
public static boolean isArmorstandsName() { public static boolean isArmorstandsName() {
return getPlayerNameType() == PlayerNameType.ARMORSTANDS; return getPlayerNameType() == PlayerNameType.ARMORSTANDS;
@ -322,22 +317,6 @@ public class DisguiseConfig {
return; return;
} }
if (!LibsDisguises.getInstance().getConfig().getDefaults().getBoolean("AutoUpdate")) {
updaterTask = Bukkit.getScheduler().runTaskTimer(LibsDisguises.getInstance(), new Runnable() {
@Override
public void run() {
for (Set<TargetedDisguise> disguises : DisguiseUtilities.getDisguises().values()) {
for (Disguise disguise : disguises) {
disguise.getWatcher().setSprinting(true);
disguise.getWatcher().setHelmet(new ItemStack(Material.LEATHER_HELMET));
}
}
}
}, TimeUnit.HOURS.toSeconds(1) * 20, (20 * TimeUnit.MINUTES.toSeconds(10)));
return;
}
if (updaterTask == null != startTask) { if (updaterTask == null != startTask) {
return; return;
} }
@ -560,75 +539,9 @@ public class DisguiseConfig {
TranslateType.refreshTranslations(); TranslateType.refreshTranslations();
} }
public static void saveDefaultConfig() {
DisguiseUtilities.getLogger().info("Config is out of date! Now updating it!");
String[] string = ReflectionManager.getResourceAsString(LibsDisguises.getInstance().getFile(), "config.yml").split("\n");
FileConfiguration savedConfig = LibsDisguises.getInstance().getConfig();
StringBuilder section = new StringBuilder();
for (int i = 0; i < string.length; i++) {
String s = string[i];
if (s.trim().startsWith("#") || !s.contains(":")) {
continue;
}
String rawKey = s.split(":")[0];
if (section.length() > 0) {
int matches = StringUtils.countMatches(rawKey, " ");
int allowed = 0;
for (int a = 0; a < matches; a++) {
allowed = section.indexOf(".", allowed) + 1;
}
section = new StringBuilder(section.substring(0, allowed));
}
String key = (rawKey.startsWith(" ") ? section.toString() : "") + rawKey.trim();
if (savedConfig.isConfigurationSection(key)) {
section.append(key).append(".");
} else if (savedConfig.isSet(key)) {
String rawVal = s.split(":")[1].trim();
Object val = savedConfig.get(key);
if (savedConfig.isString(key) && !rawVal.equals("true") && !rawVal.equals("false")) {
val = "'" + StringEscapeUtils.escapeJava(val.toString().replace(ChatColor.COLOR_CHAR + "", "&")) + "'";
}
string[i] = rawKey + ": " + val;
}
}
File config = new File(LibsDisguises.getInstance().getDataFolder(), "config.yml");
try {
if (config.exists()) {
config.renameTo(new File(config.getParentFile(), "config-old.yml"));
DisguiseUtilities.getLogger().info("Old config has been copied to config-old.yml");
}
config.createNewFile();
try (PrintWriter out = new PrintWriter(config)) {
out.write(StringUtils.join(string, "\n"));
}
} catch (IOException e) {
e.printStackTrace();
}
}
public static void loadConfig() { public static void loadConfig() {
// Always save the default config ConfigLoader configLoader = new ConfigLoader();
LibsDisguises.getInstance().saveDefaultConfig(); configLoader.saveMissingConfigs();
// Redundant for the first load, however other plugins may call loadConfig() at a later stage where we
// definitely want to reload it.
LibsDisguises.getInstance().reloadConfig();
loadModdedDisguiseTypes(); loadModdedDisguiseTypes();
@ -650,10 +563,9 @@ public class DisguiseConfig {
} }
} }
ConfigurationSection config = LibsDisguises.getInstance().getConfig(); ConfigurationSection config = configLoader.load();
PacketsManager.setViewDisguisesListener(true); PacketsManager.setViewDisguisesListener(true);
disableCommands = config.getBoolean("DisableCommands");
setAddEntityAnimations(config.getBoolean("AddEntityAnimations")); setAddEntityAnimations(config.getBoolean("AddEntityAnimations"));
setAnimationPacketsEnabled(config.getBoolean("PacketsEnabled.Animation")); setAnimationPacketsEnabled(config.getBoolean("PacketsEnabled.Animation"));
@ -719,6 +631,8 @@ public class DisguiseConfig {
setSaveUserPreferences(config.getBoolean("SaveUserPreferences")); setSaveUserPreferences(config.getBoolean("SaveUserPreferences"));
setPlayerDisguisesSkinExpiresMove(config.getInt("PlayerDisguisesTablistExpiresMove")); setPlayerDisguisesSkinExpiresMove(config.getInt("PlayerDisguisesTablistExpiresMove"));
setViewSelfDisguisesDefault(config.getBoolean("ViewSelfDisguisesDefault")); setViewSelfDisguisesDefault(config.getBoolean("ViewSelfDisguisesDefault"));
setContactMojangServers(config.getBoolean("ContactMojangServers"));
setDisguiseRadiusMax(config.getInt("DisguiseRadiusMax"));
if (!LibsPremium.isPremium() && (isSavePlayerDisguises() || isSaveEntityDisguises())) { if (!LibsPremium.isPremium() && (isSavePlayerDisguises() || isSaveEntityDisguises())) {
DisguiseUtilities.getLogger().warning("You must purchase the plugin to use saved disguises!"); DisguiseUtilities.getLogger().warning("You must purchase the plugin to use saved disguises!");
@ -826,19 +740,11 @@ public class DisguiseConfig {
} }
} }
int missingConfigs = 0; int missingConfigs = doOutput(config, false, true).size();
for (String key : config.getDefaultSection().getKeys(true)) {
if (config.contains(key, true)) {
continue;
}
missingConfigs++;
}
if (missingConfigs > 0) { if (missingConfigs > 0) {
if (config.getBoolean("UpdateConfig", true)) { if (config.getBoolean("UpdateConfig", true)) {
saveDefaultConfig(); configLoader.saveDefaultConfigs();
DisguiseUtilities.getLogger().info("Config has been auto-updated!"); DisguiseUtilities.getLogger().info("Config has been auto-updated!");
} else if (!verbose) { } else if (!verbose) {
DisguiseUtilities.getLogger().warning("Your config is missing " + missingConfigs + " options! Please consider regenerating your config!"); DisguiseUtilities.getLogger().warning("Your config is missing " + missingConfigs + " options! Please consider regenerating your config!");
@ -850,7 +756,7 @@ public class DisguiseConfig {
} }
public static void loadModdedDisguiseTypes() { public static void loadModdedDisguiseTypes() {
File disguisesFile = new File("plugins/LibsDisguises/disguises.yml"); File disguisesFile = new File(LibsDisguises.getInstance().getDataFolder(), "configs/disguises.yml");
if (!disguisesFile.exists()) { if (!disguisesFile.exists()) {
return; return;
@ -929,9 +835,18 @@ public class DisguiseConfig {
new ModdedManager(channels); new ModdedManager(channels);
} }
public static ArrayList<String> doOutput(boolean informChangedUnknown, boolean informMissing) {
return doOutput(new ConfigLoader().load(), informChangedUnknown, informMissing);
}
public static ArrayList<String> doOutput(ConfigurationSection config, boolean informChangedUnknown, boolean informMissing) { public static ArrayList<String> doOutput(ConfigurationSection config, boolean informChangedUnknown, boolean informMissing) {
HashMap<String, Object> configs = new HashMap<>(); HashMap<String, Object> configs = new HashMap<>();
ConfigurationSection defaultSection = config.getDefaultSection(); ConfigurationSection defaultSection = config.getDefaultSection();
if (defaultSection == null) {
defaultSection = new ConfigLoader().loadDefaults();
}
ArrayList<String> returns = new ArrayList<>(); ArrayList<String> returns = new ArrayList<>();
for (String key : defaultSection.getKeys(true)) { for (String key : defaultSection.getKeys(true)) {
@ -975,7 +890,7 @@ public class DisguiseConfig {
static void loadCustomDisguises() { static void loadCustomDisguises() {
customDisguises.clear(); customDisguises.clear();
File disguisesFile = new File("plugins/LibsDisguises/disguises.yml"); File disguisesFile = new File(LibsDisguises.getInstance().getDataFolder(), "configs/disguises.yml");
if (!disguisesFile.exists()) { if (!disguisesFile.exists()) {
return; return;

61
src/main/java/me/libraryaddict/disguise/LibsDisguises.java
View File

@ -82,7 +82,7 @@ public class LibsDisguises extends JavaPlugin {
Bukkit.getPluginManager().enablePlugin(plugin); Bukkit.getPluginManager().enablePlugin(plugin);
} else { } else {
getLogger().severe("Please restar the server to complete the ProtocolLib update!"); getLogger().severe("Please restart the server to complete the ProtocolLib update!");
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -119,8 +119,18 @@ public class LibsDisguises extends JavaPlugin {
"plugin will continue to load, but it will look like a mugging victim"); "plugin will continue to load, but it will look like a mugging victim");
} }
if (!new File(getDataFolder(), "disguises.yml").exists()) { File disguiseFile = new File(getDataFolder(), "configs/disguises.yml");
saveResource("disguises.yml", false);
if (!disguiseFile.exists()) {
disguiseFile.getParentFile().mkdirs();
File oldFile = new File(getDataFolder(), "disguises.yml");
if (oldFile.exists()) {
oldFile.renameTo(disguiseFile);
} else {
saveResource("configs/disguises.yml", false);
}
} }
YamlConfiguration pluginYml = ReflectionManager.getPluginYAML(getFile()); YamlConfiguration pluginYml = ReflectionManager.getPluginYAML(getFile());
@ -209,31 +219,26 @@ public class LibsDisguises extends JavaPlugin {
} }
registerCommand("libsdisguises", new LibsDisguisesCommand()); registerCommand("libsdisguises", new LibsDisguisesCommand());
registerCommand("disguise", new DisguiseCommand());
if (!DisguiseConfig.isDisableCommands()) { registerCommand("undisguise", new UndisguiseCommand());
registerCommand("disguise", new DisguiseCommand()); registerCommand("disguiseplayer", new DisguisePlayerCommand());
registerCommand("undisguise", new UndisguiseCommand()); registerCommand("undisguiseplayer", new UndisguisePlayerCommand());
registerCommand("disguiseplayer", new DisguisePlayerCommand()); registerCommand("undisguiseentity", new UndisguiseEntityCommand());
registerCommand("undisguiseplayer", new UndisguisePlayerCommand()); registerCommand("disguiseentity", new DisguiseEntityCommand());
registerCommand("undisguiseentity", new UndisguiseEntityCommand()); registerCommand("disguiseradius", new DisguiseRadiusCommand());
registerCommand("disguiseentity", new DisguiseEntityCommand()); registerCommand("undisguiseradius", new UndisguiseRadiusCommand());
registerCommand("disguiseradius", new DisguiseRadiusCommand(getConfig().getInt("DisguiseRadiusMax"))); registerCommand("disguisehelp", new DisguiseHelpCommand());
registerCommand("undisguiseradius", new UndisguiseRadiusCommand(getConfig().getInt("UndisguiseRadiusMax"))); registerCommand("disguiseclone", new DisguiseCloneCommand());
registerCommand("disguisehelp", new DisguiseHelpCommand()); registerCommand("disguiseviewself", new DisguiseViewSelfCommand());
registerCommand("disguiseclone", new DisguiseCloneCommand()); registerCommand("disguiseviewbar", new DisguiseViewBarCommand());
registerCommand("disguiseviewself", new DisguiseViewSelfCommand()); registerCommand("disguisemodify", new DisguiseModifyCommand());
registerCommand("disguiseviewbar", new DisguiseViewBarCommand()); registerCommand("disguisemodifyentity", new DisguiseModifyEntityCommand());
registerCommand("disguisemodify", new DisguiseModifyCommand()); registerCommand("disguisemodifyplayer", new DisguiseModifyPlayerCommand());
registerCommand("disguisemodifyentity", new DisguiseModifyEntityCommand()); registerCommand("disguisemodifyradius", new DisguiseModifyRadiusCommand());
registerCommand("disguisemodifyplayer", new DisguiseModifyPlayerCommand()); registerCommand("copydisguise", new CopyDisguiseCommand());
registerCommand("disguisemodifyradius", new DisguiseModifyRadiusCommand(getConfig().getInt("DisguiseRadiusMax"))); registerCommand("grabskin", new GrabSkinCommand());
registerCommand("copydisguise", new CopyDisguiseCommand()); registerCommand("savedisguise", new SaveDisguiseCommand());
registerCommand("grabskin", new GrabSkinCommand()); registerCommand("grabhead", new GrabHeadCommand());
registerCommand("savedisguise", new SaveDisguiseCommand());
registerCommand("grabhead", new GrabHeadCommand());
} else {
getLogger().info("Commands has been disabled, as per config");
}
unregisterCommands(false); unregisterCommands(false);

13
src/main/java/me/libraryaddict/disguise/commands/disguise/DisguiseRadiusCommand.java
View File

@ -29,12 +29,9 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCompleter { public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCompleter {
private int maxRadius = 30;
private ArrayList<Class<? extends Entity>> validClasses = new ArrayList<>(); private ArrayList<Class<? extends Entity>> validClasses = new ArrayList<>();
public DisguiseRadiusCommand(int maxRadius) { public DisguiseRadiusCommand() {
this.maxRadius = maxRadius;
for (EntityType type : EntityType.values()) { for (EntityType type : EntityType.values()) {
Class c = type.getEntityClass(); Class c = type.getEntityClass();
@ -131,9 +128,9 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom
int radius = Integer.parseInt(args[starting]); int radius = Integer.parseInt(args[starting]);
if (radius > maxRadius) { if (radius > DisguiseConfig.getDisguiseRadiusMax()) {
LibsMsg.LIMITED_RADIUS.send(sender, maxRadius); LibsMsg.LIMITED_RADIUS.send(sender, DisguiseConfig.getDisguiseRadiusMax());
radius = maxRadius; radius = DisguiseConfig.getDisguiseRadiusMax();
} }
String[] newArgs = new String[args.length - (starting + 1)]; String[] newArgs = new String[args.length - (starting + 1)];
@ -291,7 +288,7 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom
return; return;
} }
LibsMsg.DRADIUS_HELP1.send(sender, maxRadius); LibsMsg.DRADIUS_HELP1.send(sender, DisguiseConfig.getDisguiseRadiusMax());
LibsMsg.CAN_USE_DISGS.send(sender, StringUtils.join(allowedDisguises, LibsMsg.CAN_USE_DISGS_SEPERATOR.get())); LibsMsg.CAN_USE_DISGS.send(sender, StringUtils.join(allowedDisguises, LibsMsg.CAN_USE_DISGS_SEPERATOR.get()));
if (allowedDisguises.contains("player")) { if (allowedDisguises.contains("player")) {

3
src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDConfig.java
View File

@ -1,7 +1,6 @@
package me.libraryaddict.disguise.commands.libsdisguises; package me.libraryaddict.disguise.commands.libsdisguises;
import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.utilities.translations.LibsMsg; import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -31,7 +30,7 @@ public class LDConfig implements LDCommand {
@Override @Override
public void onCommand(CommandSender sender, String[] args) { public void onCommand(CommandSender sender, String[] args) {
ArrayList<String> returns = DisguiseConfig.doOutput(LibsDisguises.getInstance().getConfig(), true, true); ArrayList<String> returns = DisguiseConfig.doOutput(true, true);
if (returns.isEmpty()) { if (returns.isEmpty()) {
LibsMsg.USING_DEFAULT_CONFIG.send(sender); LibsMsg.USING_DEFAULT_CONFIG.send(sender);

67
src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java
View File

@ -3,6 +3,7 @@ package me.libraryaddict.disguise.commands.libsdisguises;
import lombok.Data; import lombok.Data;
import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.LibsDisguises; import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.utilities.config.ConfigLoader;
import me.libraryaddict.disguise.utilities.translations.LibsMsg; import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.ComponentBuilder;
@ -22,6 +23,7 @@ import java.util.Arrays;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/** /**
* Created by libraryaddict on 18/06/2020. * Created by libraryaddict on 18/06/2020.
@ -120,35 +122,42 @@ public class LDUploadLogs implements LDCommand {
@Override @Override
public void onCommand(CommandSender sender, String[] args) { public void onCommand(CommandSender sender, String[] args) {
if (lastUsed + TimeUnit.MINUTES.toMillis(3) > System.currentTimeMillis()) { if (lastUsed + TimeUnit.MINUTES.toMillis(3) > System.currentTimeMillis()) {
sender.sendMessage(ChatColor.RED + sender.sendMessage(ChatColor.RED + "You last used this command under 3 minutes ago! Restart the server or wait for this timer to " + "disappear!");
"You last used this command under 3 minutes ago! Restart the server or wait for this timer to " +
"disappear!");
return; return;
} }
File latest = new File("logs/latest.log"); File latest = new File("logs/latest.log");
File disguises = new File(LibsDisguises.getInstance().getDataFolder(), "disguises.yml"); File disguises = new File(LibsDisguises.getInstance().getDataFolder(), "configs/disguises.yml");
File config = new File(LibsDisguises.getInstance().getDataFolder(), "config.yml");
List<File> configs =
new ConfigLoader().getConfigs().stream().map(f -> new File(LibsDisguises.getInstance().getDataFolder(), f)).collect(Collectors.toList());
StringBuilder configText = new StringBuilder();
for (File config : configs) {
if (configText.length() != 0) {
configText.append("\n\n================\n\n");
}
try {
configText.append(new String(Files.readAllBytes(config.toPath())));
} catch (IOException e) {
e.printStackTrace();
}
}
if (isTooBig(latest)) { if (isTooBig(latest)) {
sender.sendMessage(ChatColor.RED + sender.sendMessage(
"Your latest.log file is too big! It should be less than 512kb! Please restart and run this " + ChatColor.RED + "Your latest.log file is too big! It should be less than 512kb! Please restart and run this " + "command again!");
"command again!");
return; return;
} }
if (isTooBig(disguises)) { if (isTooBig(disguises)) {
sender.sendMessage(ChatColor.RED + sender.sendMessage(ChatColor.RED + "Your disguises.yml is too big! You'll need to trim that file down before using this command! It " +
"Your disguises.yml is too big! You'll need to trim that file down before using this command! It " +
"should be less than 512kb!"); "should be less than 512kb!");
return; return;
} }
if (isTooBig(config)) {
sender.sendMessage(ChatColor.RED + "Your config.yml is too big! It should be less than 512kb!");
return;
}
try { try {
String latestText = new String(Files.readAllBytes(latest.toPath())); String latestText = new String(Files.readAllBytes(latest.toPath()));
@ -166,8 +175,7 @@ public class LDUploadLogs implements LDCommand {
lastFind = nextLine + 2; lastFind = nextLine + 2;
if (!str.contains("Starting minecraft server version") && !str.contains("Loading properties") && if (!str.contains("Starting minecraft server version") && !str.contains("Loading properties") && !str.contains("This server is running")) {
!str.contains("This server is running")) {
continue; continue;
} }
@ -176,8 +184,7 @@ public class LDUploadLogs implements LDCommand {
} }
if (!valid) { if (!valid) {
sender.sendMessage( sender.sendMessage(ChatColor.RED + "Your latest.log is too old! Please restart the server and try again!");
ChatColor.RED + "Your latest.log is too old! Please restart the server and try again!");
return; return;
} }
@ -188,12 +195,10 @@ public class LDUploadLogs implements LDCommand {
public void run() { public void run() {
try { try {
String disguiseText = new String(Files.readAllBytes(disguises.toPath())); String disguiseText = new String(Files.readAllBytes(disguises.toPath()));
StringBuilder configText = new StringBuilder(new String(Files.readAllBytes(config.toPath())));
configText.append("\n================\n"); configText.append("\n\n================\n");
ArrayList<String> modified = ArrayList<String> modified = DisguiseConfig.doOutput(true, true);
DisguiseConfig.doOutput(LibsDisguises.getInstance().getConfig(), true, true);
for (String s : modified) { for (String s : modified) {
configText.append("\n").append(s); configText.append("\n").append(s);
@ -203,8 +208,10 @@ public class LDUploadLogs implements LDCommand {
configText.append("\nUsing default config!"); configText.append("\nUsing default config!");
} }
String ctext = configText.toString().replaceAll("\n? *#[^\n]*", "");
URL latestPaste = new GuestPaste("latest.log", latestText).paste(); URL latestPaste = new GuestPaste("latest.log", latestText).paste();
URL configPaste = new GuestPaste("LibsDisguises config.yml", configText.toString()).paste(); URL configPaste = new GuestPaste("LibsDisguises config.yml", ctext).paste();
URL disguisesPaste = new GuestPaste("LibsDisguises disguises.yml", disguiseText).paste(); URL disguisesPaste = new GuestPaste("LibsDisguises disguises.yml", disguiseText).paste();
lastUsed = System.currentTimeMillis(); lastUsed = System.currentTimeMillis();
@ -216,12 +223,10 @@ public class LDUploadLogs implements LDCommand {
// Console can't click :( // Console can't click :(
if (sender instanceof Player) { if (sender instanceof Player) {
sender.sendMessage(ChatColor.GOLD + sender.sendMessage(ChatColor.GOLD + "Click on the below message to have it appear in your chat input");
"Click on the below message to have it appear in your chat input");
} }
String text = "My log file: " + latestPaste + ", my config file: " + configPaste + String text = "My log file: " + latestPaste + ", my config file: " + configPaste + " and my disguises file: " + disguisesPaste;
" and my disguises file: " + disguisesPaste;
ComponentBuilder builder = new ComponentBuilder(""); ComponentBuilder builder = new ComponentBuilder("");
builder.append(text); builder.append(text);
@ -243,7 +248,11 @@ public class LDUploadLogs implements LDCommand {
} }
private boolean isTooBig(File file) { private boolean isTooBig(File file) {
return file.exists() && file.length() >= 512 * 1024; return file.exists() && isTooBig(file.length());
}
private boolean isTooBig(long length) {
return length >= 512 * 1024;
} }
@Override @Override

47
src/main/java/me/libraryaddict/disguise/commands/modify/DisguiseModifyRadiusCommand.java
View File

@ -1,6 +1,7 @@
package me.libraryaddict.disguise.commands.modify; package me.libraryaddict.disguise.commands.modify;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.commands.DisguiseBaseCommand; import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType; import me.libraryaddict.disguise.disguisetypes.DisguiseType;
@ -26,12 +27,6 @@ import java.lang.reflect.Method;
import java.util.*; import java.util.*;
public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements TabCompleter { public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements TabCompleter {
private int maxRadius = 30;
public DisguiseModifyRadiusCommand(int maxRadius) {
this.maxRadius = maxRadius;
}
private Collection<Entity> getNearbyEntities(CommandSender sender, int radius) { private Collection<Entity> getNearbyEntities(CommandSender sender, int radius) {
Location center; Location center;
@ -77,8 +72,7 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
Collections.sort(classes); Collections.sort(classes);
LibsMsg.DMODRADIUS_USABLE.send(sender, LibsMsg.DMODRADIUS_USABLE.send(sender, ChatColor.GREEN + StringUtils.join(classes, ChatColor.DARK_GREEN + ", " + ChatColor.GREEN));
ChatColor.GREEN + StringUtils.join(classes, ChatColor.DARK_GREEN + ", " + ChatColor.GREEN));
return true; return true;
} }
@ -124,9 +118,9 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
int radius = Integer.parseInt(args[starting]); int radius = Integer.parseInt(args[starting]);
if (radius > maxRadius) { if (radius > DisguiseConfig.getDisguiseRadiusMax()) {
LibsMsg.LIMITED_RADIUS.send(sender, maxRadius); LibsMsg.LIMITED_RADIUS.send(sender, DisguiseConfig.getDisguiseRadiusMax());
radius = maxRadius; radius = DisguiseConfig.getDisguiseRadiusMax();
} }
String[] newArgs = new String[args.length - (starting + 1)]; String[] newArgs = new String[args.length - (starting + 1)];
@ -154,10 +148,11 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
Disguise disguise; Disguise disguise;
if (sender instanceof Player) if (sender instanceof Player) {
disguise = DisguiseAPI.getDisguise((Player) sender, entity); disguise = DisguiseAPI.getDisguise((Player) sender, entity);
else } else {
disguise = DisguiseAPI.getDisguise(entity); disguise = DisguiseAPI.getDisguise(entity);
}
if (disguise == null) { if (disguise == null) {
continue; continue;
@ -174,18 +169,15 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
tempArgs = DisguiseParser.parsePlaceholders(tempArgs, sender, entity); tempArgs = DisguiseParser.parsePlaceholders(tempArgs, sender, entity);
try { try {
DisguiseParser.callMethods(sender, disguise, permissions, disguisePerm, new ArrayList<>(), tempArgs, DisguiseParser.callMethods(sender, disguise, permissions, disguisePerm, new ArrayList<>(), tempArgs, "DisguiseModifyRadius");
"DisguiseModifyRadius");
modifiedDisguises++; modifiedDisguises++;
} } catch (DisguiseParseException ex) {
catch (DisguiseParseException ex) {
if (ex.getMessage() != null) { if (ex.getMessage() != null) {
DisguiseUtilities.sendMessage(sender, ex.getMessage()); DisguiseUtilities.sendMessage(sender, ex.getMessage());
} }
return true; return true;
} } catch (Exception ex) {
catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
return true; return true;
} }
@ -238,8 +230,9 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
} }
// Not a valid radius // Not a valid radius
if (starting == 1 || args.length == 1 || !isInteger(args[1])) if (starting == 1 || args.length == 1 || !isInteger(args[1])) {
return filterTabs(tabs, origArgs); return filterTabs(tabs, origArgs);
}
} }
if (args.length <= starting || !isInteger(args[starting])) { if (args.length <= starting || !isInteger(args[starting])) {
@ -248,9 +241,9 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
int radius = Integer.parseInt(args[starting]); int radius = Integer.parseInt(args[starting]);
if (radius > maxRadius) { if (radius > DisguiseConfig.getDisguiseRadiusMax()) {
LibsMsg.LIMITED_RADIUS.send(sender, maxRadius); LibsMsg.LIMITED_RADIUS.send(sender, DisguiseConfig.getDisguiseRadiusMax());
radius = maxRadius; radius = DisguiseConfig.getDisguiseRadiusMax();
} }
starting++; starting++;
@ -260,15 +253,17 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
for (Entity entity : getNearbyEntities(sender, radius)) { for (Entity entity : getNearbyEntities(sender, radius)) {
Disguise disguise = DisguiseAPI.getDisguise(entity); Disguise disguise = DisguiseAPI.getDisguise(entity);
if (disguise == null) if (disguise == null) {
continue; continue;
}
DisguiseType disguiseType = disguise.getType(); DisguiseType disguiseType = disguise.getType();
for (Method method : ParamInfoManager.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) { for (Method method : ParamInfoManager.getDisguiseWatcherMethods(disguiseType.getWatcherClass())) {
for (String arg : args) { for (String arg : args) {
if (!method.getName().equalsIgnoreCase(arg) || usedOptions.contains(arg)) if (!method.getName().equalsIgnoreCase(arg) || usedOptions.contains(arg)) {
continue; continue;
}
usedOptions.add(arg); usedOptions.add(arg);
} }
@ -291,7 +286,7 @@ public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements
protected void sendCommandUsage(CommandSender sender, DisguisePermissions permissions) { protected void sendCommandUsage(CommandSender sender, DisguisePermissions permissions) {
ArrayList<String> allowedDisguises = getAllowedDisguises(permissions); ArrayList<String> allowedDisguises = getAllowedDisguises(permissions);
LibsMsg.DMODRADIUS_HELP1.send(sender, maxRadius); LibsMsg.DMODRADIUS_HELP1.send(sender, DisguiseConfig.getDisguiseRadiusMax());
LibsMsg.DMODIFY_HELP3.send(sender, StringUtils.join(allowedDisguises, LibsMsg.CAN_USE_DISGS_SEPERATOR.get())); LibsMsg.DMODIFY_HELP3.send(sender, StringUtils.join(allowedDisguises, LibsMsg.CAN_USE_DISGS_SEPERATOR.get()));
LibsMsg.DMODRADIUS_HELP2.send(sender); LibsMsg.DMODRADIUS_HELP2.send(sender);

18
src/main/java/me/libraryaddict/disguise/commands/undisguise/UndisguiseRadiusCommand.java
View File

@ -1,6 +1,7 @@
package me.libraryaddict.disguise.commands.undisguise; package me.libraryaddict.disguise.commands.undisguise;
import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.utilities.LibsPremium; import me.libraryaddict.disguise.utilities.LibsPremium;
import me.libraryaddict.disguise.utilities.translations.LibsMsg; import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -13,12 +14,6 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class UndisguiseRadiusCommand implements CommandExecutor { public class UndisguiseRadiusCommand implements CommandExecutor {
private int maxRadius = 30;
public UndisguiseRadiusCommand(int maxRadius) {
this.maxRadius = maxRadius;
}
private boolean isNumeric(String string) { private boolean isNumeric(String string) {
try { try {
Integer.parseInt(string); Integer.parseInt(string);
@ -43,16 +38,19 @@ public class UndisguiseRadiusCommand implements CommandExecutor {
} }
if (sender.hasPermission("libsdisguises.undisguiseradius")) { if (sender.hasPermission("libsdisguises.undisguiseradius")) {
int radius = maxRadius; int radius = DisguiseConfig.getDisguiseRadiusMax();
if (args.length > 0) { if (args.length > 0) {
if (!isNumeric(args[0])) { if (!isNumeric(args[0])) {
LibsMsg.NOT_NUMBER.send(sender, args[0]); LibsMsg.NOT_NUMBER.send(sender, args[0]);
return true; return true;
} }
radius = Integer.parseInt(args[0]); radius = Integer.parseInt(args[0]);
if (radius > maxRadius) {
LibsMsg.LIMITED_RADIUS.send(sender, maxRadius); if (radius > DisguiseConfig.getDisguiseRadiusMax()) {
radius = maxRadius; LibsMsg.LIMITED_RADIUS.send(sender, DisguiseConfig.getDisguiseRadiusMax());
radius = DisguiseConfig.getDisguiseRadiusMax();
} }
} }

4
src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
View File

@ -469,7 +469,7 @@ public class PlayerDisguise extends TargetedDisguise {
}; };
WrappedGameProfile gameProfile = DisguiseUtilities WrappedGameProfile gameProfile = DisguiseUtilities
.getProfileFromMojang(this.skinToUse, currentLookup, LibsDisguises.getInstance().getConfig().getBoolean("ContactMojangServers", true)); .getProfileFromMojang(this.skinToUse, currentLookup, DisguiseConfig.isContactMojangServers());
if (gameProfile != null) { if (gameProfile != null) {
setSkin(gameProfile); setSkin(gameProfile);
@ -635,7 +635,7 @@ public class PlayerDisguise extends TargetedDisguise {
}; };
WrappedGameProfile gameProfile = DisguiseUtilities WrappedGameProfile gameProfile = DisguiseUtilities
.getProfileFromMojang(this.skinToUse, currentLookup, LibsDisguises.getInstance().getConfig().getBoolean("ContactMojangServers", true)); .getProfileFromMojang(this.skinToUse, currentLookup, DisguiseConfig.isContactMojangServers());
if (gameProfile != null) { if (gameProfile != null) {
setSkin(gameProfile); setSkin(gameProfile);

20
src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

@ -161,7 +161,7 @@ public class DisguiseUtilities {
private static final HashSet<UUID> selfDisguised = new HashSet<>(); private static final HashSet<UUID> selfDisguised = new HashSet<>();
private static final HashMap<UUID, String> preDisguiseTeam = new HashMap<>(); private static final HashMap<UUID, String> preDisguiseTeam = new HashMap<>();
private static final HashMap<UUID, String> disguiseTeam = new HashMap<>(); private static final HashMap<UUID, String> disguiseTeam = new HashMap<>();
private static final File profileCache = new File("plugins/LibsDisguises/GameProfiles"); private static final File profileCache = new File("plugins/LibsDisguises/SavedSkins");
private static final File savedDisguises = new File("plugins/LibsDisguises/SavedDisguises"); private static final File savedDisguises = new File("plugins/LibsDisguises/SavedDisguises");
@Getter @Getter
private static Gson gson; private static Gson gson;
@ -1124,7 +1124,7 @@ public class DisguiseUtilities {
DisguiseUtilities.refreshTrackers(disguise); DisguiseUtilities.refreshTrackers(disguise);
} }
}, LibsDisguises.getInstance().getConfig().getBoolean("ContactMojangServers", true)); }, DisguiseConfig.isContactMojangServers());
} }
/** /**
@ -1271,7 +1271,13 @@ public class DisguiseUtilities {
gson = gsonBuilder.create(); gson = gsonBuilder.create();
if (!profileCache.exists()) { if (!profileCache.exists()) {
profileCache.mkdirs(); File old = new File(profileCache.getParentFile(), "GameProfiles");
if (old.exists() && old.isDirectory()) {
old.renameTo(profileCache);
} else {
profileCache.mkdirs();
}
} }
if (!savedDisguises.exists()) { if (!savedDisguises.exists()) {
@ -1331,13 +1337,7 @@ public class DisguiseUtilities {
Method m = CompileMethods.class.getMethod("main", String[].class); Method m = CompileMethods.class.getMethod("main", String[].class);
if ((!m.isAnnotationPresent(CompileMethods.CompileMethodsIntfer.class) || if ((!m.isAnnotationPresent(CompileMethods.CompileMethodsIntfer.class) ||
m.getAnnotation(CompileMethods.CompileMethodsIntfer.class).user().matches("[0-9]+")) && m.getAnnotation(CompileMethods.CompileMethodsIntfer.class).user().matches("[0-9]+")) && !DisguiseConfig.doOutput(true, false).isEmpty()) {
!DisguiseConfig.doOutput(LibsDisguises.getInstance().getConfig(), true, false).isEmpty()) {
/*File f = new File(LibsDisguises.getInstance().getDataFolder(), "config.yml");
File f2 = new File(f.getParentFile(), "config-older.yml");
f2.delete();
f.renameTo(f2);
LibsDisguises.getInstance().saveDefaultConfig();*/
DisguiseConfig.setViewDisguises(false); DisguiseConfig.setViewDisguises(false);
} }
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {

191
src/main/java/me/libraryaddict/disguise/utilities/config/ConfigLoader.java Normal file
View File

@ -0,0 +1,191 @@
package me.libraryaddict.disguise.utilities.config;
import lombok.Getter;
import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.reflection.ClassGetter;
import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
/**
* Created by libraryaddict on 31/01/2021.
*/
public class ConfigLoader {
@Getter
private final List<String> configs = new ArrayList<>();
public ConfigLoader() {
for (String s : ClassGetter.getEntriesForPackage(ConfigLoader.class, "configs")) {
if (!s.endsWith(".yml")) {
continue;
}
if (s.endsWith("/disguises.yml") || s.endsWith("/sounds.yml")) {
continue;
}
configs.add(s);
}
}
public void saveMissingConfigs() {
File oldFile = new File(LibsDisguises.getInstance().getDataFolder(), "config.yml");
boolean migrated = oldFile.exists();
for (String config : configs) {
File f = new File(LibsDisguises.getInstance().getDataFolder(), config);
if (f.exists()) {
migrated = false;
continue;
}
saveDefaultConfig(config);
}
if (migrated) {
DisguiseUtilities.getLogger().info("Migrated old config system to new config system");
oldFile.delete();
}
}
public YamlConfiguration loadDefaults() {
YamlConfiguration globalConfig = new YamlConfiguration();
for (String config : configs) {
try {
YamlConfiguration c = new YamlConfiguration();
c.loadFromString(ReflectionManager.getResourceAsString(LibsDisguises.getInstance().getFile(), config));
for (String k : c.getKeys(true)) {
if (c.isConfigurationSection(k)) {
continue;
}
globalConfig.set(k, c.get(k));
}
} catch (Exception ex) {
ex.printStackTrace();
}
}
return globalConfig;
}
public YamlConfiguration load() {
YamlConfiguration globalConfig = new YamlConfiguration();
for (String config : configs) {
YamlConfiguration c = YamlConfiguration.loadConfiguration(new File(LibsDisguises.getInstance().getDataFolder(), config));
for (String k : c.getKeys(true)) {
if (c.isConfigurationSection(k)) {
continue;
}
globalConfig.set(k, c.get(k));
}
}
return globalConfig;
}
public void saveDefaultConfigs() {
for (String config : configs) {
saveDefaultConfig(config);
}
File f = new File(LibsDisguises.getInstance().getDataFolder(), "config.yml");
f.delete();
}
public void saveDefaultConfig(String name) {
DisguiseUtilities.getLogger().info("Config " + name + " is out of date (Or missing)! Now refreshing it!");
String ourConfig = ReflectionManager.getResourceAsString(LibsDisguises.getInstance().getFile(), name);
YamlConfiguration savedConfig = null;
File loadFrom = new File(LibsDisguises.getInstance().getDataFolder(), name);
File configFile = loadFrom;
if (!loadFrom.exists()) {
loadFrom = new File(LibsDisguises.getInstance().getDataFolder(), "config.yml");
}
if (loadFrom.exists()) {
savedConfig = YamlConfiguration.loadConfiguration(loadFrom);
} else {
try {
savedConfig = new YamlConfiguration();
savedConfig.loadFromString(ourConfig);
} catch (Exception e) {
e.printStackTrace();
}
}
String[] string = ourConfig.split("\n");
StringBuilder section = new StringBuilder();
for (int i = 0; i < string.length; i++) {
String s = string[i];
if (s.trim().startsWith("#") || !s.contains(":")) {
continue;
}
String rawKey = s.split(":")[0];
if (section.length() > 0) {
int matches = StringUtils.countMatches(rawKey, " ");
int allowed = 0;
for (int a = 0; a < matches; a++) {
allowed = section.indexOf(".", allowed) + 1;
}
section = new StringBuilder(section.substring(0, allowed));
}
String key = (rawKey.startsWith(" ") ? section.toString() : "") + rawKey.trim();
if (savedConfig.isConfigurationSection(key)) {
section.append(key).append(".");
} else if (savedConfig.isSet(key)) {
String rawVal = s.split(":")[1].trim();
Object val = savedConfig.get(key);
if (savedConfig.isString(key) && !rawVal.equals("true") && !rawVal.equals("false")) {
val = "'" + StringEscapeUtils.escapeJava(val.toString().replace(ChatColor.COLOR_CHAR + "", "&")) + "'";
}
string[i] = rawKey + ": " + val;
}
}
try {
if (!configFile.getParentFile().exists()) {
configFile.mkdirs();
}
configFile.delete();
configFile.createNewFile();
try (PrintWriter out = new PrintWriter(configFile)) {
out.write(StringUtils.join(string, "\n"));
}
} catch (IOException e) {
e.printStackTrace();
}
}
}

10
src/main/java/me/libraryaddict/disguise/utilities/config/DisguiseCommandConfig.java
View File

@ -27,7 +27,7 @@ public class DisguiseCommandConfig {
private boolean enabled; private boolean enabled;
} }
private File commandConfig = new File(LibsDisguises.getInstance().getDataFolder(), "commands.yml"); private File commandConfig = new File(LibsDisguises.getInstance().getDataFolder(), "configs/plugin-commands.yml");
private HashMap<String, DisguiseCommand> commands = new HashMap<>(); private HashMap<String, DisguiseCommand> commands = new HashMap<>();
private boolean modifyCommands = false; private boolean modifyCommands = false;
@ -87,13 +87,19 @@ public class DisguiseCommandConfig {
section.set("aliases", command.getAliases()); section.set("aliases", command.getAliases());
} }
String configString = config.saveToString();
configString = configString.replaceAll("\n([a-zA-Z])", "\n\n$1");
String s = String s =
"# The following can be changed to modify how the disguise commands are registered\n# This will only work on server startup\nModifyCommands: " + "# The following can be changed to modify how the disguise commands are registered\n# This will only work on server startup\nModifyCommands: " +
modifyCommands + "\n\n" + config.saveToString(); modifyCommands + "\n\n" + configString;
commandConfig.delete(); commandConfig.delete();
try { try {
commandConfig.getParentFile().mkdirs();
commandConfig.createNewFile(); commandConfig.createNewFile();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();

8
src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
View File

@ -95,18 +95,14 @@ public class DisguiseListener implements Listener {
// If build number is null, or not a number. Then we can't check snapshots regardless // If build number is null, or not a number. Then we can't check snapshots regardless
return !plugin.isNumberedBuild(); return !plugin.isNumberedBuild();
// Check snapshots
} }
private void runUpdateScheduler() { private void runUpdateScheduler() {
boolean autoUpdate = plugin.getConfig().getBoolean("AutoUpdateDev"); if (!DisguiseConfig.isNotifyUpdate()) {
if (!plugin.getConfig().getBoolean("NotifyUpdate")) {
return; return;
} }
if (autoUpdate && !isCheckReleases()) { if (DisguiseConfig.isAutoUpdate() && !isCheckReleases()) {
DisguiseUtilities.getLogger().info("Plugin will attempt to auto update when new builds are ready! Check config to disable."); DisguiseUtilities.getLogger().info("Plugin will attempt to auto update when new builds are ready! Check config to disable.");
} }
} }

1
src/main/java/me/libraryaddict/disguise/utilities/metrics/Metrics.java
View File

@ -95,6 +95,7 @@ public class Metrics {
"Check out https://bStats.org/ to learn more :)").copyDefaults(true); "Check out https://bStats.org/ to learn more :)").copyDefaults(true);
try { try {
config.save(configFile); config.save(configFile);
DisguiseUtilities.getLogger().info("Saved bStats config");
} }
catch (IOException ignored) { catch (IOException ignored) {
} }

6
src/main/java/me/libraryaddict/disguise/utilities/metrics/MetricsInitalizer.java
View File

@ -221,12 +221,12 @@ public class MetricsInitalizer {
} }
}); });
metrics.addCustomChart(new Metrics.SimplePie("commands") { /*metrics.addCustomChart(new Metrics.SimplePie("commands") {
@Override @Override
public String getValue() { public String getValue() {
return DisguiseConfig.isDisableCommands() ? "Enabled" : "Disabled"; return DisguiseConfig.isDisableCommands() ? "Enabled" : "Disabled";
} }
}); });*/
metrics.addCustomChart(new Metrics.SimplePie("spigot") { metrics.addCustomChart(new Metrics.SimplePie("spigot") {
@Override @Override
@ -241,7 +241,7 @@ public class MetricsInitalizer {
} }
}); });
final boolean updates = plugin.getConfig().getBoolean("NotifyUpdate"); final boolean updates = DisguiseConfig.isNotifyUpdate();
metrics.addCustomChart(new Metrics.SimplePie("updates") { metrics.addCustomChart(new Metrics.SimplePie("updates") {
@Override @Override

60
src/main/java/me/libraryaddict/disguise/utilities/reflection/ClassGetter.java
View File

@ -22,8 +22,31 @@ public class ClassGetter {
return getClassesForPackage(Entity.class, pkgname); return getClassesForPackage(Entity.class, pkgname);
} }
public static ArrayList<String> getEntriesForPackage(String pkgname) {
return getEntriesForPackage(Entity.class, pkgname);
}
public static ArrayList<Class<?>> getClassesForPackage(Class runFrom, String pkgname) { public static ArrayList<Class<?>> getClassesForPackage(Class runFrom, String pkgname) {
ArrayList<Class<?>> classes = new ArrayList<>(); ArrayList<String> list = getEntriesForPackage(runFrom, pkgname);
ArrayList<Class<?>> classList = new ArrayList<>();
for (String s : list) {
if (!s.endsWith(".class")) {
continue;
}
Class<?> c = loadClass(s.replace(".class", "").replace('/', '.'));
if (c != null) {
classList.add(c);
}
}
return classList;
}
public static ArrayList<String> getEntriesForPackage(Class runFrom, String pkgname) {
ArrayList<String> classes = new ArrayList<>();
// String relPath = pkgname.replace('.', '/'); // String relPath = pkgname.replace('.', '/');
// Get a File object for the package // Get a File object for the package
@ -36,16 +59,11 @@ public class ClassGetter {
processJarfile(resource, pkgname, classes); processJarfile(resource, pkgname, classes);
} else { } else {
for (File f : new File(resource.getPath() + "/" + pkgname.replace(".", "/")).listFiles()) { for (File f : new File(resource.getPath() + "/" + pkgname.replace(".", "/")).listFiles()) {
if (!f.getName().endsWith(".class") || f.getName().contains("$")) { if (f.getName().contains("$")) {
continue; continue;
} }
try { classes.add(pkgname + "/" + f.getName());
classes.add(Class.forName(pkgname + "." + f.getName().replace(".class", "")));
}
catch (ClassNotFoundException e) {
e.printStackTrace();
}
} }
} }
} }
@ -56,16 +74,12 @@ public class ClassGetter {
private static Class<?> loadClass(String className) { private static Class<?> loadClass(String className) {
try { try {
return Class.forName(className); return Class.forName(className);
} } catch (ClassNotFoundException | NoClassDefFoundError e) {
catch (ClassNotFoundException e) {
throw new RuntimeException("Unexpected ClassNotFoundException loading class '" + className + "'");
}
catch (NoClassDefFoundError e) {
return null; return null;
} }
} }
private static void processJarfile(URL resource, String pkgname, ArrayList<Class<?>> classes) { private static void processJarfile(URL resource, String pkgname, ArrayList<String> classes) {
try { try {
String relPath = pkgname.replace('.', '/'); String relPath = pkgname.replace('.', '/');
String resPath = URLDecoder.decode(resource.getPath(), "UTF-8"); String resPath = URLDecoder.decode(resource.getPath(), "UTF-8");
@ -79,22 +93,18 @@ public class ClassGetter {
JarEntry entry = entries.nextElement(); JarEntry entry = entries.nextElement();
String entryName = entry.getName(); String entryName = entry.getName();
String className = null; String className = null;
if (entryName.endsWith(".class") && entryName.startsWith(relPath) &&
entryName.length() > (relPath.length() + "/".length())) {
className = entryName.replace('/', '.').replace('\\', '.').replace(".class", "");
}
if (className != null) {
Class<?> c = loadClass(className);
if (c != null) { if (entryName.startsWith(relPath) && entryName.length() > (relPath.length() + "/".length())) {
classes.add(c); className = entryName.replace('\\', '/');
} }
if (className != null) {
classes.add(className);
} }
} }
jarFile.close(); jarFile.close();
} } catch (Exception ex) {
catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
} }
} }

23
src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundManager.java
View File

@ -29,10 +29,18 @@ public class SoundManager {
} }
private void loadCustomSounds() { private void loadCustomSounds() {
File f = new File(LibsDisguises.getInstance().getDataFolder(), "sounds.yml"); File f = new File(LibsDisguises.getInstance().getDataFolder(), "configs/sounds.yml");
if (!f.exists()) { if (!f.exists()) {
LibsDisguises.getInstance().saveResource("sounds.yml", false); f.getParentFile().mkdirs();
File old = new File(LibsDisguises.getInstance().getDataFolder(), "sounds.yml");
if (old.exists()) {
old.renameTo(f);
} else {
LibsDisguises.getInstance().saveResource("configs/sounds.yml", false);
}
} }
YamlConfiguration config = YamlConfiguration.loadConfiguration(f); YamlConfiguration config = YamlConfiguration.loadConfiguration(f);
@ -55,8 +63,7 @@ public class SoundManager {
continue; continue;
} }
List<String> list = section.getStringList( List<String> list = section.getStringList(type.name().charAt(0) + type.name().substring(1).toLowerCase(Locale.ENGLISH));
type.name().charAt(0) + type.name().substring(1).toLowerCase(Locale.ENGLISH));
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
continue; continue;
@ -67,17 +74,15 @@ public class SoundManager {
SoundGroup subGroup = SoundGroup.getGroup(sound); SoundGroup subGroup = SoundGroup.getGroup(sound);
if (subGroup == null) { if (subGroup == null) {
DisguiseUtilities.getLogger().warning("Invalid sound '" + sound + DisguiseUtilities.getLogger().warning("Invalid sound '" + sound + "'! Must be a minecraft:sound.name or SoundGroup name!");
"'! Must be a minecraft:sound.name or SoundGroup name!");
continue; continue;
} }
Object[] sounds = subGroup.getDisguiseSounds().get(type); Object[] sounds = subGroup.getDisguiseSounds().get(type);
if (sounds == null) { if (sounds == null) {
DisguiseUtilities.getLogger().warning( DisguiseUtilities.getLogger()
"Sound group '" + sound + "' does not contain a category for " + type + .warning("Sound group '" + sound + "' does not contain a category for " + type + "! Can't use as default in " + key);
"! Can't use as default in " + key);
continue; continue;
} }

2
src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java
View File

@ -359,7 +359,7 @@ public enum LibsMsg {
LD_COMMAND_DEBUG(ChatColor.BLUE + "/libsdisguises debug - " + ChatColor.AQUA + LD_COMMAND_DEBUG(ChatColor.BLUE + "/libsdisguises debug - " + ChatColor.AQUA +
"Used to help debug scoreboard issues on a player disguise"), "Used to help debug scoreboard issues on a player disguise"),
LD_COMMAND_UPLOAD_LOGS(ChatColor.BLUE + "/libsdisguises uploadlogs - " + ChatColor.AQUA + LD_COMMAND_UPLOAD_LOGS(ChatColor.BLUE + "/libsdisguises uploadlogs - " + ChatColor.AQUA +
"Uploads latest.log, disguises.yml and config.yml and gives you the link to share. Used when seeking " + "Uploads latest.log, disguises.yml and configs and gives you the link to share. Used when seeking " +
"assistance."), "assistance."),
SELF_DISGUISE_HIDDEN(ChatColor.GREEN + "Self disguise hidden as it's too tall.."); SELF_DISGUISE_HIDDEN(ChatColor.GREEN + "Self disguise hidden as it's too tall..");

352
src/main/resources/config.yml
View File

@ -1,352 +0,0 @@
Permissions:
# By default "libsdisguises.disguise.cow" will allow all options for cow disguise unless another permission has
# defined otherwise.
# If given "libsdisguises.disguise.animals.setburning" then "libsdisguises.disguise.cow" they will still be able to
# use other options like "setbaby". This was provided for backwards compatibility.
# By turning this from 'false' to 'true' the plugin will no longer give them the options unless the player was
# explicitly granted it. Even if by wildcard. The above example means they can only use "setburning"
# To summarize, "libsdisguises.disguise.cow" will no longer let them do any options on the cow disguise unless it
# was added to their permissions
# You can read more about permissions here: https://www.spigotmc.org/wiki/lib-s-disguises-setting-up-permissions/
# The permission used to check OPs who may not have permissions defined, is "libsdisguises.*.*.*" which you can
# negate with your permissions plugin
ExplicitDisguises: false
# What should the default permissions be for seeing commands?
# This is a config option because I can't verify if they should be able to see commands normally due to my
# permissions system. My system is complex, but its a ton of control.
# This isn't an issue normally, but I recently received complaints from someone who doesn't believe in permissions...
# Some of you may also wish to hide these commands!
# The permissions for commands are a simple 'libsdisguises.seecmd.command' where 'command' can be
# 'disguise', 'undisguise' etc. A simple 'libsdisguises.seecmd' permission may also work for children
# If you change this while the server is running, players may need to rejoin for it to take effect
# Remember that command blocks need 'TRUE' or 'OP' to use the commands.
# TRUE = Everyone can see this, the default. Can be negated with permissions
# FALSE = No one can see this without permissions to allow it
# OP = Only operators can see this
# NOT_OP = Only non operators can see this
SeeCommands: TRUE
# Some disguises have randomized options on disguise, such as a fox type or a villager breed.
# This may be problematic for some server owners, so you can disable it below
RandomDisguiseOptions: true
# You can also get this information through /libsdisguises config
# Should the plugin output missing config options instead of just counting them
VerboseConfig: false
# Should the plugin output changed config options? Will also list unknown extra options
ChangedConfig: false
# Should the config automatically update itself each time there's a config entry missing?
# The old config will have any custom comments or invalid config entries wiped.
UpdateConfig: true
# Disables commands with the exception of /libsdisguises. Useful if you don't want the plugin to be used by anything
# but a plugin
# Useful if you didn't purchase the plugin.
DisableCommands: false
# This means that the plugin doesn't need to constantly call Mojang just to find a skin for an offline player
# However some people may prefer to disable this.
# Even if you disable this, if there was disguises in the cache already then it will use them
SaveGameProfiles: true
# This option is useless if you don't enable SaveGameProfiles!
# If a player has been disguised before and their skin saved into the cache
# When they join the server will automatically update the cache in case they changed their skin
UpdateGameProfiles: true
# THIS IS A PREMIUM ONLY FEATURE. TO USE IT, PURCHASE THE PLUGIN.
# Saves disguises so that they persist after server shutdown, chunks unload, player logouts and so on.
# As such, this completely replaces the KeepDisguises aspect which has been removed except for the player death.
# Players - Are player disguises saved
# Entities - Are entities disguises saved (This is everything that's not a player)
# If you are using the dev builds, place your premium version of Lib's Disguises.jar inside the LibsDisguises folder
# This will enable premium only features for the dev builds.
# The saved disguises are saved in a json file format inside the plugin folder, there will be no other formats
SaveDisguises:
Players: false
Entities: false
# There are four options you can use
# VANILLA - Names are limited to 16 chars but can't be changed without resending disguise
# TEAMS - Names are limited to 32 chars but can be changed willy nilly
# EXTENDED - Names are limited to 48 chars but can't be changed without resending disguise
# ARMORSTANDS - Names are limited to 256 chars, uses a mix of armorstands and teams to do this. Slightly hacky.
# Downside of armorstand names is that there's a chance of it becoming desynced from the player disguise
# And names will always display even if the entity is invisible using potion effects
# With ArmorStands & the Premium version, you can also use multiple lines in the nametag, use \n as a seperator.
# Read the next option for more information.
PlayerNames: TEAMS
# If doing ARMORSTANDS in the above option, should CustomNames be overridden to use armorstands too?
# This allows multiline names if you have purchased the plugin
# Use \n for a new line, though if you're doing it in a config you may need to use \\n as " and ' are treated differently.
OverrideCustomNames: true
# How many ticks before tab packet is sent to remove from tablist. This shouldn't need to be touched
TablistRemoveDelay: 3
# Does the player keep their disguise after they die?
KeepDisguises:
PlayerDeath: false
# Should the plugin use translations? Note that a player must see the message before it will appear in translations.yml
Translations: false
# How should the plugin handle self disguises scoreboards? It disables pushing in whichever team they're assigned.
# If you want them to be able to push again when they undisguise, set this to CREATE_SCOREBOARD
# I have to disable pushing or you will be pushed around by your own self disguise
# MODIFY_SCOREBOARD - Modifies the player's current team if possible, otherwise assigns them to a new scoreboard team.
# IGNORE_SCOREBOARD - Doesn't touch scoreboards at all, effectively means that if you didn't disable pushing in their scoreboard team; They will still be pushed around
# CREATE_SCOREBOARD - Creates a new team which copies the attributes of their previous scoreboard team which they are then assigned to. This means they keep nametag color and other options.
SelfDisguisesScoreboard: MODIFY_SCOREBOARD
# More options in case you want to disable a specific setting of the scoreboard
Scoreboard:
# Should it modify the scoreboard to turn collisions off?
Collisions: true
# Should it modify the scoreboard teams to disable seeing friendly invisibles?
DisableFriendlyInvisibles: true
# Should the scoreboard warn you if it detects a potential conflict?
# If self disguises are disabled, or the scoreboard is using IGNORE_SCOREBOARD then this does nothing.
WarnConflict: true
# When disguising as a player, should the prefix/suffix of the player disguise name copy the team info?
# Only takes effect if using PlayerNames TEAMS or ARMORSTANDS
CopyPlayerTeamInfo: true
# Shall I notify those with the correct permission when there's a LibsDisguises update?
# Disabling this will also disable notifications when the plugin updated
NotifyUpdate: true
# Should the plugin automatically update?
AutoUpdate: true
# Where should the plugin check for updates?
# SAME_BUILDS - Will check snapshots if you're not using a release build
# RELEASES - Only check for actual releases
# SNAPSHOTS - Only check for new snapshots
UpdatesBranch: SAME_BUILDS
# Whats the max size allowed for command disguiseradius
DisguiseRadiusMax: 50
# Whats the max size allowed for command undisguiseradius
UndisguiseRadiusMax: 50
# Shall the players view their disguises?
# Best used when viewing yourself in 3rd person
ViewSelfDisguises: true
# Are self disguises enabled by default
# Default is true
ViewSelfDisguisesDefault: true
# Some disguises are rather big and tall and block your vision
# By default those disguises are enabled despite misgivings, such as zombies, players, etc.
# The baby versions however, should be short enough that it's a non-issue
TallSelfDisguises: true
# Shall I disguise the sounds?
# This turns your damage sound into a MOOOO
DisguiseSounds: true
# Shall the disguised hear their disguise sounds or their damage sounds.
# I disable this as it can be a little confusing when not used with self disguises
HearSelfDisguise: true
# When disguised, should a message be displayed to the player? If so, where?
# The message can be customized in translations
# BOSS_BAR is not supported in 1.12!
# NONE, BOSS_BAR, ACTION_BAR
NotifyBar: ACTION_BAR
# If using boss bar, these two options come into play
# https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/boss/BarColor.html
BossBarColor: GREEN
# https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/boss/BarStyle.html
BossBarStyle: SOLID
# By the default the plugin saves the users of the /viewdisguisebar and /viewselfdisguises to a file
# So that it persists after restart
SaveUserPreferences: true
# Shall I send the velocity packets? I REALLY recommend you don't disable.
# This is the only thing allowing the mobs to fly without glitching out.
SendVelocity: true
# For self disguises, they need to have the armor and the held item removed
# Else they see floating armor, floating held items.
# This turns the items invisible in the disguised players inventory. It does not actually remove them!
# Be warned that in creative this can actually delete the item from the inventory due to a weird bug
RemoveArmor: true
RemoveHeldItem: false
# If you set a disguise to burning, it will no longer be able to be shown as sneaking or invisible.
# Set this to true if you want the disguise to get the animations of the disguised entity. Such as invisible, on fire, sprinting, sneaking, blocking
# This is only valid if you set a animation on the disguise itself. Because the entity's animations are applied otherwise.
AddEntityAnimations: true
# When a sheep or wolf is right clicked with dye. The client automatically assumes it was successful and displays the sheep's wool or the wolfs collar as dyed.
# This is a option that either prevents that happening, or it changes their color officially in the plugin so that everyone sees it changed.
# Its currently set to false which means that the color is not changed and will refresh itself to the player.
# Please note that this will not remove the dye from their hands. This also does not check if the disguised entity is actually a sheep/wolf and wants a say in its color.
DyeableSheep: false
DyeableWolf: false
DyeableCat: false
# Can a player interact with a llama with carpet to set or change their carpet color?
CarpetableLlama: false
# Can a player interact with a non-saddled horse of any type, to give it a saddle?
# This does not change what you can ride or control!
SaddleableHorse: false
# This is only called into action when the disguise is constructed using the commands.
# And when the disguise supports that. This will not be used at all for plugins constructing the disguises for instance.
# Such as prophunt. Its also false because its kind of a retarded feature.
# This is pretty simple. It shows the players displayname (Name as it appears in chat) above their head.
# This also overrides any custom name they have set in their disguise options.
# This does not take effect on player disguises
# Permission to disable is libsdisguises.disablename
ShowNamesAboveDisguises: false
# This supports the above option.
# If this is true, then the name shown above the head appears regardless of if you are looking at the disguise directly or not.
NameAboveHeadAlwaysVisible: true
# What should the name be shown as?
# Two placeholders can be used.
# %simple% = The very basic name, 'libraryaddict'
# %complex% = Name will be grabbed from scoreboard or display name if scoreboard fails.
NameAboveDisguise: '%complex%'
# This modifies the bounding box, This is stuff like can a arrow hit them.
# If you turn this to true, arrows will act like they hit the disguise in the right place!
# Clients will not see any difference in the hitboxes they are attacking, this is a server-sided calculation!
# So someone disguised as a enderdragon will easily get shot down by arrows!
# This WILL conflict with NoCheatPlus. Other plugins may also get problems.
# This shouldn't really be enabled for players as it also interferes with their movement because the server thinks
# the player is larger than they really are.
# That makes the player unable to approach this building because the server thinks they are trying to glitch inside
# blocks.
# This feature is highly experimental and is guaranteed to cause problems for players who are disguised
ModifyBoundingBox: false
# This prevents disguised players from being targeted by monsters.
# This doesn't prevent their targeting you if already targeting when disguised
# They will just ignore you unless provoked.
MonstersIgnoreDisguises: false
# This works only for players, disguised monsters and the like will not be undisguised
# Should the player's disguises be removed if they attacks something?
# Blown Disguise message can be changed in translations
# Message can be hidden with an empty translation
BlowDisguisesWhenAttacking: false
# Should the player's disguises be removed if they're attacked by something?
BlowDisguisesWhenAttacked: false
# Should PvP be disabled when disguised?
DisablePvP: false
# Should PvE be disabled when disguised? (Eg, fighting zombie)
DisablePvE: false
# How long after disguise wears off, should pvp be allowed again? Requires above to be true
# Default value 5 seconds
PvPTimer: 5
# This works with 'DisablePvP' that if attacked by another entity, they have 'PvPTimer' amount of time
# to attack back. Timer is reset with every successful attack
RetaliationCombat: false
#Stop shulker disguises from moving, they're weird. This option only effects PLAYERS that are disguised, other entities disguised as shulkers will NOT be effected!
StopShulkerDisguisesFromMoving: true
# A option to choose how many seconds a DisguiseEntity command is valid for people to right click a entity to disguise it before expiring
DisguiseEntityExpire: 10
# Another option to choose the same thing for DisguiseClone command
DisguiseCloneExpire: 10
# Max disguises to store at a time with the DisguiseClone command
DisguiseCloneSize: 3
# This controls if a entity's max health is determined by the entity, or by the disguise.
# Wither is 200, a player is 20. With this enabled, a player disguised as a wither will have the boss bar health accurate to the players health.
# Else it will be 1/20 of the boss bar when they are full health.
# Setting this in LivingWatcher overrides both values.
MaxHealthDeterminedByEntity: true
# This here is a option to turn off misc disguises.
# This means you can not have a living entity disguise as a non-living entity.
# This disables the Attributes packet, Non-living entities can still disguise as other non-living
# This means that the above option will not work as it uses the attribute packet.
MiscDisguisesForLiving: true
# Turn this to true to have players undisguised when switching worlds
UndisguiseOnWorldChange: false
# Contact Mojang's servers? Disabling this option will disable player skin disguises!
ContactMojangServers: true
# Hide players in tab when disguised? This means a disguised player cannot be seen when you press tab! This can be toggled on/off per disguise
HideDisguisedPlayersFromTab: false
# Always show player disguises in tab? The names will continue to appear in tab until the disguise is removed.
ShowPlayerDisguisesInTab: false
# On player disguise, a fake player is added to tablist so the skin can load properly.
# This option is ignored if 'ShowPlayerDisguisesInTab' is enabled.
# 3 ticks should easily be enough.
PlayerDisguisesTablistExpires: 3
# To prevent skins from defaulting to alex/steve, there is a timer that only expires after X ticks or when the player moves
# You shouldn't actually touch this, but eh. Your server.
# Default is 5 seconds
PlayerDisguisesTablistExpiresMove: 100
# Don't like players able to set themselves invisible when using the disguise commands? Toggle this to true and no one can use setInvisible! Plugins can still use this however.
DisableInvisibility: false
# Disguises have a 'setExpires' option which removes the disguise after a set amount of time
# By default, this is set to false which means it expires 9 minutes afterwards, even if they logged off.
# If true, it means they will experience the full 9 minutes, even if they log on for just a minute per day
# Expired message can be hidden with an empty translation message
DynamicExpiry: false
# Some players have issues with conflicting plugins where disguised entities will show the wrong armor
# This should be left alone unless you're trying to solve this issue. Such as MM and stone blocks.
# When true, the plugin will hide player disguises armor to prevent a minor visual bug for half a second
PlayerHideArmor: true
# This will help performance, especially with CPU
# Due to safety reasons, self disguises can never have their packets disabled.
PacketsEnabled:
# This disables the animation packet. If a disguised entity sends a animation packet and they are using a non-living disguise. People will crash.
# Disabling this also means that if a player disguised as a non-player leaves a bug. People will crash
Animation: true
# This disguises the collect packet. If a living entity disguised as a non-living entity picks up a item. People will crash. This fixes it
# This also fixes people crashing if a item disguised as a sleeping player is picked up - Only true if Bed is enabled as well
Collect: true
# This disables a fix for when a disguised entity wearing armor dies, if the disguise can wear armor. It drops unpickupable items to anyone watching.
EntityStatus: true
# Entity equipment is the packets that are sent to ensure that a disguise has or doesn't have armor, and their held item.
# Disabling this means that any disguises which can wear armor or hold items will show the armor/held item that the disguised is wearing.
Equipment: true
# This doesn't actually disable the packet. It would introduce problems. Instead it does the next best thing and caches the data.
# This means that entity metadata will not change, and will only be sent in the spawn packet.
# This is good if performance is extremely in need.
# This is bad to disable unless you are ONLY going to use the disguises for decorations.
# To be honest. This is basically "Disable entity animations". That option is called 'AddEntityAnimations' in the config but unlike that, this is always in effect.
# Animations set by use of the api or through the disguise command are still in effect.
Metadata: true
# Movement packets are the biggest cpu hit. These are majorly used to ensure that the disguises facing direction isn't bugged up.
# If you are using the Item_Frame disguise, when a packet is sent (Roughly every 2min) the disguise will bug up until they move.
Movement: true
# Disable this if you don't mind crashing everytime you see someone riding something disguised as a non-living entity
Riding: true
# When disguised as a wither skull, it sends a look packet every tick so that the wither skull is facing the right way.
WitherSkull: true
# This is only used when using a modded disguises thingy, check disguises.yml for more info
# This is used as a hack to bypass bungeecord issues
LoginPayload: true
# Added to support a Chinese Minecraft Server which uses their own skin server unless the UUID is not version 4.
# Changing this from 4 to say, 3. Means their server will fetch skins from Mojang instead.
UUIDVersion: 4

29
src/main/resources/configs/combat.yml Normal file
View File

@ -0,0 +1,29 @@
# This config file is for settings that effects combat!
# This prevents disguised players from being targeted by monsters.
# This doesn't prevent their targeting you if already targeting when disguised
# They will just ignore you unless provoked.
MonstersIgnoreDisguises: false
# Should PvP be disabled when disguised?
DisablePvP: false
# Should PvE be disabled when disguised? (Eg, fighting zombie)
DisablePvE: false
# This works only for players, disguised monsters and the like will not be undisguised
# Should the player's disguises be removed if they attacks something?
# Blown Disguise message can be changed in translations
# Message can be hidden with an empty translation
BlowDisguisesWhenAttacking: false
# Should the player's disguises be removed if they're attacked by something?
BlowDisguisesWhenAttacked: false
# This works with 'DisablePvP' that if attacked by another entity, they have 'PvPTimer' amount of time
# to attack back. Timer is reset with every successful attack
RetaliationCombat: false
# If pvp or pve is disabled, this takes effect.
# If RetaliationCombat is false, or it's true but they haven't fought back in PvPTimer seconds, then they can't fight back.
# This also controls it so they can't fight back PvPTimer seconds after applying a disguise
PvPTimer: 5

54
src/main/resources/configs/commands.yml Normal file
View File

@ -0,0 +1,54 @@
# This config file is for settings that effect commands only!
# Don't like players able to set themselves invisible when using the disguise commands? Toggle this to true and no one can use setInvisible! Plugins can still use this however.
DisableInvisibility: false
# By the default the plugin saves the users of the /viewdisguisebar and /viewselfdisguises to a file
# So that it persists after restart
SaveUserPreferences: true
Permissions:
# By default "libsdisguises.disguise.cow" will allow all options for cow disguise unless another permission has
# defined otherwise.
# If given "libsdisguises.disguise.animals.setburning" then "libsdisguises.disguise.cow" they will still be able to
# use other options like "setbaby". This was provided for backwards compatibility.
# By turning this from 'false' to 'true' the plugin will no longer give them the options unless the player was
# explicitly granted it. Even if by wildcard. The above example means they can only use "setburning"
# To summarize, "libsdisguises.disguise.cow" will no longer let them do any options on the cow disguise unless it
# was added to their permissions
# You can read more about permissions here: https://www.spigotmc.org/wiki/lib-s-disguises-setting-up-permissions/
# The permission used to check OPs who may not have permissions defined, is "libsdisguises.*.*.*" which you can
# negate with your permissions plugin
ExplicitDisguises: false
# What should the default permissions be for seeing commands?
# This is a config option because I can't verify if they should be able to see commands normally due to my
# permissions system. My system is complex, but its a ton of control.
# This isn't an issue normally, but I recently received complaints from someone who doesn't believe in permissions...
# Some of you may also wish to hide these commands!
# The permissions for commands are a simple 'libsdisguises.seecmd.command' where 'command' can be
# 'disguise', 'undisguise' etc. A simple 'libsdisguises.seecmd' permission may also work for children
# If you change this while the server is running, players may need to rejoin for it to take effect
# Remember that command blocks need 'TRUE' or 'OP' to use the commands.
# TRUE = Everyone can see this, the default. Can be negated with permissions
# FALSE = No one can see this without permissions to allow it
# OP = Only operators can see this
# NOT_OP = Only non operators can see this
SeeCommands: TRUE
# Whats the max size allowed for command disguiseradius
DisguiseRadiusMax: 50
# Whats the max size allowed for command undisguiseradius
UndisguiseRadiusMax: 50
# A option to choose how many seconds a DisguiseEntity command is valid for people to right click a entity to disguise it before expiring
DisguiseEntityExpire: 10
# Another option to choose the same thing for DisguiseClone command
DisguiseCloneExpire: 10
# Max disguises to store at a time with the DisguiseClone command
DisguiseCloneSize: 3

0
src/main/resources/disguises.yml → src/main/resources/configs/disguises.yml
View File

42
src/main/resources/configs/features.yml Normal file
View File

@ -0,0 +1,42 @@
# This config file is for features that are something the server might want to customize!
# Disguises have a 'setExpires' option which removes the disguise after a set amount of time
# By default, this is set to false which means it expires 9 minutes afterwards, even if they logged off.
# If true, it means they will experience the full 9 minutes, even if they log on for just a minute per day
# Expired message can be hidden with an empty translation message
DynamicExpiry: false
# THIS IS A PREMIUM ONLY FEATURE. TO USE IT, PURCHASE THE PLUGIN.
# Saves disguises so that they persist after server shutdown, chunks unload, player logouts and so on.
# As such, this completely replaces the KeepDisguises aspect which has been removed except for the player death.
# Players - Are player disguises saved
# Entities - Are entities disguises saved (This is everything that's not a player)
# If you are using the dev builds, place your premium version of Lib's Disguises.jar inside the LibsDisguises folder
# This will enable premium only features for the dev builds.
# The saved disguises are saved in a json file format inside the plugin folder, there will be no other formats
SaveDisguises:
Players: false
Entities: false
# Does the player keep their disguise after they die?
KeepDisguises:
PlayerDeath: false
# Shall I disguise the sounds?
# This turns your damage sound into a MOOOO
DisguiseSounds: true
# Turn this to true to have players undisguised when switching worlds
UndisguiseOnWorldChange: false
# When disguised, should a message be displayed to the player? If so, where?
# The message can be customized in translations
# BOSS_BAR is not supported in 1.12!
# NONE, BOSS_BAR, ACTION_BAR
NotifyBar: ACTION_BAR
# If using boss bar, these two options come into play
# https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/boss/BarColor.html
BossBarColor: GREEN
# https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/boss/BarStyle.html
BossBarStyle: SOLID

30
src/main/resources/configs/libsdisguises.yml Normal file
View File

@ -0,0 +1,30 @@
# This config is for options that are about Libs Disguises itself, not the disguises.
# Contact Mojang's servers? Disabling this option will disable player disguises if there's no skin to use!
ContactMojangServers: true
# Should the plugin use translations? Note that a player must see the message before it will appear in translations.yml
Translations: false
# Shall I notify those with the correct permission when there's a LibsDisguises update?
# Disabling this will also disable notifications when the plugin updated
NotifyUpdate: true
# Should the plugin automatically update?
AutoUpdate: true
# Where should the plugin check for updates?
# SAME_BUILDS - Will check snapshots if you're not using a release build
# RELEASES - Only check for actual releases
# SNAPSHOTS - Only check for new snapshots
UpdatesBranch: SAME_BUILDS
# You can also get this information through /libsdisguises config
# Should the plugin output missing config options instead of just counting them
VerboseConfig: false
# Should the plugin output changed config options? Will also list unknown extra options
ChangedConfig: false
# Should the config automatically update itself each time there's a config entry missing?
# The old config will have any custom comments or invalid config entries wiped.
UpdateConfig: true

49
src/main/resources/configs/nametags.yml Normal file
View File

@ -0,0 +1,49 @@
# This config file is about the names that appear over heads! A fair bit of player disguise stuff is in players.yml however
# This is only called into action when the disguise is constructed using the commands.
# And when the disguise supports that. This will not be used at all for plugins constructing the disguises for instance.
# Such as prophunt. Its also false because its kind of a retarded feature.
# This is pretty simple. It shows the players displayname (Name as it appears in chat) above their head.
# This also overrides any custom name they have set in their disguise options.
# This does not take effect on player disguises
# Permission to disable is libsdisguises.disablename
ShowNamesAboveDisguises: false
# This supports the above option.
# If this is true, then the name shown above the head appears regardless of if you are looking at the disguise directly or not.
NameAboveHeadAlwaysVisible: true
# What should the name be shown as?
# Two placeholders can be used.
# %simple% = The very basic name, 'libraryaddict'
# %complex% = Name will be grabbed from scoreboard or display name if scoreboard fails.
NameAboveDisguise: '%complex%'
# There are four options you can use
# VANILLA - Names are limited to 16 chars but can't be changed without resending disguise
# TEAMS - Names are limited to 32 chars but can be changed willy nilly
# EXTENDED - Names are limited to 48 chars but can't be changed without resending disguise
# ARMORSTANDS - Names are limited to 256 chars, uses a mix of armorstands and teams to do this. Slightly hacky.
# Downside of armorstand names is that there's a chance of it becoming desynced from the player disguise
# And names will always display even if the entity is invisible using potion effects
# With ArmorStands & the Premium version, you can also use multiple lines in the nametag, use \n as a seperator.
# Read the next option for more information.
PlayerNames: TEAMS
# If doing ARMORSTANDS in the above option, should CustomNames for non-player disguises be overridden to use armorstands too?
# This allows multiline names if you have purchased the plugin
# Use \n for a new line, though if you're doing it in a config you may need to use \\n as " and ' are treated differently.
OverrideCustomNames: true
# More options in case you want to disable a specific setting of the scoreboard
Scoreboard:
# Should it modify the scoreboard to turn collisions off?
Collisions: true
# Should it modify the scoreboard teams to disable seeing friendly invisibles?
DisableFriendlyInvisibles: true
# Should the scoreboard warn you if it detects a potential conflict?
# If self disguises are disabled, or the scoreboard is using IGNORE_SCOREBOARD then this does nothing.
WarnConflict: true
# When disguising as a player, should the prefix/suffix of the player disguise name copy the team info?
# Only takes effect if using PlayerNames TEAMS or ARMORSTANDS
CopyPlayerTeamInfo: true

45
src/main/resources/configs/players.yml Normal file
View File

@ -0,0 +1,45 @@
# This config file is for settings that are about the players themselves, and the player disguises!
# Shall the players view their disguises?
# Best used when viewing yourself in 3rd person
ViewSelfDisguises: true
# Are self disguises enabled by default
# Default is true
ViewSelfDisguisesDefault: true
# Shall the disguised hear their disguise sounds or their damage sounds.
# I disable this as it can be a little confusing when not used with self disguises
HearSelfDisguise: true
# Some disguises are rather big and tall and block your vision
# By default those disguises are enabled despite misgivings, such as zombies, players, etc.
# The baby versions however, should be short enough that it's a non-issue
TallSelfDisguises: true
# How should the plugin handle self disguises scoreboards? It disables pushing in whichever team they're assigned.
# If you want them to be able to push again when they undisguise, set this to CREATE_SCOREBOARD
# I have to disable pushing or you will be pushed around by your own self disguise
# MODIFY_SCOREBOARD - Modifies the player's current team if possible, otherwise assigns them to a new scoreboard team.
# IGNORE_SCOREBOARD - Doesn't touch scoreboards at all, effectively means that if you didn't disable pushing in their scoreboard team; They will still be pushed around
# CREATE_SCOREBOARD - Creates a new team which copies the attributes of their previous scoreboard team which they are then assigned to. This means they keep nametag color and other options.
SelfDisguisesScoreboard: MODIFY_SCOREBOARD
# Hide players in tab when disguised? This means a disguised player cannot be seen when you press tab! This can be toggled on/off per disguise
HideDisguisedPlayersFromTab: false
# Always show player disguises in tab? The names will continue to appear in tab until the disguise is removed.
ShowPlayerDisguisesInTab: false
# On player disguise, a fake player is added to tablist so the skin can load properly.
# This option is ignored if 'ShowPlayerDisguisesInTab' is enabled.
# 3 ticks should easily be enough.
PlayerDisguisesTablistExpires: 3
# How many ticks before tab packet is sent to remove from tablist. This shouldn't need to be touched
TablistRemoveDelay: 3
# To prevent skins from defaulting to alex/steve, there is a timer that only expires after X ticks or when the player moves
# You shouldn't actually touch this, but eh. Your server.
# Default is 5 seconds
PlayerDisguisesTablistExpiresMove: 100

74
src/main/resources/configs/protocol.yml Normal file
View File

@ -0,0 +1,74 @@
# This config is for options that should only be touched if you're having compatibility issues with other plugins
# Some players have issues with conflicting plugins where disguised entities will show the wrong armor
# This should be left alone unless you're trying to solve this issue. Such as MM and stone blocks.
# When true, the plugin will hide player disguises armor to prevent a minor visual bug for half a second
PlayerHideArmor: true
# Some disguises have randomized options on disguise, such as a fox type or a villager breed.
# This may be problematic for some server owners, so you can disable it below
RandomDisguiseOptions: true
# For self disguises, they need to have the armor and the held item removed
# Else they see floating armor, floating held items.
# This turns the items invisible in the disguised players inventory. It does not actually remove them!
# Be warned that in creative this can actually delete the item from the inventory due to a weird bug
RemoveArmor: true
RemoveHeldItem: false
# If you set a disguise to burning, it will no longer be able to be shown as sneaking or invisible.
# Set this to true if you want the disguise to get the animations of the disguised entity. Such as invisible, on fire, sprinting, sneaking, blocking
# This is only valid if you set a animation on the disguise itself. Because the entity's animations are applied otherwise.
AddEntityAnimations: true
# This controls if a entity's max health is determined by the entity, or by the disguise.
# Wither is 200, a player is 20. With this enabled, a player disguised as a wither will have the boss bar health accurate to the players health.
# Else it will be 1/20 of the boss bar when they are full health.
# Setting this in LivingWatcher overrides both values.
MaxHealthDeterminedByEntity: true
# This here is a option to turn off misc disguises.
# This means you can not have a living entity disguise as a non-living entity.
# This disables the Attributes packet, Non-living entities can still disguise as other non-living
# This means that the above option will not work as it uses the attribute packet.
MiscDisguisesForLiving: true
# Shall I send the velocity packets? I REALLY recommend you don't disable.
# This is the only thing allowing the mobs to fly without glitching out.
SendVelocity: true
# This will help performance, especially with CPU
# Due to safety reasons, self disguises can never have their packets disabled.
PacketsEnabled:
# This disables the animation packet. If a disguised entity sends a animation packet and they are using a non-living disguise. People will crash.
# Disabling this also means that if a player disguised as a non-player leaves a bug. People will crash
Animation: true
# This disguises the collect packet. If a living entity disguised as a non-living entity picks up a item. People will crash. This fixes it
# This also fixes people crashing if a item disguised as a sleeping player is picked up - Only true if Bed is enabled as well
Collect: true
# This disables a fix for when a disguised entity wearing armor dies, if the disguise can wear armor. It drops unpickupable items to anyone watching.
EntityStatus: true
# Entity equipment is the packets that are sent to ensure that a disguise has or doesn't have armor, and their held item.
# Disabling this means that any disguises which can wear armor or hold items will show the armor/held item that the disguised is wearing.
Equipment: true
# This doesn't actually disable the packet. It would introduce problems. Instead it does the next best thing and caches the data.
# This means that entity metadata will not change, and will only be sent in the spawn packet.
# This is good if performance is extremely in need.
# This is bad to disable unless you are ONLY going to use the disguises for decorations.
# To be honest. This is basically "Disable entity animations". That option is called 'AddEntityAnimations' in the config but unlike that, this is always in effect.
# Animations set by use of the api or through the disguise command are still in effect.
Metadata: true
# Movement packets are the biggest cpu hit. These are majorly used to ensure that the disguises facing direction isn't bugged up.
# If you are using the Item_Frame disguise, when a packet is sent (Roughly every 2min) the disguise will bug up until they move.
Movement: true
# Disable this if you don't mind crashing everytime you see someone riding something disguised as a non-living entity
Riding: true
# When disguised as a wither skull, it sends a look packet every tick so that the wither skull is facing the right way.
WitherSkull: true
# This is only used when using a modded disguises thingy, check disguises.yml for more info
# This is used as a hack to bypass bungeecord issues
LoginPayload: true
# Added to support a Chinese Minecraft Server which uses their own skin server unless the UUID is not version 4.
# Changing this from 4 to say, 3. Means their server will fetch skins from Mojang instead.
UUIDVersion: 4

41
src/main/resources/configs/sanity.yml Normal file
View File

@ -0,0 +1,41 @@
# This config is called sanity, because you shouldn't need to change the stuff in here
#Stop shulker disguises from moving, they're weird. This option only effects PLAYERS that are disguised, other entities disguised as shulkers will NOT be effected!
StopShulkerDisguisesFromMoving: true
# This means that the plugin doesn't need to constantly call Mojang just to find a skin for an offline player
# However some people may prefer to disable this.
# Even if you disable this, if there was disguises in the cache already then it will use them
SaveGameProfiles: true
# This option is useless if you don't enable SaveGameProfiles!
# If a player has been disguised before and their skin saved into the cache
# When they join the server will automatically update the cache in case they changed their skin
UpdateGameProfiles: true
# This modifies the bounding box, This is stuff like can a arrow hit them.
# If you turn this to true, arrows will act like they hit the disguise in the right place!
# Clients will not see any difference in the hitboxes they are attacking, this is a server-sided calculation!
# So someone disguised as a enderdragon will easily get shot down by arrows!
# This WILL conflict with NoCheatPlus. Other plugins may also get problems.
# This shouldn't really be enabled for players as it also interferes with their movement because the server thinks
# the player is larger than they really are.
# That makes the player unable to approach this building because the server thinks they are trying to glitch inside
# blocks.
# This feature is highly experimental and is guaranteed to cause problems for players who are disguised
ModifyBoundingBox: false
# When a sheep or wolf is right clicked with dye. The client automatically assumes it was successful and displays the sheep's wool or the wolfs collar as dyed.
# This is a option that either prevents that happening, or it changes their color officially in the plugin so that everyone sees it changed.
# Its currently set to false which means that the color is not changed and will refresh itself to the player.
# Please note that this will not remove the dye from their hands. This also does not check if the disguised entity is actually a sheep/wolf and wants a say in its color.
DyeableSheep: false
DyeableWolf: false
DyeableCat: false
# Can a player interact with a llama with carpet to set or change their carpet color?
CarpetableLlama: false
# Can a player interact with a non-saddled horse of any type, to give it a saddle?
# This does not change what you can ride or control!
SaddleableHorse: false

0
src/main/resources/sounds.yml → src/main/resources/configs/sounds.yml
View File