pom.xml changes

Bump netty-all from 4.0.23.Final to 4.1.42.Final

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.retrooper</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.3</version>
     <packaging>jar</packaging>
 
     <name>PacketEvents</name>
@@ -54,10 +54,6 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
@@ -73,12 +69,13 @@
             <groupId>com.mojang</groupId>
             <artifactId>authlib</artifactId>
             <version>1.5.21</version>
+            <scope>compile</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.0.23.Final</version>
+            <version>4.1.42.Final</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.bukkit</groupId>

src/main/java/com/comphenix/tinyprotocol/ExamplePlugin.java

@@ -1,114 +0,0 @@
-package com.comphenix.tinyprotocol;
-
-import io.netty.channel.Channel;
-
-import org.bukkit.*;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-import com.comphenix.tinyprotocol.Reflection.*;
-
-/**
- * Represents an example plugin utilizing TinyProtocol
- */
-public class ExamplePlugin extends JavaPlugin {
-	// Chat packets
-	private FieldAccessor<String> CHAT_MESSAGE = Reflection.getField("{nms}.PacketPlayInChat", String.class, 0);
-
-	// Explosion packet
-	private Class<?> particleClass = Reflection.getClass("{nms}.PacketPlayOutWorldParticles");
-	private FieldAccessor<String> particleName = Reflection.getField(particleClass, String.class, 0);
-	private FieldAccessor<Float> particleX = Reflection.getField(particleClass, float.class, 0);
-	private FieldAccessor<Float> particleY = Reflection.getField(particleClass, float.class, 1);
-	private FieldAccessor<Float> particleZ = Reflection.getField(particleClass, float.class, 2);
-	private FieldAccessor<Integer> particleCount = Reflection.getField(particleClass, int.class, 0);
-
-	// Server info packet
-	private Class<?> serverInfoClass = Reflection.getClass("{nms}.PacketStatusOutServerInfo");
-	private Class<Object> serverPingClass = Reflection.getUntypedClass("{nms}.ServerPing");
-	private Class<Object> playerSampleClass = Reflection.getUntypedClass("{nms}.ServerPingPlayerSample");
-	private FieldAccessor<Object> serverPing = Reflection.getField(serverInfoClass, serverPingClass, 0);
-	private FieldAccessor<Object> playerSample = Reflection.getField(serverPingClass, playerSampleClass, 0);
-	private ConstructorInvoker playerSampleInvoker = Reflection.getConstructor(playerSampleClass, int.class, int.class);
-
-	private TinyProtocol protocol;
-
-	@Override
-	public void onEnable() {
-		protocol = new TinyProtocol(this) {
-
-			@Override
-			public Object onPacketInAsync(Player sender, Channel channel, Object packet) {
-				// Cancel chat packets
-				if (CHAT_MESSAGE.hasField(packet)) {
-					if (CHAT_MESSAGE.get(packet).contains("dirty")) {
-						sendExplosion(sender);
-						return null;
-					}
-				}
-
-				if (particleName.hasField(packet)) {
-					System.out.println("Sending particle field:" + packet);
-				}
-
-				return super.onPacketInAsync(sender, channel, packet);
-			}
-
-			@Override
-			public Object onPacketOutAsync(Player reciever, Channel channel, Object packet) {
-				if (serverInfoClass.isInstance(packet)) {
-					Object ping = serverPing.get(packet);
-					playerSample.set(ping, playerSampleInvoker.invoke(1000, 0));
-
-					// Which is equivalent to:
-					// serverPing.get(packet).setPlayerSample(new ServerPingPlayerSample(1000, 0));
-					return packet;
-				}
-
-				return super.onPacketOutAsync(reciever, channel, packet);
-			}
-
-		};
-	}
-
-	@Override
-	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (sender instanceof Player) {
-			Player player = (Player) sender;
-
-			// Toggle injection
-			if (protocol.hasInjected(player)) {
-				protocol.uninjectPlayer(player);
-				sender.sendMessage(ChatColor.YELLOW + "Player " + player + " has been uninjected.");
-			} else {
-				protocol.injectPlayer(player);
-				sender.sendMessage(ChatColor.DARK_GREEN + "Player " + player + " has been injected.");
-			}
-
-			return true;
-		} else {
-			sender.sendMessage(ChatColor.RED + "Can only be invoked by a player.");
-		}
-
-		return false;
-	}
-
-	private void sendExplosion(Player player) {
-		try {
-			// Only visible for the client
-			Object explosionPacket = particleClass.newInstance();
-			Location loc = player.getLocation();
-			particleName.set(explosionPacket, "hugeexplosion");
-			particleX.set(explosionPacket, (float) loc.getX());
-			particleY.set(explosionPacket, (float) loc.getY());
-			particleZ.set(explosionPacket, (float) loc.getZ());
-			particleCount.set(explosionPacket, 1);
-
-			// Send the packet to the player
-			protocol.sendPacket(player, explosionPacket);
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot send packet.", e);
-		}
-	}
-}

src/main/java/me/purplex/packetevents/Main.java

@@ -2,8 +2,8 @@ package me.purplex.packetevents;
 
 import com.comphenix.tinyprotocol.*;
 import io.netty.channel.Channel;
+import me.purplex.packetevents.bukkitevent.ServerTickEvent;
 import me.purplex.packetevents.events.PacketReceiveEvent;
-import me.retrooper.packetevents.events.*;
 import me.purplex.packetevents.example.TestExample;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -16,7 +16,7 @@ public class Main extends JavaPlugin implements Listener {
     @Override
     public void onEnable() {
         Bukkit.getPluginManager().registerEvents(this, this);
-        PacketEvents.getPacketManager().registerPacketListener(new TestExample());
+        //PacketEvents.getPacketManager().registerPacketListener(new TestExample());
         protocol = new TinyProtocol(this) {
             @Override
             public Object onPacketInAsync(Player p, Channel channel, Object packet) {
@@ -39,6 +39,14 @@ public class Main extends JavaPlugin implements Listener {
             }
         };
 
+        Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, new Runnable() {
+            @Override
+            public void run() {
+                long now = System.currentTimeMillis();
+                PacketEvents.getPacketManager().callServerTickEvent(new ServerTickEvent(now));
+            }
+        },  0L, 1L);
+
     }
     @Override
     public void onDisable() {

src/main/java/me/purplex/packetevents/bukkitevent/ServerTickEvent.java

@@ -0,0 +1,19 @@
+package me.purplex.packetevents.bukkitevent;
+
+import me.purplex.packetevents.events.PacketEvent;
+
+
+public class ServerTickEvent extends PacketEvent {
+
+    private long timestamp;
+    public ServerTickEvent(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+}

src/main/java/me/purplex/packetevents/events/PacketEventManager.java

@@ -1,5 +1,7 @@
 package me.purplex.packetevents.events;
 
+import me.purplex.packetevents.bukkitevent.ServerTickEvent;
+
 import java.util.LinkedList;
 
 public interface PacketEventManager {
@@ -10,4 +12,6 @@ public interface PacketEventManager {
 
     public void registerPacketListener(PacketListener e);
 
+    public void callServerTickEvent(ServerTickEvent e);
+
 }

src/main/java/me/purplex/packetevents/events/PacketHandler.java

@@ -1,7 +1,5 @@
 package me.purplex.packetevents.events;
 
-import org.bukkit.event.EventHandler;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/main/java/me/purplex/packetevents/events/PacketManager.java

@@ -1,5 +1,7 @@
 package me.purplex.packetevents.events;
 
+import me.purplex.packetevents.bukkitevent.ServerTickEvent;
+
 import java.lang.reflect.Method;
 
 public class PacketManager implements PacketEventManager {
@@ -44,4 +46,22 @@ public class PacketManager implements PacketEventManager {
     public void registerPacketListener(PacketListener e) {
         this.packetListeners.add(e);
     }
+
+    @Override
+    public void callServerTickEvent(ServerTickEvent e) {
+        for (PacketListener listener : this.packetListeners) {
+            Method[] methods = listener.getClass().getMethods();
+            for (Method m : methods) {
+                if (m.isAnnotationPresent(PacketHandler.class)) {
+                    if (m.getParameterTypes()[0].getSimpleName().equals(e.getClass().getSimpleName())) {
+                        try {
+                            m.invoke(listener, e);
+                        } catch (Exception ex) {
+
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

src/main/java/me/purplex/packetevents/example/TestExample.java

@@ -1,22 +1,54 @@
 package me.purplex.packetevents.example;
 
+import me.purplex.packetevents.bukkitevent.ServerTickEvent;
 import me.purplex.packetevents.events.PacketHandler;
 import me.purplex.packetevents.events.PacketListener;
 import me.purplex.packetevents.events.PacketReceiveEvent;
 import me.purplex.packetevents.events.PacketSendEvent;
 import me.purplex.packetevents.packets.Packet;
-import me.retrooper.packetevents.events.*;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 public class TestExample implements PacketListener {
+    /**
+     * How to register a packet listener?
+     *
+     *  PacketEvents.getPacketManager().registerPacketListener(new TestExample());
+     */
+
+    private int tick;
+
+
     @PacketHandler
     public void onPacketReceive(PacketReceiveEvent e) {
-        if (e.getPacketName().equals(Packet.Client.POSITION)) {
-            e.getPlayer().sendMessage("You sent a position packet!");
+        //ONLY CLIENT PACKETS ALLOWED HERE!
+        if(e.getPacketName().equals(Packet.Client.USE_ENTITY)) {
+            e.getPlayer().sendMessage("You have attacked an entity!");
+        }
+        else if(e.getPacketName().equals(Packet.Client.ARM_ANIMATION)) {
+            e.getPlayer().sendMessage("You swung your arm.");
+        }
+        else if(e.getPacketName().equals(Packet.Client.POSITION)) {
+            e.getPlayer().sendMessage("You updated your position!");
         }
     }
 
     @PacketHandler
     public void onPacketSend(PacketSendEvent e) {
+        //ONLY SERVER PACKETS ALLOWED HERE!
+        if(e.getPacketName().equals(Packet.Server.ENTITY_VELOCITY)) {
+            e.getPlayer().sendMessage("You took velocity!");
+        }
+    }
 
+    @PacketHandler
+    public void onServerTick(ServerTickEvent e) {
+        //CALLED EVERY TICK
+        tick++;
+        if(tick % 20 == 0) {
+            for(Player p : Bukkit.getOnlinePlayers()) {
+                p.sendMessage("One second has passed!");
+            }
+        }
     }
 }

src/main/resources/plugin.yml

@@ -1,4 +1,4 @@
 name: PacketEvents
 version: ${project.version}
-main: me.retrooper.packetevents.Main
+main: me.purplex.packetevents.Main
 authors: [purplex]