TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-06-28 10:10:34 +00:00
Code Issues Projects Releases Wiki Activity

Move kits to kits.yml (#1774)

Browse source 
* Move kits to kits.yml
We will now use a separate kits.yml file.
Any kits that were defined in the config.yml will be migrated over to the kits.yml file automatically on startup.
This commit is contained in:
Trent Hensler 2018-01-18 00:25:00 -08:00 • committed by GitHub
parent 1f0f77ff72
commit cd43355d4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 286 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/commands/Commandkit.java
View file

@ -23,7 +23,7 @@ public class Commandkit extends EssentialsCommand {
@Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
if (args.length < 1) {
final String kitList = Kit.listKits(ess, user);
final String kitList = ess.getKits().listKits(ess, user);
user.sendMessage(kitList.length() > 0 ? tl("kits", kitList) : tl("noKits"));
throw new NoChargeException();
} else if (args.length > 1 && user.isAuthorized("essentials.kit.others")) {
@ -39,7 +39,7 @@ public class Commandkit extends EssentialsCommand {
@Override
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
if (args.length < 2) {
final String kitList = Kit.listKits(ess, null);
final String kitList = ess.getKits().listKits(ess, null);
sender.sendMessage(kitList.length() > 0 ? tl("kits", kitList) : tl("noKits"));
throw new NoChargeException();
} else {
@ -106,7 +106,7 @@ public class Commandkit extends EssentialsCommand {
if (args.length == 1) {
List<String> options = new ArrayList<>();
// TODO: Move all of this to its own method
for (String kitName : ess.getSettings().getKits().getKeys(false)) {
for (String kitName : ess.getKits().getKits().getKeys(false)) {
if (!user.isAuthorized("essentials.kits." + kitName)) { // Only check perm, not time or money
continue;
}
@ -123,7 +123,7 @@ public class Commandkit extends EssentialsCommand {
@Override
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
if (args.length == 1) {
return new ArrayList<>(ess.getSettings().getKits().getKeys(false)); // TODO: Move this to its own method
return new ArrayList<>(ess.getKits().getKits().getKeys(false)); // TODO: Move this to its own method
} else if (args.length == 2) {
return getPlayers(server, sender);
} else {