Update dependencies

Author: twizmwazin

build.gradle

@@ -31,15 +31,15 @@ repositories {
 }
 
 dependencies {
-    compile 'org.projectlombok:lombok:1.16.6'
-    compile 'tc.oc:sportbukkit-api:1.10-R0.1-SNAPSHOT'
-    // compile 'tc.oc:sportbukkit:1.10-R0.1-SNAPSHOT' -Leaving this disabled until we need to enable it
-    compile 'ee.ellytr.command:EllyCommand:2.0.0'
-    compile 'ee.ellytr.chat:EllyChat:1.1.0'
+    compile 'org.projectlombok:lombok:1.16.8'
+    compile 'tc.oc:sportbukkit-api:1.10.2-R0.1-SNAPSHOT'
+    // compile 'tc.oc:sportbukkit:1.10.2-R0.1-SNAPSHOT' -Leaving this disabled until we need to enable it
+    compile 'ee.ellytr.command:EllyCommand:2.0.3'
+    compile 'ee.ellytr.chat:EllyChat:1.2.5'
     compile 'org.jdom:jdom2:2.0.6'
     compile 'org.ow2.asm:asm-all:5.0.4'
 
-    testCompile('junit:junit:4.10')
+    testCompile('junit:junit:4.12')
 }
 
 processResources {
@@ -60,8 +60,8 @@ shadowJar {
         relocate 'org.jdom2', 'in.twizmwaz.cardinal.libs.jdom2'
         include(dependency('org.ow2.asm:asm-all:5.0.4'))
         relocate 'org.objectweb.asm', 'in.twizmwaz.cardinal.libs.asm'
-        include(dependency('ee.ellytr.command:EllyCommand:2.0.0'))
-        include(dependency('ee.ellytr.chat:EllyChat:1.1.0'))
+        include(dependency('ee.ellytr.command:EllyCommand:2.0.3'))
+        include(dependency('ee.ellytr.chat:EllyChat:1.2.5'))
     }
 }
 

src/main/java/in/twizmwaz/cardinal/module/channel/AbstractChannel.java

@@ -44,7 +44,7 @@ public class AbstractChannel implements Channel {
   public void sendMessage(BaseComponent... components) {
     for (Player player : players) {
       List<BaseComponent> toSend = Lists.newArrayList();
-      Locale locale = ChatUtil.getLocale(player);
+      Locale locale = ChatUtil.getLocale(player.getLocale());
       for (BaseComponent component : components) {
         if (component instanceof LanguageComponent) {
           toSend.addAll(Arrays.asList(((LanguageComponent) component).getComponents(locale)));

src/main/java/in/twizmwaz/cardinal/module/objective/core/Core.java

@@ -139,7 +139,7 @@ public void onBlockBreak(BlockBreakEvent event) {
             ChatConstant.getConstant("objective.core.touched"),
             new TeamComponent(this.team),
             new UnlocalizedComponent(name),
-            Components.getNameComponentBuilder(player).flairs(false).build())));
+            Components.getNameComponentBuilder(player).build())));
       }
       Bukkit.getPluginManager().callEvent(new ObjectiveTouchEvent(this, player, showMessage));
     }

src/main/java/in/twizmwaz/cardinal/module/objective/wool/Wool.java

@@ -148,7 +148,7 @@ public void onInventoryClick(InventoryClickEvent event) {
                     .color(Colors.convertDyeToChatColor(color)).build()).build()));
         Channels.getTeamChannel(match, Team.getObservers(match)).sendMessage(Components.appendTeamPrefix(team,
             new LocalizedComponentBuilder(ChatConstant.getConstant("objective.wool.touchedFor"),
-                Components.getNameComponentBuilder(player).flairs(false).build(),
+                Components.getNameComponentBuilder(player).build(),
                 new UnlocalizedComponentBuilder(getName()).color(Colors.convertDyeToChatColor(color)).build(),
                 new TeamComponent(team)).build()));
       }
@@ -176,12 +176,12 @@ public void onPlayerPickupItem(PlayerPickupItemEvent event) {
         Match match = getMatch();
         Channels.getTeamChannel(match, team).sendMessage(Components.appendTeamPrefix(team,
             new LocalizedComponentBuilder(ChatConstant.getConstant("objective.wool.touched"),
-                Components.getNameComponentBuilder(player).flairs(false).build(),
+                Components.getNameComponentBuilder(player).build(),
                 new UnlocalizedComponentBuilder(getName())
                     .color(Colors.convertDyeToChatColor(color)).build()).build()));
         Channels.getTeamChannel(match, Team.getObservers(match)).sendMessage(Components.appendTeamPrefix(team,
             new LocalizedComponentBuilder(ChatConstant.getConstant("objective.wool.touchedFor"),
-                Components.getNameComponentBuilder(player).flairs(false).build(),
+                Components.getNameComponentBuilder(player).build(),
                 new UnlocalizedComponentBuilder(getName()).color(Colors.convertDyeToChatColor(color)).build(),
                 new TeamComponent(team)).build()));
       }