Merge branch 'feature/optimizations' into master

ap/pom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.geysermc</groupId>
+        <artifactId>geyser-parent</artifactId>
+        <version>1.4.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>ap</artifactId>
+    <version>1.4.1-SNAPSHOT</version>
+</project>

ap/src/main/java/org/geysermc/processor/BlockEntityProcessor.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.processor;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+
+@SupportedAnnotationTypes("org.geysermc.connector.network.translators.world.block.entity.BlockEntity")
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+public class BlockEntityProcessor extends ClassProcessor {
+    public BlockEntityProcessor() {
+        super("org.geysermc.connector.network.translators.world.block.entity.BlockEntity");
+    }
+}

ap/src/main/java/org/geysermc/processor/ClassProcessor.java

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.processor;
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
+import javax.tools.Diagnostic;
+import javax.tools.FileObject;
+import javax.tools.StandardLocation;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public class ClassProcessor extends AbstractProcessor {
+    private final String annotationClassName;
+
+    private Path outputPath;
+
+    private final List<String> locations = new ArrayList<>();
+
+    public ClassProcessor(String annotationClassName) {
+        this.annotationClassName = annotationClassName;
+    }
+
+    @Override
+    public synchronized void init(ProcessingEnvironment processingEnv) {
+        super.init(processingEnv);
+
+        this.processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Initializing processor " + this.annotationClassName);
+
+        String outputFile = processingEnv.getOptions().get("metadataOutputFile");
+        if (outputFile != null && !outputFile.isEmpty()) {
+            this.outputPath = Paths.get(outputFile);
+        }
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+        if (roundEnv.processingOver()) {
+            if (!roundEnv.errorRaised()) {
+                complete();
+            }
+
+            return false;
+        }
+
+        if (!contains(annotations, this.annotationClassName)) {
+            return false;
+        }
+
+        for (Element element : roundEnv.getRootElements()) {
+            if (element.getKind() != ElementKind.CLASS) {
+                continue;
+            }
+
+            if (!contains(element.getAnnotationMirrors(), this.annotationClassName)) {
+                continue;
+            }
+
+            TypeElement typeElement = (TypeElement) element;
+            this.locations.add(typeElement.getQualifiedName().toString());
+        }
+        return true;
+    }
+
+    public boolean contains(Collection<? extends TypeElement> elements, String className) {
+        if (elements.isEmpty()) {
+            return false;
+        }
+
+        for (TypeElement element : elements) {
+            if (element.getQualifiedName().contentEquals(className)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public boolean contains(List<? extends AnnotationMirror> elements, String className) {
+        if (elements.isEmpty()) {
+            return false;
+        }
+
+        for (AnnotationMirror element : elements) {
+            if (element.getAnnotationType().toString().equals(className)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public void complete() {
+        try (BufferedWriter writer = this.createWriter()) {
+            for (String location : this.locations) {
+                writer.write(location);
+                writer.newLine();
+            }
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+
+        this.processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Completed processing for " + this.annotationClassName);
+    }
+
+    private BufferedWriter createWriter() throws IOException {
+        if (this.outputPath != null) {
+            this.processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Writing " + this.annotationClassName + " to " + this.outputPath);
+            return Files.newBufferedWriter(this.outputPath);
+        }
+
+        FileObject obj = this.processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", this.annotationClassName);
+        this.processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Writing " + this.annotationClassName + " to " + obj.toUri());
+        return new BufferedWriter(obj.openWriter());
+    }
+}

ap/src/main/java/org/geysermc/processor/CollisionRemapperProcessor.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.processor;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+
+@SupportedAnnotationTypes("org.geysermc.connector.network.translators.collision.CollisionRemapper")
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+public class CollisionRemapperProcessor extends ClassProcessor {
+    public CollisionRemapperProcessor() {
+        super("org.geysermc.connector.network.translators.collision.CollisionRemapper");
+    }
+}

ap/src/main/java/org/geysermc/processor/ItemRemapperProcessor.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.processor;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+
+@SupportedAnnotationTypes("org.geysermc.connector.network.translators.ItemRemapper")
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+public class ItemRemapperProcessor extends ClassProcessor {
+    public ItemRemapperProcessor() {
+        super("org.geysermc.connector.network.translators.ItemRemapper");
+    }
+}

ap/src/main/java/org/geysermc/processor/PacketTranslatorProcessor.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.processor;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+
+@SupportedAnnotationTypes("org.geysermc.connector.network.translators.Translator")
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+public class PacketTranslatorProcessor extends ClassProcessor {
+    public PacketTranslatorProcessor() {
+        super("org.geysermc.connector.network.translators.Translator");
+    }
+}

ap/src/main/java/org/geysermc/processor/SoundHandlerProcessor.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.processor;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+
+@SupportedAnnotationTypes("org.geysermc.connector.network.translators.sound.SoundHandler")
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+public class SoundHandlerProcessor extends ClassProcessor {
+    public SoundHandlerProcessor() {
+        super("org.geysermc.connector.network.translators.sound.SoundHandler");
+    }
+}

bootstrap/bungeecord/pom.xml

@@ -71,10 +71,6 @@
                                     <pattern>io.netty.channel.kqueue</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.io.netty.channel.kqueue</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.reflections</pattern>
-                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.reflections</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.google.common</shadedPattern>
@@ -83,10 +79,6 @@
                                     <pattern>com.google.guava</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.google.guava</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.dom4j</pattern>
-                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.dom4j</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>net.kyori</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.kyori</shadedPattern>

bootstrap/pom.xml

@@ -29,6 +29,16 @@
             <url>https://repo.velocitypowered.com/snapshots/</url>
         </repository>
     </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.geysermc</groupId>
+            <artifactId>ap</artifactId>
+            <version>1.4.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
     <modules>
         <module>bungeecord</module>
         <module>spigot</module>

bootstrap/spigot/pom.xml

@@ -83,10 +83,6 @@
                                     <pattern>com.fasterxml.jackson</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.jackson</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.reflections</pattern>
-                                    <shadedPattern>org.geysermc.platform.spigot.shaded.reflections</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.google.common</shadedPattern>
@@ -95,10 +91,6 @@
                                     <pattern>com.google.guava</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.google.guava</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.dom4j</pattern>
-                                    <shadedPattern>org.geysermc.platform.spigot.shaded.dom4j</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>net.kyori</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.kyori</shadedPattern>

bootstrap/sponge/pom.xml

@@ -69,10 +69,6 @@
                                     <pattern>it.unimi.dsi.fastutil</pattern>
                                     <shadedPattern>org.geysermc.platform.sponge.shaded.fastutil</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.reflections</pattern>
-                                    <shadedPattern>org.geysermc.platform.sponge.shaded.reflections</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
                                     <shadedPattern>org.geysermc.platform.sponge.shaded.google.common</shadedPattern>
@@ -81,10 +77,6 @@
                                     <pattern>com.google.guava</pattern>
                                     <shadedPattern>org.geysermc.platform.sponge.shaded.google.guava</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.dom4j</pattern>
-                                    <shadedPattern>org.geysermc.platform.sponge.shaded.dom4j</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>net.kyori</pattern>
                                     <shadedPattern>org.geysermc.platform.sponge.shaded.kyori</shadedPattern>

bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/GeyserStandaloneBootstrap.java

@@ -30,6 +30,7 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
+import io.netty.util.ResourceLeakDetector;
 import lombok.Getter;
 import net.minecrell.terminalconsole.TerminalConsoleAppender;
 import org.apache.logging.log4j.Level;
@@ -80,6 +81,10 @@ public class GeyserStandaloneBootstrap implements GeyserBootstrap {
     private static final Map<String, String> argsConfigKeys = new HashMap<>();
 
     public static void main(String[] args) {
+        if (System.getProperty("io.netty.leakDetection.level") == null) {
+            ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED); // Can eat performance
+        }
+
         GeyserStandaloneBootstrap bootstrap = new GeyserStandaloneBootstrap();
         // Set defaults
         boolean useGuiOpts = bootstrap.useGui;

bootstrap/velocity/pom.xml

@@ -65,10 +65,6 @@
                                     <pattern>it.unimi.dsi.fastutil</pattern>
                                     <shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.reflections</pattern>
-                                    <shadedPattern>org.geysermc.platform.velocity.shaded.reflections</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
                                     <shadedPattern>org.geysermc.platform.velocity.shaded.google.common</shadedPattern>
@@ -77,10 +73,6 @@
                                     <pattern>com.google.guava</pattern>
                                     <shadedPattern>org.geysermc.platform.velocity.shaded.google.guava</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.dom4j</pattern>
-                                    <shadedPattern>org.geysermc.platform.velocity.shaded.dom4j</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>net.kyori.adventure.text.serializer.gson.legacyimpl</pattern>
                                     <shadedPattern>org.geysermc.platform.velocity.shaded.kyori.legacyimpl</shadedPattern>

connector/pom.xml

@@ -18,6 +18,12 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.geysermc</groupId>
+            <artifactId>ap</artifactId>
+            <version>1.4.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.geysermc</groupId>
             <artifactId>common</artifactId>
@@ -207,18 +213,6 @@
             <classifier>osx-x86_64</classifier>
         </dependency>
         <!-- End -->
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.11</version> <!-- This isn't the latest version to get round https://github.com/ronmamo/reflections/issues/273 -->
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>2.1.3</version>
-            <scope>compile</scope>
-        </dependency>
         <!-- Adventure text serialization -->
         <dependency>
             <groupId>net.kyori</groupId>
@@ -342,54 +336,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.gmavenplus</groupId>
-                <artifactId>gmavenplus-plugin</artifactId>
-                <version>1.9.1</version>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <scripts>
-                                <script><![CDATA[
-                                    new org.reflections.Reflections("org.geysermc.connector.network.translators")
-                                        .save("${project.artifactId}/target/classes/META-INF/reflections/org.geysermc.connector.network.translators-reflections.xml")
-                                    new org.reflections.Reflections("org.geysermc.connector.network.translators.collision.translators")
-                                        .save("${project.artifactId}/target/classes/META-INF/reflections/org.geysermc.connector.network.translators.collision.translators-reflections.xml")
-                                    new org.reflections.Reflections("org.geysermc.connector.network.translators.item")
-                                        .save("${project.artifactId}/target/classes/META-INF/reflections/org.geysermc.connector.network.translators.item-reflections.xml")
-                                    new org.reflections.Reflections("org.geysermc.connector.network.translators.sound")
-                                        .save("${project.artifactId}/target/classes/META-INF/reflections/org.geysermc.connector.network.translators.sound-reflections.xml")
-                                    new org.reflections.Reflections("org.geysermc.connector.network.translators.world.block.entity")
-                                        .save("${project.artifactId}/target/classes/META-INF/reflections/org.geysermc.connector.network.translators.world.block.entity-reflections.xml")
-                                ]]></script>
-                            </scripts>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.reflections</groupId>
-                        <artifactId>reflections</artifactId>
-                        <version>0.9.11</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.dom4j</groupId>
-                        <artifactId>dom4j</artifactId>
-                        <version>2.1.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-all</artifactId>
-                        <version>3.0.5</version>
-                        <scope>runtime</scope>
-                        <type>pom</type>
-                    </dependency>
-                </dependencies>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

connector/src/main/java/org/geysermc/connector/GeyserConnector.java

@@ -524,18 +524,6 @@ public class GeyserConnector {
         return !"DEV".equals(GeyserConnector.VERSION);
     }
 
-    /**
-     * Whether to use XML reflections in the jar or manually find the reflections.
-     * Will return true if in production and the platform is not Fabric.
-     * On Fabric - it complains about being unable to create a default XMLReader.
-     * On other platforms this should only be true in compiled jars.
-     *
-     * @return whether to use XML reflections
-     */
-    public boolean useXmlReflections() {
-        return !this.getPlatformType().equals(PlatformType.FABRIC) && isProductionEnvironment();
-    }
-
     public static GeyserConnector getInstance() {
         return instance;
     }

connector/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java

@@ -114,7 +114,7 @@ public class VillagerEntity extends AbstractMerchantEntity {
         if (bedPosition != null) {
             bedId = session.getConnector().getWorldManager().getBlockAt(session, bedPosition);
         }
-        String bedRotationZ = BlockRegistries.JAVA_IDENTIFIERS.get().inverse().get(bedId);
+        String bedRotationZ = BlockRegistries.JAVA_IDENTIFIERS.get().get(bedId);
         setRotation(rotation);
         setOnGround(isOnGround);
         this.position = Vector3f.from(position.getX() + relX, position.getY() + relY, position.getZ() + relZ);

connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

@@ -560,8 +560,10 @@ public class GeyserSession implements CommandSender {
         }
 
         loggingIn = true;
-        // new thread so clients don't timeout
+
-        new Thread(() -> {
+        // Use a future to prevent timeouts as all the authentication is handled sync
+        // This will be changed with the new protocol library.
+        CompletableFuture.supplyAsync(() -> {
             try {
                 if (password != null && !password.isEmpty()) {
                     AuthenticationService authenticationService;
@@ -587,15 +589,14 @@ public class GeyserSession implements CommandSender {
 
                     protocol = new MinecraftProtocol(validUsername);
                 }
-
-                connectDownstream();
             } catch (InvalidCredentialsException | IllegalArgumentException e) {
                 connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.invalid", username));
                 disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.login.invalid.kick", getClientData().getLanguageCode()));
             } catch (RequestException ex) {
                 ex.printStackTrace();
             }
-        }).start();
+            return null;
+        }).whenComplete((aVoid, ex) -> connectDownstream());
     }
 
     /**
@@ -608,28 +609,31 @@ public class GeyserSession implements CommandSender {
         }
 
         loggingIn = true;
-        // new thread so clients don't timeout
-        new Thread(() -> {
-            try {
-                MsaAuthenticationService msaAuthenticationService = new MsaAuthenticationService(GeyserConnector.OAUTH_CLIENT_ID);
-
-                MsaAuthenticationService.MsCodeResponse response = msaAuthenticationService.getAuthCode();
-                LoginEncryptionUtils.buildAndShowMicrosoftCodeWindow(this, response);
 
         // This just looks cool
         SetTimePacket packet = new SetTimePacket();
         packet.setTime(16000);
         sendUpstreamPacket(packet);
 
-                // Wait for the code to validate
+        // new thread so clients don't timeout
-                attemptCodeAuthentication(msaAuthenticationService);
+        MsaAuthenticationService msaAuthenticationService = new MsaAuthenticationService(GeyserConnector.OAUTH_CLIENT_ID);
-            } catch (InvalidCredentialsException | IllegalArgumentException e) {
+
-                connector.getLogger().info(LanguageUtils.getLocaleStringLog("geyser.auth.login.invalid", getAuthData().getName()));
+        // Use a future to prevent timeouts as all the authentication is handled sync
-                disconnect(LanguageUtils.getPlayerLocaleString("geyser.auth.login.invalid.kick", getClientData().getLanguageCode()));
+        // This will be changed with the new protocol library.
-            } catch (RequestException ex) {
+        CompletableFuture.supplyAsync(() -> {
-                ex.printStackTrace();
+            try {
+                return msaAuthenticationService.getAuthCode();
+            } catch (RequestException e) {
+                throw new CompletionException(e);
             }
-        }).start();
+        }).whenComplete((response, ex) -> {
+            if (ex != null) {
+                ex.printStackTrace();
+                return;
+            }
+            LoginEncryptionUtils.buildAndShowMicrosoftCodeWindow(this, response);
+            attemptCodeAuthentication(msaAuthenticationService);
+        });
     }
 
     /**
@@ -646,7 +650,7 @@ public class GeyserSession implements CommandSender {
             connectDownstream();
         } catch (RequestException e) {
             if (!(e instanceof AuthPendingException)) {
-                e.printStackTrace();
+                throw new RuntimeException("Failed to log in with Microsoft code!", e);
             } else {
                 // Wait one second before trying again
                 connector.getGeneralThreadPool().schedule(() -> attemptCodeAuthentication(msaAuthenticationService), 1, TimeUnit.SECONDS);

connector/src/main/java/org/geysermc/connector/network/translators/PacketTranslatorRegistry.java

@@ -35,13 +35,12 @@ import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.utils.FileUtils;
 import org.geysermc.connector.utils.LanguageUtils;
-import org.reflections.Reflections;
 
-import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
 
 public class PacketTranslatorRegistry<T> {
-    private final Map<Class<? extends T>, PacketTranslator<? extends T>> translators = new HashMap<>();
+    private final Map<Class<? extends T>, PacketTranslator<? extends T>> translators = new IdentityHashMap<>();
 
     public static final PacketTranslatorRegistry<Packet> JAVA_TRANSLATOR = new PacketTranslatorRegistry<>();
     public static final PacketTranslatorRegistry<BedrockPacket> BEDROCK_TRANSLATOR = new PacketTranslatorRegistry<>();
@@ -49,9 +48,7 @@ public class PacketTranslatorRegistry<T> {
     private static final ObjectArrayList<Class<?>> IGNORED_PACKETS = new ObjectArrayList<>();
 
     static {
-        Reflections ref = GeyserConnector.getInstance().useXmlReflections() ? FileUtils.getReflections("org.geysermc.connector.network.translators") : new Reflections("org.geysermc.connector.network.translators");
+        for (Class<?> clazz : FileUtils.getGeneratedClassesForAnnotation(Translator.class)) {
-
-        for (Class<?> clazz : ref.getTypesAnnotatedWith(Translator.class)) {
             Class<?> packet = clazz.getAnnotation(Translator.class).packet();
 
             GeyserConnector.getInstance().getLogger().debug("Found annotated translator: " + clazz.getCanonicalName() + " : " + packet.getSimpleName());

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java

@@ -232,7 +232,7 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
                             if (session.getOpPermissionLevel() >= 2 && session.getGameMode() == GameMode.CREATIVE) {
                                 // Otherwise insufficient permissions
                                 int blockState = session.getBlockMappings().getJavaBlockState(packet.getBlockRuntimeId());
-                                String blockName = BlockRegistries.JAVA_IDENTIFIERS.get().inverse().getOrDefault(blockState, "");
+                                String blockName = BlockRegistries.JAVA_IDENTIFIERS.get().getOrDefault(blockState, "");
                                 // In the future this can be used for structure blocks too, however not all elements
                                 // are available in each GUI
                                 if (blockName.contains("jigsaw")) {

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockActionTranslator.java

@@ -178,7 +178,7 @@ public class BedrockActionTranslator extends PacketTranslator<PlayerActionPacket
                 // Account for fire - the client likes to hit the block behind.
                 Vector3i fireBlockPos = BlockUtils.getBlockPosition(packet.getBlockPosition(), packet.getFace());
                 int blockUp = session.getConnector().getWorldManager().getBlockAt(session, fireBlockPos);
-                String identifier = BlockRegistries.JAVA_IDENTIFIERS.get().inverse().get(blockUp);
+                String identifier = BlockRegistries.JAVA_IDENTIFIERS.get().get(blockUp);
                 if (identifier.startsWith("minecraft:fire") || identifier.startsWith("minecraft:soul_fire")) {
                     ClientPlayerActionPacket startBreakingPacket = new ClientPlayerActionPacket(PlayerAction.START_DIGGING, new Position(fireBlockPos.getX(),
                             fireBlockPos.getY(), fireBlockPos.getZ()), BlockFace.values()[packet.getFace()]);

connector/src/main/java/org/geysermc/connector/network/translators/inventory/holder/BlockInventoryHolder.java

@@ -78,7 +78,7 @@ public class BlockInventoryHolder extends InventoryHolder {
         if (checkInteractionPosition(session)) {
             // Then, check to see if the interacted block is valid for this inventory by ensuring the block state identifier is valid
             int javaBlockId = session.getConnector().getWorldManager().getBlockAt(session, session.getLastInteractionBlockPosition());
-            String[] javaBlockString = BlockRegistries.JAVA_IDENTIFIERS.get().inverse().getOrDefault(javaBlockId, "minecraft:air").split("\\[");
+            String[] javaBlockString = BlockRegistries.JAVA_IDENTIFIERS.get().getOrDefault(javaBlockId, "minecraft:air").split("\\[");
             if (isValidBlock(javaBlockString)) {
                 // We can safely use this block
                 inventory.setHolderPosition(session.getLastInteractionBlockPosition());

connector/src/main/java/org/geysermc/connector/network/translators/inventory/translators/chest/DoubleChestInventoryTranslator.java

@@ -54,7 +54,7 @@ public class DoubleChestInventoryTranslator extends ChestInventoryTranslator {
         // See BlockInventoryHolder - same concept there except we're also dealing with a specific block state
         if (session.getLastInteractionPlayerPosition().equals(session.getPlayerEntity().getPosition())) {
             int javaBlockId = session.getConnector().getWorldManager().getBlockAt(session, session.getLastInteractionBlockPosition());
-            String[] javaBlockString = BlockRegistries.JAVA_IDENTIFIERS.get().inverse().getOrDefault(javaBlockId, "minecraft:air").split("\\[");
+            String[] javaBlockString = BlockRegistries.JAVA_IDENTIFIERS.get().getOrDefault(javaBlockId, "minecraft:air").split("\\[");
             if (javaBlockString.length > 1 && (javaBlockString[0].equals("minecraft:chest") || javaBlockString[0].equals("minecraft:trapped_chest"))
                     && !javaBlockString[1].contains("type=single")) {
                 inventory.setHolderPosition(session.getLastInteractionBlockPosition());

connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java

@@ -43,7 +43,6 @@ import org.geysermc.connector.registry.type.ItemMapping;
 import org.geysermc.connector.registry.type.ItemMappings;
 import org.geysermc.connector.utils.FileUtils;
 import org.geysermc.connector.utils.LocaleUtils;
-import org.reflections.Reflections;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -61,10 +60,8 @@ public abstract class ItemTranslator {
 
     static {
         /* Load item translators */
-        Reflections ref = GeyserConnector.getInstance().useXmlReflections() ? FileUtils.getReflections("org.geysermc.connector.network.translators.item") : new Reflections("org.geysermc.connector.network.translators.item");
-
         Map<NbtItemStackTranslator, Integer> loadedNbtItemTranslators = new HashMap<>();
-        for (Class<?> clazz : ref.getTypesAnnotatedWith(ItemRemapper.class)) {
+        for (Class<?> clazz : FileUtils.getGeneratedClassesForAnnotation(ItemRemapper.class)) {
             int priority = clazz.getAnnotation(ItemRemapper.class).priority();
 
             GeyserConnector.getInstance().getLogger().debug("Found annotated item translator: " + clazz.getCanonicalName());

connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaBlockChangeTranslator.java

@@ -101,7 +101,7 @@ public class JavaBlockChangeTranslator extends PacketTranslator<ServerBlockChang
                 || lastInteractPos.getZ() != packet.getRecord().getPosition().getZ())) {
             return;
         }
-        String identifier = BlockRegistries.JAVA_IDENTIFIERS.get().inverse().get(packet.getRecord().getBlock());
+        String identifier = BlockRegistries.JAVA_IDENTIFIERS.get().get(packet.getRecord().getBlock());
         session.setInteracting(false);
         BlockSoundInteractionHandler.handleBlockInteraction(session, lastInteractPos.toFloat(), identifier);
     }

connector/src/main/java/org/geysermc/connector/registry/BlockRegistries.java

@@ -25,8 +25,6 @@
 
 package org.geysermc.connector.registry;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
@@ -35,6 +33,7 @@ import org.geysermc.connector.registry.loader.RegistryLoaders;
 import org.geysermc.connector.registry.populator.BlockRegistryPopulator;
 import org.geysermc.connector.registry.type.BlockMapping;
 import org.geysermc.connector.registry.type.BlockMappings;
+import org.geysermc.connector.utils.Object2IntBiMap;
 
 /**
  * Holds all the block registries in Geyser.
@@ -46,7 +45,7 @@ public class BlockRegistries {
 
     public static final SimpleMappedRegistry<Integer, BlockMapping> JAVA_BLOCKS = SimpleMappedRegistry.create(RegistryLoaders.empty(Int2ObjectOpenHashMap::new));
 
-    public static final MappedRegistry<String, Integer, BiMap<String, Integer>> JAVA_IDENTIFIERS = MappedRegistry.create(RegistryLoaders.empty(HashBiMap::create));
+    public static final MappedRegistry<String, Integer, Object2IntBiMap<String>> JAVA_IDENTIFIERS = MappedRegistry.create(RegistryLoaders.empty(Object2IntBiMap::new));
 
     public static final SimpleMappedRegistry<Integer, String> JAVA_CLEAN_IDENTIFIERS = SimpleMappedRegistry.create(RegistryLoaders.empty(Int2ObjectOpenHashMap::new));
 

connector/src/main/java/org/geysermc/connector/registry/Registries.java

@@ -58,9 +58,9 @@ import java.util.Set;
 public class Registries {
     public static final SimpleRegistry<NbtMap> BIOMES = SimpleRegistry.create("bedrock/biome_definitions.dat", RegistryLoaders.NBT);
 
-    public static final SimpleMappedRegistry<String, BlockEntityTranslator> BLOCK_ENTITIES = SimpleMappedRegistry.create("org.geysermc.connector.network.translators.world.block.entity", BlockEntityRegistryLoader::new);
+    public static final SimpleMappedRegistry<String, BlockEntityTranslator> BLOCK_ENTITIES = SimpleMappedRegistry.create("org.geysermc.connector.network.translators.world.block.entity.BlockEntity", BlockEntityRegistryLoader::new);
 
-    public static final SimpleMappedRegistry<Integer, BlockCollision> COLLISIONS = SimpleMappedRegistry.create(Pair.of("org.geysermc.connector.network.translators.collision.translators", "mappings/collision.json"), CollisionRegistryLoader::new);
+    public static final SimpleMappedRegistry<Integer, BlockCollision> COLLISIONS = SimpleMappedRegistry.create(Pair.of("org.geysermc.connector.network.translators.collision.translators.Translator", "mappings/collision.json"), CollisionRegistryLoader::new);
 
     public static final VersionedRegistry<Map<RecipeType, List<CraftingData>>> CRAFTING_DATA = VersionedRegistry.create(RegistryLoaders.empty(Int2ObjectOpenHashMap::new));
 
@@ -80,7 +80,7 @@ public class Registries {
 
     public static final SimpleMappedRegistry<SoundEffect, Effect> SOUND_EFFECTS = SimpleMappedRegistry.create("mappings/effects.json", SoundEffectsRegistryLoader::new);
 
-    public static final SimpleMappedRegistry<SoundHandler, SoundInteractionHandler<?>> SOUND_HANDLERS = SimpleMappedRegistry.create("org.geysermc.connector.network.translators.sound", SoundHandlerRegistryLoader::new);
+    public static final SimpleMappedRegistry<SoundHandler, SoundInteractionHandler<?>> SOUND_HANDLERS = SimpleMappedRegistry.create("org.geysermc.connector.network.translators.sound.SoundHandler", SoundHandlerRegistryLoader::new);
 
     public static void init() {
         // no-op

connector/src/main/java/org/geysermc/connector/registry/loader/AnnotatedRegistryLoader.java

@@ -26,9 +26,7 @@
 package org.geysermc.connector.registry.loader;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.utils.FileUtils;
-import org.reflections.Reflections;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
@@ -66,8 +64,7 @@ public class AnnotatedRegistryLoader<R, A extends Annotation, V> implements Regi
     @Override
     public Map<R, V> load(String input) {
         Map<R, V> entries = new Object2ObjectOpenHashMap<>();
-        Reflections ref = GeyserConnector.getInstance().useXmlReflections() ? FileUtils.getReflections(input) : new Reflections(input);
+        for (Class<?> clazz : FileUtils.getGeneratedClassesForAnnotation(input)) {
-        for (Class<?> clazz : ref.getTypesAnnotatedWith(this.annotation)) {
             try {
                 entries.put(this.mapper.apply(clazz.getAnnotation(this.annotation)), (V) clazz.newInstance());
             } catch (InstantiationException | IllegalAccessException ex) {

connector/src/main/java/org/geysermc/connector/registry/loader/CollisionRegistryLoader.java

@@ -26,10 +26,10 @@
 package org.geysermc.connector.registry.loader;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.google.common.collect.BiMap;
 import it.unimi.dsi.fastutil.Pair;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import lombok.AllArgsConstructor;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.translators.collision.BoundingBox;
@@ -40,11 +40,11 @@ import org.geysermc.connector.network.translators.collision.translators.OtherCol
 import org.geysermc.connector.network.translators.collision.translators.SolidCollision;
 import org.geysermc.connector.registry.BlockRegistries;
 import org.geysermc.connector.utils.FileUtils;
-import org.reflections.Reflections;
+import org.geysermc.connector.utils.Object2IntBiMap;
 
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
 
@@ -57,9 +57,8 @@ public class CollisionRegistryLoader extends MultiResourceRegistryLoader<String,
     public Map<Integer, BlockCollision> load(Pair<String, String> input) {
         Int2ObjectMap<BlockCollision> collisions = new Int2ObjectOpenHashMap<>();
 
-        Map<Class<?>, CollisionInfo> annotationMap = new HashMap<>();
+        Map<Class<?>, CollisionInfo> annotationMap = new IdentityHashMap<>();
-        Reflections ref = GeyserConnector.getInstance().useXmlReflections() ? FileUtils.getReflections(input.key()) : new Reflections(input.key());
+        for (Class<?> clazz : FileUtils.getGeneratedClassesForAnnotation(CollisionRemapper.class.getName())) {
-        for (Class<?> clazz : ref.getTypesAnnotatedWith(CollisionRemapper.class)) {
             GeyserConnector.getInstance().getLogger().debug("Found annotated collision translator: " + clazz.getCanonicalName());
 
             CollisionRemapper collisionRemapper = clazz.getAnnotation(CollisionRemapper.class);
@@ -76,16 +75,16 @@ public class CollisionRegistryLoader extends MultiResourceRegistryLoader<String,
             throw new AssertionError("Unable to load collision data", e);
         }
 
-        BiMap<String, Integer> javaIdBlockMap = BlockRegistries.JAVA_IDENTIFIERS.get();
+        Object2IntBiMap<String> javaIdBlockMap = BlockRegistries.JAVA_IDENTIFIERS.get();
 
         // Map of classes that don't change based on parameters that have already been created
-        Map<Class<?>, BlockCollision> instantiatedCollision = new HashMap<>();
+        Map<Class<?>, BlockCollision> instantiatedCollision = new IdentityHashMap<>();
-        for (Map.Entry<String, Integer> entry : javaIdBlockMap.entrySet()) {
+        for (Object2IntMap.Entry<String> entry : javaIdBlockMap.object2IntEntrySet()) {
-            BlockCollision newCollision = instantiateCollision(entry.getKey(), entry.getValue(), annotationMap, instantiatedCollision, collisionList);
+            BlockCollision newCollision = instantiateCollision(entry.getKey(), entry.getIntValue(), annotationMap, instantiatedCollision, collisionList);
             if (newCollision != null) {
                 instantiatedCollision.put(newCollision.getClass(), newCollision);
             }
-            collisions.put(entry.getValue().intValue(), newCollision);
+            collisions.put(entry.getIntValue(), newCollision);
         }
         return collisions;
     }

connector/src/main/java/org/geysermc/connector/registry/populator/ItemRegistryPopulator.java

@@ -49,7 +49,6 @@ import org.geysermc.connector.network.translators.item.StoredItemMappings;
 import org.geysermc.connector.registry.BlockRegistries;
 import org.geysermc.connector.registry.Registries;
 import org.geysermc.connector.registry.type.*;
-import org.geysermc.connector.utils.BlockUtils;
 import org.geysermc.connector.utils.FileUtils;
 
 import java.io.ByteArrayInputStream;
@@ -124,6 +123,7 @@ public class ItemRegistryPopulator {
 
             // Used to get the Bedrock namespaced ID (in instances where there are small differences)
             Object2IntMap<String> bedrockIdentifierToId = new Object2IntOpenHashMap<>();
+            bedrockIdentifierToId.defaultReturnValue(Short.MIN_VALUE);
 
             List<String> itemNames = new ArrayList<>();
 
@@ -268,14 +268,14 @@ public class ItemRegistryPopulator {
                 }
                 String bedrockIdentifier = mappingItem.getBedrockIdentifier();
                 int bedrockId = bedrockIdentifierToId.getInt(bedrockIdentifier);
-                if (bedrockIdentifier == null) {
+                if (bedrockId == Short.MIN_VALUE) {
-                    throw new RuntimeException("Missing Bedrock ID in mappings!: " + bedrockId);
+                    throw new RuntimeException("Missing Bedrock ID in mappings: " + bedrockIdentifier);
                 }
-                int stackSize = mappingItem.getStackSize() == null ? 64 : mappingItem.getStackSize();
+                int stackSize = mappingItem.getStackSize();
 
                 int bedrockBlockId = -1;
-                Integer blockRuntimeIdNode = entry.getValue().getBlockRuntimeId();
+                Integer firstBlockRuntimeId = entry.getValue().getFirstBlockRuntimeId();
-                if (blockRuntimeIdNode != null) {
+                if (firstBlockRuntimeId != null) {
                     int blockIdOverride = bedrockBlockIdOverrides.getOrDefault(bedrockIdentifier, -1);
                     if (blockIdOverride != -1) {
                         // Straight from BDS is our best chance of getting an item that doesn't run into issues
@@ -285,21 +285,21 @@ public class ItemRegistryPopulator {
                         int aValidBedrockBlockId = blacklistedIdentifiers.getOrDefault(bedrockIdentifier, -1);
                         if (aValidBedrockBlockId == -1) {
                             // Fallback
-                            bedrockBlockId = blockMappings.getBedrockBlockId(blockRuntimeIdNode);
+                            bedrockBlockId = blockMappings.getBedrockBlockId(firstBlockRuntimeId);
                         } else {
                             // As of 1.16.220, every item requires a block runtime ID attached to it.
                             // This is mostly for identifying different blocks with the same item ID - wool, slabs, some walls.
                             // However, in order for some visuals and crafting to work, we need to send the first matching block state
                             // as indexed by Bedrock's block palette
                             // There are exceptions! But, ideally, the block ID override should take care of those.
-                            String javaBlockIdentifier = BlockRegistries.JAVA_BLOCKS.get(blockRuntimeIdNode).getCleanJavaIdentifier();
                             NbtMapBuilder requiredBlockStatesBuilder = NbtMap.builder();
                             String correctBedrockIdentifier = blockMappings.getBedrockBlockStates().get(aValidBedrockBlockId).getString("name");
                             boolean firstPass = true;
-                            for (Map.Entry<String, Integer> blockEntry : BlockRegistries.JAVA_IDENTIFIERS.get().entrySet()) {
+                            // Block states are all grouped together. In the mappings, we store the first block runtime ID in order,
-                                String aBlockIdentifier = BlockUtils.getCleanIdentifier(blockEntry.getKey());
+                            // and the last, if relevant. We then iterate over all those values and get their Bedrock equivalents
-                                if (aBlockIdentifier.equals(javaBlockIdentifier)) {
+                            Integer lastBlockRuntimeId = entry.getValue().getLastBlockRuntimeId() == null ? firstBlockRuntimeId : entry.getValue().getLastBlockRuntimeId();
-                                    int bedrockBlockRuntimeId = blockMappings.getBedrockBlockId(blockEntry.getValue());
+                            for (int i = firstBlockRuntimeId; i <= lastBlockRuntimeId; i++) {
+                                int bedrockBlockRuntimeId = blockMappings.getBedrockBlockId(i);
                                 NbtMap blockTag = blockMappings.getBedrockBlockStates().get(bedrockBlockRuntimeId);
                                 String bedrockName = blockTag.getString("name");
                                 if (!bedrockName.equals(correctBedrockIdentifier)) {
@@ -332,7 +332,6 @@ public class ItemRegistryPopulator {
                                     break;
                                 }
                             }
-                            }
 
                             NbtMap requiredBlockStates = requiredBlockStatesBuilder.build();
                             if (bedrockBlockId == -1) {

connector/src/main/java/org/geysermc/connector/registry/populator/RecipeRegistryPopulator.java

@@ -70,7 +70,7 @@ public class RecipeRegistryPopulator {
         }
 
         int currentRecipeId = LAST_RECIPE_NET_ID;
-        for (Map.Entry<Integer, ItemMappings> version : Registries.ITEMS.get().entrySet()) {
+        for (Int2ObjectMap.Entry<ItemMappings> version : Registries.ITEMS.get().int2ObjectEntrySet()) {
             // Make a bit of an assumption here that the last recipe net ID will be equivalent between all versions
             LAST_RECIPE_NET_ID = currentRecipeId;
             Map<RecipeType, List<CraftingData>> craftingData = new EnumMap<>(RecipeType.class);
@@ -116,8 +116,8 @@ public class RecipeRegistryPopulator {
                         c -> new ObjectArrayList<>()).add(getCraftingDataFromJsonNode(entry, recipes, version.getValue()));
             }
 
-            Registries.CRAFTING_DATA.register(version.getKey(), craftingData);
+            Registries.CRAFTING_DATA.register(version.getIntKey(), craftingData);
-            Registries.RECIPES.register(version.getKey(), recipes);
+            Registries.RECIPES.register(version.getIntKey(), recipes);
         }
     }
 

connector/src/main/java/org/geysermc/connector/registry/type/GeyserMappingItem.java

@@ -35,8 +35,9 @@ import lombok.Data;
 public class GeyserMappingItem {
     @JsonProperty("bedrock_identifier") String bedrockIdentifier;
     @JsonProperty("bedrock_data") int bedrockData;
-    Integer blockRuntimeId;
+    Integer firstBlockRuntimeId;
-    @JsonProperty("stack_size") Integer stackSize;
+    Integer lastBlockRuntimeId;
+    @JsonProperty("stack_size") int stackSize = 64;
     @JsonProperty("tool_type") String toolType;
     @JsonProperty("tool_tier") String toolTier;
 }

connector/src/main/java/org/geysermc/connector/utils/FileUtils.java

@@ -30,16 +30,15 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.geysermc.connector.GeyserConnector;
-import org.reflections.Reflections;
-import org.reflections.serializers.XmlSerializer;
-import org.reflections.util.ConfigurationBuilder;
 
 import java.io.*;
-import java.net.URL;
+import java.lang.annotation.Annotation;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.security.MessageDigest;
+import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class FileUtils {
 
@@ -193,24 +192,6 @@ public class FileUtils {
         return sha1;
     }
 
-    /**
-     * Get the stored reflection data for a given path
-     *
-     * @param path The path to get the reflection data for
-     * @return The created Reflections object
-     */
-    public static Reflections getReflections(String path) {
-        Reflections reflections = new Reflections(new ConfigurationBuilder().setScanners());
-        XmlSerializer serializer = new XmlSerializer();
-        URL resource = FileUtils.class.getClassLoader().getResource("META-INF/reflections/" + path + "-reflections.xml");
-        try (InputStream inputStream = resource.openConnection().getInputStream()) {
-            reflections.merge(serializer.read(inputStream));
-        } catch (IOException ignored) {
-        }
-
-        return reflections;
-    }
-
     /**
      * An android compatible version of {@link Files#readAllBytes}
      *
@@ -242,4 +223,41 @@ public class FileUtils {
             throw new RuntimeException("Error while trying to read input stream!");
         }
     }
+
+    /**
+     * Returns a set of all the classes that are annotated by a given annotation.
+     * Keep in mind that these are from a set of generated annotations generated
+     * at compile time by the annotation processor, meaning that arbitrary annotations
+     * cannot be passed into this method and expected to have a set of classes
+     * returned back.
+     *
+     * @param annotationClass the annotation class
+     * @return a set of all the classes annotated by the given annotation
+     */
+    public static Set<Class<?>> getGeneratedClassesForAnnotation(Class<? extends Annotation> annotationClass) {
+        return getGeneratedClassesForAnnotation(annotationClass.getName());
+    }
+
+    /**
+     * Returns a set of all the classes that are annotated by a given annotation.
+     * Keep in mind that these are from a set of generated annotations generated
+     * at compile time by the annotation processor, meaning that arbitrary annotations
+     * cannot be passed into this method and expected to have a set of classes
+     * returned back.
+     *
+     * @param input the fully qualified name of the annotation
+     * @return a set of all the classes annotated by the given annotation
+     */
+    public static Set<Class<?>> getGeneratedClassesForAnnotation(String input) {
+        InputStream annotatedClass = FileUtils.getResource(input);
+        BufferedReader reader = new BufferedReader(new InputStreamReader(annotatedClass));
+        return reader.lines().map(className -> {
+            try {
+                return Class.forName(className);
+            } catch (ClassNotFoundException ex) {
+                GeyserConnector.getInstance().getLogger().error("Failed to find class " + className, ex);
+                throw new RuntimeException(ex);
+            }
+        }).collect(Collectors.toSet());
+    }
 }

connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java

@@ -39,6 +39,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.zip.ZipFile;
 
 public class LocaleUtils {
@@ -56,14 +57,14 @@ public class LocaleUtils {
         localesFolder.mkdir();
 
         // Download the latest asset list and cache it
-        generateAssetCache();
+        generateAssetCache().whenComplete((aVoid, ex) -> downloadAndLoadLocale(LanguageUtils.getDefaultLocale()));
-        downloadAndLoadLocale(LanguageUtils.getDefaultLocale());
     }
 
     /**
      * Fetch the latest versions asset cache from Mojang so we can grab the locale files later
      */
-    private static void generateAssetCache() {
+    private static CompletableFuture<Void> generateAssetCache() {
+        return CompletableFuture.supplyAsync(() -> {
             try {
                 // Get the version manifest from Mojang
                 VersionManifest versionManifest = GeyserConnector.JSON_MAPPER.readValue(WebUtils.getBody("https://launchermeta.mojang.com/mc/game/version_manifest.json"), VersionManifest.class);
@@ -103,6 +104,8 @@ public class LocaleUtils {
             } catch (Exception e) {
                 GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.locale.fail.asset_cache", (!e.getMessage().isEmpty() ? e.getMessage() : e.getStackTrace())));
             }
+            return null;
+        });
     }
 
     /**
@@ -311,31 +314,30 @@ public class LocaleUtils {
     public static void init() {
         // no-op
     }
-}
 
-@JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
-@Getter
+    @Getter
-class VersionManifest {
+    static class VersionManifest {
         @JsonProperty("latest")
         private LatestVersion latestVersion;
 
         @JsonProperty("versions")
         private List<Version> versions;
-}
+    }
 
-@JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
-@Getter
+    @Getter
-class LatestVersion {
+    static class LatestVersion {
         @JsonProperty("release")
         private String release;
 
         @JsonProperty("snapshot")
         private String snapshot;
-}
+    }
 
-@JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
-@Getter
+    @Getter
-class Version {
+    static class Version {
         @JsonProperty("id")
         private String id;
 
@@ -350,11 +352,11 @@ class Version {
 
         @JsonProperty("releaseTime")
         private String releaseTime;
-}
+    }
 
-@JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
-@Getter
+    @Getter
-class VersionInfo {
+    static class VersionInfo {
         @JsonProperty("id")
         private String id;
 
@@ -372,11 +374,11 @@ class VersionInfo {
 
         @JsonProperty("downloads")
         private Map<String, VersionDownload> downloads;
-}
+    }
 
-@JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
-@Getter
+    @Getter
-class VersionDownload {
+    static class VersionDownload {
         @JsonProperty("sha1")
         private String sha1;
 
@@ -385,11 +387,11 @@ class VersionDownload {
 
         @JsonProperty("url")
         private String url;
-}
+    }
 
-@JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
-@Getter
+    @Getter
-class AssetIndex {
+    static class AssetIndex {
         @JsonProperty("id")
         private String id;
 
@@ -404,14 +406,15 @@ class AssetIndex {
 
         @JsonProperty("url")
         private String url;
-}
+    }
 
-@JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
-@Getter
+    @Getter
-class Asset {
+    static class Asset {
         @JsonProperty("hash")
         private String hash;
 
         @JsonProperty("size")
         private int size;
+    }
 }

connector/src/main/java/org/geysermc/connector/utils/Object2IntBiMap.java

@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2019-2021 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.utils;
+
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntCollection;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectSet;
+import it.unimi.dsi.fastutil.objects.ObjectSets;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * A primitive int BiMap implementation built around fastutil to
+ * reduce boxing and the memory footprint. Protocol has a
+ * {@link com.nukkitx.protocol.util.Int2ObjectBiMap} class, but it
+ * does not extend the Map interface making it difficult to utilize
+ * it in for loops and the registry system.
+ *
+ * @param <T> the value
+ */
+public class Object2IntBiMap<T> implements Object2IntMap<T> {
+    private final Object2IntMap<T> forwards;
+    private final Int2ObjectMap<T> backwards;
+
+    public Object2IntBiMap() {
+        this(16);
+    }
+
+    public Object2IntBiMap(int expected) {
+        this(expected, 0.75F);
+    }
+
+    public Object2IntBiMap(T defaultForwardsValue) {
+        this(16, 0.75F, defaultForwardsValue, -1);
+    }
+
+    public Object2IntBiMap(int expected, float loadFactor) {
+        this(expected, loadFactor, -1);
+    }
+
+    public Object2IntBiMap(int expected, float loadFactor, int defaultBackwardsValue) {
+        this(expected, loadFactor, null, defaultBackwardsValue);
+    }
+
+    public Object2IntBiMap(int expected, float loadFactor, T defaultForwardsValue, int defaultBackwardsValue) {
+        this.forwards = new Object2IntOpenHashMap<>(expected, loadFactor);
+        this.backwards = new Int2ObjectOpenHashMap<>(expected, loadFactor);
+        this.forwards.defaultReturnValue(defaultBackwardsValue);
+        this.backwards.defaultReturnValue(defaultForwardsValue);
+    }
+
+    @Override
+    public int size() {
+        return this.forwards.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.forwards.isEmpty();
+    }
+
+    @Override
+    public int getInt(Object o) {
+        return this.forwards.getInt(o);
+    }
+
+    public T get(int key) {
+        return this.backwards.get(key);
+    }
+
+    @Override
+    public int getOrDefault(Object key, int defaultValue) {
+        return this.forwards.getOrDefault(key, defaultValue);
+    }
+
+    public T getOrDefault(int key, T defaultValue) {
+        return this.backwards.getOrDefault(key, defaultValue);
+    }
+
+    @Override
+    public void defaultReturnValue(int i) {
+        this.forwards.defaultReturnValue(i);
+    }
+
+    public void defaultReturnValue(T v) {
+        this.backwards.defaultReturnValue(v);
+    }
+
+    @Override
+    public int defaultReturnValue() {
+        return this.forwards.defaultReturnValue();
+    }
+
+    public T backwardsDefaultReturnValue() {
+        return this.backwards.defaultReturnValue();
+    }
+
+    @Override
+    public ObjectSet<Entry<T>> object2IntEntrySet() {
+        return ObjectSets.unmodifiable(this.forwards.object2IntEntrySet());
+    }
+
+    public ObjectSet<Int2ObjectMap.Entry<T>> int2ObjectEntrySet() {
+        return ObjectSets.unmodifiable(this.backwards.int2ObjectEntrySet());
+    }
+
+    @Override
+    public ObjectSet<T> keySet() {
+        return this.forwards.keySet();
+    }
+
+    @Override
+    public IntCollection values() {
+        return this.forwards.values();
+    }
+
+    @Override
+    public boolean containsKey(Object o) {
+        return this.forwards.containsKey(o);
+    }
+
+    @Override
+    public boolean containsValue(int i) {
+        return this.backwards.containsKey(i);
+    }
+
+    @Override
+    public int put(T key, int value) {
+        this.backwards.put(value, key);
+        return this.forwards.put(key, value);
+    }
+
+    @Override
+    public void putAll(@NotNull Map<? extends T, ? extends Integer> m) {
+        this.forwards.putAll(m);
+        for (Map.Entry<? extends T, ? extends Integer> entry : m.entrySet()) {
+            this.backwards.put((int) entry.getValue(), entry.getKey());
+        }
+    }
+
+    @Override
+    public int removeInt(Object key) {
+        if (!this.forwards.containsKey(key)) {
+            return this.defaultReturnValue();
+        }
+
+        int value = this.forwards.getInt(key);
+        if (!this.backwards.containsKey(value)) {
+            return this.defaultReturnValue();
+        };
+        this.backwards.remove(value);
+        return this.forwards.removeInt(key);
+    }
+
+    @Override
+    public int hashCode() {
+        return this.forwards.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return this.forwards.toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Object2IntBiMap<?> that = (Object2IntBiMap<?>) o;
+        return Objects.equals(this.forwards, that.forwards) && Objects.equals(this.backwards, that.backwards);
+    }
+}

connector/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -0,0 +1,5 @@
+org.geysermc.processor.BlockEntityProcessor
+org.geysermc.processor.CollisionRemapperProcessor
+org.geysermc.processor.ItemRemapperProcessor
+org.geysermc.processor.PacketTranslatorProcessor
+org.geysermc.processor.SoundHandlerProcessor

connector/src/main/resources/mappings

@@ -1 +1 @@
-Subproject commit 7a67fa9ff78496f4fc30b8f72d0eff451f1771e2
+Subproject commit 8351b0f5bb6e9a1d614f84e18c91e82288c34bf6

pom.xml

@@ -31,6 +31,7 @@
     </scm>
 
     <modules>
+        <module>ap</module>
         <module>bootstrap</module>
         <module>common</module>
         <module>connector</module>