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

Add hex color support to translations

Browse Source
This commit is contained in:
libraryaddict
2020-06-27 21:01:58 +12:00
parent 5f2ac293bf
commit ffd6536565
70 changed files with 481 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/me/libraryaddict/disguise/commands/undisguise/UndisguiseCommand.java
View File

@@ -1,6 +1,7 @@
package me.libraryaddict.disguise.commands.undisguise;
import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.LibsPremium;
import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.bukkit.ChatColor;
@@ -21,19 +22,19 @@ public class UndisguiseCommand implements CommandExecutor {
}
if (sender.getName().equals("CONSOLE")) {
sender.sendMessage(LibsMsg.NO_CONSOLE.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
return true;
}
if (sender.hasPermission("libsdisguises.undisguise") && !"%%__USER__%%".equals(12345 + "")) {
if (DisguiseAPI.isDisguised((Entity) sender)) {
DisguiseAPI.undisguiseToAll((Player) sender);
sender.sendMessage(LibsMsg.UNDISG.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.UNDISG);
} else {
sender.sendMessage(LibsMsg.NOT_DISGUISED.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NOT_DISGUISED);
}
} else {
sender.sendMessage(LibsMsg.NO_PERM.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
}
return true;

7
src/main/java/me/libraryaddict/disguise/commands/undisguise/UndisguiseEntityCommand.java
View File

@@ -3,6 +3,7 @@ package me.libraryaddict.disguise.commands.undisguise;
import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.commands.interactions.UndisguiseEntityInteraction;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.LibsPremium;
import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.bukkit.ChatColor;
@@ -21,18 +22,18 @@ public class UndisguiseEntityCommand implements CommandExecutor {
}
if (sender.getName().equals("CONSOLE")) {
sender.sendMessage(LibsMsg.NO_CONSOLE.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
return true;
}
if (!sender.hasPermission("libsdisguises.undisguiseentity")) {
sender.sendMessage(LibsMsg.NO_PERM.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
return true;
}
LibsDisguises.getInstance().getListener().addInteraction(sender.getName(), new UndisguiseEntityInteraction(),
DisguiseConfig.getDisguiseEntityExpire());
sender.sendMessage(LibsMsg.UND_ENTITY.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.UND_ENTITY);
return true;
}

5
src/main/java/me/libraryaddict/disguise/commands/undisguise/UndisguisePlayerCommand.java
View File

@@ -2,6 +2,7 @@ package me.libraryaddict.disguise.commands.undisguise;
import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.LibsPremium;
import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.bukkit.Bukkit;
@@ -62,12 +63,12 @@ public class UndisguisePlayerCommand implements CommandExecutor, TabCompleter {
}
if (!sender.hasPermission("libsdisguises.undisguiseplayer")) {
sender.sendMessage(LibsMsg.NO_PERM.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
return true;
}
if (args.length == 0) {
sender.sendMessage(LibsMsg.UNDISG_PLAYER_HELP.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.UNDISG_PLAYER_HELP);
return true;
}

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

@@ -1,6 +1,7 @@
package me.libraryaddict.disguise.commands.undisguise;
import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import me.libraryaddict.disguise.utilities.LibsPremium;
import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.bukkit.ChatColor;
@@ -36,7 +37,7 @@ public class UndisguiseRadiusCommand implements CommandExecutor {
}
if (sender.getName().equals("CONSOLE")) {
sender.sendMessage(LibsMsg.NO_CONSOLE.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_CONSOLE);
return true;
}
@@ -49,7 +50,7 @@ public class UndisguiseRadiusCommand implements CommandExecutor {
}
radius = Integer.parseInt(args[0]);
if (radius > maxRadius) {
sender.sendMessage(LibsMsg.LIMITED_RADIUS.get(maxRadius));
DisguiseUtilities.sendMessage(sender, LibsMsg.LIMITED_RADIUS, maxRadius);
radius = maxRadius;
}
}
@@ -65,9 +66,9 @@ public class UndisguiseRadiusCommand implements CommandExecutor {
}
}
sender.sendMessage(LibsMsg.UNDISRADIUS.get(disguisedEntitys));
DisguiseUtilities.sendMessage(sender, LibsMsg.UNDISRADIUS, disguisedEntitys);
} else {
sender.sendMessage(LibsMsg.NO_PERM.get());
DisguiseUtilities.sendMessage(sender, LibsMsg.NO_PERM);
}
return true;
}