cdanesi/PlayerVaults
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce MiniMessage, new lang, and fix storage quirks

Browse Source
This commit is contained in:
mbax
2020-12-25 12:19:55 -05:00
parent f5cea1214e
commit 5e3deaa8e2
23 changed files with 754 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/commands/ConvertCommand.java
+8 -7
View File
@@ -21,7 +21,6 @@ package com.drtshock.playervaults.commands;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.converters.BackpackConverter;
import com.drtshock.playervaults.converters.Converter;
import com.drtshock.playervaults.translations.Lang;
import com.drtshock.playervaults.vaultmanagement.VaultOperations;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@@ -33,18 +32,20 @@ import java.util.List;
public class ConvertCommand implements CommandExecutor {
private final List<Converter> converters = new ArrayList<>();
private final PlayerVaults plugin;
public ConvertCommand() {
public ConvertCommand(PlayerVaults plugin) {
converters.add(new BackpackConverter());
this.plugin = plugin;
}
@Override
public boolean onCommand(final CommandSender sender, Command command, String label, String[] args) {
if (!sender.hasPermission("playervaults.convert")) {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
this.plugin.getTL().noPerms().title().send(sender);
} else {
if (args.length == 0) {
sender.sendMessage(Lang.TITLE + "/" + label + " <all | plugin name>");
sender.sendMessage("/" + label + " <all | plugin name>");
} else {
String name = args[0];
final List<Converter> applicableConverters = new ArrayList<>();
@@ -58,10 +59,10 @@ public class ConvertCommand implements CommandExecutor {
}
}
if (applicableConverters.size() <= 0) {
sender.sendMessage(Lang.TITLE.toString() + Lang.CONVERT_PLUGIN_NOT_FOUND);
this.plugin.getTL().convertPluginNotFound().title().send(sender);
} else {
// Fork into background
sender.sendMessage(Lang.TITLE + Lang.CONVERT_BACKGROUND.toString());
this.plugin.getTL().convertBackground().title().send(sender);
PlayerVaults.getInstance().getServer().getScheduler().runTaskLaterAsynchronously(PlayerVaults.getInstance(), () -> {
int converted = 0;
VaultOperations.setLocked(true);
@@ -71,7 +72,7 @@ public class ConvertCommand implements CommandExecutor {
}
}
VaultOperations.setLocked(false);
sender.sendMessage(Lang.TITLE + Lang.CONVERT_COMPLETE.toString().replace("%converted", converted + ""));
this.plugin.getTL().convertComplete().title().with("count", converted + "").send(sender);
}, 5);
}
}
src/main/java/com/drtshock/playervaults/commands/DeleteCommand.java
+12 -9
View File
@@ -19,11 +19,9 @@
package com.drtshock.playervaults.commands;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.translations.Lang;
import com.drtshock.playervaults.vaultmanagement.VaultManager;
import com.drtshock.playervaults.vaultmanagement.VaultOperations;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@@ -31,11 +29,16 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class DeleteCommand implements CommandExecutor {
private final PlayerVaults plugin;
public DeleteCommand(PlayerVaults plugin) {
this.plugin = plugin;
}
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (VaultOperations.isLocked()) {
sender.sendMessage(Lang.TITLE + Lang.LOCKED.toString());
this.plugin.getTL().locked().title().send(sender);
return true;
}
switch (args.length) {
@@ -43,7 +46,7 @@ public class DeleteCommand implements CommandExecutor {
if (sender instanceof Player) {
VaultOperations.deleteOwnVault((Player) sender, args[0]);
} else {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY);
this.plugin.getTL().playerOnly().title().send(sender);
}
break;
case 2:
@@ -57,19 +60,19 @@ public class DeleteCommand implements CommandExecutor {
if (args[1].equalsIgnoreCase("all")) {
if (sender.hasPermission("playervaults.delete.all")) {
VaultManager.getInstance().deleteAllVaults(target);
sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_OTHER_VAULT_ALL.toString().replaceAll("%p", target));
this.plugin.getTL().deleteOtherVaultAll().title().with("player", target).send(sender);
PlayerVaults.getInstance().getLogger().info(String.format("%s deleted ALL vaults belonging to %s", sender.getName(), target));
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
this.plugin.getTL().noPerms().title().send(sender);
}
}
VaultOperations.deleteOtherVault(sender, target, args[1]);
break;
default:
sender.sendMessage(Lang.TITLE + "/" + label + " <number>");
sender.sendMessage(Lang.TITLE + "/" + label + " <player> <number>");
sender.sendMessage(Lang.TITLE + "/" + label + " <player> all");
sender.sendMessage("/" + label + " <number>");
sender.sendMessage("/" + label + " <player> <number>");
sender.sendMessage("/" + label + " <player> all");
}
return true;
}
src/main/java/com/drtshock/playervaults/commands/SignCommand.java
+15 -11
View File
@@ -19,19 +19,23 @@
package com.drtshock.playervaults.commands;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.translations.Lang;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class SignCommand implements CommandExecutor {
private final PlayerVaults plugin;
public SignCommand(PlayerVaults plugin) {
this.plugin = plugin;
}
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (sender.hasPermission("playervaults.signs.set")) {
if (!PlayerVaults.getInstance().getConf().isSigns()) {
sender.sendMessage(Lang.TITLE.toString() + Lang.SIGNS_DISABLED.toString());
this.plugin.getTL().signsDisabled().title().send(sender);
return true;
}
if (sender instanceof Player) {
@@ -40,31 +44,31 @@ public class SignCommand implements CommandExecutor {
try {
i = Integer.parseInt(args[0]);
} catch (NumberFormatException nfe) {
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
sender.sendMessage(Lang.TITLE.toString() + "Usage: /" + label + " [owner] <#>");
this.plugin.getTL().mustBeNumber().title().send(sender);
sender.sendMessage(" /" + label + " [owner] <#>");
return true;
}
PlayerVaults.getInstance().getSetSign().put(sender.getName(), new SignSetInfo(i));
sender.sendMessage(Lang.TITLE.toString() + Lang.CLICK_A_SIGN);
this.plugin.getTL().clickASign().title().send(sender);
} else if (args.length >= 2) {
int i;
try {
i = Integer.parseInt(args[1]);
} catch (NumberFormatException nfe) {
sender.sendMessage(Lang.TITLE.toString() + Lang.MUST_BE_NUMBER);
sender.sendMessage(Lang.TITLE.toString() + "Usage: /" + label + " [owner] <#>");
this.plugin.getTL().mustBeNumber().title().send(sender);
sender.sendMessage(" /" + label + " [owner] <#>");
return true;
}
PlayerVaults.getInstance().getSetSign().put(sender.getName(), new SignSetInfo(args[0].toLowerCase(), i));
sender.sendMessage(Lang.TITLE.toString() + Lang.CLICK_A_SIGN);
this.plugin.getTL().clickASign().title().send(sender);
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.INVALID_ARGS);
this.plugin.getTL().invalidArgs().title().send(sender);
}
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.PLAYER_ONLY);
this.plugin.getTL().playerOnly().title().send(sender);
}
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS);
this.plugin.getTL().noPerms().title().send(sender);
}
return true;
src/main/java/com/drtshock/playervaults/commands/VaultCommand.java
+13 -10
View File
@@ -19,12 +19,10 @@
package com.drtshock.playervaults.commands;
import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.translations.Lang;
import com.drtshock.playervaults.vaultmanagement.VaultManager;
import com.drtshock.playervaults.vaultmanagement.VaultOperations;
import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@@ -33,11 +31,16 @@ import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
public class VaultCommand implements CommandExecutor {
private final PlayerVaults plugin;
public VaultCommand(PlayerVaults plugin) {
this.plugin = plugin;
}
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (VaultOperations.isLocked()) {
sender.sendMessage(Lang.TITLE + Lang.LOCKED.toString());
this.plugin.getTL().locked().title().send(sender);
return true;
}
@@ -61,20 +64,20 @@ public class VaultCommand implements CommandExecutor {
YamlConfiguration file = VaultManager.getInstance().getPlayerVaultFile(target, false);
if (file == null) {
sender.sendMessage(Lang.TITLE.toString() + Lang.VAULT_DOES_NOT_EXIST.toString());
this.plugin.getTL().vaultDoesNotExist().title().send(sender);
} else {
StringBuilder sb = new StringBuilder();
for (String key : file.getKeys(false)) {
sb.append(key.replace("vault", "")).append(" ");
}
sender.sendMessage(Lang.TITLE.toString() + Lang.EXISTING_VAULTS.toString().replaceAll("%p", args[0]).replaceAll("%v", sb.toString().trim()));
this.plugin.getTL().existingVaults().title().with("player", args[0]).with("vault", sb.toString().trim()).send(sender);
}
}
break;
case 2:
if (!player.hasPermission("playervaults.admin")) {
player.sendMessage(Lang.TITLE.toString() + Lang.NO_PERMS.toString());
this.plugin.getTL().noPerms().title().send(sender);
break;
}
@@ -82,7 +85,7 @@ public class VaultCommand implements CommandExecutor {
try {
number = Integer.parseInt(args[1]);
} catch (NumberFormatException e) {
player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER);
this.plugin.getTL().mustBeNumber().title().send(sender);
return true;
}
@@ -94,14 +97,14 @@ public class VaultCommand implements CommandExecutor {
if (VaultOperations.openOtherVault(player, target, args[1])) {
PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(target, number));
} else {
sender.sendMessage(Lang.TITLE.toString() + Lang.NO_OWNER_FOUND.toString().replaceAll("%p", args[0]));
this.plugin.getTL().noOwnerFound().title().with("player", args[0]).send(sender);
}
break;
default:
sender.sendMessage(Lang.TITLE.toString() + Lang.HELP.toString());
this.plugin.getTL().help().title().send(sender);
}
} else {
sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY.toString());
this.plugin.getTL().playerOnly().title().send(sender);
}
return true;