Merge remote-tracking branch 'refs/remotes/upstream/2.0' into grim/2.0

# Conflicts:
#	fabric/src/main/java/io/github/retrooper/packetevents/factory/fabric/FabricPacketEventsAPI.java

Author: Axionize

api/src/main/java/com/github/retrooper/packetevents/util/mappings/SynchronizedRegistriesHandler.java

@@ -122,6 +122,13 @@ public final class SynchronizedRegistriesHandler {
     private SynchronizedRegistriesHandler() {
     }
 
+    public static void init() {
+        // check this class has been fully loaded
+        if (REGISTRY_KEYS.isEmpty()) {
+            throw new AssertionError();
+        }
+    }
+
     public static @Nullable RegistryEntry<?> getRegistryEntry(ResourceLocation registryKey) {
         return REGISTRY_KEYS.get(registryKey);
     }

bungeecord/src/main/java/io/github/retrooper/packetevents/bungee/factory/BungeePacketEventsBuilder.java

@@ -37,6 +37,7 @@
 import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
 import com.github.retrooper.packetevents.settings.PacketEventsSettings;
 import com.github.retrooper.packetevents.util.LogManager;
+import com.github.retrooper.packetevents.util.mappings.SynchronizedRegistriesHandler;
 import io.github.retrooper.packetevents.impl.netty.NettyManagerImpl;
 import io.github.retrooper.packetevents.impl.netty.manager.player.PlayerManagerAbstract;
 import io.github.retrooper.packetevents.impl.netty.manager.protocol.ProtocolManagerAbstract;
@@ -202,6 +203,7 @@ public void load() {
                     PacketEvents.TIMEOUT_HANDLER_NAME = "pe-timeout-handler-" + id;
 
                     WrappedBlockState.ensureLoad();
+                    SynchronizedRegistriesHandler.init();
 
                     injector.inject();
                     loaded = true;

fabric/src/main/java/io/github/retrooper/packetevents/factory/fabric/FabricPacketEventsAPI.java

@@ -31,6 +31,7 @@
 import com.github.retrooper.packetevents.settings.PacketEventsSettings;
 import com.github.retrooper.packetevents.util.LogManager;
 import io.github.retrooper.packetevents.PacketEventsMod;
+import com.github.retrooper.packetevents.util.mappings.SynchronizedRegistriesHandler;
 import io.github.retrooper.packetevents.impl.netty.NettyManagerImpl;
 import io.github.retrooper.packetevents.manager.AbstractFabricPlayerManager;
 import io.github.retrooper.packetevents.manager.FabricLoggerManager;
@@ -91,6 +92,7 @@ public void load() {
         PacketEvents.SERVER_CHANNEL_HANDLER_NAME = "pe-connection-initializer-" + id;
 
         WrappedBlockState.ensureLoad();
+        SynchronizedRegistriesHandler.init();
 
         // register internal packet listener (should be the first listener)
         // this listener doesn't do any modifications to the packets, just reads data

spigot/src/main/java/io/github/retrooper/packetevents/factory/spigot/SpigotPacketEventsBuilder.java

@@ -32,6 +32,7 @@
 import com.github.retrooper.packetevents.settings.PacketEventsSettings;
 import com.github.retrooper.packetevents.util.LogManager;
 import com.github.retrooper.packetevents.util.PEVersion;
+import com.github.retrooper.packetevents.util.mappings.SynchronizedRegistriesHandler;
 import com.github.retrooper.packetevents.util.updatechecker.UpdateChecker;
 import io.github.retrooper.packetevents.bukkit.InternalBukkitListener;
 import io.github.retrooper.packetevents.bukkit.InternalBukkitLoginListener;
@@ -115,6 +116,7 @@ public void load() {
                         SpigotReflectionUtil.init();
                         CustomPipelineUtil.init();
                         WrappedBlockState.ensureLoad();
+                        SynchronizedRegistriesHandler.init();
                     } catch (Exception ex) {
                         throw new IllegalStateException(ex);
                     }

sponge/src/main/java/io/github/retrooper/packetevents/sponge/factory/SpongePacketEventsBuilder.java

@@ -30,6 +30,7 @@
 import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
 import com.github.retrooper.packetevents.settings.PacketEventsSettings;
 import com.github.retrooper.packetevents.util.LogManager;
+import com.github.retrooper.packetevents.util.mappings.SynchronizedRegistriesHandler;
 import io.github.retrooper.packetevents.sponge.injector.SpongeChannelInjector;
 import io.github.retrooper.packetevents.sponge.injector.connection.ServerConnectionInitializer;
 import io.github.retrooper.packetevents.sponge.manager.protocol.ProtocolManagerImpl;
@@ -104,6 +105,7 @@ public void load() {
                     SpongeReflectionUtil.init();
                     CustomPipelineUtil.init();
                     WrappedBlockState.ensureLoad();
+                    SynchronizedRegistriesHandler.init();
                 } catch (Exception ex) {
                     throw new IllegalStateException(ex);
                 }

velocity/src/main/java/io/github/retrooper/packetevents/velocity/factory/VelocityPacketEventsBuilder.java

@@ -34,6 +34,7 @@
 import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
 import com.github.retrooper.packetevents.settings.PacketEventsSettings;
 import com.github.retrooper.packetevents.util.LogManager;
+import com.github.retrooper.packetevents.util.mappings.SynchronizedRegistriesHandler;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.plugin.PluginContainer;
@@ -179,6 +180,7 @@ public void load() {
                     PacketEvents.SERVER_CHANNEL_HANDLER_NAME = "pe-connection-initializer-" + id;
                     PacketEvents.TIMEOUT_HANDLER_NAME = "pe-timeout-handler-" + id;
                     WrappedBlockState.ensureLoad();
+                    SynchronizedRegistriesHandler.init();
                     injector.inject();
 
                     loaded = true;