fix build & use args.nextPlayer

Author: cyilin

build.gradle

@@ -22,6 +22,11 @@ repositories {
         url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
     }
 
+    maven {
+        name 'sonatype'
+        url 'https://oss.sonatype.org/content/groups/public'
+    }
+
     maven {
         name 'vault-repo'
         url 'http://nexus.hc.to/content/repositories/pub_releases'
@@ -36,28 +41,27 @@ repositories {
         name 'NyaaCentral'
         url 'https://raw.githubusercontent.com/NyaaCat/NyaaCentral/maven-repo'
     }
-
-    maven {
-        name 'langutils-repo'
-        url 'https://raw.github.com/MascusJeoraly/LanguageUtils/mvn-repo/'
-    }
 }
 
 dependencies {
     compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
     compile ('net.milkbowl.vault:VaultAPI:1.7') {
         transitive = false
     }
-    compile 'cat.nyaa:nyaacore:6.2-SNAPSHOT'
+    compile 'cat.nyaa:nyaacore:6.3-SNAPSHOT'
     compile('net.ess3:Essentials:2.13-SNAPSHOT') {
         transitive = false
     }
     compile files('lib/LocketteProAPI.jar')
     compile ('org.librazy:NyaaUtilsLangChecker:2.0-SNAPSHOT') {
         transitive = false
     }
-    compile('com.meowj:LangUtils:1.9') {
-        transitive = false
+    if (gradle.hasProperty("useLocalDependencies") && gradle.useLocalDependencies) {
+        compile project(":LanguageUtils")
+    } else {
+        compileOnly('cat.nyaa:LangUtils:2.1-SNAPSHOT') {
+            transitive = false
+        }
     }
 }
 

src/main/java/cat/nyaa/HamsterEcoHelper/balance/BalanceCommands.java

@@ -16,20 +16,19 @@ public BalanceCommands(Object plugin, LanguageRepository i18n) {
         this.plugin = (HamsterEcoHelper) plugin;
     }
 
-    @SuppressWarnings("deprecation")
     @CommandHandler.SubCommand(value = "pay", permission = "heh.balance.pay")
     public void pay(CommandSender sender, CommandHandler.Arguments args) {
         if (args.length() >= 5) {
             double amount = 0.0D;
-            String playerName = "";
+            Player player;
             String type = args.next().toLowerCase();
             if (type.equals("amount")) {
                 amount = args.nextDouble("#.##");
-                playerName = args.next();
+                player = args.nextPlayer();
             } else if (type.equals("percent")) {
                 double percent = args.nextDouble();
                 amount = (plugin.systemBalance.getBalance() / 100) * percent;
-                playerName = args.next();
+                player = args.nextPlayer();
                 double min = args.length() >= 6 ? args.nextDouble("#.##") : -1;
                 double max = args.length() == 7 ? args.nextDouble("#.##") : -1;
                 if (max != -1 && amount > max) {
@@ -46,15 +45,10 @@ public void pay(CommandSender sender, CommandHandler.Arguments args) {
                 msg(sender, "user.error.not_int");
                 return;
             }
-            Player player = Bukkit.getPlayer(playerName);
-            if (player != null) {
-                plugin.systemBalance.withdrawAllowDebt(amount, plugin);
-                plugin.eco.deposit(player, amount);
-                msg(sender, "user.balance.pay", amount, playerName);
-                msg(player, "user.balance.pay_notice", amount);
-            } else {
-                msg(sender, "user.info.player_not_found", playerName);
-            }
+            plugin.systemBalance.withdrawAllowDebt(amount, plugin);
+            plugin.eco.deposit(player, amount);
+            msg(sender, "user.balance.pay", amount, player.getName());
+            msg(player, "user.balance.pay_notice", amount);
             return;
         }
         msg(sender, "manual.balance.pay.usage");
@@ -65,7 +59,6 @@ public String getHelpPrefix() {
         return "balance";
     }
 
-    @SuppressWarnings("deprecation")
     @CommandHandler.SubCommand(value = "take", permission = "heh.balance.take")
     public void take(CommandSender sender, CommandHandler.Arguments args) {
         if (args.length() != 4) {

src/main/java/cat/nyaa/HamsterEcoHelper/market/MarketCommands.java

@@ -51,12 +51,11 @@ public void offer(CommandSender sender, Arguments args) {
         }
     }
 
-    @SuppressWarnings("deprecation")
     @SubCommand(value = "view", permission = "heh.view")
     public void view(CommandSender sender, Arguments args) {
         Player player = asPlayer(sender);
         if (args.length() == 3) {
-            OfflinePlayer seller = Bukkit.getOfflinePlayer(args.next());
+            OfflinePlayer seller = args.nextOfflinePlayer();
             if (seller != null) {
                 plugin.marketManager.openGUI(player, 1, seller.getUniqueId());
             }

src/main/java/cat/nyaa/HamsterEcoHelper/signshop/SearchCommands.java

@@ -8,7 +8,6 @@
 import cat.nyaa.nyaacore.CommandReceiver;
 import cat.nyaa.nyaacore.LanguageRepository;
 import cat.nyaa.nyaacore.Message;
-import cat.nyaa.nyaacore.utils.ReflectionUtils;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableSet;
@@ -109,7 +108,7 @@ public void search(CommandSender sender, Arguments args) {
         final Material materialLimit;
         if (itemLimit != null) {
             materialLimit = MiscUtils.getMaterial(itemLimit, sender);
-            if (materialLimit == null || materialLimit == Material.AIR || !ReflectionUtils.isValidItem(new ItemStack(materialLimit))) {
+            if (materialLimit == null || materialLimit == Material.AIR || !materialLimit.isItem()) {
                 msg(sender, "user.error.unknown_item", itemLimit);
                 return;
             }

src/main/java/cat/nyaa/HamsterEcoHelper/signshop/SignShopCommands.java

@@ -8,7 +8,6 @@
 import cat.nyaa.HamsterEcoHelper.market.MarketManager;
 import cat.nyaa.nyaacore.CommandReceiver;
 import cat.nyaa.nyaacore.LanguageRepository;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.block.Block;
@@ -116,16 +115,10 @@ public void sell(CommandSender sender, CommandHandler.Arguments args) {
         player.sendMessage(I18n.format("user.signshop.not_sign"));
     }
 
-    @SuppressWarnings("deprecation")
     @SubCommand(value = "remove", permission = "heh.removesignshop")
     public void remove(CommandSender sender, Arguments args) {
-        String name = args.nextString();
+        OfflinePlayer player = args.nextOfflinePlayer();
         boolean removeBlock = args.top() != null && args.nextBoolean();
-        OfflinePlayer player = Bukkit.getOfflinePlayer(name);
-        if (player != null) {
-            plugin.signShopManager.removePlayerSignShops(player, sender, removeBlock);
-        } else {
-            msg(sender, "user.info.player_not_found", name);
-        }
+        plugin.signShopManager.removePlayerSignShops(player, sender, removeBlock);
     }
 }