Merge pull request #3 from BlckqPlugins/feat/allay

updates for allay

Author: tunikakeks

pom.xml

@@ -90,7 +90,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.AllayMC.Allay</groupId>
+            <groupId>org.allaymc.allay</groupId>
             <artifactId>api</artifactId>
             <version>${version.allay}</version>
             <scope>provided</scope>

src/main/java/de/redstonecloud/bridge/platform/allay/AllayExecutor.java

@@ -16,8 +16,7 @@ public class AllayExecutor implements BridgeExecutor {
     private static Server server = Server.getInstance();
 
     public EntityPlayer getPlayerByCloudPlayer(ICloudPlayer player) {
-        //return server.getOnlinePlayers().get(UUID.fromString(player.getUUID()));
-        return null;
+        return server.getPlayerService().getPlayers().get(UUID.fromString(player.getUUID()));
     }
 
     public void sendMessage(ICloudPlayer cloudPlayer, String message) {
@@ -26,8 +25,7 @@ public void sendMessage(ICloudPlayer cloudPlayer, String message) {
 
     @Override
     public void sendTitle(ICloudPlayer cloudPlayer, String title) {
-        // title not implemented yet
-        //getPlayerByCloudPlayer(cloudPlayer).sendTitle(title);
+        Objects.requireNonNull(getPlayerByCloudPlayer(cloudPlayer)).sendTitle(title);
     }
 
     @Override
@@ -42,14 +40,12 @@ public void kick(ICloudPlayer player, String reason) {
 
     @Override
     public void sendActionbar(ICloudPlayer player, String message) {
-        // actionbar not implemented yet
-        getPlayerByCloudPlayer(player).sendPopup(message);
+        Objects.requireNonNull(getPlayerByCloudPlayer(player)).sendActionBar(message);
     }
 
     @Override
     public void sendToast(ICloudPlayer player, String title, String message) {
-        // toasts not implemented yet
-        //getPlayerByCloudPlayer(player).sendToast(title, message);
+        Objects.requireNonNull(getPlayerByCloudPlayer(player)).sendToast(title, message);
     }
 
     @Override

src/main/java/de/redstonecloud/bridge/platform/allay/AllayListener.java

@@ -11,13 +11,13 @@ public class AllayListener {
     public void onLogin(PlayerLoginEvent ev) {
         EntityPlayer player = ev.getPlayer();
 
-        CloudInterface.getInstance().playerLogin(player.getOriginName(), player.getUUID().toString(), player.getClientSession().getSocketAddress().toString());
+        CloudInterface.getInstance().playerLogin(player.getOriginName(), player.getLoginData().getUuid().toString(), player.getClientSession().getSocketAddress().toString());
     }
 
     @EventHandler
     public void onDisconnect(PlayerQuitEvent ev) {
         EntityPlayer player = ev.getPlayer();
 
-        CloudInterface.getInstance().playerDisconnect(player.getUUID().toString());
+        CloudInterface.getInstance().playerDisconnect(player.getLoginData().getUuid().toString());
     }
 }