From 9a14d44288469ae4831a0b22c696432511f90905 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 18 Apr 2020 17:30:17 -0700 Subject: [PATCH] Fixes locale references to aoneblock. --- .../aoneblock/commands/AdminSanityCheck.java | 8 ++++---- .../commands/AdminSetChestCommand.java | 18 +++++++++--------- .../commands/AdminSetCountCommand.java | 6 +++--- .../aoneblock/commands/IslandCountCommand.java | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/world/bentobox/aoneblock/commands/AdminSanityCheck.java b/src/main/java/world/bentobox/aoneblock/commands/AdminSanityCheck.java index d2545512..53e520fd 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/AdminSanityCheck.java +++ b/src/main/java/world/bentobox/aoneblock/commands/AdminSanityCheck.java @@ -19,8 +19,8 @@ public AdminSanityCheck(CompositeCommand islandCommand) { @Override public void setup() { - setParametersHelp("oneblock.commands.admin.sanity.parameters"); - setDescription("oneblock.commands.admin.sanity.description"); + setParametersHelp("aoneblock.commands.admin.sanity.parameters"); + setDescription("aoneblock.commands.admin.sanity.description"); // Permission setPermission("admin.sanity"); addon = (AOneBlock)getAddon(); @@ -37,7 +37,7 @@ public boolean canExecute(User user, String label, List args) { // Check phase Optional opPhase = addon.getOneBlockManager().getPhase(args.get(0).toUpperCase()); if (!opPhase.isPresent()) { - user.sendMessage("oneblock.commands.admin.setchest.unknown-phase"); + user.sendMessage("aoneblock.commands.admin.setchest.unknown-phase"); return false; } else { phase = opPhase.get(); @@ -54,7 +54,7 @@ public boolean execute(User user, String label, List args) { addon.getOneBlockManager().getProbs(phase); } if (user.isPlayer()) { - user.sendMessage("oneblock.commands.admin.setchest.see-console"); + user.sendMessage("aoneblock.commands.admin.setchest.see-console"); } return true; } diff --git a/src/main/java/world/bentobox/aoneblock/commands/AdminSetChestCommand.java b/src/main/java/world/bentobox/aoneblock/commands/AdminSetChestCommand.java index f2ded677..a081127e 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/AdminSetChestCommand.java +++ b/src/main/java/world/bentobox/aoneblock/commands/AdminSetChestCommand.java @@ -38,8 +38,8 @@ public AdminSetChestCommand(CompositeCommand islandCommand) { @Override public void setup() { - setParametersHelp("oneblock.commands.admin.setchest.parameters"); - setDescription("oneblock.commands.admin.setchest.description"); + setParametersHelp("aoneblock.commands.admin.setchest.parameters"); + setDescription("aoneblock.commands.admin.setchest.description"); // Permission setPermission("admin.setchest"); setOnlyPlayer(true); @@ -56,7 +56,7 @@ public boolean canExecute(User user, String label, List args) { // Check phase Optional opPhase = addon.getOneBlockManager().getPhase(args.get(0).toUpperCase()); if (!opPhase.isPresent()) { - user.sendMessage("oneblock.commands.admin.setchest.unknown-phase"); + user.sendMessage("aoneblock.commands.admin.setchest.unknown-phase"); return false; } else { phase = opPhase.get(); @@ -66,19 +66,19 @@ public boolean canExecute(User user, String label, List args) { try { rarity = Rarity.valueOf(args.get(1).toUpperCase()); } catch (Exception e) { - user.sendMessage("oneblock.commands.admin.setchest.unknown-rarity"); + user.sendMessage("aoneblock.commands.admin.setchest.unknown-rarity"); return false; } // Check that player is looking at a chest Block target = user.getPlayer().getTargetBlock(null, 5); if (!target.getType().equals(Material.CHEST)) { - user.sendMessage("oneblock.commands.admin.setchest.look-at-chest"); + user.sendMessage("aoneblock.commands.admin.setchest.look-at-chest"); return false; } chest = (Chest)target.getState(); if (chest.getInventory().getHolder() instanceof DoubleChest) { - user.sendMessage("oneblock.commands.admin.setchest.only-single-chest"); + user.sendMessage("aoneblock.commands.admin.setchest.only-single-chest"); return false; } return true; @@ -96,14 +96,14 @@ public boolean execute(User user, String label, List args) { } } if (items.isEmpty()) { - user.sendMessage("oneblock.commands.admin.setchest.chest-is-empty"); + user.sendMessage("aoneblock.commands.admin.setchest.chest-is-empty"); return false; } phase.addChest(items, rarity); if (addon.getOneBlockManager().saveOneBlockConfig()) { - user.sendMessage("oneblock.commands.admin.setchest.success"); + user.sendMessage("aoneblock.commands.admin.setchest.success"); } else { - user.sendMessage("oneblock.commands.admin.setchest.failure"); + user.sendMessage("aoneblock.commands.admin.setchest.failure"); } return true; } diff --git a/src/main/java/world/bentobox/aoneblock/commands/AdminSetCountCommand.java b/src/main/java/world/bentobox/aoneblock/commands/AdminSetCountCommand.java index 985f9408..96489db2 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/AdminSetCountCommand.java +++ b/src/main/java/world/bentobox/aoneblock/commands/AdminSetCountCommand.java @@ -27,8 +27,8 @@ public AdminSetCountCommand(CompositeCommand islandCommand) { @Override public void setup() { - setParametersHelp("oneblock.commands.admin.setcount.parameters"); - setDescription("oneblock.commands.admin.setcount.description"); + setParametersHelp("aoneblock.commands.admin.setcount.parameters"); + setDescription("aoneblock.commands.admin.setcount.description"); // Permission setPermission("admin.setcount"); addon = (AOneBlock)getAddon(); @@ -62,7 +62,7 @@ public boolean canExecute(User user, String label, List args) { public boolean execute(User user, String label, List args) { OneBlockIslands i = addon.getOneBlocksIsland(island); i.setBlockNumber(count); - user.sendMessage("oneblock.commands.admin.setcount.set", TextVariables.NUMBER, String.valueOf(i.getBlockNumber()), TextVariables.NAME, getPlayers().getName(targetUUID)); + user.sendMessage("aoneblock.commands.admin.setcount.set", TextVariables.NUMBER, String.valueOf(i.getBlockNumber()), TextVariables.NAME, getPlayers().getName(targetUUID)); return true; } diff --git a/src/main/java/world/bentobox/aoneblock/commands/IslandCountCommand.java b/src/main/java/world/bentobox/aoneblock/commands/IslandCountCommand.java index cb08700a..63b11c36 100644 --- a/src/main/java/world/bentobox/aoneblock/commands/IslandCountCommand.java +++ b/src/main/java/world/bentobox/aoneblock/commands/IslandCountCommand.java @@ -19,7 +19,7 @@ public IslandCountCommand(CompositeCommand islandCommand) { @Override public void setup() { - setDescription("oneblock.commands.count.description"); + setDescription("aoneblock.commands.count.description"); setOnlyPlayer(true); // Permission setPermission("count"); @@ -43,7 +43,7 @@ public boolean canExecute(User user, String label, List args) { public boolean execute(User user, String label, List args) { getIslands().getProtectedIslandAt(user.getLocation()).ifPresent(island -> { OneBlockIslands i = addon.getOneBlocksIsland(island); - user.sendMessage("oneblock.commands.count.info", TextVariables.NUMBER, String.valueOf(i.getBlockNumber()), TextVariables.NAME, i.getPhaseName()); + user.sendMessage("aoneblock.commands.count.info", TextVariables.NUMBER, String.valueOf(i.getBlockNumber()), TextVariables.NAME, i.getPhaseName()); }); return true; }