zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Compare commits

base: zhdev:f1f30d441b6f341fb3b85712a4ef1af44658e44c
Branches Tags
zhdev:master
...
compare: zhdev:6190c4d700f5132645e6933d06f6b81d29bedbb6
Branches Tags
zhdev:master

2 commits
f1f30d441b ... 6190c4d700

Author SHA1 Message Date
Roman Zhuravlev
6190c4d700 Rename project to Griefus 2025-11-02 00:44:01 +05:00
Roman Zhuravlev
9ede7a6efa Revert "Rename project to Griefus" 
This reverts commit 73fffc5254.
 2025-11-02 00:43:12 +05:00
42 changed files with 209 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/api/version/v10.md
View file

@ -35,7 +35,7 @@ import net.coreprotect.CoreProtect;
import net.coreprotect.CoreProtectAPI; import net.coreprotect.CoreProtectAPI;
private CoreProtectAPI getCoreProtect() { private CoreProtectAPI getCoreProtect() {
Plugin plugin = getServer().getPluginManager().getPlugin("CoreProtect"); Plugin plugin = getServer().getPluginManager().getPlugin("Griefus");
// Check that CoreProtect is loaded // Check that CoreProtect is loaded
if (plugin == null || !(plugin instanceof CoreProtect)) { if (plugin == null || !(plugin instanceof CoreProtect)) {

2
docs/api/version/v11.md
View file

@ -38,7 +38,7 @@ import net.coreprotect.CoreProtect;
import net.coreprotect.CoreProtectAPI; import net.coreprotect.CoreProtectAPI;
private CoreProtectAPI getCoreProtect() { private CoreProtectAPI getCoreProtect() {
Plugin plugin = getServer().getPluginManager().getPlugin("CoreProtect"); Plugin plugin = getServer().getPluginManager().getPlugin("Griefus");
// Check that CoreProtect is loaded // Check that CoreProtect is loaded
if (plugin == null || !(plugin instanceof CoreProtect)) { if (plugin == null || !(plugin instanceof CoreProtect)) {

2
docs/api/version/v7.md
View file

@ -49,7 +49,7 @@ import net.coreprotect.CoreProtect;
import net.coreprotect.CoreProtectAPI; import net.coreprotect.CoreProtectAPI;
private CoreProtectAPI getCoreProtect() { private CoreProtectAPI getCoreProtect() {
Plugin plugin = getServer().getPluginManager().getPlugin("CoreProtect"); Plugin plugin = getServer().getPluginManager().getPlugin("Griefus");
// Check that CoreProtect is loaded // Check that CoreProtect is loaded
if (plugin == null || !(plugin instanceof CoreProtect)) { if (plugin == null || !(plugin instanceof CoreProtect)) {

2
docs/api/version/v8.md
View file

@ -35,7 +35,7 @@ import net.coreprotect.CoreProtect;
import net.coreprotect.CoreProtectAPI; import net.coreprotect.CoreProtectAPI;
private CoreProtectAPI getCoreProtect() { private CoreProtectAPI getCoreProtect() {
Plugin plugin = getServer().getPluginManager().getPlugin("CoreProtect"); Plugin plugin = getServer().getPluginManager().getPlugin("Griefus");
// Check that CoreProtect is loaded // Check that CoreProtect is loaded
if (plugin == null || !(plugin instanceof CoreProtect)) { if (plugin == null || !(plugin instanceof CoreProtect)) {

2
docs/api/version/v9.md
View file

@ -35,7 +35,7 @@ import net.coreprotect.CoreProtect;
import net.coreprotect.CoreProtectAPI; import net.coreprotect.CoreProtectAPI;
private CoreProtectAPI getCoreProtect() { private CoreProtectAPI getCoreProtect() {
Plugin plugin = getServer().getPluginManager().getPlugin("CoreProtect"); Plugin plugin = getServer().getPluginManager().getPlugin("Griefus");
// Check that CoreProtect is loaded // Check that CoreProtect is loaded
if (plugin == null || !(plugin instanceof CoreProtect)) { if (plugin == null || !(plugin instanceof CoreProtect)) {

4
src/main/java/net/coreprotect/command/ApplyCommand.java
View file

@ -29,7 +29,7 @@ public class ApplyCommand {
} }
} }
if (!valid) { if (!valid) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.FIRST)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.FIRST));
} }
else { else {
ConfigHandler.lastRollback.remove(user.getName()); ConfigHandler.lastRollback.remove(user.getName());
@ -37,7 +37,7 @@ public class ApplyCommand {
} }
} }
else { else {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.FIRST)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.FIRST));
} }
} }
catch (Exception e) { catch (Exception e) {

4
src/main/java/net/coreprotect/command/CancelCommand.java
View file

@ -29,7 +29,7 @@ public class CancelCommand {
} }
} }
if (!valid) { if (!valid) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.FIRST)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.FIRST));
} }
else { else {
ConfigHandler.lastRollback.remove(user.getName()); ConfigHandler.lastRollback.remove(user.getName());
@ -37,7 +37,7 @@ public class CancelCommand {
} }
} }
else { else {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.FIRST)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.FIRST));
} }
} }
catch (Exception e) { catch (Exception e) {

8
src/main/java/net/coreprotect/command/CommandHandler.java
View file

@ -121,18 +121,18 @@ public class CommandHandler implements CommandExecutor {
} }
else if (corecommand.equals("migrate-db")) { else if (corecommand.equals("migrate-db")) {
if (!VersionUtils.validDonationKey()) { if (!VersionUtils.validDonationKey()) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DONATION_KEY_REQUIRED)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DONATION_KEY_REQUIRED));
} }
else { else {
Extensions.runDatabaseMigration(corecommand, user, argumentArray); Extensions.runDatabaseMigration(corecommand, user, argumentArray);
} }
} }
else { else {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_NOT_FOUND, Color.WHITE, "/co " + corecommand)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_NOT_FOUND, Color.WHITE, "/co " + corecommand));
} }
} }
else { else {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, Color.WHITE, "/co <parameters>")); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, Color.WHITE, "/co <parameters>"));
} }
if (user.isOp() && versionAlert.get(user.getName()) == null) { if (user.isOp() && versionAlert.get(user.getName()) == null) {
@ -145,7 +145,7 @@ public class CommandHandler implements CommandExecutor {
public void run() { public void run() {
try { try {
Thread.sleep(5000); Thread.sleep(5000);
Chat.sendMessage(user, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.UPDATE_HEADER, Griefus + (VersionUtils.isCommunityEdition() ? " " + ConfigHandler.COMMUNITY_EDITION : "")) + Color.WHITE + " -----"); Chat.sendMessage(user, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.UPDATE_HEADER, "Griefus" + (VersionUtils.isCommunityEdition() ? " " + ConfigHandler.COMMUNITY_EDITION : "")) + Color.WHITE + " -----");
if (latestVersion != null) { if (latestVersion != null) {
Chat.sendMessage(user, Color.DARK_AQUA + Phrase.build(Phrase.UPDATE_NOTICE, Color.WHITE, "CoreProtect CE v" + latestVersion)); Chat.sendMessage(user, Color.DARK_AQUA + Phrase.build(Phrase.UPDATE_NOTICE, Color.WHITE, "CoreProtect CE v" + latestVersion));
Chat.sendMessage(user, Color.DARK_AQUA + Phrase.build(Phrase.LINK_DOWNLOAD, Color.WHITE, "www.coreprotect.net/download/")); Chat.sendMessage(user, Color.DARK_AQUA + Phrase.build(Phrase.LINK_DOWNLOAD, Color.WHITE, "www.coreprotect.net/download/"));

18
src/main/java/net/coreprotect/command/ConsumerCommand.java
View file

@ -19,19 +19,19 @@ public class ConsumerCommand {
protected static void runCommand(final CommandSender player, boolean permission, String[] args) { protected static void runCommand(final CommandSender player, boolean permission, String[] args) {
if (!permission) { if (!permission) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (!(player instanceof ConsoleCommandSender)) { if (!(player instanceof ConsoleCommandSender)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_CONSOLE)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_CONSOLE));
return; return;
} }
if (ConfigHandler.converterRunning) { if (ConfigHandler.converterRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.purgeRunning) { if (ConfigHandler.purgeRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS));
return; return;
} }
@ -43,27 +43,27 @@ public class ConsumerCommand {
if (pauseCommand || resumeCommand) { if (pauseCommand || resumeCommand) {
if (ConfigHandler.pauseConsumer) { if (ConfigHandler.pauseConsumer) {
if (pauseCommand) { if (pauseCommand) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.CONSUMER_ERROR, Selector.FIRST)); // already paused Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.CONSUMER_ERROR, Selector.FIRST)); // already paused
} }
else { else {
ConfigHandler.pauseConsumer = false; ConfigHandler.pauseConsumer = false;
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.CONSUMER_TOGGLED, Selector.SECOND)); // now started Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.CONSUMER_TOGGLED, Selector.SECOND)); // now started
} }
} }
else { else {
if (resumeCommand) { if (resumeCommand) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.CONSUMER_ERROR, Selector.SECOND)); // already running Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.CONSUMER_ERROR, Selector.SECOND)); // already running
} }
else { else {
ConfigHandler.pauseConsumer = true; ConfigHandler.pauseConsumer = true;
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.CONSUMER_TOGGLED, Selector.FIRST)); // now paused Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.CONSUMER_TOGGLED, Selector.FIRST)); // now paused
} }
} }
return; return;
} }
} }
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, Color.WHITE, "/co consumer <pause|resume>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, Color.WHITE, "/co consumer <pause|resume>"));
} }
} }

6
src/main/java/net/coreprotect/command/HelpCommand.java
View file

@ -17,7 +17,7 @@ public class HelpCommand {
String helpcommand_original = args[1]; String helpcommand_original = args[1];
String helpcommand = args[1].toLowerCase(Locale.ROOT); String helpcommand = args[1].toLowerCase(Locale.ROOT);
helpcommand = helpcommand.replaceAll("[^a-zA-Z]", ""); helpcommand = helpcommand.replaceAll("[^a-zA-Z]", "");
Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.HELP_HEADER, Griefus) + Color.WHITE + " -----"); Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.HELP_HEADER, "Griefus") + Color.WHITE + " -----");
if (helpcommand.equals("help")) { if (helpcommand.equals("help")) {
Chat.sendMessage(player, Color.DARK_AQUA + "/co help " + Color.WHITE + "- " + Phrase.build(Phrase.HELP_LIST)); Chat.sendMessage(player, Color.DARK_AQUA + "/co help " + Color.WHITE + "- " + Phrase.build(Phrase.HELP_LIST));
} }
@ -111,7 +111,7 @@ public class HelpCommand {
} }
} }
else { else {
Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.HELP_HEADER, Griefus) + Color.WHITE + " -----"); Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.HELP_HEADER, "Griefus") + Color.WHITE + " -----");
Chat.sendMessage(player, Color.DARK_AQUA + "/co help " + Color.GREY + "<command> " + Color.WHITE + "- " + Phrase.build(Phrase.HELP_COMMAND)); Chat.sendMessage(player, Color.DARK_AQUA + "/co help " + Color.GREY + "<command> " + Color.WHITE + "- " + Phrase.build(Phrase.HELP_COMMAND));
Chat.sendMessage(player, Color.DARK_AQUA + "/co " + Color.GREY + "inspect " + Color.WHITE + "- " + Phrase.build(Phrase.HELP_INSPECT_COMMAND)); Chat.sendMessage(player, Color.DARK_AQUA + "/co " + Color.GREY + "inspect " + Color.WHITE + "- " + Phrase.build(Phrase.HELP_INSPECT_COMMAND));
Chat.sendMessage(player, Color.DARK_AQUA + "/co " + Color.GREY + "rollback " + Color.DARK_AQUA + "<params> " + Color.WHITE + "- " + Phrase.build(Phrase.HELP_ROLLBACK_COMMAND)); Chat.sendMessage(player, Color.DARK_AQUA + "/co " + Color.GREY + "rollback " + Color.DARK_AQUA + "<params> " + Color.WHITE + "- " + Phrase.build(Phrase.HELP_ROLLBACK_COMMAND));
@ -123,7 +123,7 @@ public class HelpCommand {
} }
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
} }
} }
} }

10
src/main/java/net/coreprotect/command/InspectCommand.java
View file

@ -27,26 +27,26 @@ public class InspectCommand {
if (!ConfigHandler.inspecting.get(player.getName())) { if (!ConfigHandler.inspecting.get(player.getName())) {
if (command == 0) { if (command == 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INSPECTOR_ERROR, Selector.SECOND)); // already disabled Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INSPECTOR_ERROR, Selector.SECOND)); // already disabled
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INSPECTOR_TOGGLED, Selector.FIRST)); // now enabled Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INSPECTOR_TOGGLED, Selector.FIRST)); // now enabled
ConfigHandler.inspecting.put(player.getName(), true); ConfigHandler.inspecting.put(player.getName(), true);
} }
} }
else { else {
if (command == 1) { if (command == 1) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INSPECTOR_ERROR, Selector.FIRST)); // already enabled Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INSPECTOR_ERROR, Selector.FIRST)); // already enabled
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INSPECTOR_TOGGLED, Selector.SECOND)); // now disabled Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INSPECTOR_TOGGLED, Selector.SECOND)); // now disabled
ConfigHandler.inspecting.put(player.getName(), false); ConfigHandler.inspecting.put(player.getName(), false);
} }
} }
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
} }
} }
} }

78
src/main/java/net/coreprotect/command/LookupCommand.java
View file

@ -56,7 +56,7 @@ public class LookupCommand {
} }
if (args[0].toLowerCase(Locale.ROOT).equals("page") && (args.length != 2 || !args[1].equals(args[1].replaceAll("[^0-9]", "")))) { if (args[0].toLowerCase(Locale.ROOT).equals("page") && (args.length != 2 || !args[1].equals(args[1].replaceAll("[^0-9]", "")))) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, Color.WHITE, "/co page <page>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, Color.WHITE, "/co page <page>"));
return; return;
} }
@ -76,7 +76,7 @@ public class LookupCommand {
argAction.add(3); argAction.add(3);
} }
else if (!argAction.contains(3)) { else if (!argAction.contains(3)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO));
return; return;
} }
} }
@ -93,14 +93,14 @@ public class LookupCommand {
argAction.add(3); argAction.add(3);
} }
else if (!argAction.contains(3)) { else if (!argAction.contains(3)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO));
return; return;
} }
} }
} }
if (hasBlock && hasEntity) { if (hasBlock && hasEntity) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO));
return; return;
} }
@ -154,33 +154,33 @@ public class LookupCommand {
} }
} }
if (ConfigHandler.converterRunning) { if (ConfigHandler.converterRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.purgeRunning) { if (ConfigHandler.purgeRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS));
return; return;
} }
if (resultc < 2) { if (resultc < 2) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co l <params>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co l <params>"));
return; return;
} }
if (argAction.contains(-1)) { if (argAction.contains(-1)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_ACTION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_ACTION));
return; return;
} }
if (worldedit && argRadius == null) { if (worldedit && argRadius == null) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_SELECTION, "WorldEdit")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_SELECTION, "WorldEdit"));
return; return;
} }
if (argRadius != null && argRadius[0] == -1) { if (argRadius != null && argRadius[0] == -1) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_RADIUS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_RADIUS));
return; return;
} }
if (ConfigHandler.lookupThrottle.get(player.getName()) != null) { if (ConfigHandler.lookupThrottle.get(player.getName()) != null) {
Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName()); Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName());
if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 50) { if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 50) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
return; return;
} }
} }
@ -190,73 +190,73 @@ public class LookupCommand {
} }
if (!allPermission) { if (!allPermission) {
if (!pageLookup && (argAction.size() == 0 || (argAction.size() == 1 && (argAction.contains(0) || argAction.contains(1)))) && !player.hasPermission("coreprotect.lookup.block")) { if (!pageLookup && (argAction.size() == 0 || (argAction.size() == 1 && (argAction.contains(0) || argAction.contains(1)))) && !player.hasPermission("coreprotect.lookup.block")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(2) && !player.hasPermission("coreprotect.lookup.click")) { if (argAction.contains(2) && !player.hasPermission("coreprotect.lookup.click")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(3) && !player.hasPermission("coreprotect.lookup.kill")) { if (argAction.contains(3) && !player.hasPermission("coreprotect.lookup.kill")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(4) && !argAction.contains(11) && !player.hasPermission("coreprotect.lookup.container")) { if (argAction.contains(4) && !argAction.contains(11) && !player.hasPermission("coreprotect.lookup.container")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(6) && !player.hasPermission("coreprotect.lookup.chat")) { if (argAction.contains(6) && !player.hasPermission("coreprotect.lookup.chat")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(7) && !player.hasPermission("coreprotect.lookup.command")) { if (argAction.contains(7) && !player.hasPermission("coreprotect.lookup.command")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(8) && !player.hasPermission("coreprotect.lookup.session")) { if (argAction.contains(8) && !player.hasPermission("coreprotect.lookup.session")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(9) && !player.hasPermission("coreprotect.lookup.username")) { if (argAction.contains(9) && !player.hasPermission("coreprotect.lookup.username")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(10) && !player.hasPermission("coreprotect.lookup.sign")) { if (argAction.contains(10) && !player.hasPermission("coreprotect.lookup.sign")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(11) && !argAction.contains(4) && !player.hasPermission("coreprotect.lookup.item")) { if (argAction.contains(11) && !argAction.contains(4) && !player.hasPermission("coreprotect.lookup.item")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (argAction.contains(4) && argAction.contains(11) && !player.hasPermission("coreprotect.lookup.inventory")) { if (argAction.contains(4) && argAction.contains(11) && !player.hasPermission("coreprotect.lookup.inventory")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
} }
if (argAction.contains(6) || argAction.contains(7) || argAction.contains(8) || argAction.contains(9) || argAction.contains(10)) { if (argAction.contains(6) || argAction.contains(7) || argAction.contains(8) || argAction.contains(9) || argAction.contains(10)) {
if (argAction.contains(9) && (argRadius != null || argWid > 0 || worldedit)) { if (argAction.contains(9) && (argRadius != null || argWid > 0 || worldedit)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INCOMPATIBLE_ACTION, "r:")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INCOMPATIBLE_ACTION, "r:"));
return; return;
} }
if (argBlocks.size() > 0) { if (argBlocks.size() > 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INCOMPATIBLE_ACTION, "i:")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INCOMPATIBLE_ACTION, "i:"));
return; return;
} }
if (argExclude.size() > 0) { if (argExclude.size() > 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INCOMPATIBLE_ACTION, "e:")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INCOMPATIBLE_ACTION, "e:"));
return; return;
} }
} }
if (startTime <= 0 && !pageLookup && type == 4 && (argBlocks.size() > 0 || argUsers.size() > 0)) { if (startTime <= 0 && !pageLookup && type == 4 && (argBlocks.size() > 0 || argUsers.size() > 0)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_TIME, Selector.FIRST)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_TIME, Selector.FIRST));
return; return;
} }
if (argAction.contains(4) && argAction.contains(11)) { // a:inventory if (argAction.contains(4) && argAction.contains(11)) { // a:inventory
if (argUsers.size() == 0) { if (argUsers.size() == 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ACTION_USER)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ACTION_USER));
return; return;
} }
@ -458,8 +458,8 @@ public class LookupCommand {
if (argRadius != null) { if (argRadius != null) {
int radiusValue = argRadius[0]; int radiusValue = argRadius[0];
if (radiusValue > MAX_RADIUS && MAX_RADIUS > 0) { if (radiusValue > MAX_RADIUS && MAX_RADIUS > 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MAXIMUM_RADIUS, MAX_RADIUS.toString(), Selector.FIRST)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MAXIMUM_RADIUS, MAX_RADIUS.toString(), Selector.FIRST));
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.GLOBAL_LOOKUP)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.GLOBAL_LOOKUP));
return; return;
} }
} }
@ -482,7 +482,7 @@ public class LookupCommand {
if (argAction.contains(4) && argAction.contains(11)) { if (argAction.contains(4) && argAction.contains(11)) {
if (ruser.startsWith("#")) { if (ruser.startsWith("#")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_USERNAME, ruser)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_USERNAME, ruser));
return; return;
} }
} }
@ -532,13 +532,13 @@ public class LookupCommand {
} }
if (rollbackusers.size() == 1 && rollbackusers.contains("#global") && argAction.contains(9)) { if (rollbackusers.size() == 1 && rollbackusers.contains("#global") && argAction.contains(9)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co l a:username u:<user>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co l a:username u:<user>"));
return; return;
} }
if (rollbackusers.contains("#container")) { if (rollbackusers.contains("#container")) {
if (argAction.contains(6) || argAction.contains(7) || argAction.contains(8) || argAction.contains(9) || argAction.contains(10) || argAction.contains(11)) { if (argAction.contains(6) || argAction.contains(7) || argAction.contains(8) || argAction.contains(9) || argAction.contains(10) || argAction.contains(11)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_USERNAME, "#container")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_USERNAME, "#container"));
return; return;
} }
@ -557,7 +557,7 @@ public class LookupCommand {
if (valid) { if (valid) {
if (!player.hasPermission("coreprotect.lookup.container") && !allPermission) { if (!player.hasPermission("coreprotect.lookup.container") && !allPermission) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
String lcommand = ConfigHandler.lookupCommand.get(player.getName()); String lcommand = ConfigHandler.lookupCommand.get(player.getName());
@ -571,14 +571,14 @@ public class LookupCommand {
argWid = 0; argWid = 0;
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_CONTAINER)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_CONTAINER));
return; return;
} }
} }
} }
try { try {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Color.ITALIC + Phrase.build(Phrase.LOOKUP_SEARCHING)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Color.ITALIC + Phrase.build(Phrase.LOOKUP_SEARCHING));
if (timeStart == -1) { if (timeStart == -1) {
if (startTime <= 0) { if (startTime <= 0) {
@ -606,20 +606,20 @@ public class LookupCommand {
else { else {
// Functions.sendMessage(player, ChatColors.RED + "You did not specify a lookup radius."); // Functions.sendMessage(player, ChatColors.RED + "You did not specify a lookup radius.");
if (argUsers.size() == 0 && argBlocks.size() == 0 && (argWid > 0 || forceglobal)) { if (argUsers.size() == 0 && argBlocks.size() == 0 && (argWid > 0 || forceglobal)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_USER, Selector.FIRST)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_USER, Selector.FIRST));
return; return;
} }
else if (argUsers.size() == 0 && argBlocks.size() == 0 && argRadius == null) { else if (argUsers.size() == 0 && argBlocks.size() == 0 && argRadius == null) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_USER, Selector.SECOND)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_USER, Selector.SECOND));
return; return;
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co l <params>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co l <params>"));
} }
} }
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co l <params>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co l <params>"));
} }
} }
} }

2
src/main/java/net/coreprotect/command/NetworkDebugCommand.java
View file

@ -11,7 +11,7 @@ import net.coreprotect.utility.Color;
public class NetworkDebugCommand { public class NetworkDebugCommand {
protected static void runCommand(CommandSender player, boolean permission, String[] args) { protected static void runCommand(CommandSender player, boolean permission, String[] args) {
if (!permission || !Config.getGlobal().NETWORK_DEBUG) { if (!permission || !Config.getGlobal().NETWORK_DEBUG) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }

18
src/main/java/net/coreprotect/command/PurgeCommand.java
View file

@ -53,23 +53,23 @@ public class PurgeCommand extends Consumer {
} }
if (ConfigHandler.converterRunning || ConfigHandler.migrationRunning) { if (ConfigHandler.converterRunning || ConfigHandler.migrationRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.purgeRunning) { if (ConfigHandler.purgeRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS));
return; return;
} }
if (!permission) { if (!permission) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (resultc <= 1) { if (resultc <= 1) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co purge t:<time>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co purge t:<time>"));
return; return;
} }
if (endTime <= 0) { if (endTime <= 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co purge t:<time>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co purge t:<time>"));
return; return;
} }
if (argRadius != null) { if (argRadius != null) {
@ -82,16 +82,16 @@ public class PurgeCommand extends Consumer {
return; return;
} }
if (player instanceof Player && endTime < 2592000) { if (player instanceof Player && endTime < 2592000) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_MINIMUM_TIME, "30", Selector.FIRST)); // 30 days Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_MINIMUM_TIME, "30", Selector.FIRST)); // 30 days
return; return;
} }
else if (endTime < 86400) { else if (endTime < 86400) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_MINIMUM_TIME, "24", Selector.SECOND)); // 24 hours Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_MINIMUM_TIME, "24", Selector.SECOND)); // 24 hours
return; return;
} }
for (int action : argAction) { for (int action : argAction) {
if (!supportedActions.contains(action)) { if (!supportedActions.contains(action)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED));
// Functions.sendMessage(player, new ChatMessage("Please specify a valid purge action.").build()); // Functions.sendMessage(player, new ChatMessage("Please specify a valid purge action.").build());
return; return;
} }
@ -159,7 +159,7 @@ public class PurgeCommand extends Consumer {
} }
if (entity) { if (entity) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED));
return; return;
} }

12
src/main/java/net/coreprotect/command/ReloadCommand.java
View file

@ -13,17 +13,17 @@ public class ReloadCommand {
protected static void runCommand(final CommandSender player, boolean permission, String[] args) { protected static void runCommand(final CommandSender player, boolean permission, String[] args) {
if (permission) { if (permission) {
if (ConfigHandler.converterRunning) { if (ConfigHandler.converterRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.purgeRunning) { if (ConfigHandler.purgeRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.lookupThrottle.get(player.getName()) != null) { if (ConfigHandler.lookupThrottle.get(player.getName()) != null) {
Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName()); Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName());
if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 100) { if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 100) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
return; return;
} }
} }
@ -34,7 +34,7 @@ public class ReloadCommand {
public void run() { public void run() {
try { try {
if (Consumer.isPaused) { if (Consumer.isPaused) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.RELOAD_STARTED)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.RELOAD_STARTED));
} }
while (Consumer.isPaused) { while (Consumer.isPaused) {
Thread.sleep(1); Thread.sleep(1);
@ -42,7 +42,7 @@ public class ReloadCommand {
Consumer.isPaused = true; Consumer.isPaused = true;
ConfigHandler.performInitialization(false); ConfigHandler.performInitialization(false);
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.RELOAD_SUCCESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.RELOAD_SUCCESS));
Thread networkHandler = new Thread(new NetworkHandler(false, false)); Thread networkHandler = new Thread(new NetworkHandler(false, false));
networkHandler.start(); networkHandler.start();
@ -60,7 +60,7 @@ public class ReloadCommand {
thread.start(); thread.start();
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
} }
} }
} }

72
src/main/java/net/coreprotect/command/RollbackRestoreCommand.java
View file

@ -70,7 +70,7 @@ public class RollbackRestoreCommand {
argAction.add(3); argAction.add(3);
} }
else if (!argAction.contains(3)) { else if (!argAction.contains(3)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO));
return; return;
} }
} }
@ -87,14 +87,14 @@ public class RollbackRestoreCommand {
argAction.add(3); argAction.add(3);
} }
else if (!argAction.contains(3)) { else if (!argAction.contains(3)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO));
return; return;
} }
} }
} }
if (hasBlock && hasEntity) { if (hasBlock && hasEntity) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE_COMBO));
return; return;
} }
@ -103,42 +103,42 @@ public class RollbackRestoreCommand {
return; return;
} }
if (ConfigHandler.converterRunning) { if (ConfigHandler.converterRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.purgeRunning) { if (ConfigHandler.purgeRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS));
return; return;
} }
if (argWid == -1) { if (argWid == -1) {
String worldName = CommandParser.parseWorldName(args, true); String worldName = CommandParser.parseWorldName(args, true);
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.WORLD_NOT_FOUND, worldName)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.WORLD_NOT_FOUND, worldName));
return; return;
} }
if (preview > 0 && (!(player instanceof Player))) { if (preview > 0 && (!(player instanceof Player))) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_IN_GAME)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_IN_GAME));
return; return;
} }
if (argAction.contains(-1)) { if (argAction.contains(-1)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_ACTION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_ACTION));
return; return;
} }
if (worldedit && argRadius == null) { if (worldedit && argRadius == null) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_SELECTION, "WorldEdit")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_SELECTION, "WorldEdit"));
return; return;
} }
if (argRadius != null && argRadius[0] == -1) { if (argRadius != null && argRadius[0] == -1) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_RADIUS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_RADIUS));
return; return;
} }
if (ConfigHandler.activeRollbacks.get(player.getName()) != null) { if (ConfigHandler.activeRollbacks.get(player.getName()) != null) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.lookupThrottle.get(player.getName()) != null) { if (ConfigHandler.lookupThrottle.get(player.getName()) != null) {
Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName()); Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName());
if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 100) { if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 100) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
return; return;
} }
} }
@ -173,17 +173,17 @@ public class RollbackRestoreCommand {
if (argUsers.size() == 0 && (argWid > 0 || forceglobal) && argRadius == null) { if (argUsers.size() == 0 && (argWid > 0 || forceglobal) && argRadius == null) {
if (finalAction == 0) { if (finalAction == 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ROLLBACK_USER, Selector.FIRST)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ROLLBACK_USER, Selector.FIRST));
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ROLLBACK_USER, Selector.SECOND)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ROLLBACK_USER, Selector.SECOND));
} }
return; return;
} }
if (argAction.contains(4) && argAction.contains(11)) { // a:inventory if (argAction.contains(4) && argAction.contains(11)) { // a:inventory
if (argUsers.size() == 0) { if (argUsers.size() == 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ACTION_USER)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ACTION_USER));
return; return;
} }
@ -201,28 +201,28 @@ public class RollbackRestoreCommand {
if (argRadius != null) { if (argRadius != null) {
int radiusValue = argRadius[0]; int radiusValue = argRadius[0];
if (radiusValue > MAX_RADIUS && MAX_RADIUS > 0) { if (radiusValue > MAX_RADIUS && MAX_RADIUS > 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MAXIMUM_RADIUS, MAX_RADIUS.toString(), (finalAction == 0 ? Selector.SECOND : Selector.THIRD))); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MAXIMUM_RADIUS, MAX_RADIUS.toString(), (finalAction == 0 ? Selector.SECOND : Selector.THIRD)));
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.GLOBAL_ROLLBACK, "r:#global", (finalAction == 0 ? Selector.FIRST : Selector.SECOND))); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.GLOBAL_ROLLBACK, "r:#global", (finalAction == 0 ? Selector.FIRST : Selector.SECOND)));
return; return;
} }
} }
if (argAction.size() > 0) { if (argAction.size() > 0) {
if (argAction.contains(4)) { if (argAction.contains(4)) {
if (argUsers.contains("#global") || (argUsers.size() == 0 && argRadius == null)) { if (argUsers.contains("#global") || (argUsers.size() == 0 && argRadius == null)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ACTION_USER)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ACTION_USER));
return; return;
} }
else if (preview > 0) { else if (preview > 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_TRANSACTION, !argAction.contains(11) ? Selector.FIRST : Selector.SECOND)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_TRANSACTION, !argAction.contains(11) ? Selector.FIRST : Selector.SECOND));
return; return;
} }
} }
if (argAction.contains(8) || (argAction.contains(11) && !argAction.contains(4)) || (!argAction.contains(0) && !argAction.contains(1) && !argAction.contains(3) && !argAction.contains(4))) { if (argAction.contains(8) || (argAction.contains(11) && !argAction.contains(4)) || (!argAction.contains(0) && !argAction.contains(1) && !argAction.contains(3) && !argAction.contains(4))) {
if (finalAction == 0) { if (finalAction == 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED));
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ACTION_NOT_SUPPORTED));
} }
return; return;
} }
@ -247,7 +247,7 @@ public class RollbackRestoreCommand {
if (argAction.contains(4) && argAction.contains(11)) { if (argAction.contains(4) && argAction.contains(11)) {
Player onlineUser = Bukkit.getServer().getPlayer(ruser); Player onlineUser = Bukkit.getServer().getPlayer(ruser);
if (onlineUser == null || !onlineUser.isOnline()) { if (onlineUser == null || !onlineUser.isOnline()) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.USER_OFFLINE, ruser)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.USER_OFFLINE, ruser));
return; return;
} }
} }
@ -259,7 +259,7 @@ public class RollbackRestoreCommand {
int z = 0; int z = 0;
if (rollbackusers.contains("#container")) { if (rollbackusers.contains("#container")) {
if (argAction.contains(11)) { if (argAction.contains(11)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_USERNAME, "#container")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_USERNAME, "#container"));
return; return;
} }
@ -277,7 +277,7 @@ public class RollbackRestoreCommand {
} }
if (valid) { if (valid) {
if (preview > 0) { if (preview > 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_TRANSACTION, Selector.FIRST)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_TRANSACTION, Selector.FIRST));
return; return;
} }
else { else {
@ -310,7 +310,7 @@ public class RollbackRestoreCommand {
} }
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_CONTAINER)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_CONTAINER));
return; return;
} }
} }
@ -412,16 +412,16 @@ public class RollbackRestoreCommand {
users = "#" + location.getWorld().getName(); users = "#" + location.getWorld().getName();
} }
if (finalPreview == 2) { if (finalPreview == 2) {
Chat.sendMessage(player2, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_CANCELLING)); Chat.sendMessage(player2, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_CANCELLING));
} }
else if (finalPreview == 1) { else if (finalPreview == 1) {
Chat.sendMessage(player2, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_STARTED, users, Selector.THIRD)); Chat.sendMessage(player2, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_STARTED, users, Selector.THIRD));
} }
else if (action == 0) { else if (action == 0) {
Chat.sendMessage(player2, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_STARTED, users, Selector.FIRST)); Chat.sendMessage(player2, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_STARTED, users, Selector.FIRST));
} }
else { else {
Chat.sendMessage(player2, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_STARTED, users, Selector.SECOND)); Chat.sendMessage(player2, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_STARTED, users, Selector.SECOND));
} }
if (finalArgAction.contains(5)) { if (finalArgAction.contains(5)) {
@ -440,12 +440,12 @@ public class RollbackRestoreCommand {
} }
} }
else { else {
Chat.sendMessage(player2, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.USER_NOT_FOUND, baduser)); Chat.sendMessage(player2, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.USER_NOT_FOUND, baduser));
} }
statement.close(); statement.close();
} }
else { else {
Chat.sendMessage(player2, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(player2, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
} }
} }
catch (Exception e) { catch (Exception e) {
@ -467,24 +467,24 @@ public class RollbackRestoreCommand {
} }
else { else {
if (finalAction == 0) { if (finalAction == 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_TIME, Selector.SECOND)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_TIME, Selector.SECOND));
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_TIME, Selector.THIRD)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_LOOKUP_TIME, Selector.THIRD));
} }
} }
} }
else { else {
if (finalAction == 0) { if (finalAction == 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ROLLBACK_RADIUS, Selector.FIRST)); // rollback Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ROLLBACK_RADIUS, Selector.FIRST)); // rollback
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ROLLBACK_RADIUS, Selector.SECOND)); // restore Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_ROLLBACK_RADIUS, Selector.SECOND)); // restore
} }
} }
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
} }
} }
} }

4
src/main/java/net/coreprotect/command/StatusCommand.java
View file

@ -25,7 +25,7 @@ public class StatusCommand {
protected static void runCommand(CommandSender player, boolean permission, String[] args) { protected static void runCommand(CommandSender player, boolean permission, String[] args) {
if (!permission) { if (!permission) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
@ -48,7 +48,7 @@ public class StatusCommand {
} }
} }
Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + Griefus + (VersionUtils.isCommunityEdition() ? " " + ConfigHandler.COMMUNITY_EDITION : "") + Color.WHITE + " -----"); Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + "Griefus" + (VersionUtils.isCommunityEdition() ? " " + ConfigHandler.COMMUNITY_EDITION : "") + Color.WHITE + " -----");
Chat.sendMessage(player, Color.DARK_AQUA + Phrase.build(Phrase.STATUS_VERSION, Color.WHITE, ConfigHandler.EDITION_NAME + " v" + pdfFile.getVersion() + ".") + versionCheck); Chat.sendMessage(player, Color.DARK_AQUA + Phrase.build(Phrase.STATUS_VERSION, Color.WHITE, ConfigHandler.EDITION_NAME + " v" + pdfFile.getVersion() + ".") + versionCheck);
String donationKey = NetworkHandler.donationKey(); String donationKey = NetworkHandler.donationKey();

10
src/main/java/net/coreprotect/command/TeleportCommand.java
View file

@ -23,25 +23,25 @@ public class TeleportCommand {
int resultc = args.length; int resultc = args.length;
if (!permission) { if (!permission) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return; return;
} }
if (!(player instanceof Player)) { if (!(player instanceof Player)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.TELEPORT_PLAYERS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.TELEPORT_PLAYERS));
return; return;
} }
if (ConfigHandler.teleportThrottle.get(player.getName()) != null) { if (ConfigHandler.teleportThrottle.get(player.getName()) != null) {
Object[] lookupThrottle = ConfigHandler.teleportThrottle.get(player.getName()); Object[] lookupThrottle = ConfigHandler.teleportThrottle.get(player.getName());
if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 500) { if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 500) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_THROTTLED)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_THROTTLED));
return; return;
} }
} }
if (resultc < 3) { if (resultc < 3) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co teleport <world> <x> <y> <z>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co teleport <world> <x> <y> <z>"));
return; return;
} }
@ -91,7 +91,7 @@ public class TeleportCommand {
String zValidate = z.replaceAll("[^.\\-]", ""); String zValidate = z.replaceAll("[^.\\-]", "");
if ((x.length() == 0 || x.length() >= 12 || x.equals(xValidate)) || (y.length() == 0 || y.length() >= 12 || y.equals(yValidate)) || (z.length() == 0 || z.length() >= 12 || z.equals(zValidate))) { if ((x.length() == 0 || x.length() >= 12 || x.equals(xValidate)) || (y.length() == 0 || y.length() >= 12 || y.equals(yValidate)) || (z.length() == 0 || z.length() >= 12 || z.equals(zValidate))) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co teleport <world> <x> <y> <z>")); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co teleport <world> <x> <y> <z>"));
return; return;
} }

2
src/main/java/net/coreprotect/command/UndoCommand.java
View file

@ -43,7 +43,7 @@ public class UndoCommand {
} }
} }
else { else {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_ROLLBACK, Selector.SECOND));
} }
} }
catch (Exception e) { catch (Exception e) {

2
src/main/java/net/coreprotect/command/lookup/BlockLookupThread.java
View file

@ -78,7 +78,7 @@ public class BlockLookupThread implements Runnable {
statement.close(); statement.close();
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
} }
} }
catch (Exception e) { catch (Exception e) {

2
src/main/java/net/coreprotect/command/lookup/ChestTransactionLookupThread.java
View file

@ -43,7 +43,7 @@ public class ChestTransactionLookupThread implements Runnable {
statement.close(); statement.close();
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
} }
} }
catch (Exception e) { catch (Exception e) {

12
src/main/java/net/coreprotect/command/lookup/StandardLookupThread.java
View file

@ -190,12 +190,12 @@ public class StandardLookupThread implements Runnable {
} }
if (count) { if (count) {
String row_format = NumberFormat.getInstance().format(rows); String row_format = NumberFormat.getInstance().format(rows);
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.LOOKUP_ROWS_FOUND, row_format, (rows == 1 ? Selector.FIRST : Selector.SECOND))); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.LOOKUP_ROWS_FOUND, row_format, (rows == 1 ? Selector.FIRST : Selector.SECOND)));
} }
else if (pageStart < rows) { else if (pageStart < rows) {
List<String[]> lookupList = Lookup.performPartialLookup(statement, player, uuidList, userList, blockList, excludedBlocks, excludedUsers, actions, finalLocation, radius, rowData, timeStart, timeEnd, (int) pageStart, displayResults, restrict_world, true); List<String[]> lookupList = Lookup.performPartialLookup(statement, player, uuidList, userList, blockList, excludedBlocks, excludedUsers, actions, finalLocation, radius, rowData, timeStart, timeEnd, (int) pageStart, displayResults, restrict_world, true);
Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.LOOKUP_HEADER, Griefus + Color.WHITE + " | " + Color.DARK_AQUA) + Color.WHITE + " -----"); Chat.sendMessage(player, Color.WHITE + "----- " + Color.DARK_AQUA + Phrase.build(Phrase.LOOKUP_HEADER, "Griefus" + Color.WHITE + " | " + Color.DARK_AQUA) + Color.WHITE + " -----");
if (actions.contains(6) || actions.contains(7)) { // Chat/command if (actions.contains(6) || actions.contains(7)) { // Chat/command
for (String[] data : lookupList) { for (String[] data : lookupList) {
String time = data[0]; String time = data[0];
@ -446,19 +446,19 @@ public class StandardLookupThread implements Runnable {
} }
} }
else if (rows > 0) { else if (rows > 0) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.FIRST)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.FIRST));
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS));
} }
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.USER_NOT_FOUND, baduser)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.USER_NOT_FOUND, baduser));
} }
statement.close(); statement.close();
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
} }
} }
catch (Exception e) { catch (Exception e) {

8
src/main/java/net/coreprotect/command/parser/MaterialParser.java
View file

@ -74,8 +74,8 @@ public class MaterialParser {
restricted.add(i3_material); restricted.add(i3_material);
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE, i3)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE, i3));
// Functions.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co help include")); // Functions.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co help include"));
return null; return null;
} }
} }
@ -103,8 +103,8 @@ public class MaterialParser {
restricted.add(material); restricted.add(material);
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE, argument)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.INVALID_INCLUDE, argument));
// Functions.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co help include")); // Functions.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co help include"));
return null; return null;
} }
} }

10
src/main/java/net/coreprotect/database/lookup/BlockLookup.java
View file

@ -84,7 +84,7 @@ public class BlockLookup {
String timeAgo = ChatUtils.getTimeSince(resultTime, time, true); String timeAgo = ChatUtils.getTimeSince(resultTime, time, true);
if (!found) { if (!found) {
resultTextBuilder = new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + Griefus + Color.WHITE + "----- " + ChatUtils.getCoordinates(command, worldId, x, y, z, false, false) + "\n"); resultTextBuilder = new StringBuilder(Color.WHITE + "----- " + Color.DARK_AQUA + "Griefus " + Color.WHITE + "----- " + ChatUtils.getCoordinates(command, worldId, x, y, z, false, false) + "\n");
} }
found = true; found = true;
@ -144,13 +144,13 @@ public class BlockLookup {
} }
else { else {
if (rowMax > count && count > 0) { if (rowMax > count && count > 0) {
resultText = Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.SECOND); resultText = Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.SECOND);
} }
else { else {
// resultText = Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Color.WHITE + "No block data found at " + Color.ITALIC + "x" + x + "/y" + y + "/z" + z + "."; // resultText = Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Color.WHITE + "No block data found at " + Color.ITALIC + "x" + x + "/y" + y + "/z" + z + ".";
resultText = Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA_LOCATION, Selector.FIRST); resultText = Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA_LOCATION, Selector.FIRST);
if (!blockName.equals("air") && !blockName.equals("cave_air")) { if (!blockName.equals("air") && !blockName.equals("cave_air")) {
resultText = Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA, Color.ITALIC + block.getType().name().toLowerCase(Locale.ROOT) + Color.WHITE) + "\n"; resultText = Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA, Color.ITALIC + block.getType().name().toLowerCase(Locale.ROOT) + Color.WHITE) + "\n";
} }
} }
} }

4
src/main/java/net/coreprotect/database/lookup/ChestTransactionLookup.java
View file

@ -136,10 +136,10 @@ public class ChestTransactionLookup {
} }
else { else {
if (rowMax > count && count > 0) { if (rowMax > count && count > 0) {
result.add(Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.SECOND)); result.add(Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.SECOND));
} }
else { else {
result.add(Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA_LOCATION, Selector.SECOND)); result.add(Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA_LOCATION, Selector.SECOND));
} }
} }

4
src/main/java/net/coreprotect/database/lookup/InteractionLookup.java
View file

@ -126,10 +126,10 @@ public class InteractionLookup {
} }
else { else {
if (rowMax > count && count > 0) { if (rowMax > count && count > 0) {
result = Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.SECOND); result = Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.SECOND);
} }
else { else {
result = Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA_LOCATION, Selector.THIRD); result = Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA_LOCATION, Selector.THIRD);
} }
} }

4
src/main/java/net/coreprotect/database/lookup/SignMessageLookup.java
View file

@ -164,10 +164,10 @@ public class SignMessageLookup {
} }
else { else {
if (rowMax > count && count > 0) { if (rowMax > count && count > 0) {
result.add(Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.SECOND)); result.add(Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_RESULTS_PAGE, Selector.SECOND));
} }
else { else {
result.add(Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA_LOCATION, Selector.FOURTH)); result.add(Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_DATA_LOCATION, Selector.FOURTH));
} }
} }

4
src/main/java/net/coreprotect/database/rollback/Rollback.java
View file

@ -178,7 +178,7 @@ public class Rollback extends RollbackUtil {
userString = user.getName(); userString = user.getName();
if (verbose && preview == 0 && !actionList.contains(11)) { if (verbose && preview == 0 && !actionList.contains(11)) {
Integer chunks = chunkList.size(); Integer chunks = chunkList.size();
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_CHUNKS_FOUND, chunks.toString(), (chunks == 1 ? Selector.FIRST : Selector.SECOND))); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_CHUNKS_FOUND, chunks.toString(), (chunks == 1 ? Selector.FIRST : Selector.SECOND)));
} }
} }
@ -302,7 +302,7 @@ public class Rollback extends RollbackUtil {
if (verbose && user != null && preview == 0 && !actionList.contains(11)) { if (verbose && user != null && preview == 0 && !actionList.contains(11)) {
Integer chunks = chunkList.size(); Integer chunks = chunkList.size();
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_CHUNKS_MODIFIED, chunkCount.toString(), chunks.toString(), (chunks == 1 ? Selector.FIRST : Selector.SECOND))); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_CHUNKS_MODIFIED, chunkCount.toString(), chunks.toString(), (chunks == 1 ? Selector.FIRST : Selector.SECOND)));
} }
} }

50
src/main/java/net/coreprotect/database/rollback/RollbackComplete.java
View file

@ -22,7 +22,7 @@ public class RollbackComplete {
public static void output(CommandSender user, Location location, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, String timeString, Integer chunkCount, Double seconds, Integer itemCount, Integer blockCount, Integer entityCount, int rollbackType, Integer[] radius, boolean verbose, boolean restrictWorld, int preview) { public static void output(CommandSender user, Location location, List<String> checkUsers, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, String timeString, Integer chunkCount, Double seconds, Integer itemCount, Integer blockCount, Integer entityCount, int rollbackType, Integer[] radius, boolean verbose, boolean restrictWorld, int preview) {
try { try {
if (preview == 2) { if (preview == 2) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_CANCELLED)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PREVIEW_CANCELLED));
return; return;
} }
@ -44,69 +44,69 @@ public class RollbackComplete {
} }
if (preview > 0) { if (preview > 0) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_COMPLETED, users, Selector.THIRD)); // preview Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_COMPLETED, users, Selector.THIRD)); // preview
} }
else if (rollbackType == 0) { else if (rollbackType == 0) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_COMPLETED, users, Selector.FIRST)); // rollback Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_COMPLETED, users, Selector.FIRST)); // rollback
} }
else if (rollbackType == 1) { else if (rollbackType == 1) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_COMPLETED, users, Selector.SECOND)); // restore Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_COMPLETED, users, Selector.SECOND)); // restore
} }
if (preview == 1 || rollbackType == 0 || rollbackType == 1) { if (preview == 1 || rollbackType == 0 || rollbackType == 1) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_TIME, timeString)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_TIME, timeString));
} }
if (radius != null) { if (radius != null) {
int worldedit = radius[7]; int worldedit = radius[7];
if (worldedit == 0) { if (worldedit == 0) {
Integer rollbackRadius = radius[0]; Integer rollbackRadius = radius[0];
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_RADIUS, rollbackRadius.toString(), (rollbackRadius == 1 ? Selector.FIRST : Selector.SECOND))); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_RADIUS, rollbackRadius.toString(), (rollbackRadius == 1 ? Selector.FIRST : Selector.SECOND)));
} }
else { else {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_SELECTION, "#worldedit")); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_SELECTION, "#worldedit"));
} }
} }
if (restrictWorld && radius == null) { if (restrictWorld && radius == null) {
if (location != null) { if (location != null) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, location.getWorld().getName(), Selector.FIRST)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, location.getWorld().getName(), Selector.FIRST));
} }
} }
if (actionList.contains(4) && actionList.contains(11)) { if (actionList.contains(4) && actionList.contains(11)) {
if (actionList.contains(0)) { if (actionList.contains(0)) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "+inventory", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "+inventory", Selector.SECOND));
} }
else if (actionList.contains(1)) { else if (actionList.contains(1)) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "-inventory", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "-inventory", Selector.SECOND));
} }
else { else {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "inventory", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "inventory", Selector.SECOND));
} }
} }
else if (actionList.contains(4)) { else if (actionList.contains(4)) {
if (actionList.contains(0)) { if (actionList.contains(0)) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "-container", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "-container", Selector.SECOND));
} }
else if (actionList.contains(1)) { else if (actionList.contains(1)) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "+container", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "+container", Selector.SECOND));
} }
else { else {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "container", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "container", Selector.SECOND));
} }
} }
else if (actionList.contains(0) && actionList.contains(1)) { else if (actionList.contains(0) && actionList.contains(1)) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "block", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "block", Selector.SECOND));
} }
else if (actionList.contains(0)) { else if (actionList.contains(0)) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "-block", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "-block", Selector.SECOND));
} }
else if (actionList.contains(1)) { else if (actionList.contains(1)) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "+block", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "+block", Selector.SECOND));
} }
else if (actionList.contains(3)) { else if (actionList.contains(3)) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "kill", Selector.SECOND)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_WORLD_ACTION, "kill", Selector.SECOND));
} }
if (restrictList.size() > 0) { if (restrictList.size() > 0) {
@ -150,7 +150,7 @@ public class RollbackComplete {
targetType = Selector.SECOND; targetType = Selector.SECOND;
} }
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_INCLUDE, restrictTargets.toString(), Selector.FIRST, targetType, (targetCount == 1 ? Selector.FIRST : Selector.SECOND))); // include Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_INCLUDE, restrictTargets.toString(), Selector.FIRST, targetType, (targetCount == 1 ? Selector.FIRST : Selector.SECOND))); // include
} }
if (excludeList.size() > 0) { if (excludeList.size() > 0) {
@ -209,7 +209,7 @@ public class RollbackComplete {
} }
if (excludeCount > 0) { if (excludeCount > 0) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_INCLUDE, excludeTargets.toString(), Selector.SECOND, targetType, (excludeCount == 1 ? Selector.FIRST : Selector.SECOND))); // exclude Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_INCLUDE, excludeTargets.toString(), Selector.SECOND, targetType, (excludeCount == 1 ? Selector.FIRST : Selector.SECOND))); // exclude
} }
} }
@ -236,7 +236,7 @@ public class RollbackComplete {
} }
if (excludeCount > 0) { if (excludeCount > 0) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_EXCLUDED_USERS, excludeUsers.toString(), (excludeCount == 1 ? Selector.FIRST : Selector.SECOND))); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_EXCLUDED_USERS, excludeUsers.toString(), (excludeCount == 1 ? Selector.FIRST : Selector.SECOND)));
} }
} }
@ -283,19 +283,19 @@ public class RollbackComplete {
} }
} }
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_MODIFIED, modifiedData.toString(), (preview == 0 ? Selector.FIRST : Selector.SECOND))); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_MODIFIED, modifiedData.toString(), (preview == 0 ? Selector.FIRST : Selector.SECOND)));
if (modifiedDataVerbose.length() > 0) { if (modifiedDataVerbose.length() > 0) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_MODIFIED, modifiedDataVerbose.toString(), (preview == 0 ? Selector.FIRST : Selector.SECOND))); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_MODIFIED, modifiedDataVerbose.toString(), (preview == 0 ? Selector.FIRST : Selector.SECOND)));
} }
if (preview == 0) { if (preview == 0) {
BigDecimal decimalSeconds = new BigDecimal(seconds).setScale(1, RoundingMode.HALF_EVEN); BigDecimal decimalSeconds = new BigDecimal(seconds).setScale(1, RoundingMode.HALF_EVEN);
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_LENGTH, decimalSeconds.stripTrailingZeros().toPlainString(), (decimalSeconds.doubleValue() == 1 ? Selector.FIRST : Selector.SECOND))); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_LENGTH, decimalSeconds.stripTrailingZeros().toPlainString(), (decimalSeconds.doubleValue() == 1 ? Selector.FIRST : Selector.SECOND)));
} }
Chat.sendMessage(user, "-----"); Chat.sendMessage(user, "-----");
if (preview > 0) { if (preview > 0) {
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PLEASE_SELECT, "/co apply", "/co cancel")); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PLEASE_SELECT, "/co apply", "/co cancel"));
} }
} }
catch (Exception e) { catch (Exception e) {

2
src/main/java/net/coreprotect/listener/channel/PluginChannelListener.java
View file

@ -197,7 +197,7 @@ public class PluginChannelListener implements Listener {
break; break;
} }
commandSender.sendMessage(Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NETWORK_TEST)); commandSender.sendMessage(Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NETWORK_TEST));
} }
private void send(CommandSender commandSender, byte[] msgBytes) { private void send(CommandSender commandSender, byte[] msgBytes) {

10
src/main/java/net/coreprotect/listener/entity/HangingBreakByEntityListener.java
View file

@ -37,22 +37,22 @@ public final class HangingBreakByEntityListener extends Queue implements Listene
@Override @Override
public void run() { public void run() {
if (!player.hasPermission("coreprotect.inspect")) { if (!player.hasPermission("coreprotect.inspect")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
ConfigHandler.inspecting.put(player.getName(), false); ConfigHandler.inspecting.put(player.getName(), false);
return; return;
} }
if (ConfigHandler.converterRunning) { if (ConfigHandler.converterRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.purgeRunning) { if (ConfigHandler.purgeRunning) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.lookupThrottle.get(player.getName()) != null) { if (ConfigHandler.lookupThrottle.get(player.getName()) != null) {
Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName()); Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName());
if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 100) { if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 100) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
return; return;
} }
} }
@ -75,7 +75,7 @@ public final class HangingBreakByEntityListener extends Queue implements Listene
statement.close(); statement.close();
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
} }
} }
catch (Exception e) { catch (Exception e) {

10
src/main/java/net/coreprotect/listener/player/ArmorStandManipulateListener.java
View file

@ -33,22 +33,22 @@ public final class ArmorStandManipulateListener extends Queue implements Listene
@Override @Override
public void run() { public void run() {
if (!finalPlayer.hasPermission("coreprotect.inspect")) { if (!finalPlayer.hasPermission("coreprotect.inspect")) {
Chat.sendMessage(finalPlayer, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(finalPlayer, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
ConfigHandler.inspecting.put(finalPlayer.getName(), false); ConfigHandler.inspecting.put(finalPlayer.getName(), false);
return; return;
} }
if (ConfigHandler.converterRunning) { if (ConfigHandler.converterRunning) {
Chat.sendMessage(finalPlayer, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); Chat.sendMessage(finalPlayer, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.purgeRunning) { if (ConfigHandler.purgeRunning) {
Chat.sendMessage(finalPlayer, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS)); Chat.sendMessage(finalPlayer, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS));
return; return;
} }
if (ConfigHandler.lookupThrottle.get(finalPlayer.getName()) != null) { if (ConfigHandler.lookupThrottle.get(finalPlayer.getName()) != null) {
Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(finalPlayer.getName()); Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(finalPlayer.getName());
if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 100) { if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 100) {
Chat.sendMessage(finalPlayer, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(finalPlayer, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
return; return;
} }
} }
@ -64,7 +64,7 @@ public final class ArmorStandManipulateListener extends Queue implements Listene
statement.close(); statement.close();
} }
else { else {
Chat.sendMessage(finalPlayer, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); Chat.sendMessage(finalPlayer, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
} }
} }
catch (Exception e) { catch (Exception e) {

2
src/main/java/net/coreprotect/listener/player/PlayerInteractListener.java
View file

@ -78,7 +78,7 @@ public final class PlayerInteractListener extends Queue implements Listener {
} }
if (!player.hasPermission("coreprotect.inspect")) { if (!player.hasPermission("coreprotect.inspect")) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
ConfigHandler.inspecting.put(player.getName(), false); ConfigHandler.inspecting.put(player.getName(), false);
return; return;
} }

8
src/main/java/net/coreprotect/listener/player/inspector/BaseInspector.java
View file

@ -13,17 +13,17 @@ public abstract class BaseInspector {
protected void checkPreconditions(Player player) throws InspectionException { protected void checkPreconditions(Player player) throws InspectionException {
if (ConfigHandler.converterRunning) { if (ConfigHandler.converterRunning) {
throw new InspectionException(Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS)); throw new InspectionException(Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.UPGRADE_IN_PROGRESS));
} }
if (ConfigHandler.purgeRunning) { if (ConfigHandler.purgeRunning) {
throw new InspectionException(Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS)); throw new InspectionException(Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.PURGE_IN_PROGRESS));
} }
if (ConfigHandler.lookupThrottle.get(player.getName()) != null) { if (ConfigHandler.lookupThrottle.get(player.getName()) != null) {
Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName()); Object[] lookupThrottle = ConfigHandler.lookupThrottle.get(player.getName());
if ((boolean) lookupThrottle[0] || (System.currentTimeMillis() - (long) lookupThrottle[1]) < 100) { if ((boolean) lookupThrottle[0] || (System.currentTimeMillis() - (long) lookupThrottle[1]) < 100) {
throw new InspectionException(Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); throw new InspectionException(Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
} }
} }
} }
@ -33,7 +33,7 @@ public abstract class BaseInspector {
Connection connection = Database.getConnection(true); Connection connection = Database.getConnection(true);
if (connection == null) { if (connection == null) {
throw new InspectionException(Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY)); throw new InspectionException(Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.DATABASE_BUSY));
} }
return connection; return connection;

2
src/main/java/net/coreprotect/patch/Patch.java
View file

@ -313,7 +313,7 @@ public class Patch {
currentVersion[2] = 0; currentVersion[2] = 0;
lastVersion[2] = 0; lastVersion[2] = 0;
if (VersionUtils.newVersion(currentVersion, lastVersion)) { if (VersionUtils.newVersion(currentVersion, lastVersion)) {
Chat.sendConsoleMessage(Color.RED + "[CoreProtect] " + Phrase.build(Phrase.VERSION_REQUIRED, Griefus, "v" + lastVersion[1] + "." + lastVersion[2])); Chat.sendConsoleMessage(Color.RED + "[CoreProtect] " + Phrase.build(Phrase.VERSION_REQUIRED, "Griefus", "v" + lastVersion[1] + "." + lastVersion[2]));
return false; return false;
} }
} }

2
src/main/java/net/coreprotect/services/VersionCheckService.java
View file

@ -46,7 +46,7 @@ public class VersionCheckService {
// Patch version validation // Patch version validation
if (VersionUtils.newVersion(ConfigHandler.PATCH_VERSION, VersionUtils.getPluginVersion()) && !VersionUtils.isBranch("dev")) { if (VersionUtils.newVersion(ConfigHandler.PATCH_VERSION, VersionUtils.getPluginVersion()) && !VersionUtils.isBranch("dev")) {
Chat.console(Phrase.build(Phrase.VERSION_INCOMPATIBLE, Griefus, "v" + VersionUtils.getPluginVersion())); Chat.console(Phrase.build(Phrase.VERSION_INCOMPATIBLE, "Griefus", "v" + VersionUtils.getPluginVersion()));
Chat.sendConsoleMessage(Color.GREY + "[CoreProtect] " + Phrase.build(Phrase.INVALID_BRANCH_2)); Chat.sendConsoleMessage(Color.GREY + "[CoreProtect] " + Phrase.build(Phrase.INVALID_BRANCH_2));
return false; return false;
} }

6
src/main/java/net/coreprotect/thread/NetworkHandler.java
View file

@ -73,7 +73,7 @@ public class NetworkHandler extends Language implements Runnable {
HttpURLConnection connection = (HttpURLConnection) url.openConnection(); HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET"); connection.setRequestMethod("GET");
connection.setRequestProperty("Accept-Charset", "UTF-8"); connection.setRequestProperty("Accept-Charset", "UTF-8");
connection.setRequestProperty("User-Agent", Griefus); connection.setRequestProperty("User-Agent", "Griefus");
connection.setDoOutput(true); connection.setDoOutput(true);
connection.setInstanceFollowRedirects(true); connection.setInstanceFollowRedirects(true);
connection.setConnectTimeout(5000); connection.setConnectTimeout(5000);
@ -201,7 +201,7 @@ public class NetworkHandler extends Language implements Runnable {
connection.setRequestMethod("POST"); connection.setRequestMethod("POST");
connection.setRequestProperty("Accept-Charset", "UTF-8"); connection.setRequestProperty("Accept-Charset", "UTF-8");
connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=utf-8"); connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
connection.setRequestProperty("User-Agent", Griefus); connection.setRequestProperty("User-Agent", "Griefus");
connection.setRequestProperty("Content-Length", Integer.toString(postDataLength)); connection.setRequestProperty("Content-Length", Integer.toString(postDataLength));
connection.setDoOutput(true); connection.setDoOutput(true);
connection.setInstanceFollowRedirects(true); connection.setInstanceFollowRedirects(true);
@ -386,7 +386,7 @@ public class NetworkHandler extends Language implements Runnable {
connection = (HttpURLConnection) url.openConnection(); connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET"); connection.setRequestMethod("GET");
connection.setRequestProperty("Accept-Charset", "UTF-8"); connection.setRequestProperty("Accept-Charset", "UTF-8");
connection.setRequestProperty("User-Agent", Griefus); connection.setRequestProperty("User-Agent", "Griefus");
connection.setConnectTimeout(5000); connection.setConnectTimeout(5000);
connection.connect(); connection.connect();
connection.getResponseCode(); connection.getResponseCode();

4
src/main/java/net/coreprotect/utility/Chat.java
View file

@ -62,12 +62,12 @@ public final class Chat {
server.getConsoleSender().sendMessage("[CoreProtect] " + string); server.getConsoleSender().sendMessage("[CoreProtect] " + string);
for (Player player : server.getOnlinePlayers()) { for (Player player : server.getOnlinePlayers()) {
if (player.isOp() && !player.getName().equals(user.getName())) { if (player.isOp() && !player.getName().equals(user.getName())) {
sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + string); sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + string);
} }
} }
if (user instanceof Player) { if (user instanceof Player) {
if (((Player) user).isOnline()) { if (((Player) user).isOnline()) {
sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + string); sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + string);
} }
} }
} }

2
src/main/java/net/coreprotect/utility/ChatMessage.java
View file

@ -7,7 +7,7 @@ public class ChatMessage {
/** /**
* Returns the plugin name with the DARK_AQUA chat color. * Returns the plugin name with the DARK_AQUA chat color.
*/ */
String pluginName = Color.DARK_AQUA + Griefus; String pluginName = Color.DARK_AQUA + "Griefus";
String message; String message;
String textColor = Color.WHITE; String textColor = Color.WHITE;

2
src/main/java/net/coreprotect/utility/Extensions.java
View file

@ -16,7 +16,7 @@ public class Extensions {
} }
catch (Exception e) { catch (Exception e) {
// plugin not compiled with extension // plugin not compiled with extension
Chat.sendMessage(user, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_NOT_FOUND, Color.WHITE, "/co " + command)); Chat.sendMessage(user, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_NOT_FOUND, Color.WHITE, "/co " + command));
} }
} }

6
src/main/java/net/coreprotect/utility/Teleport.java
View file

@ -110,14 +110,14 @@ public class Teleport {
if (!enforceTeleport) { if (!enforceTeleport) {
// Only send a message if the player was moved by at least 1 block // Only send a message if the player was moved by at least 1 block
if (location.getY() >= (oldY + 1.00)) { if (location.getY() >= (oldY + 1.00)) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.TELEPORTED_SAFETY)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.TELEPORTED_SAFETY));
} }
} }
else { else {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + "- " + Phrase.build(Phrase.TELEPORTED, "x" + playerX + "/y" + checkY + "/z" + playerZ + "/" + location.getWorld().getName())); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + "- " + Phrase.build(Phrase.TELEPORTED, "x" + playerX + "/y" + checkY + "/z" + playerZ + "/" + location.getWorld().getName()));
} }
if (alert) { if (alert) {
Chat.sendMessage(player, Color.DARK_AQUA + Griefus + Color.WHITE + Color.ITALIC + "- " + Phrase.build(Phrase.DIRT_BLOCK)); Chat.sendMessage(player, Color.DARK_AQUA + "Griefus " + Color.WHITE + Color.ITALIC + "- " + Phrase.build(Phrase.DIRT_BLOCK));
} }
} }

4
src/main/java/net/coreprotect/utility/VersionUtils.java
View file

@ -49,12 +49,12 @@ public class VersionUtils {
CoreProtect instance = CoreProtect.getInstance(); CoreProtect instance = CoreProtect.getInstance();
// Return default name if instance is null // Return default name if instance is null
if (instance == null) { if (instance == null) {
return Griefus; return "Griefus";
} }
// Return default name if description is null // Return default name if description is null
if (instance.getDescription() == null) { if (instance.getDescription() == null) {
return Griefus; return "Griefus";
} }
String name = instance.getDescription().getName(); String name = instance.getDescription().getName();