update to NyaaCore&NyaaUtils 4.0

NyaaCat · Aug 28, 2017 · ac9e440 · ac9e440
1 parent 3ed47b9
commit ac9e440
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -45,6 +45,11 @@ repositories {
         name 'nu-langchecker'
         url 'https://raw.githubusercontent.com/Librazy/NyaaUtilsLangChecker/maven-repo'
     }
+
+    maven {
+        name 'langutils-repo'
+        url 'https://raw.github.com/MascusJeoraly/LanguageUtils/mvn-repo/'
+    }
 }
 
 dependencies {
@@ -53,7 +58,7 @@ dependencies {
     compile('cat.nyaa:nyaautils:4.0-SNAPSHOT') {
         transitive = false
     }
-    compile('cat.nyaa:nyaacore:3.0-SNAPSHOT') {
+    compile('cat.nyaa:nyaacore:4.0-SNAPSHOT') {
         transitive = false
     }
     compile('net.ess3:Essentials:2.13-SNAPSHOT') {
@@ -63,6 +68,9 @@ dependencies {
     compile ('org.librazy:NyaaUtilsLangChecker:1.0-SNAPSHOT') {
         transitive = false
     }
+    compile('com.meowj:LangUtils:1.9') {
+        transitive = false
+    }
 }
 
 String nyaaCoreLangDir = System.getenv("NYAACORE_LANG_DIR")

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/CommandHandler.java b/src/main/java/cat/nyaa/HamsterEcoHelper/CommandHandler.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class CommandHandler extends CommandReceiver<HamsterEcoHelper> {
+public class CommandHandler extends CommandReceiver {
 
     private final HamsterEcoHelper plugin;
     @SubCommand("auction")

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/ads/AdsCommands.java b/src/main/java/cat/nyaa/HamsterEcoHelper/ads/AdsCommands.java
@@ -10,7 +10,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class AdsCommands extends CommandReceiver<HamsterEcoHelper> {
+public class AdsCommands extends CommandReceiver {
     private HamsterEcoHelper plugin;
 
     public AdsCommands(Object plugin, LanguageRepository i18n) {

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/auction/AuctionCommands.java b/src/main/java/cat/nyaa/HamsterEcoHelper/auction/AuctionCommands.java
@@ -9,7 +9,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-public class AuctionCommands extends CommandReceiver<HamsterEcoHelper> {
+public class AuctionCommands extends CommandReceiver {
     private HamsterEcoHelper plugin;
 
     public AuctionCommands(Object plugin, LanguageRepository i18n) {

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/balance/BalanceCommands.java b/src/main/java/cat/nyaa/HamsterEcoHelper/balance/BalanceCommands.java
@@ -8,7 +8,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class BalanceCommands extends CommandReceiver<HamsterEcoHelper> {
+public class BalanceCommands extends CommandReceiver {
     private HamsterEcoHelper plugin;
 
     public BalanceCommands(Object plugin, LanguageRepository i18n) {

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/market/MarketCommands.java b/src/main/java/cat/nyaa/HamsterEcoHelper/market/MarketCommands.java
@@ -11,7 +11,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-public class MarketCommands extends CommandReceiver<HamsterEcoHelper> {
+public class MarketCommands extends CommandReceiver {
     private HamsterEcoHelper plugin;
 
     public MarketCommands(Object plugin, LanguageRepository i18n) {

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/requisition/RequisitionCommands.java b/src/main/java/cat/nyaa/HamsterEcoHelper/requisition/RequisitionCommands.java
@@ -12,7 +12,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-public class RequisitionCommands extends CommandReceiver<HamsterEcoHelper> {
+public class RequisitionCommands extends CommandReceiver {
     private HamsterEcoHelper plugin;
 
     public RequisitionCommands(Object plugin, LanguageRepository i18n) {

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/LottoCommands.java b/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/LottoCommands.java
@@ -9,7 +9,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class LottoCommands extends CommandReceiver<HamsterEcoHelper> {
+public class LottoCommands extends CommandReceiver {
 
     private final HamsterEcoHelper plugin;
 

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/SearchCommands.java b/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/SearchCommands.java
@@ -7,11 +7,11 @@
 import cat.nyaa.nyaacore.CommandReceiver;
 import cat.nyaa.nyaacore.LanguageRepository;
 import cat.nyaa.nyaacore.Message;
-import cat.nyaa.nyaacore.utils.I18nUtils;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.LinkedListMultimap;
+import com.meowj.langutils.lang.LanguageHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -30,7 +30,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public class SearchCommands extends CommandReceiver<HamsterEcoHelper> {
+public class SearchCommands extends CommandReceiver {
     private Cache<UUID, List<Map.Entry<SignShop, ShopItem>>> searchResult =
             CacheBuilder.newBuilder()
                         .concurrencyLevel(2)
@@ -186,8 +186,8 @@ && distance(curLoc, sign) < rangeLimit)) {
                                 enchMatch = enchants.entrySet()
                                                     .stream().flatMap(enchEntry ->
                                                                               Stream.of(
-                                                                                      I18nUtils.getEnchantmentDisplayName(enchEntry, "zh_cn"),
-                                                                                      I18nUtils.getEnchantmentDisplayName(enchEntry, "en_us")
+                                                                                      LanguageHelper.getEnchantmentDisplayName(enchEntry, "zh_cn"),
+                                                                                      LanguageHelper.getEnchantmentDisplayName(enchEntry, "en_us")
                                                                               )
                                         )
                                                     .map(ChatColor::stripColor)
@@ -196,8 +196,8 @@ && distance(curLoc, sign) < rangeLimit)) {
                                 if (enchMatch) return true;
                             }
                             if (matchEnchOnly) return false;
-                            String zhName = ChatColor.stripColor(I18nUtils.getItemDisplayName(stack, "zh_cn")).toLowerCase();
-                            String enName = ChatColor.stripColor(I18nUtils.getItemDisplayName(stack, "en_us")).toLowerCase();
+                            String zhName = ChatColor.stripColor(LanguageHelper.getItemDisplayName(stack, "zh_cn")).toLowerCase();
+                            String enName = ChatColor.stripColor(LanguageHelper.getItemDisplayName(stack, "en_us")).toLowerCase();
                             return "*".equals(keywords.get(0)) || keywords.stream().anyMatch(zhName::contains) || keywords.stream().anyMatch(enName::contains);
                         }
                 ).forEach(shopItem -> match.put(shop, shopItem));

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/SignShopCommands.java b/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/SignShopCommands.java
@@ -15,7 +15,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.BlockIterator;
 
-public class SignShopCommands extends CommandReceiver<HamsterEcoHelper> {
+public class SignShopCommands extends CommandReceiver {
     @SubCommand("storage")
     public StorageCommands storageCommands;
     @SubCommand("lotto")

diff --git a/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/StorageCommands.java b/src/main/java/cat/nyaa/HamsterEcoHelper/signshop/StorageCommands.java
@@ -8,7 +8,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class StorageCommands extends CommandReceiver<HamsterEcoHelper> {
+public class StorageCommands extends CommandReceiver {
 
     private final HamsterEcoHelper plugin;