Bump up version to 1.8.4;

Deprecated the "async" loading methods in PacketEvents.java

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
-about: Report a bug to help us fix
-title: "[BUG REPORT]"
+about: Report bugs to help us improve our software.
+title: ""
 labels: bug
 assignees: ''
 
@@ -10,11 +10,21 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+**Software brand**
+Please let us know what software you are using.
+Eg. Spigot 1.18.2, Paper 1.18.2, Tuinity 1.18.2, Pufferfish 1.18.2, etc...
+Make sure to mention the version of the software.
+
+**Plugins**
+Please give us a list of your plugins. Sometimes we run into incompatibilities. Having an overview of the plugins on your server can really help identify the problem quicker.
+Eg. ViaVersion, ProtocolLib, HolographicDisplays
+You may also provide a screenshot.
+
+**How To Reproduce**
 Steps to reproduce the behavior:
 *Example:*
-1. Login on the 1.16.4 minecraft client.
-2. Join the server while it is still starting up.
+1. Join with the 1.18.2 vanilla minecraft client.
+2. Spam
 3. ....
 4. See error
 
@@ -24,18 +34,5 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**About your server (please complete the following information):**
- - Spigot: [eg. Paper or Tuinity]
-    We only accept reports that are reproducible
-    on one of the supported spigots.
- 
-- Server Version: [eg. 1.16.4]
-    Feel free to report bugs for versions newer than 1.7.10, even if we
-    don’t support them yet, but be aware that we might have already
-    found the bug and fixed it in a dev build, just before you reported it.
-    Please don’t get frustrated in such cases.
-
-- Plugins List if possible: [eg. ViaVersion, ProtocolLib, HolographicDisplays]
-
 **Additional context**
 Add any other context about the problem here.

README.md

@@ -3,7 +3,7 @@
 [![](https://img.shields.io/badge/License-GPLv3-yellow.svg)](https://github.com/retrooper/packetevents/blob/dev/LICENSE)
 [![](https://jitpack.io/v/retrooper/packetevents.svg)](https://jitpack.io/#retrooper/packetevents)
 
-PacketEvents is an open-source Packet API. It has many cross-version packet-wrappers. You can process incoming and outgoing packets on the server. You can even send packets with our packet-wrappers. We are here to save you a ton of time.
+PacketEvents is a powerful packet library. Our packet wrappers are efficient and easy to use. We support many protocol versions. (1.8+)
 
 ### Resources
 * [SpigotMC](https://www.spigotmc.org/resources/packetevents-api.80279/)
@@ -13,10 +13,6 @@ PacketEvents is an open-source Packet API. It has many cross-version packet-wrap
 ### Setup
 [Learn more](https://github.com/retrooper/packetevents/wiki/1.-Setup)
 
-### Contributing/Forking
-[Learn more](https://github.com/retrooper/packetevents/wiki/2.-Contributing-and-Forking)\
-Our discord server has a role for contributors and forkers.
-
 ### Sponsorships
 [![](https://www.ej-technologies.com/images/product_banners/jprofiler_small.png)](https://www.ej-technologies.com/products/jprofiler/overview.html)
 

build.gradle

@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.jetbrains:annotations:22.0.0'
+    implementation 'org.jetbrains:annotations:23.0.0'
 
     compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
     compileOnly 'com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT'
@@ -66,7 +66,7 @@ dependencies {
 }
 
 group = 'io.github.retrooper'
-version = '1.8.2'
+version = '1.8.4'
 description = 'packetevents'
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 

src/main/java/io/github/retrooper/packetevents/PacketEvents.java

@@ -57,7 +57,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public final class PacketEvents implements Listener, EventManager {
     private static PacketEvents instance;
     private static Plugin plugin;
-    private final PEVersion version = new PEVersion(1, 8, 2);
+    private final PEVersion version = new PEVersion(1, 8, 4);
     private final EventManager eventManager = new PEEventManager();
     private final PlayerUtils playerUtils = new PlayerUtils();
     private final ServerUtils serverUtils = new ServerUtils();
@@ -161,10 +161,12 @@ public final class PacketEvents implements Listener, EventManager {
         }
     }
 
+    @Deprecated
     public void loadAsyncNewThread() {
         new Thread(this::load).start();
     }
 
+    @Deprecated
     public void loadAsync(ExecutorService executorService) {
         executorService.execute(this::load);
     }

src/main/java/io/github/retrooper/packetevents/PacketEventsPlugin.java

@@ -18,8 +18,14 @@
 
 package io.github.retrooper.packetevents;
 
+import io.github.retrooper.packetevents.event.PacketListenerAbstract;
+import io.github.retrooper.packetevents.event.impl.PacketPlayReceiveEvent;
+import io.github.retrooper.packetevents.packettype.PacketType;
+import io.github.retrooper.packetevents.packetwrappers.play.out.setslot.WrappedPacketOutSetSlot;
 import io.github.retrooper.packetevents.settings.PacketEventsSettings;
 import io.github.retrooper.packetevents.utils.server.ServerVersion;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class PacketEventsPlugin extends JavaPlugin {
@@ -37,6 +43,16 @@ public class PacketEventsPlugin extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        /*PacketEvents.get().getEventManager().registerListener(new PacketListenerAbstract() {
+            @Override
+            public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
+                if (event.getPacketId() == PacketType.Play.Client.USE_ENTITY) {
+                    ItemStack stack = new ItemStack(Material.STICK);
+                    WrappedPacketOutSetSlot setSlot = new WrappedPacketOutSetSlot(0, 2, stack);
+                    PacketEvents.get().getPlayerUtils().sendPacket(event.getPlayer(), setSlot);
+                }
+            }
+        });*/
         PacketEvents.get().init();
     }
 

src/main/java/io/github/retrooper/packetevents/injector/legacy/PlayerChannelHandlerLegacy.java

@@ -20,6 +20,7 @@ package io.github.retrooper.packetevents.injector.legacy;
 
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.processor.PacketProcessorInternal;
+import net.minecraft.util.io.netty.buffer.ByteBuf;
 import net.minecraft.util.io.netty.channel.ChannelDuplexHandler;
 import net.minecraft.util.io.netty.channel.ChannelHandler;
 import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
@@ -44,6 +45,11 @@ public class PlayerChannelHandlerLegacy extends ChannelDuplexHandler {
 
     @Override
     public void write(final ChannelHandlerContext ctx, Object packet, final ChannelPromise promise) throws Exception {
+         if (packet instanceof ByteBuf) {
+            //Ignore bytebufs!
+            super.write(ctx, packet, promise);
+            return;
+        }
         PacketProcessorInternal.PacketData data = PacketEvents.get().getInternalPacketProcessor().write(player, ctx.channel(), packet);
         if (data.postAction != null) {
             promise.addListener(f -> {

src/main/java/io/github/retrooper/packetevents/injector/legacy/early/EarlyChannelInjectorLegacy.java

@@ -25,7 +25,6 @@ import io.github.retrooper.packetevents.packetwrappers.NMSPacket;
 import io.github.retrooper.packetevents.packetwrappers.WrappedPacket;
 import io.github.retrooper.packetevents.utils.list.ListWrapper;
 import io.github.retrooper.packetevents.utils.nms.NMSUtils;
-import io.netty.channel.epoll.EpollSocketChannel;
 import net.minecraft.util.io.netty.channel.Channel;
 import net.minecraft.util.io.netty.channel.ChannelFuture;
 import net.minecraft.util.io.netty.channel.ChannelHandler;
@@ -130,8 +129,7 @@ public class EarlyChannelInjectorLegacy implements EarlyInjector {
                 WrappedPacket networkManagerWrapper = new WrappedPacket(new NMSPacket(networkManager), NMSUtils.networkManagerClass);
                 Channel channel = (Channel) networkManagerWrapper.readObject(0, NMSUtils.nettyChannelClass);
                 if (channel == null ||
-                        (!(channel.getClass().equals(NioSocketChannel.class))) &&
-                                !(channel.getClass().equals(EpollSocketChannel.class))) {
+                        (!channel.getClass().equals(NioSocketChannel.class))) {
                     continue;
                 }
 

src/main/java/io/github/retrooper/packetevents/injector/legacy/early/PEChannelInitializerLegacy.java

@@ -21,7 +21,6 @@ package io.github.retrooper.packetevents.injector.legacy.early;
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.injector.legacy.PlayerChannelHandlerLegacy;
 import io.github.retrooper.packetevents.utils.reflection.Reflection;
-import io.netty.channel.epoll.EpollSocketChannel;
 import net.minecraft.util.io.netty.channel.Channel;
 import net.minecraft.util.io.netty.channel.ChannelInitializer;
 import net.minecraft.util.io.netty.channel.socket.nio.NioSocketChannel;
@@ -49,8 +48,7 @@ public class PEChannelInitializerLegacy extends ChannelInitializer<Channel> {
     protected void initChannel(Channel channel) throws Exception {
         initChannelMethod.invoke(oldChannelInitializer, channel);
         PlayerChannelHandlerLegacy channelHandler = new PlayerChannelHandlerLegacy();
-        if (channel.getClass().equals(NioSocketChannel.class)
-                || channel.getClass().equals(EpollSocketChannel.class)) {
+        if (channel.getClass().equals(NioSocketChannel.class)) {
             if (channel.pipeline().get("packet_handler") != null) {
                 String handlerName = PacketEvents.get().getHandlerName();
                 if (channel.pipeline().get(handlerName) != null) {

src/main/java/io/github/retrooper/packetevents/injector/legacy/late/LateChannelInjectorLegacy.java

@@ -21,7 +21,6 @@ package io.github.retrooper.packetevents.injector.legacy.late;
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.injector.LateInjector;
 import io.github.retrooper.packetevents.injector.legacy.PlayerChannelHandlerLegacy;
-import io.netty.channel.epoll.EpollSocketChannel;
 import net.minecraft.util.io.netty.channel.Channel;
 import net.minecraft.util.io.netty.channel.socket.nio.NioSocketChannel;
 import org.bukkit.entity.Player;
@@ -42,8 +41,7 @@ public class LateChannelInjectorLegacy implements LateInjector {
         PlayerChannelHandlerLegacy playerChannelHandlerLegacy = new PlayerChannelHandlerLegacy();
         playerChannelHandlerLegacy.player = player;
         Channel channel = (Channel) PacketEvents.get().getPlayerUtils().getChannel(player);
-        if (channel.getClass().equals(NioSocketChannel.class)
-        || channel.getClass().equals(EpollSocketChannel.class)) {
+        if (channel.getClass().equals(NioSocketChannel.class)) {
             channel.pipeline().addBefore("packet_handler", PacketEvents.get().getHandlerName(), playerChannelHandlerLegacy);
         }
     }

src/main/java/io/github/retrooper/packetevents/injector/modern/PlayerChannelHandlerModern.java

@@ -20,6 +20,7 @@ package io.github.retrooper.packetevents.injector.modern;
 
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.processor.PacketProcessorInternal;
+import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
@@ -44,6 +45,11 @@ public class PlayerChannelHandlerModern extends ChannelDuplexHandler {
 
     @Override
     public void write(final ChannelHandlerContext ctx, Object packet, final ChannelPromise promise) throws Exception {
+        if (packet instanceof ByteBuf) {
+            //Ignore bytebufs!
+            super.write(ctx, packet, promise);
+            return;
+        }
         PacketProcessorInternal.PacketData data = PacketEvents.get().getInternalPacketProcessor().write(player, ctx.channel(), packet);
         if (data.postAction != null) {
             promise.addListener(f -> {

src/main/java/io/github/retrooper/packetevents/packetwrappers/play/out/blockchange/WrappedPacketOutBlockChange.java

@@ -71,7 +71,15 @@ public class WrappedPacketOutBlockChange extends WrappedPacket implements Sendab
     @Override
     protected void load() {
         getNMSBlockMethodCache = Reflection.getMethod(NMSUtils.iBlockDataClass, "getBlock", 0);
+        if (getNMSBlockMethodCache == null) {
+            Class<?> blockDataClass = NMSUtils.iBlockDataClass.getSuperclass();
+            getNMSBlockMethodCache = Reflection.getMethod(blockDataClass, NMSUtils.blockClass, 0);
+        }
         getNMSWorldTypeMethodCache = Reflection.getMethod(NMSUtils.nmsWorldClass, "getType", 0);
+        if (getNMSWorldTypeMethodCache == null) {
+            getNMSWorldTypeMethodCache = Reflection.getMethod(NMSUtils.nmsWorldClass,
+                    "getBlockStateIfLoaded", 0);
+        }
         v_1_7_10 = version.isOlderThan(ServerVersion.v_1_8);
         v_1_17 = version.isNewerThanOrEquals(ServerVersion.v_1_17);
         if (v_1_17) {

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: packetevents
-version: 1.8.2
+version: 1.8.4
 main: io.github.retrooper.packetevents.PacketEventsPlugin
 author: retrooper
 softdepend: