Changed hooks' parameters

Instead of a hook having a parameter for the player's name, now it is the player itself.
DragonetMC · Mar 16, 2015 · 8f96a33 · 8f96a33
1 parent deecc41
commit 8f96a33
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 23 deletions.
diff --git a/src/main/java/net/glowstone/EventFactory.java b/src/main/java/net/glowstone/EventFactory.java
@@ -137,21 +137,21 @@ public static AsyncPlayerChatEvent onPlayerChat(boolean async, Player player, St
 
     public static PlayerJoinEvent onPlayerJoin(Player player) {
         //Dragonet-Add
-        org.dragonet.DragonetServer.instance().getRhino().onConnect(player.getName());
+        org.dragonet.DragonetServer.instance().getRhino().onConnect(player);
         //Dragonet-End
         return callEvent(new PlayerJoinEvent(player, ChatColor.YELLOW + player.getName() + " joined the game"));
     }
 
     public static PlayerKickEvent onPlayerKick(Player player, String reason) {
         //Dragonet-Add
-        org.dragonet.DragonetServer.instance().getRhino().onKick(player.getName(), reason);
+        org.dragonet.DragonetServer.instance().getRhino().onKick(player, reason);
         //Dragonet-End
         return callEvent(new PlayerKickEvent(player, reason, null));
     }
 
     public static PlayerQuitEvent onPlayerQuit(Player player) {
         //Dragonet-Add
-        org.dragonet.DragonetServer.instance().getRhino().onQuit(player.getName());
+        org.dragonet.DragonetServer.instance().getRhino().onQuit(player);
         //Dragonet-End
         return callEvent(new PlayerQuitEvent(player, ChatColor.YELLOW + player.getName() + " left the game"));
     }
@@ -170,7 +170,7 @@ public static PlayerInteractEvent onPlayerInteract(Player player, Action action)
 
     public static PlayerInteractEvent onPlayerInteract(Player player, Action action, Block clicked, BlockFace face) {
         //Dragonet-Add
-        org.dragonet.DragonetServer.instance().getRhino().useItem(clicked.getX(), clicked.getY(), clicked.getZ(), face.name(), clicked.getType().name(), player.getName());
+        org.dragonet.DragonetServer.instance().getRhino().useItem(clicked.getX(), clicked.getY(), clicked.getZ(), face.name(), clicked.getType().name(), player);
         //Dragonet-End
         return callEvent(new PlayerInteractEvent(player, action, player.getItemInHand(), clicked, face));
     }

diff --git a/src/main/java/net/glowstone/net/handler/play/inv/EnchantItemHandler.java b/src/main/java/net/glowstone/net/handler/play/inv/EnchantItemHandler.java
@@ -10,6 +10,9 @@ public final class EnchantItemHandler implements MessageHandler<GlowSession, Enc
     @Override
     public void handle(GlowSession session, EnchantItemMessage message) {
         // todo
+        //Dragonet-Add
+        org.dragonet.DragonetServer.instance().getRhino().onEnchant(session.getPlayer(), message.enchantment, session.getPlayer().getItemInHand().getType().name(), session.getPlayer().getItemInHand().getData().getData());
+        //Dragonet-End
         GlowServer.logger.info(session + ": " + message);
     }
 }
diff --git a/src/main/java/net/glowstone/net/handler/play/player/BlockPlacementHandler.java b/src/main/java/net/glowstone/net/handler/play/player/BlockPlacementHandler.java
@@ -53,7 +53,7 @@ public void handle(GlowSession session, BlockPlacementMessage message) {
         GlowBlock clicked = player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ());
 
         //Dragonet-Add
-        org.dragonet.DragonetServer.instance().getRhino().useItem(message.getX(), message.getY(), message.getZ(), "RIGHT_CLICK_BLOCK", player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ()).getType().name(), player.getName());        
+        org.dragonet.DragonetServer.instance().getRhino().useItem(message.getX(), message.getY(), message.getZ(), "RIGHT_CLICK_BLOCK", player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ()).getType().name(), player);        
         /**
          * Check if the message is a -1. If we *just* got a message with the
          * values filled, discard it, otherwise perform right-click-air.

diff --git a/src/main/java/net/glowstone/net/handler/play/player/DiggingHandler.java b/src/main/java/net/glowstone/net/handler/play/player/DiggingHandler.java
@@ -37,7 +37,7 @@ public void handle(GlowSession session, DiggingMessage message) {
         if (message.getState() == DiggingMessage.START_DIGGING) {
 
             //Dragonet-Add
-            org.dragonet.DragonetServer.instance().getRhino().useItem(message.getX(), message.getY(), message.getZ(), face.name(), player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ()).getType().name(), player.getName());      
+            org.dragonet.DragonetServer.instance().getRhino().useItem(message.getX(), message.getY(), message.getZ(), face.name(), player.getWorld().getBlockAt(message.getX(), message.getY(), message.getZ()).getType().name(), player);      
             // call interact event
             Action action = Action.LEFT_CLICK_BLOCK;
             Block eventBlock = block;

diff --git a/src/main/java/org/dragonet/net/packet/minecraft/UseItemPacket.java b/src/main/java/org/dragonet/net/packet/minecraft/UseItemPacket.java
@@ -64,7 +64,6 @@ public void decode() {
             this.posY = reader.readFloat();
             this.posZ = reader.readFloat();
 
-            org.dragonet.DragonetServer.instance().getRhino().useItem(x, y, z, "RIGHT_CLICK_BLOCK", "", "PEPlayer");
         } catch (IOException e) {
         }
     }

diff --git a/src/main/java/org/dragonet/rhino/Rhino.java b/src/main/java/org/dragonet/rhino/Rhino.java
@@ -7,6 +7,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import net.glowstone.entity.GlowPlayer;
+import org.bukkit.entity.Player;
 import org.dragonet.rhino.api.*;
 
 /**
@@ -27,24 +29,29 @@ public void Tick()
         Tick.Tick();
     }
 
-    public void useItem(int blockX, int blockY, int blockZ, String blockFace, String blockName, String playerName)
+    public void useItem(int blockX, int blockY, int blockZ, String blockFace, String blockName, Player plr)
     {
-        useItem.useItem(blockX, blockY, blockZ, blockFace, blockName, playerName);
+        useItem.useItem(blockX, blockY, blockZ, blockFace, blockName, plr);
     }
 
-    public void onConnect(String playerName)
+    public void onConnect(Player plr)
     {
-        onConnect.onConnect(playerName);
+        onConnect.onConnect(plr);
     }
 
-    public void onQuit(String playerName)
+    public void onQuit(Player plr)
     {
-        onQuit.onQuit(playerName);
+        onQuit.onQuit(plr);
     }
 
-    public void onKick(String playerName, String msg)
+    public void onKick(Player plr, String msg)
     {
-        onKick.onKick(playerName, msg);
+        onKick.onKick(plr, msg);
+    }
+
+    public void onEnchant(Player plr, int enchantID, String itemType, byte itemData)
+    {
+        onEnchant.onEnchant(plr, enchantID, itemType, itemData);
     }
 
     private void startScriptInterpreter()

diff --git a/src/main/java/org/dragonet/rhino/api/onConnect.java b/src/main/java/org/dragonet/rhino/api/onConnect.java
@@ -4,6 +4,7 @@
  */
 package org.dragonet.rhino.api;
 
+import org.bukkit.entity.Player;
 import org.dragonet.rhino.Script;
 
 /**
@@ -12,11 +13,11 @@
  */
 public class onConnect
 {
-    public static void onConnect(String playerName)
+    public static void onConnect(Player plr)
     {
         for(Script s : org.dragonet.DragonetServer.instance().getRhino().Scripts)
         {
-            s.runFunction("onConnect", new Object[] {playerName});
+            s.runFunction("onConnect", new Object[] {plr});
         }
     }
 }
diff --git a/src/main/java/org/dragonet/rhino/api/onEnchant.java b/src/main/java/org/dragonet/rhino/api/onEnchant.java
@@ -0,0 +1,23 @@
+/*
+ * (c) 2015 The Dragonet Team
+ * All rights reserved.
+ */
+package org.dragonet.rhino.api;
+
+import org.bukkit.entity.Player;
+import org.dragonet.rhino.Script;
+
+/**
+ *
+ * @author TheMCPEGamer
+ */
+public class onEnchant
+{
+    public static void onEnchant(Player plr, int enchantID, String itemType, byte itemData)
+    {
+        for(Script s : org.dragonet.DragonetServer.instance().getRhino().Scripts)
+        {
+            s.runFunction("onEnchant", new Object[] {plr, enchantID, itemType, itemData});
+        }
+    }
+}
diff --git a/src/main/java/org/dragonet/rhino/api/onKick.java b/src/main/java/org/dragonet/rhino/api/onKick.java
@@ -4,6 +4,7 @@
  */
 package org.dragonet.rhino.api;
 
+import org.bukkit.entity.Player;
 import org.dragonet.rhino.Script;
 
 /**
@@ -12,11 +13,11 @@
  */
 public class onKick
 {
-    public static void onKick(String playerName, String msg)
+    public static void onKick(Player plr, String msg)
     {
         for(Script s : org.dragonet.DragonetServer.instance().getRhino().Scripts)
         {
-            s.runFunction("onKick", new Object[] {playerName, msg});
+            s.runFunction("onKick", new Object[] {plr, msg});
         }
     }
 }
diff --git a/src/main/java/org/dragonet/rhino/api/onQuit.java b/src/main/java/org/dragonet/rhino/api/onQuit.java
@@ -4,6 +4,7 @@
  */
 package org.dragonet.rhino.api;
 
+import org.bukkit.entity.Player;
 import org.dragonet.rhino.Script;
 
 /**
@@ -12,11 +13,11 @@
  */
 public class onQuit
 {
-    public static void onQuit(String playerName)
+    public static void onQuit(Player plr)
     {
         for(Script s : org.dragonet.DragonetServer.instance().getRhino().Scripts)
         {
-            s.runFunction("onQuit", new Object[] {playerName});
+            s.runFunction("onQuit", new Object[] {plr});
         }
     }
 }
diff --git a/src/main/java/org/dragonet/rhino/api/useItem.java b/src/main/java/org/dragonet/rhino/api/useItem.java
@@ -4,6 +4,7 @@
  */
 package org.dragonet.rhino.api;
 
+import org.bukkit.entity.Player;
 import org.dragonet.rhino.Script;
 
 /**
@@ -12,11 +13,11 @@
  */
 public class useItem 
 {
-    public static void useItem(int blockX, int blockY, int blockZ, String blockFace, String blockName, String playerName)
+    public static void useItem(int blockX, int blockY, int blockZ, String blockFace, String blockName, Player plr)
     {   
         for(Script s : org.dragonet.DragonetServer.instance().getRhino().Scripts)
         {
-            s.runFunction("useItem", new Object[] {blockX, blockY, blockZ, blockFace, blockName, playerName});
+            s.runFunction("useItem", new Object[] {blockX, blockY, blockZ, blockFace, blockName, plr});
         }
     }
 }