Merge branch 'master' into sound-master

README.md

@@ -28,12 +28,14 @@ Take a look [here](https://github.com/GeyserMC/Geyser/wiki#Setup) for how to set
 - Donate: https://patreon.com/GeyserMC
 
 ## What's Left to be Added/Fixed
-- Inventories ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
-- Crafting ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
-- Creative Mode ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
+- The Following Inventories 
+  - [ ] Enchantment Table
+  - [ ] Beacon
+  - [ ] Cartography Table
+  - [ ] Stonecutter
+  - [ ] Villager Trading
 - Sounds
 - Block Particles
-- Block Entities ([`inventory`](https://github.com/GeyserMC/Geyser/tree/inventory))
 - Some Entity Flags
 
 ## Compiling

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java

@@ -27,14 +27,18 @@ package org.geysermc.platform.bukkit;
 
 import org.bukkit.plugin.java.JavaPlugin;
 import org.geysermc.common.PlatformType;
+import org.geysermc.common.command.ICommandManager;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.common.bootstrap.IGeyserBootstrap;
+import org.geysermc.connector.command.CommandManager;
 import org.geysermc.platform.bukkit.command.GeyserBukkitCommandExecutor;
+import org.geysermc.platform.bukkit.command.GeyserBukkitCommandManager;
 
 import java.util.UUID;
 
 public class GeyserBukkitPlugin extends JavaPlugin implements IGeyserBootstrap {
 
+    private GeyserBukkitCommandManager geyserCommandManager;
     private GeyserBukkitConfiguration geyserConfig;
     private GeyserBukkitLogger geyserLogger;
 
@@ -53,6 +57,8 @@ public class GeyserBukkitPlugin extends JavaPlugin implements IGeyserBootstrap {
         this.geyserLogger = new GeyserBukkitLogger(getLogger(), geyserConfig.isDebugMode());
         this.connector = GeyserConnector.start(PlatformType.BUKKIT, this);
 
+        this.geyserCommandManager = new GeyserBukkitCommandManager(this, connector);
+
         this.getCommand("geyser").setExecutor(new GeyserBukkitCommandExecutor(connector));
     }
 
@@ -70,4 +76,9 @@ public class GeyserBukkitPlugin extends JavaPlugin implements IGeyserBootstrap {
     public GeyserBukkitLogger getGeyserLogger() {
         return geyserLogger;
     }
+
+    @Override
+    public CommandManager getGeyserCommandManager() {
+        return this.geyserCommandManager;
+    }
 }

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/command/GeyserBukkitCommandExecutor.java

@@ -70,6 +70,6 @@ public class GeyserBukkitCommandExecutor implements TabExecutor {
     }
 
     private GeyserCommand getCommand(String label) {
-        return connector.getCommandMap().getCommands().get(label);
+        return connector.getCommandManager().getCommands().get(label);
     }
 }

bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/command/GeyserBukkitCommandManager.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019-2020 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.platform.bukkit.command;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandMap;
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.CommandManager;
+import org.geysermc.platform.bukkit.GeyserBukkitPlugin;
+
+import java.lang.reflect.Field;
+
+public class GeyserBukkitCommandManager extends CommandManager {
+
+    private static CommandMap COMMAND_MAP;
+
+    static {
+        try {
+            Field cmdMapField = Bukkit.getServer().getClass().getDeclaredField("commandMap");
+            cmdMapField.setAccessible(true);
+            COMMAND_MAP = (CommandMap) cmdMapField.get(Bukkit.getServer());
+        } catch (NoSuchFieldException | IllegalAccessException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    private GeyserBukkitPlugin plugin;
+
+    public GeyserBukkitCommandManager(GeyserBukkitPlugin plugin, GeyserConnector connector) {
+        super(connector);
+
+        this.plugin = plugin;
+    }
+
+    @Override
+    public String getDescription(String command) {
+        Command cmd = COMMAND_MAP.getCommand(command.replace("/", ""));
+        return cmd != null ? cmd.getDescription() : "";
+    }
+}

bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java

@@ -33,7 +33,9 @@ import net.md_5.bungee.config.YamlConfiguration;
 import org.geysermc.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.common.bootstrap.IGeyserBootstrap;
+import org.geysermc.connector.command.CommandManager;
 import org.geysermc.platform.bungeecord.command.GeyserBungeeCommandExecutor;
+import org.geysermc.platform.bungeecord.command.GeyserBungeeCommandManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -44,6 +46,7 @@ import java.util.logging.Level;
 
 public class GeyserBungeePlugin extends Plugin implements IGeyserBootstrap {
 
+    private GeyserBungeeCommandManager geyserCommandManager;
     private GeyserBungeeConfiguration geyserConfig;
     private GeyserBungeeLogger geyserLogger;
 
@@ -91,6 +94,8 @@ public class GeyserBungeePlugin extends Plugin implements IGeyserBootstrap {
         this.geyserLogger = new GeyserBungeeLogger(getLogger(), geyserConfig.isDebugMode());
         this.connector = GeyserConnector.start(PlatformType.BUNGEECORD, this);
 
+        this.geyserCommandManager = new GeyserBungeeCommandManager(connector);
+
         this.getProxy().getPluginManager().registerCommand(this, new GeyserBungeeCommandExecutor(connector));
     }
 
@@ -108,4 +113,9 @@ public class GeyserBungeePlugin extends Plugin implements IGeyserBootstrap {
     public GeyserBungeeLogger getGeyserLogger() {
         return geyserLogger;
     }
+
+    @Override
+    public CommandManager getGeyserCommandManager() {
+        return this.geyserCommandManager;
+    }
 }

bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/command/GeyserBungeeCommandExecutor.java

@@ -71,6 +71,6 @@ public class GeyserBungeeCommandExecutor extends Command implements TabExecutor
     }
 
     private GeyserCommand getCommand(String label) {
-        return connector.getCommandMap().getCommands().get(label);
+        return connector.getCommandManager().getCommands().get(label);
     }
 }

bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/command/GeyserBungeeCommandManager.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2019-2020 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.platform.bungeecord.command;
+
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.CommandManager;
+
+public class GeyserBungeeCommandManager extends CommandManager {
+
+    public GeyserBungeeCommandManager(GeyserConnector connector) {
+        super(connector);
+    }
+
+    @Override
+    public String getDescription(String command) {
+        return ""; // no support for command descriptions in bungee
+    }
+}

bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java

@@ -32,9 +32,12 @@ import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
 
 import org.geysermc.common.PlatformType;
 import org.geysermc.common.bootstrap.IGeyserBootstrap;
+import org.geysermc.common.command.ICommandManager;
 import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.CommandManager;
 import org.geysermc.connector.utils.FileUtils;
 import org.geysermc.platform.sponge.command.GeyserSpongeCommandExecutor;
+import org.geysermc.platform.sponge.command.GeyserSpongeCommandManager;
 import org.slf4j.Logger;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.config.ConfigDir;
@@ -57,6 +60,7 @@ public class GeyserSpongePlugin implements IGeyserBootstrap {
     @ConfigDir(sharedRoot = false)
     private File configDir;
 
+    private GeyserSpongeCommandManager geyserCommandManager;
     private GeyserSpongeConfiguration geyserConfig;
     private GeyserSpongeLogger geyserLogger;
 
@@ -86,6 +90,7 @@ public class GeyserSpongePlugin implements IGeyserBootstrap {
 
         this.geyserLogger = new GeyserSpongeLogger(logger, geyserConfig.isDebugMode());
         this.connector = GeyserConnector.start(PlatformType.SPONGE, this);
+        this.geyserCommandManager = new GeyserSpongeCommandManager(Sponge.getCommandManager(), connector);
 
         Sponge.getCommandManager().register(this, new GeyserSpongeCommandExecutor(connector), "geyser");
     }
@@ -105,6 +110,11 @@ public class GeyserSpongePlugin implements IGeyserBootstrap {
         return geyserLogger;
     }
 
+    @Override
+    public CommandManager getGeyserCommandManager() {
+        return this.geyserCommandManager;
+    }
+
     @Listener
     public void onServerStart(GameStartedServerEvent event) {
         onEnable();

bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/command/GeyserSpongeCommandExecutor.java

@@ -95,6 +95,6 @@ public class GeyserSpongeCommandExecutor implements CommandCallable {
     }
 
     private GeyserCommand getCommand(String label) {
-        return connector.getCommandMap().getCommands().get(label);
+        return connector.getCommandManager().getCommands().get(label);
     }
 }

bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/command/GeyserSpongeCommandManager.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2019-2020 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.platform.sponge.command;
+
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.CommandManager;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.command.CommandMapping;
+import org.spongepowered.api.text.Text;
+
+public class GeyserSpongeCommandManager extends CommandManager {
+
+    private org.spongepowered.api.command.CommandManager handle;
+
+    public GeyserSpongeCommandManager(org.spongepowered.api.command.CommandManager handle, GeyserConnector connector) {
+        super(connector);
+
+        this.handle = handle;
+    }
+
+    @Override
+    public String getDescription(String command) {
+        return handle.get(command).map(CommandMapping::getCallable).map(callable -> callable.getShortDescription(Sponge.getServer().getConsole()).orElse(Text.EMPTY)).orElse(Text.EMPTY).toPlain();
+    }
+}

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

@@ -25,18 +25,21 @@
 
 package org.geysermc.platform.standalone;
 
+import org.geysermc.common.PlatformType;
+import org.geysermc.common.bootstrap.IGeyserBootstrap;
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.CommandManager;
+import org.geysermc.connector.utils.FileUtils;
+import org.geysermc.platform.standalone.command.GeyserCommandManager;
+import org.geysermc.platform.standalone.console.GeyserLogger;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.UUID;
 
-import org.geysermc.common.PlatformType;
-import org.geysermc.common.bootstrap.IGeyserBootstrap;
-import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.utils.FileUtils;
-import org.geysermc.platform.standalone.console.GeyserLogger;
-
 public class GeyserBootstrap implements IGeyserBootstrap {
 
+    private GeyserCommandManager geyserCommandManager;
     private GeyserConfiguration geyserConfig;
     private GeyserLogger geyserLogger;
 
@@ -61,6 +64,7 @@ public class GeyserBootstrap implements IGeyserBootstrap {
         }
 
         connector = GeyserConnector.start(PlatformType.STANDALONE, this);
+        geyserCommandManager = new GeyserCommandManager(connector);
         geyserLogger.start();
     }
 
@@ -79,4 +83,9 @@ public class GeyserBootstrap implements IGeyserBootstrap {
     public GeyserLogger getGeyserLogger() {
         return geyserLogger;
     }
+
+    @Override
+    public CommandManager getGeyserCommandManager() {
+        return geyserCommandManager;
+    }
 }

bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/command/GeyserCommandManager.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2019-2020 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.platform.standalone.command;
+
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.CommandManager;
+
+public class GeyserCommandManager extends CommandManager {
+
+    public GeyserCommandManager(GeyserConnector connector) {
+        super(connector);
+    }
+
+    @Override
+    public String getDescription(String command) {
+        return ""; // this is not sent over the protocol, so we return none
+    }
+}

bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/console/GeyserLogger.java

@@ -47,7 +47,7 @@ public class GeyserLogger extends SimpleTerminalConsole implements IGeyserLogger
 
     @Override
     protected void runCommand(String line) {
-        GeyserConnector.getInstance().getCommandMap().runCommand(this, line);
+        GeyserConnector.getInstance().getCommandManager().runCommand(this, line);
     }
 
     @Override

bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/GeyserVelocityPlugin.java

@@ -38,6 +38,7 @@ import org.geysermc.common.bootstrap.IGeyserBootstrap;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.utils.FileUtils;
 import org.geysermc.platform.velocity.command.GeyserVelocityCommandExecutor;
+import org.geysermc.platform.velocity.command.GeyserVelocityCommandManager;
 import org.slf4j.Logger;
 
 import java.io.File;
@@ -53,6 +54,7 @@ public class GeyserVelocityPlugin implements IGeyserBootstrap {
     @Inject
     private CommandManager commandManager;
 
+    private GeyserVelocityCommandManager geyserCommandManager;
     private GeyserVelocityConfiguration geyserConfig;
     private GeyserVelocityLogger geyserLogger;
 
@@ -74,6 +76,7 @@ public class GeyserVelocityPlugin implements IGeyserBootstrap {
         this.geyserLogger = new GeyserVelocityLogger(logger, geyserConfig.isDebugMode());
         this.connector = GeyserConnector.start(PlatformType.VELOCITY, this);
 
+        this.geyserCommandManager = new GeyserVelocityCommandManager(connector);
         this.commandManager.register(new GeyserVelocityCommandExecutor(connector), "geyser");
     }
 
@@ -92,6 +95,11 @@ public class GeyserVelocityPlugin implements IGeyserBootstrap {
         return geyserLogger;
     }
 
+    @Override
+    public org.geysermc.connector.command.CommandManager getGeyserCommandManager() {
+        return this.geyserCommandManager;
+    }
+
     @Subscribe
     public void onInit(ProxyInitializeEvent event) {
         onEnable();

bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/command/GeyserVelocityCommandExecutor.java

@@ -57,6 +57,6 @@ public class GeyserVelocityCommandExecutor implements Command {
     }
 
     private GeyserCommand getCommand(String label) {
-        return connector.getCommandMap().getCommands().get(label);
+        return connector.getCommandManager().getCommands().get(label);
     }
 }

bootstrap/velocity/src/main/java/org/geysermc/platform/velocity/command/GeyserVelocityCommandManager.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2019-2020 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.platform.velocity.command;
+
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.CommandManager;
+
+public class GeyserVelocityCommandManager extends CommandManager {
+
+    public GeyserVelocityCommandManager(GeyserConnector connector) {
+        super(connector);
+    }
+
+    @Override
+    public String getDescription(String command) {
+        return ""; // no support for command descriptions in velocity
+    }
+}

common/src/main/java/org/geysermc/common/AuthType.java

@@ -14,6 +14,13 @@ public enum AuthType {
         return id < VALUES.length ? VALUES[id] : OFFLINE;
     }
 
+    /**
+     * Convert the AuthType string (from config) to the enum, OFFLINE on fail
+     *
+     * @param name AuthType string
+     *
+     * @return The converted AuthType
+     */
     public static AuthType getByName(String name) {
         String upperCase = name.toUpperCase();
         for (AuthType type : VALUES) {

common/src/main/java/org/geysermc/common/ChatColor.java

@@ -51,6 +51,13 @@ public class ChatColor {
     public static final String ITALIC = ESCAPE + "o";
     public static final String RESET = ESCAPE + "r";
 
+    /**
+     * Convert chat colour codes to terminal colours
+     *
+     * @param string The text to replace colours for
+     *
+     * @return A string ready for terminal printing
+     */
     public static String toANSI(String string) {
         string = string.replace(BOLD, (char) 0x1b + "[1m");
         string = string.replace(OBFUSCATED, (char) 0x1b + "[5m");
@@ -81,6 +88,13 @@ public class ChatColor {
         return message.replace(color, ESCAPE);
     }
 
+    /**
+     * Remove all colour formatting tags from a message
+     *
+     * @param message Message to remove colour tags from
+     *
+     * @return The sanitised message
+     */
     public static String stripColors(String message) {
         return message = message.replaceAll("(&([a-fk-or0-9]))","").replaceAll("(§([a-fk-or0-9]))","").replaceAll("s/\\x1b\\[[0-9;]*[a-zA-Z]//g","");
     }

common/src/main/java/org/geysermc/common/bootstrap/IGeyserBootstrap.java

@@ -26,15 +26,39 @@
 package org.geysermc.common.bootstrap;
 
 import org.geysermc.common.IGeyserConfiguration;
+import org.geysermc.common.command.ICommandManager;
 import org.geysermc.common.logger.IGeyserLogger;
 
 public interface IGeyserBootstrap {
 
+    /**
+     * Called when the GeyserBootstrap is enabled
+     */
     void onEnable();
 
+    /**
+     * Called when the GeyserBootstrap is disabled
+     */
     void onDisable();
 
+    /**
+     * Returns the current GeyserConfig
+     *
+     * @return The current GeyserConfig
+     */
     IGeyserConfiguration getGeyserConfig();
 
+    /**
+     * Returns the current GeyserLogger
+     *
+     * @return The current GeyserLogger
+     */
     IGeyserLogger getGeyserLogger();
+
+    /**
+     * Returns the current GeyserCommandManager
+     *
+     * @return The current GeyserCommandManager
+     */
+    ICommandManager getGeyserCommandManager();
 }

common/src/main/java/org/geysermc/common/command/ICommandManager.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019-2020 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.common.command;
+
+public interface ICommandManager {
+
+    /**
+     * Returns the description of the given command
+     *
+     * @param command Command to get the description for
+     *
+     * @return Command description
+     */
+    String getDescription(String command);
+}

common/src/main/java/org/geysermc/common/window/CustomFormWindow.java

@@ -25,8 +25,9 @@
 
 package org.geysermc.common.window;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.Setter;
 import org.geysermc.common.window.button.FormImage;
@@ -34,6 +35,7 @@ import org.geysermc.common.window.component.*;
 import org.geysermc.common.window.response.CustomFormResponse;
 import org.geysermc.common.window.response.FormResponseData;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -77,7 +79,11 @@ public class CustomFormWindow extends FormWindow {
     }
 
     public String getJSONData() {
-        String toModify = new Gson().toJson(this);
+        String toModify = "";
+        try {
+            toModify = new ObjectMapper().writeValueAsString(this);
+        } catch (JsonProcessingException e) { }
+
         //We need to replace this due to Java not supporting declaring class field 'default'
         return toModify.replace("defaultOptionIndex", "default")
                 .replace("defaultText", "default")
@@ -100,7 +106,11 @@ public class CustomFormWindow extends FormWindow {
         Map<Integer, Object> responses = new HashMap<Integer, Object>();
         Map<Integer, String> labelResponses = new HashMap<Integer, String>();
 
-        List<String> componentResponses = new Gson().fromJson(data, new TypeToken<List<String>>() { }.getType());
+        List<String> componentResponses = new ArrayList<>();
+        try {
+            componentResponses = new ObjectMapper().readValue(data, new TypeReference<List<String>>(){});
+        } catch (IOException e) { }
+
         for (String response : componentResponses) {
             if (i >= content.size()) {
                 break;

common/src/main/java/org/geysermc/common/window/FormWindow.java

@@ -25,6 +25,7 @@
 
 package org.geysermc.common.window;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 import org.geysermc.common.window.response.FormResponse;
@@ -50,6 +51,7 @@ public abstract class FormWindow {
         this.response = response;
     }
 
+    @JsonIgnore
     public abstract String getJSONData();
 
     public abstract void setResponse(String response);

common/src/main/java/org/geysermc/common/window/ModalFormWindow.java

@@ -25,7 +25,8 @@
 
 package org.geysermc.common.window;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.Setter;
 import org.geysermc.common.window.response.ModalFormResponse;
@@ -59,7 +60,11 @@ public class ModalFormWindow extends FormWindow {
 
     @Override
     public String getJSONData() {
-        return new Gson().toJson(this);
+        try {
+            return new ObjectMapper().writeValueAsString(this);
+        } catch (JsonProcessingException e) {
+            return "";
+        }
     }
 
     public void setResponse(String data) {

common/src/main/java/org/geysermc/common/window/SimpleFormWindow.java

@@ -25,7 +25,8 @@
 
 package org.geysermc.common.window;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.Setter;
 import org.geysermc.common.window.button.FormButton;
@@ -63,7 +64,11 @@ public class SimpleFormWindow extends FormWindow {
 
     @Override
     public String getJSONData() {
-        return new Gson().toJson(this);
+        try {
+            return new ObjectMapper().writeValueAsString(this);
+        } catch (JsonProcessingException e) {
+            return "";
+        }
     }
 
     public void setResponse(String data) {

connector/pom.xml

@@ -66,10 +66,34 @@
             <version>8.3.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.nukkitx.fastutil</groupId>
+            <artifactId>fastutil-int-double-maps</artifactId>
+            <version>8.3.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nukkitx.fastutil</groupId>
+            <artifactId>fastutil-int-boolean-maps</artifactId>
+            <version>8.3.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nukkitx.fastutil</groupId>
+            <artifactId>fastutil-object-int-maps</artifactId>
+            <version>8.3.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nukkitx.fastutil</groupId>
+            <artifactId>fastutil-object-byte-maps</artifactId>
+            <version>8.3.1</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.github.steveice10</groupId>
             <artifactId>opennbt</artifactId>
-            <version>1.3-SNAPSHOT</version>
+            <version>1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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

@@ -32,10 +32,11 @@ import com.nukkitx.protocol.bedrock.v390.Bedrock_v390;
 import lombok.Getter;
 
 import org.geysermc.common.AuthType;
+import org.geysermc.common.IGeyserConfiguration;
 import org.geysermc.common.PlatformType;
 import org.geysermc.common.bootstrap.IGeyserBootstrap;
 import org.geysermc.common.logger.IGeyserLogger;
-import org.geysermc.connector.command.GeyserCommandMap;
+import org.geysermc.connector.command.CommandManager;
 import org.geysermc.connector.metrics.Metrics;
 import org.geysermc.connector.network.ConnectorServerEventHandler;
 import org.geysermc.connector.network.remote.RemoteServer;
@@ -43,14 +44,12 @@ import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.Translators;
 import org.geysermc.connector.thread.PingPassthroughThread;
 import org.geysermc.connector.utils.Toolbox;
-import org.geysermc.common.IGeyserConfiguration;
 
 import java.net.InetSocketAddress;
 import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -70,8 +69,6 @@ public class GeyserConnector {
     private RemoteServer remoteServer;
     private AuthType authType;
 
-    private GeyserCommandMap commandMap;
-
     private boolean shuttingDown = false;
 
     private final ScheduledExecutorService generalThreadPool;
@@ -108,7 +105,6 @@ public class GeyserConnector {
         Toolbox.init();
         Translators.start();
 
-        commandMap = new GeyserCommandMap(this);
         remoteServer = new RemoteServer(config.getRemote().getAddress(), config.getRemote().getPort());
         authType = AuthType.getByName(config.getRemote().getAuthType());
 
@@ -182,8 +178,7 @@ public class GeyserConnector {
         players.clear();
         remoteServer = null;
         authType = null;
-        commandMap.getCommands().clear();
-        commandMap = null;
+        this.getCommandManager().getCommands().clear();
 
         bootstrap.getGeyserLogger().info("Geyser shutdown successfully.");
     }
@@ -213,6 +208,10 @@ public class GeyserConnector {
         return bootstrap.getGeyserConfig();
     }
 
+    public CommandManager getCommandManager() {
+        return (CommandManager) bootstrap.getGeyserCommandManager();
+    }
+
     public static GeyserConnector getInstance() {
         return instance;
     }

connector/src/main/java/org/geysermc/connector/command/CommandManager.java

@@ -26,8 +26,10 @@
 package org.geysermc.connector.command;
 
 import lombok.Getter;
+import org.geysermc.common.command.ICommandManager;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.command.defaults.HelpCommand;
+import org.geysermc.connector.command.defaults.ListCommand;
 import org.geysermc.connector.command.defaults.ReloadCommand;
 import org.geysermc.connector.command.defaults.StopCommand;
 
@@ -35,17 +37,18 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-public class GeyserCommandMap {
+public abstract class CommandManager implements ICommandManager {
 
     @Getter
     private final Map<String, GeyserCommand> commands = Collections.synchronizedMap(new HashMap<>());
 
     private GeyserConnector connector;
 
-    public GeyserCommandMap(GeyserConnector connector) {
+    public CommandManager(GeyserConnector connector) {
         this.connector = connector;
 
         registerCommand(new HelpCommand(connector, "help", "Shows help for all registered commands.", "geyser.command.help"));
+        registerCommand(new ListCommand(connector, "list", "List all players connected through Geyser.", "geyser.command.list"));
         registerCommand(new ReloadCommand(connector, "reload", "Reloads the Geyser configurations. Kicks all players when used!", "geyser.command.reload"));
         registerCommand(new StopCommand(connector, "stop", "Shuts down Geyser.", "geyser.command.stop"));
     }

connector/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java

@@ -49,8 +49,8 @@ public class HelpCommand extends GeyserCommand {
     @Override
     public void execute(CommandSender sender, String[] args) {
         sender.sendMessage("---- Showing Help For: Geyser (Page 1/1) ----");
-        Map<String, GeyserCommand> cmds = connector.getCommandMap().getCommands();
-        List<String> commands = connector.getCommandMap().getCommands().keySet().stream().sorted().collect(Collectors.toList());
+        Map<String, GeyserCommand> cmds = connector.getCommandManager().getCommands();
+        List<String> commands = connector.getCommandManager().getCommands().keySet().stream().sorted().collect(Collectors.toList());
         commands.forEach(cmd -> sender.sendMessage(ChatColor.YELLOW + "/geyser " + cmd + ChatColor.WHITE + ": " + cmds.get(cmd).getDescription()));
     }
 }

connector/src/main/java/org/geysermc/connector/command/defaults/ListCommand.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019-2020 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.command.defaults;
+
+import org.geysermc.common.ChatColor;
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.CommandSender;
+import org.geysermc.connector.command.GeyserCommand;
+import org.geysermc.connector.network.session.GeyserSession;
+
+import java.util.stream.Collectors;
+
+public class ListCommand extends GeyserCommand {
+
+    private GeyserConnector connector;
+
+    public ListCommand(GeyserConnector connector, String name, String description, String permission) {
+        super(name, description, permission);
+
+        this.connector = connector;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        sender.sendMessage(ChatColor.YELLOW + "Online Players (" + connector.getPlayers().size() + "): " + ChatColor.WHITE + connector.getPlayers().values().stream().map(GeyserSession::getName).collect(Collectors.joining(" ")));
+    }
+}

connector/src/main/java/org/geysermc/connector/entity/Entity.java

@@ -120,6 +120,9 @@ public class Entity {
     }
 
     /**
+     * Despawns the entity
+     *
+     * @param session The GeyserSession
      * @return can be deleted
      */
     public boolean despawnEntity(GeyserSession session) {
@@ -234,6 +237,7 @@ public class Entity {
 
     /**
      * x = Pitch, y = HeadYaw, z = Yaw
+     * @return the bedrock rotation
      */
     public Vector3f getBedrockRotation() {
         return Vector3f.from(rotation.getY(), rotation.getZ(), rotation.getX());

connector/src/main/java/org/geysermc/connector/entity/ItemEntity.java

@@ -49,7 +49,7 @@ public class ItemEntity extends Entity {
             itemPacket.setUniqueEntityId(geyserId);
             itemPacket.setFromFishing(false);
             itemPacket.getMetadata().putAll(metadata);
-            itemPacket.setItemInHand(Translators.getItemTranslator().translateToBedrock((ItemStack) entityMetadata.getValue()));
+            itemPacket.setItemInHand(Translators.getItemTranslator().translateToBedrock(session, (ItemStack) entityMetadata.getValue()));
             session.getUpstream().sendPacket(itemPacket);
         }
 

connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java

@@ -44,6 +44,7 @@ import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.scoreboard.Team;
 import org.geysermc.connector.utils.MessageUtils;
+import org.geysermc.connector.network.session.cache.EntityEffectCache;
 import org.geysermc.connector.utils.SkinUtils;
 
 import java.util.UUID;
@@ -55,6 +56,7 @@ public class PlayerEntity extends LivingEntity {
     private String username;
     private long lastSkinUpdate = -1;
     private boolean playerList = true;
+    private final EntityEffectCache effectCache;
 
     public PlayerEntity(GameProfile gameProfile, long entityId, long geyserId, Vector3f position, Vector3f motion, Vector3f rotation) {
         super(entityId, geyserId, EntityType.PLAYER, position, motion, rotation);
@@ -62,6 +64,7 @@ public class PlayerEntity extends LivingEntity {
         profile = gameProfile;
         uuid = gameProfile.getId();
         username = gameProfile.getName();
+        effectCache = new EntityEffectCache();
         if (geyserId == 1) valid = true;
     }
 

connector/src/main/java/org/geysermc/connector/entity/living/AbstractFishEntity.java

@@ -25,12 +25,28 @@
 
 package org.geysermc.connector.entity.living;
 
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.EntityData;
+import com.nukkitx.protocol.bedrock.data.EntityFlag;
 import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
 
 public class AbstractFishEntity extends WaterEntity {
 
     public AbstractFishEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
         super(entityId, geyserId, entityType, position, motion, rotation);
     }
+
+    @Override
+    public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        metadata.getFlags().setFlag(EntityFlag.CAN_SWIM, true);
+        metadata.getFlags().setFlag(EntityFlag.BREATHING, true);
+        metadata.getFlags().setFlag(EntityFlag.CAN_CLIMB, false);
+        metadata.getFlags().setFlag(EntityFlag.HAS_GRAVITY, false);
+
+        metadata.put(EntityData.AIR, (short) 400);
+
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
 }

connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java

@@ -26,7 +26,6 @@
 package org.geysermc.connector.entity.living;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.data.EntityData;
 import com.nukkitx.protocol.bedrock.data.EntityFlag;
@@ -43,10 +42,8 @@ public class AgeableEntity extends CreatureEntity {
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
         if (entityMetadata.getId() == 15) {
             boolean isBaby = (boolean) entityMetadata.getValue();
-            if (isBaby) {
-                metadata.put(EntityData.SCALE, .55f);
-                metadata.getFlags().setFlag(EntityFlag.BABY, true);
-            }
+            metadata.put(EntityData.SCALE, isBaby ? .55f : 1f);
+            metadata.getFlags().setFlag(EntityFlag.BABY, isBaby);
         }
 
         super.updateBedrockMetadata(entityMetadata, session);

connector/src/main/java/org/geysermc/connector/entity/living/animal/PufferFishEntity.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019-2020 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.entity.living.animal;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.EntityData;
+import org.geysermc.connector.entity.living.AbstractFishEntity;
+import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+
+public class PufferFishEntity extends AbstractFishEntity {
+
+    public PufferFishEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
+        super(entityId, geyserId, entityType, position, motion, rotation);
+    }
+
+    @Override
+    public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        if (entityMetadata.getId() == 16) {
+            // Transfers correctly but doesn't apply on the client
+            int puffsize = (int) entityMetadata.getValue();
+            metadata.put(EntityData.PUFFERFISH_SIZE, puffsize);
+            metadata.put(EntityData.VARIANT, puffsize);
+        }
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
+}

connector/src/main/java/org/geysermc/connector/entity/living/animal/TropicalFishEntity.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2019-2020 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.entity.living.animal;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.EntityData;
+import com.nukkitx.protocol.bedrock.packet.AddEntityPacket;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.geysermc.connector.entity.living.AbstractFishEntity;
+import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+
+public class TropicalFishEntity extends AbstractFishEntity {
+
+    public TropicalFishEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
+        super(entityId, geyserId, entityType, position, motion, rotation);
+    }
+
+    @Override
+    public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        if (entityMetadata.getId() == 16) {
+            TropicalFishVariant variant = TropicalFishVariant.fromVariantNumber((int) entityMetadata.getValue());
+
+            metadata.put(EntityData.VARIANT, variant.getShape()); // Shape 0-1
+            metadata.put(EntityData.MARK_VARIANT, variant.getPattern()); // Pattern 0-5
+            metadata.put(EntityData.COLOR, variant.getBaseColor()); // Base color 0-15
+            metadata.put(EntityData.COLOR_2, variant.getPatternColor()); // Pattern color 0-15
+        }
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
+
+    @Override
+    public void spawnEntity(GeyserSession session) {
+        AddEntityPacket addEntityPacket = new AddEntityPacket();
+        addEntityPacket.setIdentifier("minecraft:tropicalfish");
+        addEntityPacket.setRuntimeEntityId(geyserId);
+        addEntityPacket.setUniqueEntityId(geyserId);
+        addEntityPacket.setPosition(position);
+        addEntityPacket.setMotion(motion);
+        addEntityPacket.setRotation(getBedrockRotation());
+        addEntityPacket.setEntityType(entityType.getType());
+        addEntityPacket.getMetadata().putAll(metadata);
+
+        valid = true;
+        session.getUpstream().sendPacket(addEntityPacket);
+
+        session.getConnector().getLogger().debug("Spawned entity " + entityType + " at location " + position + " with id " + geyserId + " (java id " + entityId + ")");
+    }
+
+    @Getter
+    @AllArgsConstructor
+    private static class TropicalFishVariant {
+        private int shape;
+        private int pattern;
+        private byte baseColor;
+        private byte patternColor;
+
+        /**
+         * Convert the variant number from Java into separate values
+         *
+         * @param varNumber Variant number from Java edition
+         *
+         * @return The variant converted into TropicalFishVariant
+         */
+        public static TropicalFishVariant fromVariantNumber(int varNumber) {
+            return new TropicalFishVariant((varNumber & 0xFF), ((varNumber >> 8) & 0xFF), (byte) ((varNumber >> 16) & 0xFF), (byte) ((varNumber >> 24) & 0xFF));
+        }
+    }
+}

connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/WolfEntity.java

@@ -44,9 +44,19 @@ public class WolfEntity extends TameableEntity {
         if (entityMetadata.getId() == 18) {
             metadata.getFlags().setFlag(EntityFlag.INTERESTED, (boolean) entityMetadata.getValue());
         }
+
+        //Reset wolf color
+        if (entityMetadata.getId() == 16) {
+            byte xd = (byte) entityMetadata.getValue();
+            boolean angry = (xd & 0x02) == 0x02;
+            if (angry) {
+                metadata.put(EntityData.COLOR, (byte) 0);
+            }
+        }
+
         // Wolf collar color
         // Relies on EntityData.OWNER_EID being set in TameableEntity.java
-        if (entityMetadata.getId() == 19) {
+        if (entityMetadata.getId() == 19 && !metadata.getFlags().getFlag(EntityFlag.ANGRY)) {
             metadata.put(EntityData.COLOR, (byte) (int) entityMetadata.getValue());
         }
         super.updateBedrockMetadata(entityMetadata, session);

connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java

@@ -140,10 +140,10 @@ public enum EntityType {
     VEX(MonsterEntity.class, 105, 0f),
     ICE_BOMB(Entity.class, 106, 0f),
     BALLOON(Entity.class, 107, 0f), //TODO
-    PUFFERFISH(AbstractFishEntity.class, 108, 0.7f, 0.7f),
+    PUFFERFISH(PufferFishEntity.class, 108, 0.7f, 0.7f),
     SALMON(AbstractFishEntity.class, 109, 0.5f, 0.7f),
     DROWNED(ZombieEntity.class, 110, 1.95f, 0.6f),
-    TROPICAL_FISH(AbstractFishEntity.class, 111, 0.6f, 0.6f),
+    TROPICAL_FISH(TropicalFishEntity.class, 111, 0.6f, 0.6f),
     COD(AbstractFishEntity.class, 112, 0.25f, 0.5f),
     PANDA(PandaEntity.class, 113, 1.25f, 1.125f, 1.825f),
     FOX(FoxEntity.class, 121, 0.5f, 1.25f),

connector/src/main/java/org/geysermc/connector/inventory/Inventory.java

@@ -27,9 +27,12 @@ package org.geysermc.connector.inventory;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
 import com.github.steveice10.mc.protocol.data.game.window.WindowType;
+import com.nukkitx.math.vector.Vector3i;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 public class Inventory {
 
     @Getter
@@ -43,16 +46,26 @@ public class Inventory {
     protected WindowType windowType;
 
     @Getter
-    protected int size;
+    protected final int size;
 
     @Getter
     @Setter
     protected String title;
 
-    @Getter
     @Setter
     protected ItemStack[] items;
 
+    @Getter
+    @Setter
+    protected Vector3i holderPosition = Vector3i.ZERO;
+
+    @Getter
+    @Setter
+    protected long holderId = -1;
+
+    @Getter
+    protected AtomicInteger transactionId = new AtomicInteger(1);
+
     public Inventory(int id, WindowType windowType, int size) {
         this("Inventory", id, windowType, size);
     }
@@ -62,11 +75,16 @@ public class Inventory {
         this.id = id;
         this.windowType = windowType;
         this.size = size;
-
         this.items = new ItemStack[size];
     }
 
     public ItemStack getItem(int slot) {
         return items[slot];
     }
+
+    public void setItem(int slot, ItemStack item) {
+        if (item != null && (item.getId() == 0 || item.getAmount() < 1))
+            item = null;
+        items[slot] = item;
+    }
 }

connector/src/main/java/org/geysermc/connector/inventory/PlayerInventory.java

@@ -35,13 +35,21 @@ public class PlayerInventory extends Inventory {
     @Setter
     private int heldItemSlot;
 
-    public PlayerInventory() {
-        super(0, null, 45);
+    @Getter
+    private ItemStack cursor;
 
+    public PlayerInventory() {
+        super(0, null, 46);
         heldItemSlot = 0;
     }
 
+    public void setCursor(ItemStack stack) {
+        if (stack != null && (stack.getId() == 0 || stack.getAmount() < 1))
+            stack = null;
+        cursor = stack;
+    }
+
     public ItemStack getItemInHand() {
-        return items[heldItemSlot];
+        return items[36 + heldItemSlot];
     }
 }

connector/src/main/java/org/geysermc/connector/metrics/Metrics.java

@@ -25,8 +25,10 @@
 
 package org.geysermc.connector.metrics;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.geysermc.connector.GeyserConnector;
 
 import javax.net.ssl.HttpsURLConnection;
@@ -71,6 +73,8 @@ public class Metrics {
     // A list with all custom charts
     private final List<CustomChart> charts = new ArrayList<>();
 
+    private final static ObjectMapper mapper = new ObjectMapper();
+
     private GeyserConnector connector;
 
     /**
@@ -110,7 +114,7 @@ public class Metrics {
      */
     private void startSubmitting() {
         connector.getGeneralThreadPool().scheduleAtFixedRate(this::submitData, 1, 30, TimeUnit.MINUTES);
-        // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
+        // Submit the data every 30 minutes, first time after 1 minutes to give other plugins enough time to start
         // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
         // WARNING: Just don't do it!
     }
@@ -120,22 +124,22 @@ public class Metrics {
      *
      * @return The plugin specific data.
      */
-    private JsonObject getPluginData() {
-        JsonObject data = new JsonObject();
+    private ObjectNode getPluginData() {
+        ObjectNode data = mapper.createObjectNode();
 
-        data.addProperty("pluginName", name); // Append the name of the server software
-        data.addProperty("pluginVersion", GeyserConnector.VERSION); // Append the name of the server software
+        data.put("pluginName", name); // Append the name of the server software
+        data.put("pluginVersion", GeyserConnector.VERSION); // Append the name of the server software
 
-        JsonArray customCharts = new JsonArray();
+        ArrayNode customCharts = mapper.createArrayNode();
         for (CustomChart customChart : charts) {
             // Add the data of the custom charts
-            JsonObject chart = customChart.getRequestJsonObject();
+            JsonNode chart = customChart.getRequestJsonNode();
             if (chart == null) { // If the chart is null, we skip it
                 continue;
             }
             customCharts.add(chart);
         }
-        data.add("customCharts", customCharts);
+        data.put("customCharts", customCharts);
 
         return data;
     }
@@ -145,7 +149,7 @@ public class Metrics {
      *
      * @return The server specific data.
      */
-    private JsonObject getServerData() {
+    private ObjectNode getServerData() {
         // OS specific data
         int playerAmount = connector.getPlayers().size();
 
@@ -154,15 +158,15 @@ public class Metrics {
         String osVersion = System.getProperty("os.version");
         int coreCount = Runtime.getRuntime().availableProcessors();
 
-        JsonObject data = new JsonObject();
+        ObjectNode data = mapper.createObjectNode();
 
-        data.addProperty("serverUUID", serverUUID);
+        data.put("serverUUID", serverUUID);
 
-        data.addProperty("playerAmount", playerAmount);
-        data.addProperty("osName", osName);
-        data.addProperty("osArch", osArch);
-        data.addProperty("osVersion", osVersion);
-        data.addProperty("coreCount", coreCount);
+        data.put("playerAmount", playerAmount);
+        data.put("osName", osName);
+        data.put("osArch", osArch);
+        data.put("osVersion", osVersion);
+        data.put("coreCount", coreCount);
 
         return data;
     }
@@ -171,11 +175,11 @@ public class Metrics {
      * Collects the data and sends it afterwards.
      */
     private void submitData() {
-        final JsonObject data = getServerData();
+        final ObjectNode data = getServerData();
 
-        JsonArray pluginData = new JsonArray();
+        ArrayNode pluginData = mapper.createArrayNode();
         pluginData.add(getPluginData());
-        data.add("plugins", pluginData);
+        data.putPOJO("plugins", pluginData);
 
         new Thread(() -> {
             try {
@@ -196,7 +200,7 @@ public class Metrics {
      * @param data The data to send.
      * @throws Exception If the request failed.
      */
-    private static void sendData(JsonObject data) throws Exception {
+    private static void sendData(ObjectNode data) throws Exception {
         if (data == null) {
             throw new IllegalArgumentException("Data cannot be null!");
         }
@@ -262,16 +266,16 @@ public class Metrics {
             this.chartId = chartId;
         }
 
-        private JsonObject getRequestJsonObject() {
-            JsonObject chart = new JsonObject();
-            chart.addProperty("chartId", chartId);
+        private ObjectNode getRequestJsonNode() {
+            ObjectNode chart = new ObjectMapper().createObjectNode();
+            chart.put("chartId", chartId);
             try {
-                JsonObject data = getChartData();
+                ObjectNode data = getChartData();
                 if (data == null) {
                     // If the data is null we don't send the chart.
                     return null;
                 }
-                chart.add("data", data);
+                chart.putPOJO("data", data);
             } catch (Throwable t) {
                 if (logFailedRequests) {
                     logger.log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
@@ -281,7 +285,9 @@ public class Metrics {
             return chart;
         }
 
-        protected abstract JsonObject getChartData() throws Exception;
+
+
+        protected abstract ObjectNode getChartData() throws Exception;
 
     }
 
@@ -304,14 +310,14 @@ public class Metrics {
         }
 
         @Override
-        protected JsonObject getChartData() throws Exception {
-            JsonObject data = new JsonObject();
+        protected ObjectNode getChartData() throws Exception {
+            ObjectNode data = mapper.createObjectNode();
             String value = callable.call();
             if (value == null || value.isEmpty()) {
                 // Null = skip the chart
                 return null;
             }
-            data.addProperty("value", value);
+            data.put("value", value);
             return data;
         }
     }
@@ -335,9 +341,9 @@ public class Metrics {
         }
 
         @Override
-        protected JsonObject getChartData() throws Exception {
-            JsonObject data = new JsonObject();
-            JsonObject values = new JsonObject();
+        protected ObjectNode getChartData() throws Exception {
+            ObjectNode data = mapper.createObjectNode();
+            ObjectNode values = mapper.createObjectNode();
             Map<String, Integer> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
@@ -349,13 +355,13 @@ public class Metrics {
                     continue; // Skip this invalid
                 }
                 allSkipped = false;
-                values.addProperty(entry.getKey(), entry.getValue());
+                values.put(entry.getKey(), entry.getValue());
             }
             if (allSkipped) {
                 // Null = skip the chart
                 return null;
             }
-            data.add("values", values);
+            data.putPOJO("values", values);
             return data;
         }
     }
@@ -379,9 +385,9 @@ public class Metrics {
         }
 
         @Override
-        public JsonObject getChartData() throws Exception {
-            JsonObject data = new JsonObject();
-            JsonObject values = new JsonObject();
+        public ObjectNode getChartData() throws Exception {
+            ObjectNode data = mapper.createObjectNode();
+            ObjectNode values = mapper.createObjectNode();
             Map<String, Map<String, Integer>> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
@@ -389,22 +395,22 @@ public class Metrics {
             }
             boolean reallyAllSkipped = true;
             for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
-                JsonObject value = new JsonObject();
+                ObjectNode value = mapper.createObjectNode();
                 boolean allSkipped = true;
                 for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
-                    value.addProperty(valueEntry.getKey(), valueEntry.getValue());
+                    value.put(valueEntry.getKey(), valueEntry.getValue());
                     allSkipped = false;
                 }
                 if (!allSkipped) {
                     reallyAllSkipped = false;
-                    values.add(entryValues.getKey(), value);
+                    values.putPOJO(entryValues.getKey(), value);
                 }
             }
             if (reallyAllSkipped) {
                 // Null = skip the chart
                 return null;
             }
-            data.add("values", values);
+            data.putPOJO("values", values);
             return data;
         }
     }
@@ -428,14 +434,14 @@ public class Metrics {
         }
 
         @Override
-        protected JsonObject getChartData() throws Exception {
-            JsonObject data = new JsonObject();
+        protected ObjectNode getChartData() throws Exception {
+            ObjectNode data = mapper.createObjectNode();
             int value = callable.call();
             if (value == 0) {
                 // Null = skip the chart
                 return null;
             }
-            data.addProperty("value", value);
+            data.put("value", value);
             return data;
         }
 
@@ -460,9 +466,9 @@ public class Metrics {
         }
 
         @Override
-        protected JsonObject getChartData() throws Exception {
-            JsonObject data = new JsonObject();
-            JsonObject values = new JsonObject();
+        protected ObjectNode getChartData() throws Exception {
+            ObjectNode data = mapper.createObjectNode();
+            ObjectNode values = mapper.createObjectNode();
             Map<String, Integer> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
@@ -474,13 +480,13 @@ public class Metrics {
                     continue; // Skip this invalid
                 }
                 allSkipped = false;
-                values.addProperty(entry.getKey(), entry.getValue());
+                values.put(entry.getKey(), entry.getValue());
             }
             if (allSkipped) {
                 // Null = skip the chart
                 return null;
             }
-            data.add("values", values);
+            data.putPOJO("values", values);
             return data;
         }
 
@@ -505,20 +511,20 @@ public class Metrics {
         }
 
         @Override
-        protected JsonObject getChartData() throws Exception {
-            JsonObject data = new JsonObject();
-            JsonObject values = new JsonObject();
+        protected ObjectNode getChartData() throws Exception {
+            ObjectNode data = mapper.createObjectNode();
+            ObjectNode values = mapper.createObjectNode();
             Map<String, Integer> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
                 return null;
             }
             for (Map.Entry<String, Integer> entry : map.entrySet()) {
-                JsonArray categoryValues = new JsonArray();
+                ArrayNode categoryValues = mapper.createArrayNode();
                 categoryValues.add(entry.getValue());
-                values.add(entry.getKey(), categoryValues);
+                values.putPOJO(entry.getKey(), categoryValues);
             }
-            data.add("values", values);
+            data.putPOJO("values", values);
             return data;
         }
 
@@ -543,9 +549,9 @@ public class Metrics {
         }
 
         @Override
-        protected JsonObject getChartData() throws Exception {
-            JsonObject data = new JsonObject();
-            JsonObject values = new JsonObject();
+        protected ObjectNode getChartData() throws Exception {
+            ObjectNode data = mapper.createObjectNode();
+            ObjectNode values = mapper.createObjectNode();
             Map<String, int[]> map = callable.call();
             if (map == null || map.isEmpty()) {
                 // Null = skip the chart
@@ -557,17 +563,17 @@ public class Metrics {
                     continue; // Skip this invalid
                 }
                 allSkipped = false;
-                JsonArray categoryValues = new JsonArray();
+                ArrayNode categoryValues = mapper.createArrayNode();
                 for (int categoryValue : entry.getValue()) {
                     categoryValues.add(categoryValue);
                 }
-                values.add(entry.getKey(), categoryValues);
+                values.putPOJO(entry.getKey(), categoryValues);
             }
             if (allSkipped) {
                 // Null = skip the chart
                 return null;
             }
-            data.add("values", values);
+            data.putPOJO("values", values);
             return data;
         }
 

connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java

@@ -46,8 +46,11 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     @Override
     public boolean handle(LoginPacket loginPacket) {
-        if (loginPacket.getProtocolVersion() != GeyserConnector.BEDROCK_PACKET_CODEC.getProtocolVersion()) {
-            session.getUpstream().disconnect("Unsupported Bedrock version. Are you running an outdated version?");
+        if (loginPacket.getProtocolVersion() > GeyserConnector.BEDROCK_PACKET_CODEC.getProtocolVersion()) {
+            session.getUpstream().disconnect("Outdated Geyser proxy! I'm still on " + GeyserConnector.BEDROCK_PACKET_CODEC.getMinecraftVersion());
+            return true;
+        } else if (loginPacket.getProtocolVersion() < GeyserConnector.BEDROCK_PACKET_CODEC.getProtocolVersion()) {
+            session.getUpstream().disconnect("Outdated Bedrock client! Please use " + GeyserConnector.BEDROCK_PACKET_CODEC.getMinecraftVersion());
             return true;
         }
 

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

@@ -44,7 +44,13 @@ import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.nbt.tag.CompoundTag;
 import com.nukkitx.protocol.bedrock.BedrockServerSession;
+import com.nukkitx.protocol.bedrock.data.ContainerId;
 import com.nukkitx.protocol.bedrock.data.GamePublishSetting;
+import com.nukkitx.protocol.bedrock.packet.AvailableEntityIdentifiersPacket;
+import com.nukkitx.protocol.bedrock.packet.BiomeDefinitionListPacket;
+import com.nukkitx.protocol.bedrock.packet.PlayStatusPacket;
+import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
+import com.nukkitx.protocol.bedrock.packet.TextPacket;
 import com.nukkitx.protocol.bedrock.data.GameRuleData;
 import com.nukkitx.protocol.bedrock.data.PlayerPermission;
 import com.nukkitx.protocol.bedrock.packet.*;
@@ -125,6 +131,9 @@ public class GeyserSession implements CommandSender {
     private boolean manyDimPackets = false;
     private ServerRespawnPacket lastDimPacket = null;
 
+    @Setter
+    private int craftSlot = 0;
+
     public GeyserSession(GeyserConnector connector, BedrockServerSession bedrockServerSession) {
         this.connector = connector;
         this.upstream = new UpstreamSession(bedrockServerSession);
@@ -160,6 +169,11 @@ public class GeyserSession implements CommandSender {
         entityPacket.setTag(CompoundTag.EMPTY);
         upstream.sendPacket(entityPacket);
 
+        InventoryContentPacket creativePacket = new InventoryContentPacket();
+        creativePacket.setContainerId(ContainerId.CREATIVE);
+        creativePacket.setContents(Toolbox.CREATIVE_ITEMS);
+        upstream.sendPacket(creativePacket);
+
         PlayStatusPacket playStatusPacket = new PlayStatusPacket();
         playStatusPacket.setStatus(PlayStatusPacket.Status.PLAYER_SPAWN);
         upstream.sendPacket(playStatusPacket);

connector/src/main/java/org/geysermc/connector/network/session/cache/EntityEffectCache.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2019-2020 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.network.session.cache;
+
+import com.github.steveice10.mc.protocol.data.game.entity.Effect;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import lombok.Getter;
+
+public class EntityEffectCache {
+
+    @Getter
+    private final Object2IntMap<Effect> entityEffects = new Object2IntOpenHashMap<>();
+
+    public void addEffect(Effect effect, int effectAmplifier) {
+        if (effect != null) {
+            entityEffects.putIfAbsent(effect, effectAmplifier + 1);
+        }
+    }
+
+    public void removeEffect(Effect effect) {
+        if (entityEffects.containsKey(effect)) {
+            int effectLevel = entityEffects.getInt(effect);
+            entityEffects.remove(effect, effectLevel);
+        }
+    }
+
+    public int getEffectLevel(Effect effect) {
+        return entityEffects.getOrDefault(effect, 0);
+    }
+}

connector/src/main/java/org/geysermc/connector/network/session/cache/InventoryCache.java

@@ -25,15 +25,12 @@
 
 package org.geysermc.connector.network.session.cache;
 
-import com.github.steveice10.packetlib.packet.Packet;
 import lombok.Getter;
 import lombok.Setter;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class InventoryCache {
@@ -47,9 +44,6 @@ public class InventoryCache {
     @Getter
     private Map<Integer, Inventory> inventories = new HashMap<Integer, Inventory>();
 
-    @Getter
-    private Map<Integer, List<Packet>> cachedPackets = new HashMap<Integer, List<Packet>>();
-
     public InventoryCache(GeyserSession session) {
         this.session = session;
     }
@@ -65,10 +59,4 @@ public class InventoryCache {
     public void uncacheInventory(int id) {
         inventories.remove(id);
     }
-
-    public void cachePacket(int id, Packet packet) {
-        List<Packet> packets = cachedPackets.getOrDefault(id, new ArrayList<Packet>());
-        packets.add(packet);
-        cachedPackets.put(id, packets);
-    }
 }

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface ItemRemapper {
+    int priority() default 0;
+}

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

@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import com.github.steveice10.mc.protocol.data.message.Message;
+import com.github.steveice10.opennbt.tag.builtin.*;
+import com.nukkitx.nbt.tag.CompoundTag;
+import com.nukkitx.nbt.tag.Tag;
+import com.nukkitx.protocol.bedrock.data.ItemData;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+import org.geysermc.connector.utils.MessageUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class ItemStackTranslator {
+
+    public ItemData translateToBedrock(ItemStack itemStack, ItemEntry itemEntry) {
+        if (itemStack == null) {
+            return ItemData.AIR;
+        }
+        if (itemStack.getNbt() == null) {
+            return ItemData.of(itemEntry.getBedrockId(), (short) itemEntry.getBedrockData(), itemStack.getAmount());
+        }
+        return ItemData.of(itemEntry.getBedrockId(), (short) itemEntry.getBedrockData(), itemStack.getAmount(), this.translateNbtToBedrock(itemStack.getNbt()));
+    }
+
+    public ItemStack translateToJava(ItemData itemData, ItemEntry itemEntry) {
+        if (itemData == null) return null;
+        if (itemData.getTag() == null) {
+            return new ItemStack(itemEntry.getJavaId(), itemData.getCount());
+        }
+        return new ItemStack(itemEntry.getJavaId(), itemData.getCount(), this.translateToJavaNBT(itemData.getTag()));
+    }
+
+    public abstract List<ItemEntry> getAppliedItems();
+
+    public CompoundTag translateNbtToBedrock(com.github.steveice10.opennbt.tag.builtin.CompoundTag tag) {
+        Map<String, Tag<?>> javaValue = new HashMap<String, Tag<?>>();
+        if (tag.getValue() != null && !tag.getValue().isEmpty()) {
+            for (String str : tag.getValue().keySet()) {
+                com.github.steveice10.opennbt.tag.builtin.Tag javaTag = tag.get(str);
+                com.nukkitx.nbt.tag.Tag translatedTag = translateToBedrockNBT(javaTag);
+                if (translatedTag == null)
+                    continue;
+
+                javaValue.put(translatedTag.getName(), translatedTag);
+            }
+        }
+
+        com.nukkitx.nbt.tag.CompoundTag bedrockTag = new com.nukkitx.nbt.tag.CompoundTag(tag.getName(), javaValue);
+        return bedrockTag;
+    }
+
+    private com.nukkitx.nbt.tag.Tag translateToBedrockNBT(com.github.steveice10.opennbt.tag.builtin.Tag tag) {
+        if (tag instanceof ByteArrayTag) {
+            ByteArrayTag byteArrayTag = (ByteArrayTag) tag;
+            return new com.nukkitx.nbt.tag.ByteArrayTag(byteArrayTag.getName(), byteArrayTag.getValue());
+        }
+
+        if (tag instanceof ByteTag) {
+            ByteTag byteTag = (ByteTag) tag;
+            return new com.nukkitx.nbt.tag.ByteTag(byteTag.getName(), byteTag.getValue());
+        }
+
+        if (tag instanceof DoubleTag) {
+            DoubleTag doubleTag = (DoubleTag) tag;
+            return new com.nukkitx.nbt.tag.DoubleTag(doubleTag.getName(), doubleTag.getValue());
+        }
+
+        if (tag instanceof FloatTag) {
+            FloatTag floatTag = (FloatTag) tag;
+            return new com.nukkitx.nbt.tag.FloatTag(floatTag.getName(), floatTag.getValue());
+        }
+
+        if (tag instanceof IntArrayTag) {
+            IntArrayTag intArrayTag = (IntArrayTag) tag;
+            return new com.nukkitx.nbt.tag.IntArrayTag(intArrayTag.getName(), intArrayTag.getValue());
+        }
+
+        if (tag instanceof IntTag) {
+            IntTag intTag = (IntTag) tag;
+            return new com.nukkitx.nbt.tag.IntTag(intTag.getName(), intTag.getValue());
+        }
+
+        if (tag instanceof LongArrayTag) {
+            LongArrayTag longArrayTag = (LongArrayTag) tag;
+            return new com.nukkitx.nbt.tag.LongArrayTag(longArrayTag.getName(), longArrayTag.getValue());
+        }
+
+        if (tag instanceof LongTag) {
+            LongTag longTag = (LongTag) tag;
+            return new com.nukkitx.nbt.tag.LongTag(longTag.getName(), longTag.getValue());
+        }
+
+        if (tag instanceof ShortTag) {
+            ShortTag shortTag = (ShortTag) tag;
+            return new com.nukkitx.nbt.tag.ShortTag(shortTag.getName(), shortTag.getValue());
+        }
+
+        if (tag instanceof StringTag) {
+            StringTag stringTag = (StringTag) tag;
+            return new com.nukkitx.nbt.tag.StringTag(stringTag.getName(), MessageUtils.getBedrockMessage(Message.fromString(stringTag.getValue())));
+        }
+
+        if (tag instanceof ListTag) {
+            ListTag listTag = (ListTag) tag;
+
+            List<Tag> tagList = new ArrayList<>();
+            for (com.github.steveice10.opennbt.tag.builtin.Tag value : listTag) {
+                tagList.add(translateToBedrockNBT(value));
+            }
+            Class clazz = CompoundTag.class;
+            if (!tagList.isEmpty()) {
+                clazz = tagList.get(0).getClass();
+            }
+            return new com.nukkitx.nbt.tag.ListTag(listTag.getName(), clazz, tagList);
+        }
+
+        if (tag instanceof com.github.steveice10.opennbt.tag.builtin.CompoundTag) {
+            com.github.steveice10.opennbt.tag.builtin.CompoundTag compoundTag = (com.github.steveice10.opennbt.tag.builtin.CompoundTag) tag;
+
+            return translateNbtToBedrock(compoundTag);
+        }
+
+        return null;
+    }
+
+    public com.github.steveice10.opennbt.tag.builtin.CompoundTag translateToJavaNBT(com.nukkitx.nbt.tag.CompoundTag tag) {
+        com.github.steveice10.opennbt.tag.builtin.CompoundTag javaTag = new com.github.steveice10.opennbt.tag.builtin.CompoundTag(tag.getName());
+        Map<String, com.github.steveice10.opennbt.tag.builtin.Tag> javaValue = javaTag.getValue();
+        if (tag.getValue() != null && !tag.getValue().isEmpty()) {
+            for (String str : tag.getValue().keySet()) {
+                com.nukkitx.nbt.tag.Tag bedrockTag = tag.get(str);
+                com.github.steveice10.opennbt.tag.builtin.Tag translatedTag = translateToJavaNBT(bedrockTag);
+                if (translatedTag == null)
+                    continue;
+
+                javaValue.put(translatedTag.getName(), translatedTag);
+            }
+        }
+
+        javaTag.setValue(javaValue);
+        return javaTag;
+    }
+
+    private com.github.steveice10.opennbt.tag.builtin.Tag translateToJavaNBT(com.nukkitx.nbt.tag.Tag tag) {
+        if (tag instanceof com.nukkitx.nbt.tag.ByteArrayTag) {
+            com.nukkitx.nbt.tag.ByteArrayTag byteArrayTag = (com.nukkitx.nbt.tag.ByteArrayTag) tag;
+            return new ByteArrayTag(byteArrayTag.getName(), byteArrayTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.ByteTag) {
+            com.nukkitx.nbt.tag.ByteTag byteTag = (com.nukkitx.nbt.tag.ByteTag) tag;
+            return new ByteTag(byteTag.getName(), byteTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.DoubleTag) {
+            com.nukkitx.nbt.tag.DoubleTag doubleTag = (com.nukkitx.nbt.tag.DoubleTag) tag;
+            return new DoubleTag(doubleTag.getName(), doubleTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.FloatTag) {
+            com.nukkitx.nbt.tag.FloatTag floatTag = (com.nukkitx.nbt.tag.FloatTag) tag;
+            return new FloatTag(floatTag.getName(), floatTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.IntArrayTag) {
+            com.nukkitx.nbt.tag.IntArrayTag intArrayTag = (com.nukkitx.nbt.tag.IntArrayTag) tag;
+            return new IntArrayTag(intArrayTag.getName(), intArrayTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.IntTag) {
+            com.nukkitx.nbt.tag.IntTag intTag = (com.nukkitx.nbt.tag.IntTag) tag;
+            return new IntTag(intTag.getName(), intTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.LongArrayTag) {
+            com.nukkitx.nbt.tag.LongArrayTag longArrayTag = (com.nukkitx.nbt.tag.LongArrayTag) tag;
+            return new LongArrayTag(longArrayTag.getName(), longArrayTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.LongTag) {
+            com.nukkitx.nbt.tag.LongTag longTag = (com.nukkitx.nbt.tag.LongTag) tag;
+            return new LongTag(longTag.getName(), longTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.ShortTag) {
+            com.nukkitx.nbt.tag.ShortTag shortTag = (com.nukkitx.nbt.tag.ShortTag) tag;
+            return new ShortTag(shortTag.getName(), shortTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.StringTag) {
+            com.nukkitx.nbt.tag.StringTag stringTag = (com.nukkitx.nbt.tag.StringTag) tag;
+            return new StringTag(stringTag.getName(), stringTag.getValue());
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.ListTag) {
+            com.nukkitx.nbt.tag.ListTag listTag = (com.nukkitx.nbt.tag.ListTag) tag;
+
+            List<com.github.steveice10.opennbt.tag.builtin.Tag> tags = new ArrayList<>();
+
+            for (Object value : listTag.getValue()) {
+                if (!(value instanceof com.nukkitx.nbt.tag.Tag))
+                    continue;
+
+                com.nukkitx.nbt.tag.Tag tagValue = (com.nukkitx.nbt.tag.Tag) value;
+                com.github.steveice10.opennbt.tag.builtin.Tag javaTag = translateToJavaNBT(tagValue);
+                if (javaTag != null)
+                    tags.add(javaTag);
+            }
+            return new ListTag(listTag.getName(), tags);
+        }
+
+        if (tag instanceof com.nukkitx.nbt.tag.CompoundTag) {
+            com.nukkitx.nbt.tag.CompoundTag compoundTag = (com.nukkitx.nbt.tag.CompoundTag) tag;
+            return translateToJavaNBT(compoundTag);
+        }
+
+        return null;
+    }
+
+
+}

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+
+public class NbtItemStackTranslator {
+
+    public void translateToBedrock(CompoundTag itemTag, ItemEntry itemEntry) {
+
+    }
+
+    public void translateToJava(CompoundTag itemTag, ItemEntry itemEntry) {
+
+    }
+
+    public boolean acceptItem(ItemEntry itemEntry) {
+        return true;
+    }
+
+}

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

@@ -27,11 +27,17 @@ package org.geysermc.connector.network.translators;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
+import com.github.steveice10.mc.protocol.data.game.window.WindowType;
+import com.nukkitx.protocol.bedrock.data.ContainerType;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.network.translators.block.BlockTranslator;
-import org.geysermc.connector.network.translators.inventory.GenericInventoryTranslator;
-import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+import org.geysermc.connector.network.translators.block.entity.*;
+import org.geysermc.connector.network.translators.inventory.*;
+import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater;
+import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
 import org.geysermc.connector.network.translators.item.ItemTranslator;
 import org.reflections.Reflections;
 
@@ -50,7 +56,10 @@ public class Translators {
     private static ItemTranslator itemTranslator;
 
     @Getter
-    private static InventoryTranslator inventoryTranslator = new GenericInventoryTranslator();
+    private static Map<WindowType, InventoryTranslator> inventoryTranslators = new HashMap<>();
+
+    @Getter
+    private static Map<String, BlockEntityTranslator> blockEntityTranslators = new HashMap<>();
 
     private static final CompoundTag EMPTY_TAG = CompoundTagBuilder.builder().buildRootTag();
     public static final byte[] EMPTY_LEVEL_CHUNK_DATA;
@@ -100,17 +109,51 @@ public class Translators {
         }
         
         itemTranslator = new ItemTranslator();
+        itemTranslator.init();
         BlockTranslator.init();
 
+        registerBlockEntityTranslators();
         registerInventoryTranslators();
     }
 
+    private static void registerBlockEntityTranslators() {
+        Reflections ref = new Reflections("org.geysermc.connector.network.translators.block.entity");
+
+        for (Class<?> clazz : ref.getTypesAnnotatedWith(BlockEntity.class)) {
+
+            GeyserConnector.getInstance().getLogger().debug("Found annotated block entity: " + clazz.getCanonicalName());
+
+            try {
+                blockEntityTranslators.put(clazz.getAnnotation(BlockEntity.class).name(), (BlockEntityTranslator) clazz.newInstance());
+            } catch (InstantiationException | IllegalAccessException e) {
+                GeyserConnector.getInstance().getLogger().error("Could not instantiate annotated block entity " + clazz.getCanonicalName() + ".");
+            }
+        }
+    }
+
     private static void registerInventoryTranslators() {
-        /*inventoryTranslators.put(WindowType.GENERIC_9X1, new GenericInventoryTranslator());
-        inventoryTranslators.put(WindowType.GENERIC_9X2, new GenericInventoryTranslator());
-        inventoryTranslators.put(WindowType.GENERIC_9X3, new GenericInventoryTranslator());
-        inventoryTranslators.put(WindowType.GENERIC_9X4, new GenericInventoryTranslator());
-        inventoryTranslators.put(WindowType.GENERIC_9X5, new GenericInventoryTranslator());
-        inventoryTranslators.put(WindowType.GENERIC_9X6, new GenericInventoryTranslator());*/
+        inventoryTranslators.put(null, new PlayerInventoryTranslator()); //player inventory
+        inventoryTranslators.put(WindowType.GENERIC_9X1, new SingleChestInventoryTranslator(9));
+        inventoryTranslators.put(WindowType.GENERIC_9X2, new SingleChestInventoryTranslator(18));
+        inventoryTranslators.put(WindowType.GENERIC_9X3, new SingleChestInventoryTranslator(27));
+        inventoryTranslators.put(WindowType.GENERIC_9X4, new DoubleChestInventoryTranslator(36));
+        inventoryTranslators.put(WindowType.GENERIC_9X5, new DoubleChestInventoryTranslator(45));
+        inventoryTranslators.put(WindowType.GENERIC_9X6, new DoubleChestInventoryTranslator(54));
+        inventoryTranslators.put(WindowType.BREWING_STAND, new BrewingInventoryTranslator());
+        inventoryTranslators.put(WindowType.ANVIL, new AnvilInventoryTranslator());
+        inventoryTranslators.put(WindowType.CRAFTING, new CraftingInventoryTranslator());
+        inventoryTranslators.put(WindowType.GRINDSTONE, new GrindstoneInventoryTranslator());
+        //inventoryTranslators.put(WindowType.ENCHANTMENT, new EnchantmentInventoryTranslator()); //TODO
+
+        InventoryTranslator furnace = new FurnaceInventoryTranslator();
+        inventoryTranslators.put(WindowType.FURNACE, furnace);
+        inventoryTranslators.put(WindowType.BLAST_FURNACE, furnace);
+        inventoryTranslators.put(WindowType.SMOKER, furnace);
+
+        InventoryUpdater containerUpdater = new ContainerInventoryUpdater();
+        inventoryTranslators.put(WindowType.GENERIC_3X3, new BlockInventoryTranslator(9, "minecraft:dispenser[facing=north,triggered=false]", ContainerType.DISPENSER, containerUpdater));
+        inventoryTranslators.put(WindowType.HOPPER, new BlockInventoryTranslator(5, "minecraft:hopper[enabled=false,facing=down]", ContainerType.HOPPER, containerUpdater));
+        inventoryTranslators.put(WindowType.SHULKER_BOX, new BlockInventoryTranslator(27, "minecraft:shulker_box[facing=north]", ContainerType.CONTAINER, containerUpdater));
+        //inventoryTranslators.put(WindowType.BEACON, new BlockInventoryTranslator(1, "minecraft:beacon", ContainerType.BEACON)); //TODO
     }
 }

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

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.bedrock;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
+import com.github.steveice10.mc.protocol.packet.ingame.client.world.ClientUpdateSignPacket;
+import com.nukkitx.nbt.tag.CompoundTag;
+import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.network.translators.Translator;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Translator(packet = BlockEntityDataPacket.class)
+public class BedrockBlockEntityDataTranslator extends PacketTranslator<BlockEntityDataPacket> {
+
+    // In case two people are editing signs at the same time this array holds the temporary messages to be sent
+    // Position -> Message being held
+    protected static Map<Position, String> lastMessages = new HashMap<>();
+
+    @Override
+    public void translate(BlockEntityDataPacket packet, GeyserSession session) {
+        if (packet.getData() instanceof CompoundTag) {
+            CompoundTag tag = (CompoundTag) packet.getData();
+            if (tag.getString("id").equals("Sign")) {
+                // This is the reason why this all works - Bedrock sends packets every time you update the sign, Java only wants the final packet
+                // But Bedrock sends one final packet when you're done editing the sign, which should be equal to the last message since there's no edits
+                // So if the latest update does not match the last cached update then it's still being edited
+                Position pos = new Position(tag.getInt("x"), tag.getInt("y"), tag.getInt("z"));
+                if (!tag.getString("Text").equals(lastMessages.get(pos))) {
+                    lastMessages.put(pos, tag.getString("Text"));
+                    return;
+                }
+                // Otherwise the two messages are identical and we can get to work deconstructing
+                StringBuilder newMessage = new StringBuilder();
+                // While Bedrock's sign lines are one string, Java's is an array of each line
+                // (Initialized all with empty strings because it complains about null)
+                String[] lines = new String[] {"", "", "", ""};
+                int iterator = 0;
+                // This converts the message into the array'd message Java wants
+                for (char character : tag.getString("Text").toCharArray()) {
+                    // If we get a return in Bedrock, that signals to use the next line.
+                    if (character == '\n') {
+                        lines[iterator] = newMessage.toString();
+                        iterator++;
+                        // Bedrock, for whatever reason, can hold a message out of bounds
+                        // We don't care about that so we discard that
+                        if (iterator > lines.length - 1) {
+                            break;
+                        }
+                        newMessage = new StringBuilder();
+                    } else newMessage.append(character);
+                }
+                // Put the final line on since it isn't done in the for loop
+                if (iterator < lines.length) lines[iterator] = newMessage.toString();
+                ClientUpdateSignPacket clientUpdateSignPacket = new ClientUpdateSignPacket(pos, lines);
+                session.getDownstream().getSession().send(clientUpdateSignPacket);
+                //TODO (potentially): originally I was going to update the sign blocks so Bedrock and Java users would match visually
+                // However Java can still store a lot per-line and visuals are still messed up so that doesn't work
+
+                // We remove the sign position from map to indicate there is no work-in-progress sign
+                lastMessages.remove(pos);
+            }
+        }
+
+    }
+}

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

@@ -27,7 +27,7 @@ package org.geysermc.connector.network.translators.bedrock;
 
 import org.geysermc.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.command.GeyserCommandMap;
+import org.geysermc.connector.command.CommandManager;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
@@ -42,9 +42,9 @@ public class BedrockCommandRequestTranslator extends PacketTranslator<CommandReq
     @Override
     public void translate(CommandRequestPacket packet, GeyserSession session) {
         String command = packet.getCommand().replace("/", "");
-        GeyserCommandMap commandMap = GeyserConnector.getInstance().getCommandMap();
-        if (session.getConnector().getPlatformType() == PlatformType.STANDALONE && command.startsWith("geyser ") && commandMap.getCommands().containsKey(command.split(" ")[1])) {
-            commandMap.runCommand(session, command);
+        CommandManager commandManager = GeyserConnector.getInstance().getCommandManager();
+        if (session.getConnector().getPlatformType() == PlatformType.STANDALONE && command.startsWith("geyser ") && commandManager.getCommands().containsKey(command.split(" ")[1])) {
+            commandManager.runCommand(session, command);
         } else {
             String message = packet.getCommand().trim();
 

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.bedrock;
+
+import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientCloseWindowPacket;
+import com.nukkitx.protocol.bedrock.packet.ContainerClosePacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.connector.utils.InventoryUtils;
+
+@Translator(packet = ContainerClosePacket.class)
+public class BedrockContainerCloseTranslator extends PacketTranslator<ContainerClosePacket> {
+
+    @Override
+    public void translate(ContainerClosePacket packet, GeyserSession session) {
+        byte windowId = packet.getWindowId();
+        if (windowId == -1) { //player inventory or crafting table
+            Inventory openInventory = session.getInventoryCache().getOpenInventory();
+            if (openInventory != null) {
+                windowId = (byte) openInventory.getId();
+            } else {
+                windowId = 0;
+            }
+        }
+        ClientCloseWindowPacket closeWindowPacket = new ClientCloseWindowPacket(windowId);
+        session.getDownstream().getSession().send(closeWindowPacket);
+        InventoryUtils.closeInventory(session, windowId);
+    }
+}

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

@@ -27,10 +27,14 @@ package org.geysermc.connector.network.translators.bedrock;
 
 import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerPlaceBlockPacket;
 import org.geysermc.connector.entity.Entity;
+import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.connector.network.translators.Translators;
+import org.geysermc.connector.utils.InventoryUtils;
 
+import com.nukkitx.math.vector.Vector3f;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
 import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
 import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
@@ -40,7 +44,6 @@ import com.github.steveice10.mc.protocol.data.game.world.block.BlockFace;
 import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerActionPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerInteractEntityPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerUseItemPacket;
-import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket;
 
 @Translator(packet = InventoryTransactionPacket.class)
@@ -49,6 +52,17 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
     @Override
     public void translate(InventoryTransactionPacket packet, GeyserSession session) {
         switch (packet.getTransactionType()) {
+            case NORMAL:
+                Inventory inventory = session.getInventoryCache().getOpenInventory();
+                if (inventory == null) inventory = session.getInventory();
+                Translators.getInventoryTranslators().get(inventory.getWindowType()).translateActions(session, inventory, packet.getActions());
+                break;
+            case INVENTORY_MISMATCH:
+                Inventory inv = session.getInventoryCache().getOpenInventory();
+                if (inv == null) inv = session.getInventory();
+                Translators.getInventoryTranslators().get(inv.getWindowType()).updateInventory(session, inv);
+                InventoryUtils.updateCursor(session);
+                break;
             case ITEM_USE:
                 switch (packet.getActionType()) {
                     case 0:

connector/src/main/java/org/geysermc/connector/network/translators/block/BlockStateValues.java

@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import it.unimi.dsi.fastutil.objects.Object2ByteMap;
+import it.unimi.dsi.fastutil.objects.Object2ByteOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+
+import java.util.Map;
+
+/**
+ * Used for block entities if the Java block state contains Bedrock block information.
+ */
+public class BlockStateValues {
+
+    private static final Object2IntMap<BlockState> BANNER_COLORS = new Object2IntOpenHashMap<>();
+    private static final Object2ByteMap<BlockState> BED_COLORS = new Object2ByteOpenHashMap<>();
+    private static final Object2ByteMap<BlockState> SKULL_VARIANTS = new Object2ByteOpenHashMap<>();
+    private static final Object2ByteMap<BlockState> SKULL_ROTATIONS = new Object2ByteOpenHashMap<>();
+
+    /**
+     * Determines if the block state contains Bedrock block information
+     * @param entry The String to JsonNode map used in BlockTranslator
+     * @param javaBlockState the Java Block State of the block
+     */
+    public static void storeBlockStateValues(Map.Entry<String, JsonNode> entry, BlockState javaBlockState) {
+        JsonNode bannerColor = entry.getValue().get("banner_color");
+        if (bannerColor != null) {
+            BlockStateValues.BANNER_COLORS.put(javaBlockState, (byte) bannerColor.intValue());
+            return; // There will never be a banner color and a skull variant
+        }
+
+        JsonNode bedColor = entry.getValue().get("bed_color");
+        if (bedColor != null) {
+            BlockStateValues.BED_COLORS.put(javaBlockState, (byte) bedColor.intValue());
+            return;
+        }
+
+        JsonNode skullVariation = entry.getValue().get("variation");
+        if(skullVariation != null) {
+            BlockStateValues.SKULL_VARIANTS.put(javaBlockState, (byte) skullVariation.intValue());
+        }
+
+        JsonNode skullRotation = entry.getValue().get("skull_rotation");
+        if (skullRotation != null) {
+            BlockStateValues.SKULL_ROTATIONS.put(javaBlockState, (byte) skullRotation.intValue());
+        }
+    }
+
+    /**
+     * Banner colors are part of the namespaced ID in Java Edition, but part of the block entity tag in Bedrock.
+     * This gives an integer color that Bedrock can use.
+     * @param state BlockState of the block
+     * @return banner color integer or -1 if no color
+     */
+    public static int getBannerColor(BlockState state) {
+        if (BANNER_COLORS.containsKey(state)) {
+            return BANNER_COLORS.getInt(state);
+        }
+        return -1;
+    }
+
+    /**
+     * Bed colors are part of the namespaced ID in Java Edition, but part of the block entity tag in Bedrock.
+     * This gives a byte color that Bedrock can use - Bedrock needs a byte in the final tag.
+     * @param state BlockState of the block
+     * @return bed color byte or -1 if no color
+     */
+    public static byte getBedColor(BlockState state) {
+        if (BED_COLORS.containsKey(state)) {
+            return BED_COLORS.getByte(state);
+        }
+        return -1;
+    }
+
+    /**
+     * Skull variations are part of the namespaced ID in Java Edition, but part of the block entity tag in Bedrock.
+     * This gives a byte variant ID that Bedrock can use.
+     * @param state BlockState of the block
+     * @return skull variant byte or -1 if no variant
+     */
+    public static byte getSkullVariant(BlockState state) {
+        if (SKULL_VARIANTS.containsKey(state)) {
+            return SKULL_VARIANTS.getByte(state);
+        }
+        return -1;
+    }
+
+    /**
+     *
+     * @param state BlockState of the block
+     * @return skull rotation value or -1 if no value
+     */
+    public static byte getSkullRotation(BlockState state) {
+        if (SKULL_ROTATIONS.containsKey(state)) {
+            return SKULL_ROTATIONS.getByte(state);
+        }
+        return -1;
+    }
+
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java

@@ -32,6 +32,10 @@ import com.nukkitx.nbt.NbtUtils;
 import com.nukkitx.nbt.stream.NBTInputStream;
 import com.nukkitx.nbt.tag.CompoundTag;
 import com.nukkitx.nbt.tag.ListTag;
+import it.unimi.dsi.fastutil.ints.Int2BooleanMap;
+import it.unimi.dsi.fastutil.ints.Int2BooleanOpenHashMap;
+import it.unimi.dsi.fastutil.ints.Int2DoubleMap;
+import it.unimi.dsi.fastutil.ints.Int2DoubleOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -41,7 +45,9 @@ import it.unimi.dsi.fastutil.ints.IntSet;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.network.translators.block.entity.BlockEntity;
 import org.geysermc.connector.utils.Toolbox;
+import org.reflections.Reflections;
 
 import java.io.InputStream;
 import java.util.*;
@@ -53,11 +59,22 @@ public class BlockTranslator {
 
     private static final Int2IntMap JAVA_TO_BEDROCK_BLOCK_MAP = new Int2IntOpenHashMap();
     private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_BLOCK_MAP = new Int2ObjectOpenHashMap<>();
+    private static final Map<String, BlockState> JAVA_ID_BLOCK_MAP = new HashMap<>();
     private static final IntSet WATERLOGGED = new IntOpenHashSet();
 
     // Bedrock carpet ID, used in LlamaEntity.java for decoration
     public static final int CARPET = 171;
 
+    private static final Map<BlockState, String> JAVA_ID_TO_BLOCK_ENTITY_MAP = new HashMap<>();
+
+    public static final Int2DoubleMap JAVA_RUNTIME_ID_TO_HARDNESS = new Int2DoubleOpenHashMap();
+    public static final Int2BooleanMap JAVA_RUNTIME_ID_TO_CAN_HARVEST_WITH_HAND = new Int2BooleanOpenHashMap();
+    public static final Int2ObjectMap<String> JAVA_RUNTIME_ID_TO_TOOL_TYPE = new Int2ObjectOpenHashMap<>();
+
+    // For block breaking animation math
+    public static final IntSet JAVA_RUNTIME_WOOL_IDS = new IntOpenHashSet();
+    public static final int JAVA_RUNTIME_COBWEB_ID;
+
     private static final int BLOCK_STATE_VERSION = 17760256;
 
     static {
@@ -90,16 +107,58 @@ public class BlockTranslator {
         addedStatesMap.defaultReturnValue(-1);
         List<CompoundTag> paletteList = new ArrayList<>();
 
+        Reflections ref = new Reflections("org.geysermc.connector.network.translators.block.entity");
+        ref.getTypesAnnotatedWith(BlockEntity.class);
+
         int waterRuntimeId = -1;
         int javaRuntimeId = -1;
         int bedrockRuntimeId = 0;
+        int cobwebRuntimeId = -1;
         Iterator<Map.Entry<String, JsonNode>> blocksIterator = blocks.fields();
         while (blocksIterator.hasNext()) {
             javaRuntimeId++;
             Map.Entry<String, JsonNode> entry = blocksIterator.next();
             String javaId = entry.getKey();
+            BlockState javaBlockState = new BlockState(javaRuntimeId);
             CompoundTag blockTag = buildBedrockState(entry.getValue());
 
+            // TODO fix this, (no block should have a null hardness)
+            JsonNode hardnessNode = entry.getValue().get("block_hardness");
+            if (hardnessNode != null) {
+                JAVA_RUNTIME_ID_TO_HARDNESS.put(javaRuntimeId, hardnessNode.doubleValue());
+            }
+
+            JAVA_RUNTIME_ID_TO_CAN_HARVEST_WITH_HAND.put(javaRuntimeId, entry.getValue().get("can_break_with_hand").booleanValue());
+
+            JsonNode toolTypeNode = entry.getValue().get("tool_type");
+            if (toolTypeNode != null) {
+                JAVA_RUNTIME_ID_TO_TOOL_TYPE.put(javaRuntimeId, toolTypeNode.textValue());
+            }
+
+            if (javaId.contains("wool")) {
+                JAVA_RUNTIME_WOOL_IDS.add(javaRuntimeId);
+            }
+
+            if (javaId.contains("cobweb")) {
+                cobwebRuntimeId = javaRuntimeId;
+            }
+
+            JAVA_ID_BLOCK_MAP.put(javaId, javaBlockState);
+
+            // Used for adding all "special" Java block states to block state map
+            String identifier;
+            String bedrock_identifer = entry.getValue().get("bedrock_identifier").asText();
+            for (Class<?> clazz : ref.getTypesAnnotatedWith(BlockEntity.class)) {
+                identifier = clazz.getAnnotation(BlockEntity.class).regex();
+                // Endswith, or else the block bedrock gets picked up for bed
+                if (bedrock_identifer.endsWith(identifier) && !identifier.equals("")) {
+                    JAVA_ID_TO_BLOCK_ENTITY_MAP.put(javaBlockState, clazz.getAnnotation(BlockEntity.class).name());
+                    break;
+                }
+            }
+
+            BlockStateValues.storeBlockStateValues(entry, javaBlockState);
+
             if ("minecraft:water[level=0]".equals(javaId)) {
                 waterRuntimeId = bedrockRuntimeId;
             }
@@ -107,10 +166,10 @@ public class BlockTranslator {
                     || javaId.contains("minecraft:bubble_column") || javaId.contains("minecraft:kelp") || javaId.contains("seagrass");
 
             if (waterlogged) {
-                BEDROCK_TO_JAVA_BLOCK_MAP.putIfAbsent(bedrockRuntimeId | 1 << 31, new BlockState(javaRuntimeId));
+                BEDROCK_TO_JAVA_BLOCK_MAP.putIfAbsent(bedrockRuntimeId | 1 << 31, javaBlockState);
                 WATERLOGGED.add(javaRuntimeId);
             } else {
-                BEDROCK_TO_JAVA_BLOCK_MAP.putIfAbsent(bedrockRuntimeId, new BlockState(javaRuntimeId));
+                BEDROCK_TO_JAVA_BLOCK_MAP.putIfAbsent(bedrockRuntimeId, javaBlockState);
             }
 
             CompoundTag runtimeTag = blockStateMap.remove(blockTag);
@@ -118,7 +177,7 @@ public class BlockTranslator {
                 addedStatesMap.put(blockTag, bedrockRuntimeId);
                 paletteList.add(runtimeTag);
             } else {
-                int duplicateRuntimeId = addedStatesMap.get(blockTag);
+                int duplicateRuntimeId = addedStatesMap.getOrDefault(blockTag, -1);
                 if (duplicateRuntimeId == -1) {
                     GeyserConnector.getInstance().getLogger().debug("Mapping " + javaId + " was not found for bedrock edition!");
                 } else {
@@ -131,6 +190,11 @@ public class BlockTranslator {
             bedrockRuntimeId++;
         }
 
+        if (cobwebRuntimeId == -1) {
+            throw new AssertionError("Unable to find cobwebs in palette");
+        }
+        JAVA_RUNTIME_COBWEB_ID = cobwebRuntimeId;
+
         if (waterRuntimeId == -1) {
             throw new AssertionError("Unable to find water in palette");
         }
@@ -189,6 +253,14 @@ public class BlockTranslator {
         return BEDROCK_TO_JAVA_BLOCK_MAP.get(bedrockId);
     }
 
+    public static BlockState getJavaBlockState(String javaId) {
+        return JAVA_ID_BLOCK_MAP.get(javaId);
+    }
+
+    public static String getBlockEntityString(BlockState javaId) {
+        return JAVA_ID_TO_BLOCK_ENTITY_MAP.get(javaId);
+    }
+
     public static boolean isWaterlogged(BlockState state) {
         return WATERLOGGED.contains(state.getId());
     }

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BannerBlockEntityTranslator.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.nukkitx.nbt.CompoundTagBuilder;
+import com.nukkitx.nbt.tag.IntTag;
+import com.nukkitx.nbt.tag.StringTag;
+import com.nukkitx.nbt.tag.Tag;
+import org.geysermc.connector.network.translators.block.BlockStateValues;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@BlockEntity(name = "Banner", delay = false, regex = "banner")
+public class BannerBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
+
+    @Override
+    public boolean isBlock(BlockState blockState) {
+        return BlockStateValues.getBannerColor(blockState) != -1;
+    }
+
+    @Override
+    public List<Tag<?>> translateTag(CompoundTag tag, BlockState blockState) {
+        List<Tag<?>> tags = new ArrayList<>();
+        int bannerColor = BlockStateValues.getBannerColor(blockState);
+        if (bannerColor != -1) {
+            tags.add(new IntTag("Base", 15 - bannerColor));
+        }
+        ListTag patterns = tag.get("Patterns");
+        List<com.nukkitx.nbt.tag.CompoundTag> tagsList = new ArrayList<>();
+        if (tag.contains("Patterns")) {
+            for (com.github.steveice10.opennbt.tag.builtin.Tag patternTag : patterns.getValue()) {
+                tagsList.add(getPattern((CompoundTag) patternTag));
+            }
+            com.nukkitx.nbt.tag.ListTag<com.nukkitx.nbt.tag.CompoundTag> bedrockPatterns =
+                    new com.nukkitx.nbt.tag.ListTag<>("Patterns", com.nukkitx.nbt.tag.CompoundTag.class, tagsList);
+            tags.add(bedrockPatterns);
+        }
+        if (tag.contains("CustomName")) {
+            tags.add(new StringTag("CustomName", (String) tag.get("CustomName").getValue()));
+        }
+        return tags;
+    }
+
+    @Override
+    public CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
+        CompoundTag tag = getConstantJavaTag(javaId, x, y, z);
+        tag.put(new ListTag("Patterns"));
+        return tag;
+    }
+
+    @Override
+    public com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
+        CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
+        tagBuilder.listTag("Patterns", com.nukkitx.nbt.tag.CompoundTag.class, new ArrayList<>());
+        return tagBuilder.buildRootTag();
+    }
+
+    protected com.nukkitx.nbt.tag.CompoundTag getPattern(CompoundTag pattern) {
+        return CompoundTagBuilder.builder()
+                .intTag("Color", 15 - (int) pattern.get("Color").getValue())
+                .stringTag("Pattern", (String) pattern.get("Pattern").getValue())
+                .buildRootTag();
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BedBlockEntityTranslator.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.nukkitx.nbt.CompoundTagBuilder;
+import com.nukkitx.nbt.tag.ByteTag;
+import com.nukkitx.nbt.tag.Tag;
+import org.geysermc.connector.network.translators.block.BlockStateValues;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@BlockEntity(name = "Bed", delay = false, regex = "bed")
+public class BedBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
+
+    @Override
+    public boolean isBlock(BlockState blockState) {
+        return BlockStateValues.getBedColor(blockState) != -1;
+    }
+
+    @Override
+    public List<Tag<?>> translateTag(CompoundTag tag, BlockState blockState) {
+        List<Tag<?>> tags = new ArrayList<>();
+        byte bedcolor = BlockStateValues.getBedColor(blockState);
+        // Just in case...
+        if (bedcolor == -1) bedcolor = 0;
+        tags.add(new ByteTag("color", bedcolor));
+        return tags;
+    }
+
+    @Override
+    public CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
+        return null;
+    }
+
+    @Override
+    public com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
+        CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
+        tagBuilder.byteTag("color", (byte) 0);
+        return tagBuilder.buildRootTag();
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BlockEntity.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(value = RetentionPolicy.RUNTIME)
+public @interface BlockEntity {
+
+    /**
+     * Whether to delay the sending of the block entity
+     * @return the delay for when sending the block entity
+     */
+    boolean delay();
+
+    /**
+     * The block entity name
+     * @return the name of the block entity
+     */
+    String name();
+
+    /**
+     * The search term used in BlockTranslator
+     * @return the search term used in BlockTranslator
+     */
+    String regex();
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/BlockEntityTranslator.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.IntTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
+import com.nukkitx.nbt.CompoundTagBuilder;
+import com.nukkitx.nbt.tag.Tag;
+
+import org.geysermc.connector.utils.BlockEntityUtils;
+
+import java.util.List;
+
+public abstract class BlockEntityTranslator {
+
+    public abstract List<Tag<?>> translateTag(CompoundTag tag, BlockState blockState);
+
+    public abstract CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z);
+
+    public abstract com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z);
+
+    public com.nukkitx.nbt.tag.CompoundTag getBlockEntityTag(String id, CompoundTag tag, BlockState blockState) {
+        int x = Integer.parseInt(String.valueOf(tag.getValue().get("x").getValue()));
+        int y = Integer.parseInt(String.valueOf(tag.getValue().get("y").getValue()));
+        int z = Integer.parseInt(String.valueOf(tag.getValue().get("z").getValue()));
+
+        CompoundTagBuilder tagBuilder = getConstantBedrockTag(BlockEntityUtils.getBedrockBlockEntityId(id), x, y, z).toBuilder();
+        translateTag(tag, blockState).forEach(tagBuilder::tag);
+        return tagBuilder.buildRootTag();
+    }
+
+    protected CompoundTag getConstantJavaTag(String javaId, int x, int y, int z) {
+        CompoundTag tag = new CompoundTag("");
+        tag.put(new IntTag("x", x));
+        tag.put(new IntTag("y", y));
+        tag.put(new IntTag("z", z));
+        tag.put(new StringTag("id", javaId));
+        return tag;
+    }
+
+    protected com.nukkitx.nbt.tag.CompoundTag getConstantBedrockTag(String bedrockId, int x, int y, int z) {
+        CompoundTagBuilder tagBuilder = CompoundTagBuilder.builder()
+                .intTag("x", x)
+                .intTag("y", y)
+                .intTag("z", z)
+                .stringTag("id", bedrockId);
+        return tagBuilder.buildRootTag();
+    }
+
+    @SuppressWarnings("unchecked")
+    protected <T> T getOrDefault(com.github.steveice10.opennbt.tag.builtin.Tag tag, T defaultValue) {
+        return (tag != null && tag.getValue() != null) ? (T) tag.getValue() : defaultValue;
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/CampfireBlockEntityTranslator.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.nukkitx.nbt.CompoundTagBuilder;
+import com.nukkitx.nbt.tag.Tag;
+
+import org.geysermc.connector.network.translators.Translators;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@BlockEntity(name = "Campfire", delay = false, regex = "campfire")
+public class CampfireBlockEntityTranslator extends BlockEntityTranslator {
+
+    @Override
+    public List<Tag<?>> translateTag(CompoundTag tag, BlockState blockState) {
+        List<Tag<?>> tags = new ArrayList<>();
+        ListTag items = tag.get("Items");
+        int i = 1;
+        for (com.github.steveice10.opennbt.tag.builtin.Tag itemTag : items.getValue()) {
+            tags.add(getItem((CompoundTag) itemTag).toBuilder().build("Item" + i));
+            i++;
+        }
+        return tags;
+    }
+
+    @Override
+    public CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
+        CompoundTag tag = getConstantJavaTag(javaId, x, y, z);
+        tag.put(new ListTag("Items"));
+        return tag;
+    }
+
+    @Override
+    public com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
+        CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
+        tagBuilder.tag(new com.nukkitx.nbt.tag.CompoundTag("Item1", new HashMap<>()));
+        tagBuilder.tag(new com.nukkitx.nbt.tag.CompoundTag("Item2", new HashMap<>()));
+        tagBuilder.tag(new com.nukkitx.nbt.tag.CompoundTag("Item3", new HashMap<>()));
+        tagBuilder.tag(new com.nukkitx.nbt.tag.CompoundTag("Item4", new HashMap<>()));
+        return tagBuilder.buildRootTag();
+    }
+
+    protected com.nukkitx.nbt.tag.CompoundTag getItem(CompoundTag tag) {
+        ItemEntry entry = Translators.getItemTranslator().getItemEntry((String) tag.get("id").getValue());
+        CompoundTagBuilder tagBuilder = CompoundTagBuilder.builder()
+                .shortTag("id", (short) entry.getBedrockId())
+                .byteTag("Count", (byte) tag.get("Count").getValue())
+                .shortTag("Damage", (short) entry.getBedrockData())
+                .tag(CompoundTagBuilder.builder().build("tag"));
+        return tagBuilder.buildRootTag();
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/EmptyBlockEntityTranslator.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.nukkitx.nbt.tag.Tag;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@BlockEntity(name = "Empty", delay = false, regex = "")
+public class EmptyBlockEntityTranslator extends BlockEntityTranslator {
+
+    @Override
+    public List<Tag<?>> translateTag(CompoundTag tag, BlockState blockState) {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
+        return getConstantJavaTag(javaId, x, y, z);
+    }
+
+    @Override
+    public com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
+        return getConstantBedrockTag(bedrockId, x, y, z);
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/EndGatewayBlockEntityTranslator.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.LongTag;
+import com.nukkitx.nbt.CompoundTagBuilder;
+import com.nukkitx.nbt.tag.IntTag;
+import com.nukkitx.nbt.tag.Tag;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+@BlockEntity(name = "EndGateway", delay = true, regex = "end_gateway")
+public class EndGatewayBlockEntityTranslator extends BlockEntityTranslator {
+
+    @Override
+    public List<Tag<?>> translateTag(CompoundTag tag, BlockState blockState) {
+        List<Tag<?>> tags = new ArrayList<>();
+        tags.add(new IntTag("Age", (int) (long) tag.get("Age").getValue()));
+        // Java sometimes does not provide this tag, but Bedrock crashes if it doesn't exist
+        // Linked coordinates
+        List<IntTag> tagsList = new ArrayList<>();
+        // Yes, the axis letters are capitalized
+        tagsList.add(new IntTag("", getExitPortalCoordinate(tag, "X")));
+        tagsList.add(new IntTag("", getExitPortalCoordinate(tag, "Y")));
+        tagsList.add(new IntTag("", getExitPortalCoordinate(tag, "Z")));
+        com.nukkitx.nbt.tag.ListTag<IntTag> exitPortal =
+                new com.nukkitx.nbt.tag.ListTag<>("ExitPortal", IntTag.class, tagsList);
+        tags.add(exitPortal);
+        return tags;
+    }
+
+    @Override
+    public CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
+        CompoundTag tag = getConstantJavaTag(javaId, x, y, z);
+        tag.put(new LongTag("Age"));
+        return tag;
+    }
+
+    @Override
+    public com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
+        CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
+        List<IntTag> tagsList = new ArrayList<>();
+        tagsList.add(new IntTag("", 0));
+        tagsList.add(new IntTag("", 0));
+        tagsList.add(new IntTag("", 0));
+        tagBuilder.listTag("ExitPortal", IntTag.class, tagsList);
+        return tagBuilder.buildRootTag();
+    }
+
+    private int getExitPortalCoordinate(CompoundTag tag, String axis) {
+        // Return 0 if it doesn't exist, otherwise give proper value
+        if (tag.get("ExitPortal") != null) {
+            LinkedHashMap compoundTag = (LinkedHashMap) tag.get("ExitPortal").getValue();
+            com.github.steveice10.opennbt.tag.builtin.IntTag intTag = (com.github.steveice10.opennbt.tag.builtin.IntTag) compoundTag.get(axis);
+            return intTag.getValue();
+        } return 0;
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/RequiresBlockState.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+
+/**
+ * Implemented in block entities if their Java block state is required for additional values in Bedrock
+ */
+public interface RequiresBlockState {
+
+    /**
+     * Determines if block is part of class
+     * @param blockState BlockState to be compared
+     * @return true if part of the class
+     */
+    boolean isBlock(BlockState blockState);
+
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/SignBlockEntityTranslator.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.github.steveice10.mc.protocol.data.message.Message;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.nukkitx.nbt.CompoundTagBuilder;
+import com.nukkitx.nbt.tag.StringTag;
+import com.nukkitx.nbt.tag.Tag;
+import org.geysermc.connector.utils.MessageUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@BlockEntity(name = "Sign", delay = true, regex = "sign")
+public class SignBlockEntityTranslator extends BlockEntityTranslator {
+
+    @Override
+    public List<Tag<?>> translateTag(CompoundTag tag, BlockState blockState) {
+        List<Tag<?>> tags = new ArrayList<>();
+
+        String line1 = getOrDefault(tag.getValue().get("Text1"), "");
+        String line2 = getOrDefault(tag.getValue().get("Text2"), "");
+        String line3 = getOrDefault(tag.getValue().get("Text3"), "");
+        String line4 = getOrDefault(tag.getValue().get("Text4"), "");
+
+        tags.add(new StringTag("Text", MessageUtils.getBedrockMessage(Message.fromString(line1))
+                + "\n" + MessageUtils.getBedrockMessage(Message.fromString(line2))
+                + "\n" + MessageUtils.getBedrockMessage(Message.fromString(line3))
+                + "\n" + MessageUtils.getBedrockMessage(Message.fromString(line4))
+        ));
+
+        return tags;
+    }
+
+    @Override
+    public CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
+        CompoundTag tag = getConstantJavaTag(javaId, x, y, z);
+        tag.put(new com.github.steveice10.opennbt.tag.builtin.StringTag("Text1", "{\"text\":\"\"}"));
+        tag.put(new com.github.steveice10.opennbt.tag.builtin.StringTag("Text2", "{\"text\":\"\"}"));
+        tag.put(new com.github.steveice10.opennbt.tag.builtin.StringTag("Text3", "{\"text\":\"\"}"));
+        tag.put(new com.github.steveice10.opennbt.tag.builtin.StringTag("Text4", "{\"text\":\"\"}"));
+        return tag;
+    }
+
+    @Override
+    public com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
+        CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
+        tagBuilder.stringTag("Text", "");
+        return tagBuilder.buildRootTag();
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/block/entity/SkullBlockEntityTranslator.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.block.entity;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.nukkitx.nbt.CompoundTagBuilder;
+import com.nukkitx.nbt.tag.ByteTag;
+import com.nukkitx.nbt.tag.CompoundTag;
+import com.nukkitx.nbt.tag.FloatTag;
+import com.nukkitx.nbt.tag.Tag;
+import org.geysermc.connector.network.translators.block.BlockStateValues;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@BlockEntity(name = "Skull", delay = false, regex = "skull")
+public class SkullBlockEntityTranslator extends BlockEntityTranslator implements RequiresBlockState {
+
+    @Override
+    public boolean isBlock(BlockState blockState) {
+        return BlockStateValues.getSkullVariant(blockState) != -1;
+    }
+
+    @Override
+    public List<Tag<?>> translateTag(com.github.steveice10.opennbt.tag.builtin.CompoundTag tag, BlockState blockState) {
+        List<Tag<?>> tags = new ArrayList<>();
+        byte skullVariant = BlockStateValues.getSkullVariant(blockState);
+        float rotation = BlockStateValues.getSkullRotation(blockState) * 22.5f;
+        // Just in case...
+        if (skullVariant == -1) skullVariant = 0;
+        tags.add(new FloatTag("Rotation", rotation));
+        tags.add(new ByteTag("SkullType", skullVariant));
+        return tags;
+    }
+
+    @Override
+    public com.github.steveice10.opennbt.tag.builtin.CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
+        return null;
+    }
+
+    @Override
+    public CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
+        CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
+        tagBuilder.floatTag("Rotation", 0);
+        tagBuilder.byteTag("SkullType", (byte) 0);
+        return tagBuilder.buildRootTag();
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/AnvilInventoryTranslator.java

@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import com.github.steveice10.mc.protocol.data.message.Message;
+import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientRenameItemPacket;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.nukkitx.protocol.bedrock.data.ContainerId;
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import com.nukkitx.protocol.bedrock.data.InventoryActionData;
+import com.nukkitx.protocol.bedrock.data.ItemData;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.inventory.updater.CursorInventoryUpdater;
+
+import java.util.List;
+
+public class AnvilInventoryTranslator extends BlockInventoryTranslator {
+    public AnvilInventoryTranslator() {
+        super(3, "minecraft:anvil[facing=north]", ContainerType.ANVIL, new CursorInventoryUpdater());
+    }
+
+    @Override
+    public int bedrockSlotToJava(InventoryActionData action) {
+        if (action.getSource().getContainerId() == ContainerId.CURSOR) {
+            switch (action.getSlot()) {
+                case 1:
+                    return 0;
+                case 2:
+                    return 1;
+                case 50:
+                    return 2;
+            }
+        }
+        return super.bedrockSlotToJava(action);
+    }
+
+    @Override
+    public int javaSlotToBedrock(int slot) {
+        switch (slot) {
+            case 0:
+                return 1;
+            case 1:
+                return 2;
+            case 2:
+                return 50;
+        }
+        return super.javaSlotToBedrock(slot);
+    }
+
+    @Override
+    public SlotType getSlotType(int javaSlot) {
+        if (javaSlot == 2)
+            return SlotType.OUTPUT;
+        return SlotType.NORMAL;
+    }
+
+    @Override
+    public void translateActions(GeyserSession session, Inventory inventory, List<InventoryActionData> actions) {
+        InventoryActionData anvilResult = null;
+        InventoryActionData anvilInput = null;
+        for (InventoryActionData action : actions) {
+            if (action.getSource().getContainerId() == ContainerId.ANVIL_MATERIAL) {
+                //useless packet
+                return;
+            } else if (action.getSource().getContainerId() == ContainerId.ANVIL_RESULT) {
+                anvilResult = action;
+            } else if (bedrockSlotToJava(action) == 0) {
+                anvilInput = action;
+            }
+        }
+        ItemData itemName = null;
+        if (anvilResult != null) {
+            itemName = anvilResult.getFromItem();
+        } else if (anvilInput != null) {
+            itemName = anvilInput.getToItem();
+        }
+        if (itemName != null) {
+            String rename;
+            com.nukkitx.nbt.tag.CompoundTag tag = itemName.getTag();
+            if (tag != null) {
+                rename = tag.getCompound("display").getString("Name");
+            } else {
+                rename = "";
+            }
+            ClientRenameItemPacket renameItemPacket = new ClientRenameItemPacket(rename);
+            session.getDownstream().getSession().send(renameItemPacket);
+        }
+        if (anvilResult != null) {
+            //client will send another packet to grab anvil output
+            return;
+        }
+
+        super.translateActions(session, inventory, actions);
+    }
+
+    @Override
+    public void updateSlot(GeyserSession session, Inventory inventory, int slot) {
+        if (slot >= 0 && slot <= 2) {
+            ItemStack item = inventory.getItem(slot);
+            if (item != null) {
+                String rename;
+                CompoundTag tag = item.getNbt();
+                if (tag != null) {
+                    CompoundTag displayTag = tag.get("display");
+                    if (displayTag != null) {
+                        String itemName = displayTag.get("Name").getValue().toString();
+                        Message message = Message.fromString(itemName);
+                        rename = message.getText();
+                    } else {
+                        rename = "";
+                    }
+                } else {
+                    rename = "";
+                }
+                ClientRenameItemPacket renameItemPacket = new ClientRenameItemPacket(rename);
+                session.getDownstream().getSession().send(renameItemPacket);
+            }
+        }
+        super.updateSlot(session, inventory, slot);
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/BaseInventoryTranslator.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.nukkitx.protocol.bedrock.data.ContainerId;
+import com.nukkitx.protocol.bedrock.data.InventoryActionData;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.inventory.action.InventoryActionDataTranslator;
+
+import java.util.List;
+
+public abstract class BaseInventoryTranslator extends InventoryTranslator{
+    BaseInventoryTranslator(int size) {
+        super(size);
+    }
+
+    @Override
+    public void updateProperty(GeyserSession session, Inventory inventory, int key, int value) {
+        //
+    }
+
+    @Override
+    public int bedrockSlotToJava(InventoryActionData action) {
+        int slotnum = action.getSlot();
+        if (action.getSource().getContainerId() == ContainerId.INVENTORY) {
+            //hotbar
+            if (slotnum >= 9) {
+                return slotnum + this.size - 9;
+            } else {
+                return slotnum + this.size + 27;
+            }
+        }
+        return slotnum;
+    }
+
+    @Override
+    public int javaSlotToBedrock(int slot) {
+        if (slot >= this.size) {
+            final int tmp = slot - this.size;
+            if (tmp < 27) {
+                return tmp + 9;
+            } else {
+                return tmp - 27;
+            }
+        }
+        return slot;
+    }
+
+    @Override
+    public SlotType getSlotType(int javaSlot) {
+        return SlotType.NORMAL;
+    }
+
+    @Override
+    public void translateActions(GeyserSession session, Inventory inventory, List<InventoryActionData> actions) {
+        InventoryActionDataTranslator.translate(this, session, inventory, actions);
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/BlockInventoryTranslator.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.block.BlockTranslator;
+import org.geysermc.connector.network.translators.inventory.holder.BlockInventoryHolder;
+import org.geysermc.connector.network.translators.inventory.holder.InventoryHolder;
+import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
+
+public class BlockInventoryTranslator extends BaseInventoryTranslator {
+    private final InventoryHolder holder;
+    private final InventoryUpdater updater;
+
+    public BlockInventoryTranslator(int size, String javaBlockIdentifier, ContainerType containerType, InventoryUpdater updater) {
+        super(size);
+        BlockState javaBlockState = BlockTranslator.getJavaBlockState(javaBlockIdentifier);
+        int blockId = BlockTranslator.getBedrockBlockId(javaBlockState);
+        this.holder = new BlockInventoryHolder(blockId, containerType);
+        this.updater = updater;
+    }
+
+    @Override
+    public void prepareInventory(GeyserSession session, Inventory inventory) {
+        holder.prepareInventory(this, session, inventory);
+    }
+
+    @Override
+    public void openInventory(GeyserSession session, Inventory inventory) {
+        holder.openInventory(this, session, inventory);
+    }
+
+    @Override
+    public void closeInventory(GeyserSession session, Inventory inventory) {
+        holder.closeInventory(this, session, inventory);
+    }
+
+    @Override
+    public void updateInventory(GeyserSession session, Inventory inventory) {
+        updater.updateInventory(this, session, inventory);
+    }
+
+    @Override
+    public void updateSlot(GeyserSession session, Inventory inventory, int slot) {
+        updater.updateSlot(this, session, inventory, slot);
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/BrewingInventoryTranslator.java

@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import com.nukkitx.protocol.bedrock.data.InventoryActionData;
+import com.nukkitx.protocol.bedrock.packet.ContainerSetDataPacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater;
+
+public class BrewingInventoryTranslator extends BlockInventoryTranslator {
+    public BrewingInventoryTranslator() {
+        super(5, "minecraft:brewing_stand[has_bottle_0=false,has_bottle_1=false,has_bottle_2=false]", ContainerType.BREWING_STAND, new ContainerInventoryUpdater());
+    }
+
+    @Override
+    public void openInventory(GeyserSession session, Inventory inventory) {
+        super.openInventory(session, inventory);
+        ContainerSetDataPacket dataPacket = new ContainerSetDataPacket();
+        dataPacket.setWindowId((byte) inventory.getId());
+        dataPacket.setProperty(ContainerSetDataPacket.BREWING_STAND_FUEL_TOTAL);
+        dataPacket.setValue(20);
+        session.getUpstream().sendPacket(dataPacket);
+    }
+
+    @Override
+    public void updateProperty(GeyserSession session, Inventory inventory, int key, int value) {
+        ContainerSetDataPacket dataPacket = new ContainerSetDataPacket();
+        dataPacket.setWindowId((byte) inventory.getId());
+        switch (key) {
+            case 0:
+                dataPacket.setProperty(ContainerSetDataPacket.BREWING_STAND_BREW_TIME);
+                break;
+            case 1:
+                dataPacket.setProperty(ContainerSetDataPacket.BREWING_STAND_FUEL_AMOUNT);
+                break;
+            default:
+                return;
+        }
+        dataPacket.setValue(value);
+        session.getUpstream().sendPacket(dataPacket);
+    }
+
+    @Override
+    public int bedrockSlotToJava(InventoryActionData action) {
+        final int slot = super.bedrockSlotToJava(action);
+        switch (slot) {
+            case 0:
+                return 3;
+            case 1:
+                return 0;
+            case 2:
+                return 1;
+            case 3:
+                return 2;
+            default:
+                return slot;
+        }
+    }
+
+    @Override
+    public int javaSlotToBedrock(int slot) {
+        switch (slot) {
+            case 0:
+                return 1;
+            case 1:
+                return 2;
+            case 2:
+                return 3;
+            case 3:
+                return 0;
+        }
+        return super.javaSlotToBedrock(slot);
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/CraftingInventoryTranslator.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
+import com.nukkitx.protocol.bedrock.data.ContainerId;
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import com.nukkitx.protocol.bedrock.data.InventoryActionData;
+import com.nukkitx.protocol.bedrock.data.InventorySource;
+import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.inventory.updater.CursorInventoryUpdater;
+import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
+import org.geysermc.connector.utils.InventoryUtils;
+
+import java.util.List;
+
+public class CraftingInventoryTranslator extends BaseInventoryTranslator {
+    private final InventoryUpdater updater;
+
+    public CraftingInventoryTranslator() {
+        super(10);
+        this.updater = new CursorInventoryUpdater();
+    }
+
+    @Override
+    public void prepareInventory(GeyserSession session, Inventory inventory) {
+        //
+    }
+
+    @Override
+    public void openInventory(GeyserSession session, Inventory inventory) {
+        ContainerOpenPacket containerOpenPacket = new ContainerOpenPacket();
+        containerOpenPacket.setWindowId((byte) inventory.getId());
+        containerOpenPacket.setType((byte) ContainerType.WORKBENCH.id());
+        containerOpenPacket.setBlockPosition(inventory.getHolderPosition());
+        containerOpenPacket.setUniqueEntityId(inventory.getHolderId());
+        session.getUpstream().sendPacket(containerOpenPacket);
+    }
+
+    @Override
+    public void closeInventory(GeyserSession session, Inventory inventory) {
+        //
+    }
+
+    @Override
+    public void updateInventory(GeyserSession session, Inventory inventory) {
+        updater.updateInventory(this, session, inventory);
+    }
+
+    @Override
+    public void updateSlot(GeyserSession session, Inventory inventory, int slot) {
+        updater.updateSlot(this, session, inventory, slot);
+    }
+
+    @Override
+    public int bedrockSlotToJava(InventoryActionData action) {
+        if (action.getSource().getContainerId() == ContainerId.CURSOR) {
+            int slotnum = action.getSlot();
+            if (slotnum >= 32 && 42 >= slotnum) {
+                return slotnum - 31;
+            } else if (slotnum == 50) {
+                return 0;
+            }
+        }
+        return super.bedrockSlotToJava(action);
+    }
+
+    @Override
+    public int javaSlotToBedrock(int slot) {
+        return slot == 0 ? 50 : slot + 31;
+    }
+
+    @Override
+    public SlotType getSlotType(int javaSlot) {
+        if (javaSlot == 0)
+            return SlotType.OUTPUT;
+        return SlotType.NORMAL;
+    }
+
+    @Override
+    public void translateActions(GeyserSession session, Inventory inventory, List<InventoryActionData> actions) {
+        if (session.getGameMode() == GameMode.CREATIVE) {
+            for (InventoryActionData action : actions) {
+                if (action.getSource().getType() == InventorySource.Type.CREATIVE) {
+                    updateInventory(session, inventory);
+                    InventoryUtils.updateCursor(session);
+                    return;
+                }
+            }
+        }
+        super.translateActions(session, inventory, actions);
+    }
+}

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

@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.nukkitx.math.vector.Vector3i;
+import com.nukkitx.nbt.tag.CompoundTag;
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
+import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
+import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.block.BlockTranslator;
+import org.geysermc.connector.network.translators.inventory.updater.ChestInventoryUpdater;
+import org.geysermc.connector.network.translators.inventory.updater.InventoryUpdater;
+
+public class DoubleChestInventoryTranslator extends BaseInventoryTranslator {
+    private final int blockId;
+    private final InventoryUpdater updater;
+
+    public DoubleChestInventoryTranslator(int size) {
+        super(size);
+        BlockState javaBlockState = BlockTranslator.getJavaBlockState("minecraft:chest[facing=north,type=single,waterlogged=false]");
+        this.blockId = BlockTranslator.getBedrockBlockId(javaBlockState);
+        this.updater = new ChestInventoryUpdater(54);
+    }
+
+    @Override
+    public void prepareInventory(GeyserSession session, Inventory inventory) {
+        Vector3i position = session.getPlayerEntity().getPosition().toInt().add(Vector3i.UP);
+        Vector3i pairPosition = position.add(Vector3i.UNIT_X);
+
+        UpdateBlockPacket blockPacket = new UpdateBlockPacket();
+        blockPacket.setDataLayer(0);
+        blockPacket.setBlockPosition(position);
+        blockPacket.setRuntimeId(blockId);
+        blockPacket.getFlags().addAll(UpdateBlockPacket.FLAG_ALL_PRIORITY);
+        session.getUpstream().sendPacket(blockPacket);
+
+        CompoundTag tag = CompoundTag.builder()
+                .stringTag("id", "Chest")
+                .intTag("x", position.getX())
+                .intTag("y", position.getY())
+                .intTag("z", position.getZ())
+                .intTag("pairx", pairPosition.getX())
+                .intTag("pairz", pairPosition.getZ())
+                .stringTag("CustomName", inventory.getTitle()).buildRootTag();
+        BlockEntityDataPacket dataPacket = new BlockEntityDataPacket();
+        dataPacket.setData(tag);
+        dataPacket.setBlockPosition(position);
+        session.getUpstream().sendPacket(dataPacket);
+
+        blockPacket = new UpdateBlockPacket();
+        blockPacket.setDataLayer(0);
+        blockPacket.setBlockPosition(pairPosition);
+        blockPacket.setRuntimeId(blockId);
+        blockPacket.getFlags().addAll(UpdateBlockPacket.FLAG_ALL_PRIORITY);
+        session.getUpstream().sendPacket(blockPacket);
+
+        tag = CompoundTag.builder()
+                .stringTag("id", "Chest")
+                .intTag("x", pairPosition.getX())
+                .intTag("y", pairPosition.getY())
+                .intTag("z", pairPosition.getZ())
+                .intTag("pairx", position.getX())
+                .intTag("pairz", position.getZ())
+                .stringTag("CustomName", inventory.getTitle()).buildRootTag();
+        dataPacket = new BlockEntityDataPacket();
+        dataPacket.setData(tag);
+        dataPacket.setBlockPosition(pairPosition);
+        session.getUpstream().sendPacket(dataPacket);
+
+        inventory.setHolderPosition(position);
+    }
+
+    @Override
+    public void openInventory(GeyserSession session, Inventory inventory) {
+        ContainerOpenPacket containerOpenPacket = new ContainerOpenPacket();
+        containerOpenPacket.setWindowId((byte) inventory.getId());
+        containerOpenPacket.setType((byte) ContainerType.CONTAINER.id());
+        containerOpenPacket.setBlockPosition(inventory.getHolderPosition());
+        containerOpenPacket.setUniqueEntityId(inventory.getHolderId());
+        session.getUpstream().sendPacket(containerOpenPacket);
+    }
+
+    @Override
+    public void closeInventory(GeyserSession session, Inventory inventory) {
+        Vector3i holderPos = inventory.getHolderPosition();
+        Position pos = new Position(holderPos.getX(), holderPos.getY(), holderPos.getZ());
+        BlockState realBlock = session.getChunkCache().getBlockAt(pos);
+        UpdateBlockPacket blockPacket = new UpdateBlockPacket();
+        blockPacket.setDataLayer(0);
+        blockPacket.setBlockPosition(holderPos);
+        blockPacket.setRuntimeId(BlockTranslator.getBedrockBlockId(realBlock));
+        session.getUpstream().sendPacket(blockPacket);
+
+        holderPos = holderPos.add(Vector3i.UNIT_X);
+        pos = new Position(holderPos.getX(), holderPos.getY(), holderPos.getZ());
+        realBlock = session.getChunkCache().getBlockAt(pos);
+        blockPacket = new UpdateBlockPacket();
+        blockPacket.setDataLayer(0);
+        blockPacket.setBlockPosition(holderPos);
+        blockPacket.setRuntimeId(BlockTranslator.getBedrockBlockId(realBlock));
+        session.getUpstream().sendPacket(blockPacket);
+    }
+
+    @Override
+    public void updateInventory(GeyserSession session, Inventory inventory) {
+        updater.updateInventory(this, session, inventory);
+    }
+
+    @Override
+    public void updateSlot(GeyserSession session, Inventory inventory, int slot) {
+        updater.updateSlot(this, session, inventory, slot);
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/EnchantmentInventoryTranslator.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater;
+
+public class EnchantmentInventoryTranslator extends BlockInventoryTranslator {
+    public EnchantmentInventoryTranslator() {
+        super(2, "minecraft:enchanting_table", ContainerType.ENCHANTMENT, new ContainerInventoryUpdater());
+    }
+
+    @Override
+    public void updateProperty(GeyserSession session, Inventory inventory, int key, int value) {
+
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/FurnaceInventoryTranslator.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.github.steveice10.mc.protocol.data.game.window.WindowType;
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import com.nukkitx.protocol.bedrock.packet.ContainerSetDataPacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.inventory.updater.ContainerInventoryUpdater;
+
+public class FurnaceInventoryTranslator extends BlockInventoryTranslator {
+    public FurnaceInventoryTranslator() {
+        super(3, "minecraft:furnace[facing=north,lit=false]", ContainerType.FURNACE, new ContainerInventoryUpdater());
+    }
+
+    @Override
+    public void updateProperty(GeyserSession session, Inventory inventory, int key, int value) {
+        ContainerSetDataPacket dataPacket = new ContainerSetDataPacket();
+        dataPacket.setWindowId((byte) inventory.getId());
+        switch (key) {
+            case 0:
+                dataPacket.setProperty(ContainerSetDataPacket.FURNACE_LIT_TIME);
+                break;
+            case 1:
+                dataPacket.setProperty(ContainerSetDataPacket.FURNACE_LIT_DURATION);
+                break;
+            case 2:
+                dataPacket.setProperty(ContainerSetDataPacket.FURNACE_TICK_COUNT);
+                if (inventory.getWindowType() == WindowType.BLAST_FURNACE || inventory.getWindowType() == WindowType.SMOKER) {
+                    value *= 2;
+                }
+                break;
+            default:
+                return;
+        }
+        dataPacket.setValue(value);
+        session.getUpstream().sendPacket(dataPacket);
+    }
+
+    @Override
+    public SlotType getSlotType(int javaSlot) {
+        if (javaSlot == 2)
+            return SlotType.FURNACE_OUTPUT;
+        return SlotType.NORMAL;
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/GrindstoneInventoryTranslator.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import com.nukkitx.protocol.bedrock.data.InventoryActionData;
+import org.geysermc.connector.network.translators.inventory.updater.CursorInventoryUpdater;
+
+public class GrindstoneInventoryTranslator extends BlockInventoryTranslator {
+
+    public GrindstoneInventoryTranslator() {
+        super(3, "minecraft:grindstone[face=floor,facing=north]", ContainerType.GRINDSTONE, new CursorInventoryUpdater());
+    }
+
+    @Override
+    public int bedrockSlotToJava(InventoryActionData action) {
+        final int slot = super.bedrockSlotToJava(action);
+        if (action.getSource().getContainerId() == 124) {
+            switch (slot) {
+                case 16:
+                    return 0;
+                case 17:
+                    return 1;
+                case 50:
+                    return 2;
+                default:
+                    return slot;
+            }
+        } return slot;
+    }
+
+    @Override
+    public int javaSlotToBedrock(int slot) {
+        switch (slot) {
+            case 0:
+                return 16;
+            case 1:
+                return 17;
+            case 2:
+                return 50;
+        }
+        return super.javaSlotToBedrock(slot);
+    }
+
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java

@@ -25,14 +25,25 @@
 
 package org.geysermc.connector.network.translators.inventory;
 
+import com.nukkitx.protocol.bedrock.data.InventoryActionData;
+import lombok.AllArgsConstructor;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
 
+import java.util.List;
+
+@AllArgsConstructor
 public abstract class InventoryTranslator {
+    public final int size;
 
     public abstract void prepareInventory(GeyserSession session, Inventory inventory);
     public abstract void openInventory(GeyserSession session, Inventory inventory);
+    public abstract void closeInventory(GeyserSession session, Inventory inventory);
+    public abstract void updateProperty(GeyserSession session, Inventory inventory, int key, int value);
     public abstract void updateInventory(GeyserSession session, Inventory inventory);
     public abstract void updateSlot(GeyserSession session, Inventory inventory, int slot);
-
+    public abstract int bedrockSlotToJava(InventoryActionData action);
+    public abstract int javaSlotToBedrock(int slot);
+    public abstract SlotType getSlotType(int javaSlot);
+    public abstract void translateActions(GeyserSession session, Inventory inventory, List<InventoryActionData> actions);
 }

connector/src/main/java/org/geysermc/connector/network/translators/inventory/PlayerInventoryTranslator.java

@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
+import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientCreativeInventoryActionPacket;
+import com.nukkitx.protocol.bedrock.data.*;
+import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket;
+import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.Translators;
+import org.geysermc.connector.network.translators.inventory.action.InventoryActionDataTranslator;
+import org.geysermc.connector.utils.InventoryUtils;
+
+import java.util.List;
+
+public class PlayerInventoryTranslator extends InventoryTranslator {
+    public PlayerInventoryTranslator() {
+        super(46);
+    }
+
+    @Override
+    public void updateInventory(GeyserSession session, Inventory inventory) {
+        // Crafting grid
+        for (int i = 1; i < 5; i++) {
+            InventorySlotPacket slotPacket = new InventorySlotPacket();
+            slotPacket.setContainerId(ContainerId.CURSOR);
+            slotPacket.setSlot(i + 27);
+            slotPacket.setItem(Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(i)));
+            session.getUpstream().sendPacket(slotPacket);
+        }
+
+        InventoryContentPacket inventoryContentPacket = new InventoryContentPacket();
+        inventoryContentPacket.setContainerId(ContainerId.INVENTORY);
+        ItemData[] contents = new ItemData[36];
+        // Inventory
+        for (int i = 9; i < 36; i++) {
+            contents[i] = Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(i));
+        }
+        // Hotbar
+        for (int i = 36; i < 45; i++) {
+            contents[i - 36] = Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(i));
+        }
+        inventoryContentPacket.setContents(contents);
+        session.getUpstream().sendPacket(inventoryContentPacket);
+
+        // Armor
+        InventoryContentPacket armorContentPacket = new InventoryContentPacket();
+        armorContentPacket.setContainerId(ContainerId.ARMOR);
+        contents = new ItemData[4];
+        for (int i = 5; i < 9; i++) {
+            contents[i - 5] = Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(i));
+        }
+        armorContentPacket.setContents(contents);
+        session.getUpstream().sendPacket(armorContentPacket);
+
+        // Offhand
+        InventoryContentPacket offhandPacket = new InventoryContentPacket();
+        offhandPacket.setContainerId(ContainerId.OFFHAND);
+        offhandPacket.setContents(new ItemData[]{Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(45))});
+        session.getUpstream().sendPacket(offhandPacket);
+    }
+
+    @Override
+    public void updateSlot(GeyserSession session, Inventory inventory, int slot) {
+        if (slot >= 1 && slot <= 44) {
+            InventorySlotPacket slotPacket = new InventorySlotPacket();
+            if (slot >= 9) {
+                slotPacket.setContainerId(ContainerId.INVENTORY);
+                if (slot >= 36) {
+                    slotPacket.setSlot(slot - 36);
+                } else {
+                    slotPacket.setSlot(slot);
+                }
+            } else if (slot >= 5) {
+                slotPacket.setContainerId(ContainerId.ARMOR);
+                slotPacket.setSlot(slot - 5);
+            } else {
+                slotPacket.setContainerId(ContainerId.CURSOR);
+                slotPacket.setSlot(slot + 27);
+            }
+            slotPacket.setItem(Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(slot)));
+            session.getUpstream().sendPacket(slotPacket);
+        } else if (slot == 45) {
+            InventoryContentPacket offhandPacket = new InventoryContentPacket();
+            offhandPacket.setContainerId(ContainerId.OFFHAND);
+            offhandPacket.setContents(new ItemData[]{Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(slot))});
+            session.getUpstream().sendPacket(offhandPacket);
+        }
+    }
+
+    @Override
+    public int bedrockSlotToJava(InventoryActionData action) {
+        int slotnum = action.getSlot();
+        switch (action.getSource().getContainerId()) {
+            case ContainerId.INVENTORY:
+                // Inventory
+                if (slotnum >= 9 && slotnum <= 35) {
+                    return slotnum;
+                }
+                // Hotbar
+                if (slotnum >= 0 && slotnum <= 8) {
+                    return slotnum + 36;
+                }
+                break;
+            case ContainerId.ARMOR:
+                if (slotnum >= 0 && slotnum <= 3) {
+                    return slotnum + 5;
+                }
+                break;
+            case ContainerId.OFFHAND:
+                return 45;
+            case ContainerId.CURSOR:
+                if (slotnum >= 28 && 31 >= slotnum) {
+                    return slotnum - 27;
+                } else if (slotnum == 50) {
+                    return 0;
+                }
+                break;
+        }
+        return slotnum;
+    }
+
+    @Override
+    public int javaSlotToBedrock(int slot) {
+        return slot;
+    }
+
+    @Override
+    public SlotType getSlotType(int javaSlot) {
+        if (javaSlot == 0)
+            return SlotType.OUTPUT;
+        return SlotType.NORMAL;
+    }
+
+    @Override
+    public void translateActions(GeyserSession session, Inventory inventory, List<InventoryActionData> actions) {
+        if (session.getGameMode() == GameMode.CREATIVE) {
+            //crafting grid is not visible in creative mode in java edition
+            for (InventoryActionData action : actions) {
+                if (action.getSource().getContainerId() == ContainerId.CURSOR && (action.getSlot() >= 28 && 31 >= action.getSlot())) {
+                    updateInventory(session, inventory);
+                    InventoryUtils.updateCursor(session);
+                    return;
+                }
+            }
+
+            ItemStack javaItem;
+            for (InventoryActionData action : actions) {
+                switch (action.getSource().getContainerId()) {
+                    case ContainerId.INVENTORY:
+                    case ContainerId.ARMOR:
+                    case ContainerId.OFFHAND:
+                        int javaSlot = bedrockSlotToJava(action);
+                        if (action.getToItem().getId() == 0) {
+                            javaItem = new ItemStack(-1, 0, null);
+                        } else {
+                            javaItem = Translators.getItemTranslator().translateToJava(session, action.getToItem());
+                        }
+                        ClientCreativeInventoryActionPacket creativePacket = new ClientCreativeInventoryActionPacket(javaSlot, javaItem);
+                        session.getDownstream().getSession().send(creativePacket);
+                        inventory.setItem(javaSlot, javaItem);
+                        break;
+                    case ContainerId.CURSOR:
+                        if (action.getSlot() == 0) {
+                            session.getInventory().setCursor(Translators.getItemTranslator().translateToJava(session, action.getToItem()));
+                        }
+                        break;
+                    case ContainerId.NONE:
+                        if (action.getSource().getType() == InventorySource.Type.WORLD_INTERACTION
+                                && action.getSource().getFlag() == InventorySource.Flag.DROP_ITEM) {
+                            javaItem = Translators.getItemTranslator().translateToJava(session, action.getToItem());
+                            ClientCreativeInventoryActionPacket creativeDropPacket = new ClientCreativeInventoryActionPacket(-1, javaItem);
+                            session.getDownstream().getSession().send(creativeDropPacket);
+                        }
+                        break;
+                }
+            }
+            return;
+        }
+
+        InventoryActionDataTranslator.translate(this, session, inventory, actions);
+    }
+
+    @Override
+    public void prepareInventory(GeyserSession session, Inventory inventory) {
+    }
+
+    @Override
+    public void openInventory(GeyserSession session, Inventory inventory) {
+    }
+
+    @Override
+    public void closeInventory(GeyserSession session, Inventory inventory) {
+    }
+
+    @Override
+    public void updateProperty(GeyserSession session, Inventory inventory, int key, int value) {
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/SingleChestInventoryTranslator.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import org.geysermc.connector.network.translators.inventory.updater.ChestInventoryUpdater;
+
+public class SingleChestInventoryTranslator extends BlockInventoryTranslator {
+    public SingleChestInventoryTranslator(int size) {
+        super(size, "minecraft:chest[facing=north,type=single,waterlogged=false]", ContainerType.CONTAINER, new ChestInventoryUpdater(27));
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/SlotType.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory;
+
+public enum SlotType {
+    NORMAL,
+    OUTPUT,
+    FURNACE_OUTPUT
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/action/Click.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory.action;
+
+import com.github.steveice10.mc.protocol.data.game.window.ClickItemParam;
+import com.github.steveice10.mc.protocol.data.game.window.WindowActionParam;
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+enum Click {
+    LEFT(ClickItemParam.LEFT_CLICK),
+    RIGHT(ClickItemParam.RIGHT_CLICK);
+
+    public final WindowActionParam actionParam;
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/action/ClickPlan.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory.action;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import com.github.steveice10.mc.protocol.data.game.window.WindowAction;
+import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientConfirmTransactionPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientWindowActionPacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.inventory.PlayerInventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+import org.geysermc.connector.network.translators.inventory.SlotType;
+import org.geysermc.connector.utils.InventoryUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+class ClickPlan {
+    private final List<ClickAction> plan = new ArrayList<>();
+
+    public void add(Click click, int slot) {
+        plan.add(new ClickAction(click, slot));
+    }
+
+    public void execute(GeyserSession session, InventoryTranslator translator, Inventory inventory, boolean refresh) {
+        PlayerInventory playerInventory = session.getInventory();
+        ListIterator<ClickAction> planIter = plan.listIterator();
+        while (planIter.hasNext()) {
+            final ClickAction action = planIter.next();
+            final ItemStack cursorItem = playerInventory.getCursor();
+            final ItemStack clickedItem = inventory.getItem(action.slot);
+            final short actionId = (short) inventory.getTransactionId().getAndIncrement();
+
+            //TODO: stop relying on refreshing the inventory for crafting to work properly
+            if (translator.getSlotType(action.slot) != SlotType.NORMAL)
+                refresh = true;
+
+            ClientWindowActionPacket clickPacket = new ClientWindowActionPacket(inventory.getId(),
+                    actionId, action.slot, !planIter.hasNext() && refresh ? InventoryUtils.REFRESH_ITEM : clickedItem,
+                    WindowAction.CLICK_ITEM, action.click.actionParam);
+
+            if (translator.getSlotType(action.slot) == SlotType.OUTPUT) {
+                if (cursorItem == null && clickedItem != null) {
+                    playerInventory.setCursor(clickedItem);
+                } else if (InventoryUtils.canStack(cursorItem, clickedItem)) {
+                    playerInventory.setCursor(new ItemStack(cursorItem.getId(),
+                            cursorItem.getAmount() + clickedItem.getAmount(), cursorItem.getNbt()));
+                }
+            } else {
+                switch (action.click) {
+                    case LEFT:
+                        if (!InventoryUtils.canStack(cursorItem, clickedItem)) {
+                            playerInventory.setCursor(clickedItem);
+                            inventory.setItem(action.slot, cursorItem);
+                        } else {
+                            playerInventory.setCursor(null);
+                            inventory.setItem(action.slot, new ItemStack(clickedItem.getId(),
+                                    clickedItem.getAmount() + cursorItem.getAmount(), clickedItem.getNbt()));
+                        }
+                        break;
+                    case RIGHT:
+                        if (cursorItem == null && clickedItem != null) {
+                            ItemStack halfItem = new ItemStack(clickedItem.getId(),
+                                    clickedItem.getAmount() / 2, clickedItem.getNbt());
+                            inventory.setItem(action.slot, halfItem);
+                            playerInventory.setCursor(new ItemStack(clickedItem.getId(),
+                                    clickedItem.getAmount() - halfItem.getAmount(), clickedItem.getNbt()));
+                        } else if (cursorItem != null && clickedItem == null) {
+                            playerInventory.setCursor(new ItemStack(cursorItem.getId(),
+                                    cursorItem.getAmount() - 1, cursorItem.getNbt()));
+                            inventory.setItem(action.slot, new ItemStack(cursorItem.getId(),
+                                    1, cursorItem.getNbt()));
+                        } else if (InventoryUtils.canStack(cursorItem, clickedItem)) {
+                            playerInventory.setCursor(new ItemStack(cursorItem.getId(),
+                                    cursorItem.getAmount() - 1, cursorItem.getNbt()));
+                            inventory.setItem(action.slot, new ItemStack(clickedItem.getId(),
+                                    clickedItem.getAmount() + 1, clickedItem.getNbt()));
+                        }
+                        break;
+                }
+            }
+            session.getDownstream().getSession().send(clickPacket);
+            session.getDownstream().getSession().send(new ClientConfirmTransactionPacket(inventory.getId(), actionId, true));
+        }
+
+        /*if (refresh) {
+            translator.updateInventory(session, inventory);
+            InventoryUtils.updateCursor(session);
+        }*/
+    }
+
+    private static class ClickAction {
+        final Click click;
+        final int slot;
+        ClickAction(Click click, int slot) {
+            this.click = click;
+            this.slot = slot;
+        }
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/action/InventoryActionDataTranslator.java

@@ -0,0 +1,330 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory.action;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
+import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerAction;
+import com.github.steveice10.mc.protocol.data.game.window.*;
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockFace;
+import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerActionPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientWindowActionPacket;
+import com.nukkitx.protocol.bedrock.data.ContainerId;
+import com.nukkitx.protocol.bedrock.data.InventoryActionData;
+import com.nukkitx.protocol.bedrock.data.InventorySource;
+import com.nukkitx.protocol.bedrock.data.ItemData;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.Translators;
+import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+import org.geysermc.connector.network.translators.inventory.SlotType;
+import org.geysermc.connector.utils.InventoryUtils;
+
+import java.util.*;
+
+public class InventoryActionDataTranslator {
+    public static void translate(InventoryTranslator translator, GeyserSession session, Inventory inventory, List<InventoryActionData> actions) {
+        if (actions.size() != 2)
+            return;
+
+        InventoryActionData worldAction = null;
+        InventoryActionData cursorAction = null;
+        InventoryActionData containerAction = null;
+        boolean refresh = false;
+        for (InventoryActionData action : actions) {
+            if (action.getSource().getContainerId() == ContainerId.CRAFTING_USE_INGREDIENT || action.getSource().getContainerId() == ContainerId.CRAFTING_RESULT) {
+                return;
+            } else if (action.getSource().getType() == InventorySource.Type.WORLD_INTERACTION) {
+                worldAction = action;
+            } else if (action.getSource().getContainerId() == ContainerId.CURSOR && action.getSlot() == 0) {
+                cursorAction = action;
+                ItemData translatedCursor = Translators.getItemTranslator().translateToBedrock(session, session.getInventory().getCursor());
+                if (!translatedCursor.equals(action.getFromItem())) {
+                    refresh = true;
+                }
+            } else {
+                containerAction = action;
+                ItemData translatedItem = Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(translator.bedrockSlotToJava(action)));
+                if (!translatedItem.equals(action.getFromItem())) {
+                    refresh = true;
+                }
+            }
+        }
+
+        final int craftSlot = session.getCraftSlot();
+        session.setCraftSlot(0);
+
+        if (worldAction != null) {
+            InventoryActionData sourceAction;
+            if (cursorAction != null) {
+                sourceAction = cursorAction;
+            } else {
+                sourceAction = containerAction;
+            }
+
+            if (sourceAction != null) {
+                if (worldAction.getSource().getFlag() == InventorySource.Flag.DROP_ITEM) {
+                    //quick dropping from hotbar?
+                    if (session.getInventoryCache().getOpenInventory() == null && sourceAction.getSource().getContainerId() == ContainerId.INVENTORY) {
+                        int heldSlot = session.getInventory().getHeldItemSlot();
+                        if (sourceAction.getSlot() == heldSlot) {
+                            ClientPlayerActionPacket actionPacket = new ClientPlayerActionPacket(
+                                    sourceAction.getToItem().getCount() == 0 ? PlayerAction.DROP_ITEM_STACK : PlayerAction.DROP_ITEM,
+                                    new Position(0, 0, 0), BlockFace.DOWN);
+                            session.getDownstream().getSession().send(actionPacket);
+                            ItemStack item = session.getInventory().getItem(heldSlot);
+                            if (item != null) {
+                                session.getInventory().setItem(heldSlot, new ItemStack(item.getId(), item.getAmount() - 1, item.getNbt()));
+                            }
+                            return;
+                        }
+                    }
+                    int dropAmount = sourceAction.getFromItem().getCount() - sourceAction.getToItem().getCount();
+                    if (sourceAction != cursorAction) { //dropping directly from inventory
+                        int javaSlot = translator.bedrockSlotToJava(sourceAction);
+                        if (dropAmount == sourceAction.getFromItem().getCount()) {
+                            ClientWindowActionPacket dropPacket = new ClientWindowActionPacket(inventory.getId(),
+                                    inventory.getTransactionId().getAndIncrement(),
+                                    javaSlot, null, WindowAction.DROP_ITEM,
+                                    DropItemParam.DROP_SELECTED_STACK);
+                            session.getDownstream().getSession().send(dropPacket);
+                        } else {
+                            for (int i = 0; i < dropAmount; i++) {
+                                ClientWindowActionPacket dropPacket = new ClientWindowActionPacket(inventory.getId(),
+                                        inventory.getTransactionId().getAndIncrement(),
+                                        javaSlot, null, WindowAction.DROP_ITEM,
+                                        DropItemParam.DROP_FROM_SELECTED);
+                                session.getDownstream().getSession().send(dropPacket);
+                            }
+                        }
+                        ItemStack item = session.getInventory().getItem(javaSlot);
+                        if (item != null) {
+                            session.getInventory().setItem(javaSlot, new ItemStack(item.getId(), item.getAmount() - dropAmount, item.getNbt()));
+                        }
+                        return;
+                    } else { //clicking outside of inventory
+                        ClientWindowActionPacket dropPacket = new ClientWindowActionPacket(inventory.getId(), inventory.getTransactionId().getAndIncrement(),
+                                -999, null, WindowAction.CLICK_ITEM,
+                                dropAmount > 1 ? ClickItemParam.LEFT_CLICK : ClickItemParam.RIGHT_CLICK);
+                        session.getDownstream().getSession().send(dropPacket);
+                        ItemStack cursor = session.getInventory().getCursor();
+                        if (cursor != null) {
+                            session.getInventory().setCursor(new ItemStack(cursor.getId(), dropAmount > 1 ? 0 : cursor.getAmount() - 1, cursor.getNbt()));
+                        }
+                        return;
+                    }
+                }
+            }
+        } else if (cursorAction != null && containerAction != null) {
+            //left/right click
+            ClickPlan plan = new ClickPlan();
+            int javaSlot = translator.bedrockSlotToJava(containerAction);
+            if (cursorAction.getFromItem().equals(containerAction.getToItem())
+                    && containerAction.getFromItem().equals(cursorAction.getToItem())
+                    && !InventoryUtils.canStack(cursorAction.getFromItem(), containerAction.getFromItem())) { //simple swap
+                plan.add(Click.LEFT, javaSlot);
+            } else if (cursorAction.getFromItem().getCount() > cursorAction.getToItem().getCount()) { //release
+                if (cursorAction.getToItem().getCount() == 0) {
+                    plan.add(Click.LEFT, javaSlot);
+                } else {
+                    int difference = cursorAction.getFromItem().getCount() - cursorAction.getToItem().getCount();
+                    for (int i = 0; i < difference; i++) {
+                        plan.add(Click.RIGHT, javaSlot);
+                    }
+                }
+            } else { //pickup
+                if (cursorAction.getFromItem().getCount() == 0) {
+                    if (containerAction.getToItem().getCount() == 0) { //pickup all
+                        plan.add(Click.LEFT, javaSlot);
+                    } else { //pickup some
+                        if (translator.getSlotType(javaSlot) == SlotType.FURNACE_OUTPUT
+                                || containerAction.getToItem().getCount() == containerAction.getFromItem().getCount() / 2) { //right click
+                            plan.add(Click.RIGHT, javaSlot);
+                        } else {
+                            plan.add(Click.LEFT, javaSlot);
+                            int difference = containerAction.getFromItem().getCount() - cursorAction.getToItem().getCount();
+                            for (int i = 0; i < difference; i++) {
+                                plan.add(Click.RIGHT, javaSlot);
+                            }
+                        }
+                    }
+                } else { //pickup into non-empty cursor
+                    if (translator.getSlotType(javaSlot) == SlotType.FURNACE_OUTPUT) {
+                        if (containerAction.getToItem().getCount() == 0) {
+                            plan.add(Click.LEFT, javaSlot);
+                        } else {
+                            ClientWindowActionPacket shiftClickPacket = new ClientWindowActionPacket(inventory.getId(),
+                                    inventory.getTransactionId().getAndIncrement(),
+                                    javaSlot, InventoryUtils.REFRESH_ITEM, WindowAction.SHIFT_CLICK_ITEM,
+                                    ShiftClickItemParam.LEFT_CLICK);
+                            session.getDownstream().getSession().send(shiftClickPacket);
+                            translator.updateInventory(session, inventory);
+                            return;
+                        }
+                    } else if (translator.getSlotType(javaSlot) == SlotType.OUTPUT) {
+                        plan.add(Click.LEFT, javaSlot);
+                    } else {
+                        int cursorSlot = findTempSlot(inventory, session.getInventory().getCursor(), Collections.singletonList(javaSlot));
+                        if (cursorSlot != -1) {
+                            plan.add(Click.LEFT, cursorSlot);
+                        } else {
+                            translator.updateInventory(session, inventory);
+                            return;
+                        }
+                        plan.add(Click.LEFT, javaSlot);
+                        int difference = cursorAction.getToItem().getCount() - cursorAction.getFromItem().getCount();
+                        for (int i = 0; i < difference; i++) {
+                            plan.add(Click.RIGHT, cursorSlot);
+                        }
+                        plan.add(Click.LEFT, javaSlot);
+                        plan.add(Click.LEFT, cursorSlot);
+                    }
+                }
+            }
+            plan.execute(session, translator, inventory, refresh);
+            return;
+        } else {
+            ClickPlan plan = new ClickPlan();
+            InventoryActionData fromAction;
+            InventoryActionData toAction;
+            if (actions.get(0).getFromItem().getCount() >= actions.get(0).getToItem().getCount()) {
+                fromAction = actions.get(0);
+                toAction = actions.get(1);
+            } else {
+                fromAction = actions.get(1);
+                toAction = actions.get(0);
+            }
+            int fromSlot = translator.bedrockSlotToJava(fromAction);
+            int toSlot = translator.bedrockSlotToJava(toAction);
+
+            if (translator.getSlotType(fromSlot) == SlotType.OUTPUT) {
+                if ((craftSlot != 0 && craftSlot != -2) && (inventory.getItem(toSlot) == null
+                        || InventoryUtils.canStack(session.getInventory().getCursor(), inventory.getItem(toSlot)))) {
+                    if (fromAction.getToItem().getCount() == 0) {
+                        refresh = true;
+                        plan.add(Click.LEFT, toSlot);
+                        if (craftSlot != -1) {
+                            plan.add(Click.LEFT, craftSlot);
+                        }
+                    } else {
+                        int difference = toAction.getToItem().getCount() - toAction.getFromItem().getCount();
+                        for (int i = 0; i < difference; i++) {
+                            plan.add(Click.RIGHT, toSlot);
+                        }
+                        session.setCraftSlot(craftSlot);
+                    }
+                    plan.execute(session, translator, inventory, refresh);
+                    return;
+                } else {
+                    session.setCraftSlot(-2);
+                }
+            }
+
+            int cursorSlot = -1;
+            if (session.getInventory().getCursor() != null) { //move cursor contents to a temporary slot
+                cursorSlot = findTempSlot(inventory, session.getInventory().getCursor(), Arrays.asList(fromSlot, toSlot));
+                if (cursorSlot != -1) {
+                    plan.add(Click.LEFT, cursorSlot);
+                } else {
+                    translator.updateInventory(session, inventory);
+                    return;
+                }
+            }
+            if ((fromAction.getFromItem().equals(toAction.getToItem()) && !InventoryUtils.canStack(fromAction.getFromItem(), toAction.getFromItem()))
+                    || fromAction.getToItem().getId() == 0) { //slot swap
+                plan.add(Click.LEFT, fromSlot);
+                plan.add(Click.LEFT, toSlot);
+                if (fromAction.getToItem().getId() != 0) {
+                    plan.add(Click.LEFT, fromSlot);
+                }
+            } else if (InventoryUtils.canStack(fromAction.getFromItem(), toAction.getToItem())) { //partial item move
+                if (translator.getSlotType(fromSlot) == SlotType.FURNACE_OUTPUT) {
+                    ClientWindowActionPacket shiftClickPacket = new ClientWindowActionPacket(inventory.getId(),
+                            inventory.getTransactionId().getAndIncrement(),
+                            fromSlot, InventoryUtils.REFRESH_ITEM, WindowAction.SHIFT_CLICK_ITEM,
+                            ShiftClickItemParam.LEFT_CLICK);
+                    session.getDownstream().getSession().send(shiftClickPacket);
+                    translator.updateInventory(session, inventory);
+                    return;
+                } else if (translator.getSlotType(fromSlot) == SlotType.OUTPUT) {
+                    session.setCraftSlot(cursorSlot);
+                    plan.add(Click.LEFT, fromSlot);
+                    int difference = toAction.getToItem().getCount() - toAction.getFromItem().getCount();
+                    for (int i = 0; i < difference; i++) {
+                        plan.add(Click.RIGHT, toSlot);
+                    }
+                    //client will send additional packets later to finish transferring crafting output
+                    //translator will know how to handle this using the craftSlot variable
+                } else {
+                    plan.add(Click.LEFT, fromSlot);
+                    int difference = toAction.getToItem().getCount() - toAction.getFromItem().getCount();
+                    for (int i = 0; i < difference; i++) {
+                        plan.add(Click.RIGHT, toSlot);
+                    }
+                    plan.add(Click.LEFT, fromSlot);
+                }
+            }
+            if (cursorSlot != -1) {
+                plan.add(Click.LEFT, cursorSlot);
+            }
+            plan.execute(session, translator, inventory, refresh);
+            return;
+        }
+
+        translator.updateInventory(session, inventory);
+        InventoryUtils.updateCursor(session);
+    }
+
+    private static int findTempSlot(Inventory inventory, ItemStack item, List<Integer> slotBlacklist) {
+        /*try and find a slot that can temporarily store the given item
+        only look in the main inventory and hotbar
+        only slots that are empty or contain a different type of item are valid*/
+        int offset = inventory.getId() == 0 ? 1 : 0; //offhand is not a viable slot (some servers disable it)
+        List<ItemStack> itemBlacklist = new ArrayList<>(slotBlacklist.size() + 1);
+        itemBlacklist.add(item);
+        for (int slot : slotBlacklist) {
+            ItemStack blacklistItem = inventory.getItem(slot);
+            if (blacklistItem != null)
+                itemBlacklist.add(blacklistItem);
+        }
+        for (int i = inventory.getSize() - (36 + offset); i < inventory.getSize() - offset; i++) {
+            ItemStack testItem = inventory.getItem(i);
+            boolean acceptable = true;
+            if (testItem != null) {
+                for (ItemStack blacklistItem : itemBlacklist) {
+                    if (InventoryUtils.canStack(testItem, blacklistItem)) {
+                        acceptable = false;
+                        break;
+                    }
+                }
+            }
+            if (acceptable && !slotBlacklist.contains(i))
+                return i;
+        }
+        //could not find a viable temp slot
+        return -1;
+    }
+}

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

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory.holder;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
+import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
+import com.nukkitx.math.vector.Vector3i;
+import com.nukkitx.nbt.tag.CompoundTag;
+import com.nukkitx.protocol.bedrock.data.ContainerType;
+import com.nukkitx.protocol.bedrock.packet.BlockEntityDataPacket;
+import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
+import com.nukkitx.protocol.bedrock.packet.UpdateBlockPacket;
+import lombok.AllArgsConstructor;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.block.BlockTranslator;
+import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+
+@AllArgsConstructor
+public class BlockInventoryHolder extends InventoryHolder {
+    private final int blockId;
+    private final ContainerType containerType;
+
+    @Override
+    public void prepareInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory) {
+        Vector3i position = session.getPlayerEntity().getPosition().toInt();
+        position = position.add(Vector3i.UP);
+        UpdateBlockPacket blockPacket = new UpdateBlockPacket();
+        blockPacket.setDataLayer(0);
+        blockPacket.setBlockPosition(position);
+        blockPacket.setRuntimeId(blockId);
+        blockPacket.getFlags().addAll(UpdateBlockPacket.FLAG_ALL_PRIORITY);
+        session.getUpstream().sendPacket(blockPacket);
+        inventory.setHolderPosition(position);
+
+        CompoundTag tag = CompoundTag.builder()
+                .intTag("x", position.getX())
+                .intTag("y", position.getY())
+                .intTag("z", position.getZ())
+                .stringTag("CustomName", inventory.getTitle()).buildRootTag();
+        BlockEntityDataPacket dataPacket = new BlockEntityDataPacket();
+        dataPacket.setData(tag);
+        dataPacket.setBlockPosition(position);
+        session.getUpstream().sendPacket(dataPacket);
+    }
+
+    @Override
+    public void openInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory) {
+        ContainerOpenPacket containerOpenPacket = new ContainerOpenPacket();
+        containerOpenPacket.setWindowId((byte) inventory.getId());
+        containerOpenPacket.setType((byte) containerType.id());
+        containerOpenPacket.setBlockPosition(inventory.getHolderPosition());
+        containerOpenPacket.setUniqueEntityId(inventory.getHolderId());
+        session.getUpstream().sendPacket(containerOpenPacket);
+    }
+
+    @Override
+    public void closeInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory) {
+        Vector3i holderPos = inventory.getHolderPosition();
+        Position pos = new Position(holderPos.getX(), holderPos.getY(), holderPos.getZ());
+        BlockState realBlock = session.getChunkCache().getBlockAt(pos);
+        UpdateBlockPacket blockPacket = new UpdateBlockPacket();
+        blockPacket.setDataLayer(0);
+        blockPacket.setBlockPosition(holderPos);
+        blockPacket.setRuntimeId(BlockTranslator.getBedrockBlockId(realBlock));
+        session.getUpstream().sendPacket(blockPacket);
+    }
+}

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory.holder;
+
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+
+public abstract class InventoryHolder {
+    public abstract void prepareInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory);
+    public abstract void openInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory);
+    public abstract void closeInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory);
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java

@@ -23,38 +23,32 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.connector.network.translators.inventory;
+package org.geysermc.connector.network.translators.inventory.updater;
 
-import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.protocol.bedrock.data.ItemData;
-import com.nukkitx.protocol.bedrock.packet.ContainerOpenPacket;
 import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket;
 import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
+import lombok.AllArgsConstructor;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.Translators;
+import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
 
-public class GenericInventoryTranslator extends InventoryTranslator {
+@AllArgsConstructor
+public class ChestInventoryUpdater extends InventoryUpdater {
+    private final int paddedSize;
 
     @Override
-    public void prepareInventory(GeyserSession session, Inventory inventory) {
-        // TODO: Add code here
-    }
+    public void updateInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory) {
+        super.updateInventory(translator, session, inventory);
 
-    @Override
-    public void openInventory(GeyserSession session, Inventory inventory) {
-        ContainerOpenPacket containerOpenPacket = new ContainerOpenPacket();
-        containerOpenPacket.setWindowId((byte) inventory.getId());
-        containerOpenPacket.setType((byte) 0);
-        containerOpenPacket.setBlockPosition(Vector3i.ZERO);
-        session.getUpstream().sendPacket(containerOpenPacket);
-    }
-
-    @Override
-    public void updateInventory(GeyserSession session, Inventory inventory) {
-        ItemData[] bedrockItems = new ItemData[inventory.getItems().length];
+        ItemData[] bedrockItems = new ItemData[paddedSize];
         for (int i = 0; i < bedrockItems.length; i++) {
-            bedrockItems[i] = Translators.getItemTranslator().translateToBedrock(inventory.getItems()[i]);
+            if (i <= translator.size) {
+                bedrockItems[i] = Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(i));
+            } else {
+                bedrockItems[i] = ItemData.AIR;
+            }
         }
 
         InventoryContentPacket contentPacket = new InventoryContentPacket();
@@ -64,11 +58,15 @@ public class GenericInventoryTranslator extends InventoryTranslator {
     }
 
     @Override
-    public void updateSlot(GeyserSession session, Inventory inventory, int slot) {
+    public boolean updateSlot(InventoryTranslator translator, GeyserSession session, Inventory inventory, int javaSlot) {
+        if (super.updateSlot(translator, session, inventory, javaSlot))
+            return true;
+
         InventorySlotPacket slotPacket = new InventorySlotPacket();
         slotPacket.setContainerId(inventory.getId());
-        slotPacket.setItem(Translators.getItemTranslator().translateToBedrock(inventory.getItems()[slot]));
-        slotPacket.setSlot(slot);
+        slotPacket.setSlot(translator.javaSlotToBedrock(javaSlot));
+        slotPacket.setItem(Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(javaSlot)));
         session.getUpstream().sendPacket(slotPacket);
+        return true;
     }
 }

connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ContainerInventoryUpdater.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory.updater;
+
+import com.nukkitx.protocol.bedrock.data.ItemData;
+import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket;
+import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.Translators;
+import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+
+public class ContainerInventoryUpdater extends InventoryUpdater {
+    @Override
+    public void updateInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory) {
+        super.updateInventory(translator, session, inventory);
+
+        ItemData[] bedrockItems = new ItemData[translator.size];
+        for (int i = 0; i < bedrockItems.length; i++) {
+            bedrockItems[translator.javaSlotToBedrock(i)] = Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(i));
+        }
+
+        InventoryContentPacket contentPacket = new InventoryContentPacket();
+        contentPacket.setContainerId(inventory.getId());
+        contentPacket.setContents(bedrockItems);
+        session.getUpstream().sendPacket(contentPacket);
+    }
+
+    @Override
+    public boolean updateSlot(InventoryTranslator translator, GeyserSession session, Inventory inventory, int javaSlot) {
+        if (super.updateSlot(translator, session, inventory, javaSlot))
+            return true;
+
+        InventorySlotPacket slotPacket = new InventorySlotPacket();
+        slotPacket.setContainerId(inventory.getId());
+        slotPacket.setSlot(translator.javaSlotToBedrock(javaSlot));
+        slotPacket.setItem(Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(javaSlot)));
+        session.getUpstream().sendPacket(slotPacket);
+        return true;
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/CursorInventoryUpdater.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory.updater;
+
+import com.nukkitx.protocol.bedrock.data.ContainerId;
+import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.Translators;
+import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+
+public class CursorInventoryUpdater extends InventoryUpdater {
+    @Override
+    public void updateInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory) {
+        super.updateInventory(translator, session, inventory);
+
+        for (int i = 0; i < translator.size; i++) {
+            final int bedrockSlot = translator.javaSlotToBedrock(i);
+            if (bedrockSlot == 50)
+                continue;
+            InventorySlotPacket slotPacket = new InventorySlotPacket();
+            slotPacket.setContainerId(ContainerId.CURSOR);
+            slotPacket.setSlot(bedrockSlot);
+            slotPacket.setItem(Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(i)));
+            session.getUpstream().sendPacket(slotPacket);
+        }
+    }
+
+    @Override
+    public boolean updateSlot(InventoryTranslator translator, GeyserSession session, Inventory inventory, int javaSlot) {
+        if (super.updateSlot(translator, session, inventory, javaSlot))
+            return true;
+
+        InventorySlotPacket slotPacket = new InventorySlotPacket();
+        slotPacket.setContainerId(ContainerId.CURSOR);
+        slotPacket.setSlot(translator.javaSlotToBedrock(javaSlot));
+        slotPacket.setItem(Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(javaSlot)));
+        session.getUpstream().sendPacket(slotPacket);
+        return true;
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/InventoryUpdater.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.inventory.updater;
+
+import com.nukkitx.protocol.bedrock.data.ContainerId;
+import com.nukkitx.protocol.bedrock.data.ItemData;
+import com.nukkitx.protocol.bedrock.packet.InventoryContentPacket;
+import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
+import org.geysermc.connector.inventory.Inventory;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.Translators;
+import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
+
+public abstract class InventoryUpdater {
+    public void updateInventory(InventoryTranslator translator, GeyserSession session, Inventory inventory) {
+        ItemData[] bedrockItems = new ItemData[36];
+        for (int i = 0; i < 36; i++) {
+            final int offset = i < 9 ? 27 : -9;
+            bedrockItems[i] = Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(translator.size + i + offset));
+        }
+        InventoryContentPacket contentPacket = new InventoryContentPacket();
+        contentPacket.setContainerId(ContainerId.INVENTORY);
+        contentPacket.setContents(bedrockItems);
+        session.getUpstream().sendPacket(contentPacket);
+    }
+
+    public boolean updateSlot(InventoryTranslator translator, GeyserSession session, Inventory inventory, int javaSlot) {
+        if (javaSlot >= translator.size) {
+            InventorySlotPacket slotPacket = new InventorySlotPacket();
+            slotPacket.setContainerId(ContainerId.INVENTORY);
+            slotPacket.setSlot(translator.javaSlotToBedrock(javaSlot));
+            slotPacket.setItem(Translators.getItemTranslator().translateToBedrock(session, inventory.getItem(javaSlot)));
+            session.getUpstream().sendPacket(slotPacket);
+            return true;
+        }
+        return false;
+    }
+}

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

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.item;
+
+import lombok.Getter;
+
+import java.util.Locale;
+
+@Getter
+public enum Enchantment {
+    PROTECTION,
+    FIRE_PROTECTION,
+    FEATHER_FALLING,
+    BLAST_PROTECTION,
+    PROJECTILE_PROTECTION,
+    THORNS,
+    RESPIRATION,
+    DEPTH_STRIDER,
+    AQUA_AFFINITY,
+    SHARPNESS,
+    SMITE,
+    BANE_OF_ARTHROPODS,
+    KNOCKBACK,
+    FIRE_ASPECT,
+    LOOTING,
+    EFFICIENCY,
+    SILK_TOUCH,
+    UNBREAKING,
+    FORTUNE,
+    POWER,
+    PUNCH,
+    FLAME,
+    INFINITY,
+    LUCK_OF_THE_SEA,
+    LURE,
+    FROST_WALKER,
+    MENDING,
+    BINDING_CURSE,
+    VANISHING_CURSE,
+    IMPALING,
+    RIPTIDE,
+    LOYALTY,
+    CHANNELING,
+    MULTISHOT,
+    PIERCING,
+    QUICK_CHARGE;
+
+    private final String javaIdentifier;
+
+    Enchantment() {
+        this.javaIdentifier = "minecraft:" + this.name().toLowerCase(Locale.ENGLISH);
+    }
+
+    public static Enchantment getByJavaIdentifier(String javaIdentifier) {
+        for (Enchantment enchantment : Enchantment.values()) {
+            if (enchantment.javaIdentifier.equals(javaIdentifier)) {
+                return enchantment;
+            }
+        }
+        return null;
+    }
+
+    public static Enchantment getByBedrockId(int bedrockId) {
+        if (bedrockId >= 0 && bedrockId < Enchantment.values().length) {
+            return Enchantment.values()[bedrockId];
+        }
+        return null;
+    }
+}

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

@@ -34,11 +34,11 @@ public class ItemEntry {
 
     public static ItemEntry AIR = new ItemEntry("minecraft:air", 0, 0, 0);
 
-    private String javaIdentifier;
-    private int javaId;
+    private final String javaIdentifier;
+    private final int javaId;
 
-    private int bedrockId;
-    private int bedrockData;
+    private final int bedrockId;
+    private final int bedrockData;
 
     @Override
     public boolean equals(Object obj) {

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

@@ -26,64 +26,107 @@
 package org.geysermc.connector.network.translators.item;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.message.Message;
-import com.github.steveice10.opennbt.tag.builtin.ByteArrayTag;
-import com.github.steveice10.opennbt.tag.builtin.ByteTag;
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.opennbt.tag.builtin.DoubleTag;
-import com.github.steveice10.opennbt.tag.builtin.FloatTag;
-import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
-import com.github.steveice10.opennbt.tag.builtin.IntTag;
-import com.github.steveice10.opennbt.tag.builtin.ListTag;
-import com.github.steveice10.opennbt.tag.builtin.LongArrayTag;
-import com.github.steveice10.opennbt.tag.builtin.LongTag;
-import com.github.steveice10.opennbt.tag.builtin.ShortTag;
-import com.github.steveice10.opennbt.tag.builtin.StringTag;
-import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.nukkitx.protocol.bedrock.data.ItemData;
 
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.geysermc.connector.GeyserConnector;
-import org.geysermc.connector.utils.MessageUtils;
-import org.geysermc.connector.utils.Toolbox;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.*;
+import org.geysermc.connector.utils.Toolbox;
+import org.reflections.Reflections;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class ItemTranslator {
 
-    public ItemStack translateToJava(ItemData data) {
-        ItemEntry javaItem = getItem(data);
+    private Int2ObjectMap<ItemStackTranslator> itemTranslators = new Int2ObjectOpenHashMap();
+    private List<NbtItemStackTranslator> nbtItemTranslators;
+    private Map<String, ItemEntry> javaIdentifierMap = new HashMap<>();
 
-        if (data.getTag() == null) {
-            return new ItemStack(javaItem.getJavaId(), data.getCount());
+    public void init() {
+        Reflections ref = new Reflections("org.geysermc.connector.network.translators.item");
+
+        Map<NbtItemStackTranslator, Integer> loadedNbtItemTranslators = new HashMap<>();
+        for (Class<?> clazz : ref.getTypesAnnotatedWith(ItemRemapper.class)) {
+            int priority = clazz.getAnnotation(ItemRemapper.class).priority();
+
+            GeyserConnector.getInstance().getLogger().debug("Found annotated item translator: " + clazz.getCanonicalName());
+
+            try {
+                if (NbtItemStackTranslator.class.isAssignableFrom(clazz)) {
+                    NbtItemStackTranslator nbtItemTranslator = (NbtItemStackTranslator) clazz.newInstance();
+                    loadedNbtItemTranslators.put(nbtItemTranslator, priority);
+                    continue;
+                }
+                ItemStackTranslator itemStackTranslator = (ItemStackTranslator) clazz.newInstance();
+                List<ItemEntry> appliedItems = itemStackTranslator.getAppliedItems();
+                for (ItemEntry item : appliedItems) {
+                    ItemStackTranslator registered = itemTranslators.get(item.getJavaId());
+                    if (registered != null) {
+                        GeyserConnector.getInstance().getLogger().error("Could not instantiate annotated item translator " + clazz.getCanonicalName() + "." +
+                                " Item translator " + registered.getClass().getCanonicalName() + " is already registered for the item " + item.getJavaIdentifier());
+                        continue;
+                    }
+                    itemTranslators.put(item.getJavaId(), itemStackTranslator);
+                }
+            } catch (InstantiationException | IllegalAccessException e) {
+                GeyserConnector.getInstance().getLogger().error("Could not instantiate annotated item translator " + clazz.getCanonicalName() + ".");
+            }
         }
-        return new ItemStack(javaItem.getJavaId(), data.getCount(), translateToJavaNBT(data.getTag()));
+
+        nbtItemTranslators = loadedNbtItemTranslators.keySet().stream()
+                .sorted(Comparator.comparingInt(value -> loadedNbtItemTranslators.get(value))).collect(Collectors.toList());
     }
 
-    public ItemData translateToBedrock(ItemStack stack) {
-        // Most likely dirt if null
+    public ItemStack translateToJava(GeyserSession session, ItemData data) {
+        if (data == null) {
+            return new ItemStack(0);
+        }
+        ItemEntry javaItem = getItem(data);
+
+        ItemStack itemStack;
+
+        ItemStackTranslator itemStackTranslator = itemTranslators.get(javaItem.getJavaId());
+        if (itemStackTranslator != null) {
+            itemStack = itemStackTranslator.translateToJava(data, javaItem);
+        } else {
+            itemStack = DEFAULT_TRANSLATOR.translateToJava(data, javaItem);
+        }
+
+        if (itemStack != null && itemStack.getNbt() != null) {
+            for (NbtItemStackTranslator translator : nbtItemTranslators) {
+                if (translator.acceptItem(javaItem)) {
+                    translator.translateToJava(itemStack.getNbt(), javaItem);
+                }
+            }
+        }
+        return itemStack;
+    }
+
+    public ItemData translateToBedrock(GeyserSession session, ItemStack stack) {
         if (stack == null) {
-            return ItemData.of(3, (short)0, 0);
+            return ItemData.AIR;
         }
 
         ItemEntry bedrockItem = getItem(stack);
-        if (stack.getNbt() == null) {
-           return ItemData.of(bedrockItem.getBedrockId(), (short) bedrockItem.getBedrockData(), stack.getAmount());
+
+        if (stack != null && stack.getNbt() != null) {
+            for (NbtItemStackTranslator translator : nbtItemTranslators) {
+                if (translator.acceptItem(bedrockItem)) {
+                    translator.translateToBedrock(stack.getNbt(), bedrockItem);
+                }
+            }
         }
 
-        // TODO: Create proper transformers instead of shoving everything here
-        CompoundTag tag = stack.getNbt();
-        IntTag mapId = tag.get("map");
-
-        if (mapId != null) {
-            tag.put(new StringTag("map_uuid", mapId.getValue().toString()));
-            tag.put(new IntTag("map_name_index", mapId.getValue()));
+        ItemStackTranslator itemStackTranslator = itemTranslators.get(bedrockItem.getJavaId());
+        if (itemStackTranslator != null) {
+            return itemStackTranslator.translateToBedrock(stack, bedrockItem);
+        } else {
+            return DEFAULT_TRANSLATOR.translateToBedrock(stack, bedrockItem);
         }
-
-
-        return ItemData.of(bedrockItem.getBedrockId(), (short) bedrockItem.getBedrockData(), stack.getAmount(), translateToBedrockNBT(tag));
     }
 
     public ItemEntry getItem(ItemStack stack) {
@@ -92,7 +135,14 @@ public class ItemTranslator {
 
     public ItemEntry getItem(ItemData data) {
         for (ItemEntry itemEntry : Toolbox.ITEM_ENTRIES.values()) {
-            if (itemEntry.getBedrockId() == data.getId() && itemEntry.getBedrockData() == data.getDamage()) {
+            if (itemEntry.getBedrockId() == data.getId() && (itemEntry.getBedrockData() == data.getDamage() || itemEntry.getJavaIdentifier().endsWith("potion"))) {
+                return itemEntry;
+            }
+        }
+        // If item find was unsuccessful first time, we try again while ignoring damage
+        // Fixes piston, sticky pistons, dispensers and droppers turning into air from creative inventory
+        for (ItemEntry itemEntry : Toolbox.ITEM_ENTRIES.values()) {
+            if (itemEntry.getBedrockId() == data.getId()) {
                 return itemEntry;
             }
         }
@@ -101,185 +151,15 @@ public class ItemTranslator {
         return ItemEntry.AIR;
     }
 
-    private CompoundTag translateToJavaNBT(com.nukkitx.nbt.tag.CompoundTag tag) {
-        CompoundTag javaTag = new CompoundTag(tag.getName());
-        Map<String, Tag> javaValue = javaTag.getValue();
-        if (tag.getValue() != null && !tag.getValue().isEmpty()) {
-            for (String str : tag.getValue().keySet()) {
-                com.nukkitx.nbt.tag.Tag bedrockTag = tag.get(str);
-                Tag translatedTag = translateToJavaNBT(bedrockTag);
-                if (translatedTag == null)
-                    continue;
-
-                javaValue.put(str, translatedTag);
-            }
-        }
-
-        return javaTag;
+    public ItemEntry getItemEntry(String javaIdentifier) {
+        return javaIdentifierMap.computeIfAbsent(javaIdentifier, key -> Toolbox.ITEM_ENTRIES.values()
+                .stream().filter(itemEntry -> itemEntry.getJavaIdentifier().equals(key)).findFirst().orElse(null));
     }
 
-    private Tag translateToJavaNBT(com.nukkitx.nbt.tag.Tag tag) {
-        if (tag instanceof com.nukkitx.nbt.tag.ByteArrayTag) {
-            com.nukkitx.nbt.tag.ByteArrayTag byteArrayTag = (com.nukkitx.nbt.tag.ByteArrayTag) tag;
-            return new ByteArrayTag(byteArrayTag.getName(), byteArrayTag.getValue());
+    private static final ItemStackTranslator DEFAULT_TRANSLATOR = new ItemStackTranslator() {
+        @Override
+        public List<ItemEntry> getAppliedItems() {
+            return null;
         }
-
-        if (tag instanceof com.nukkitx.nbt.tag.ByteTag) {
-            com.nukkitx.nbt.tag.ByteTag byteTag = (com.nukkitx.nbt.tag.ByteTag) tag;
-            return new ByteTag(byteTag.getName(), byteTag.getValue());
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.DoubleTag) {
-            com.nukkitx.nbt.tag.DoubleTag doubleTag = (com.nukkitx.nbt.tag.DoubleTag) tag;
-            return new DoubleTag(doubleTag.getName(), doubleTag.getValue());
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.FloatTag) {
-            com.nukkitx.nbt.tag.FloatTag floatTag = (com.nukkitx.nbt.tag.FloatTag) tag;
-            return new FloatTag(floatTag.getName(), floatTag.getValue());
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.IntArrayTag) {
-            com.nukkitx.nbt.tag.IntArrayTag intArrayTag = (com.nukkitx.nbt.tag.IntArrayTag) tag;
-            return new IntArrayTag(intArrayTag.getName(), intArrayTag.getValue());
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.IntTag) {
-            com.nukkitx.nbt.tag.IntTag intTag = (com.nukkitx.nbt.tag.IntTag) tag;
-            return new IntTag(intTag.getName(), intTag.getValue());
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.LongArrayTag) {
-            com.nukkitx.nbt.tag.LongArrayTag longArrayTag = (com.nukkitx.nbt.tag.LongArrayTag) tag;
-            return new LongArrayTag(longArrayTag.getName(), longArrayTag.getValue());
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.LongTag) {
-            com.nukkitx.nbt.tag.LongTag longTag = (com.nukkitx.nbt.tag.LongTag) tag;
-            return new LongTag(longTag.getName(), longTag.getValue());
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.ShortTag) {
-            com.nukkitx.nbt.tag.ShortTag shortTag = (com.nukkitx.nbt.tag.ShortTag) tag;
-            return new ShortTag(shortTag.getName(), shortTag.getValue());
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.StringTag) {
-            com.nukkitx.nbt.tag.StringTag stringTag = (com.nukkitx.nbt.tag.StringTag) tag;
-            return new StringTag(stringTag.getName(), stringTag.getValue());
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.ListTag) {
-            com.nukkitx.nbt.tag.ListTag listTag = (com.nukkitx.nbt.tag.ListTag) tag;
-
-            List<Tag> tags = new ArrayList<>();
-            for (Object value : listTag.getValue()) {
-                if (!(value instanceof com.nukkitx.nbt.tag.Tag))
-                    continue;
-
-                com.nukkitx.nbt.tag.Tag tagValue = (com.nukkitx.nbt.tag.Tag) value;
-                Tag javaTag = translateToJavaNBT(tagValue);
-                if (javaTag != null)
-                    tags.add(javaTag);
-            }
-            return new ListTag(listTag.getName(), tags);
-        }
-
-        if (tag instanceof com.nukkitx.nbt.tag.CompoundTag) {
-            return translateToJavaNBT((com.nukkitx.nbt.tag.CompoundTag) tag);
-        }
-
-        return null;
-    }
-
-    private com.nukkitx.nbt.tag.CompoundTag translateToBedrockNBT(CompoundTag tag) {
-        Map<String, com.nukkitx.nbt.tag.Tag<?>> javaValue = new HashMap<String, com.nukkitx.nbt.tag.Tag<?>>();
-        if (tag.getValue() != null && !tag.getValue().isEmpty()) {
-            for (String str : tag.getValue().keySet()) {
-                Tag javaTag = tag.get(str);
-                com.nukkitx.nbt.tag.Tag translatedTag = translateToBedrockNBT(javaTag);
-                if (translatedTag == null)
-                    continue;
-
-                javaValue.put(str, translatedTag);
-            }
-        }
-
-        com.nukkitx.nbt.tag.CompoundTag bedrockTag = new com.nukkitx.nbt.tag.CompoundTag(tag.getName(), javaValue);
-        return bedrockTag;
-    }
-
-    private com.nukkitx.nbt.tag.Tag translateToBedrockNBT(Tag tag) {
-        if (tag instanceof ByteArrayTag) {
-            ByteArrayTag byteArrayTag = (ByteArrayTag) tag;
-            return new com.nukkitx.nbt.tag.ByteArrayTag(byteArrayTag.getName(), byteArrayTag.getValue());
-        }
-
-        if (tag instanceof ByteTag) {
-            ByteTag byteTag = (ByteTag) tag;
-            return new com.nukkitx.nbt.tag.ByteTag(byteTag.getName(), byteTag.getValue());
-        }
-
-        if (tag instanceof DoubleTag) {
-            DoubleTag doubleTag = (DoubleTag) tag;
-            return new com.nukkitx.nbt.tag.DoubleTag(doubleTag.getName(), doubleTag.getValue());
-        }
-
-        if (tag instanceof FloatTag) {
-            FloatTag floatTag = (FloatTag) tag;
-            return new com.nukkitx.nbt.tag.FloatTag(floatTag.getName(), floatTag.getValue());
-        }
-
-        if (tag instanceof IntArrayTag) {
-            IntArrayTag intArrayTag = (IntArrayTag) tag;
-            return new com.nukkitx.nbt.tag.IntArrayTag(intArrayTag.getName(), intArrayTag.getValue());
-        }
-
-        if (tag instanceof IntTag) {
-            IntTag intTag = (IntTag) tag;
-            return new com.nukkitx.nbt.tag.IntTag(intTag.getName(), intTag.getValue());
-        }
-
-        if (tag instanceof LongArrayTag) {
-            LongArrayTag longArrayTag = (LongArrayTag) tag;
-            return new com.nukkitx.nbt.tag.LongArrayTag(longArrayTag.getName(), longArrayTag.getValue());
-        }
-
-        if (tag instanceof LongTag) {
-            LongTag longTag = (LongTag) tag;
-            return new com.nukkitx.nbt.tag.LongTag(longTag.getName(), longTag.getValue());
-        }
-
-        if (tag instanceof ShortTag) {
-            ShortTag shortTag = (ShortTag) tag;
-            return new com.nukkitx.nbt.tag.ShortTag(shortTag.getName(), shortTag.getValue());
-        }
-
-        if (tag instanceof StringTag) {
-            StringTag stringTag = (StringTag) tag;
-            return new com.nukkitx.nbt.tag.StringTag(stringTag.getName(), MessageUtils.getBedrockMessage(Message.fromString(stringTag.getValue())));
-        }
-
-        if (tag instanceof ListTag) {
-            ListTag listTag = (ListTag) tag;
-            if (listTag.getName().equalsIgnoreCase("Lore")) {
-                List<com.nukkitx.nbt.tag.StringTag> tags = new ArrayList<>();
-                for (Object value : listTag.getValue()) {
-                    if (!(value instanceof Tag))
-                        continue;
-
-                    com.nukkitx.nbt.tag.StringTag bedrockTag = (com.nukkitx.nbt.tag.StringTag) translateToBedrockNBT((Tag) value);
-                    if (bedrockTag != null)
-                        tags.add(bedrockTag);
-                }
-                return new com.nukkitx.nbt.tag.ListTag<>(listTag.getName(), com.nukkitx.nbt.tag.StringTag.class, tags);
-            }
-        }
-
-        if (tag instanceof CompoundTag) {
-            return translateToBedrockNBT((CompoundTag) tag);
-        }
-
-        return null;
-    }
+    };
 }

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

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.item;
+
+import lombok.Getter;
+
+import java.util.Locale;
+
+@Getter
+public enum Potion {
+    WATER(0),
+    MUNDANE(1),
+    THICK(3),
+    AWKWARD(4),
+    NIGHT_VISION(5),
+    LONG_NIGHT_VISION(6),
+    INVISIBILITY(7),
+    LONG_INVISIBILITY(8),
+    LEAPING(9),
+    STRONG_LEAPING(11),
+    LONG_LEAPING(10),
+    FIRE_RESISTANCE(12),
+    LONG_FIRE_RESISTANCE(13),
+    SWIFTNESS(14),
+    STRONG_SWIFTNESS(16),
+    LONG_SWIFTNESS(15),
+    SLOWNESS(17),
+    STRONG_SLOWNESS(18), //does not exist
+    LONG_SLOWNESS(18),
+    WATER_BREATHING(19),
+    LONG_WATER_BREATHING(20),
+    HEALING(21),
+    STRONG_HEALING(22),
+    HARMING(23),
+    STRONG_HARMING(24),
+    POISON(25),
+    STRONG_POISON(27),
+    LONG_POISON(26),
+    REGENERATION(28),
+    STRONG_REGENERATION(30),
+    LONG_REGENERATION(29),
+    STRENGTH(31),
+    STRONG_STRENGTH(33),
+    LONG_STRENGTH(32),
+    WEAKNESS(34),
+    LONG_WEAKNESS(35),
+    LUCK(2), //does not exist
+    TURTLE_MASTER(37),
+    STRONG_TURTLE_MASTER(39),
+    LONG_TURTLE_MASTER(38),
+    SLOW_FALLING(40),
+    LONG_SLOW_FALLING(41);
+
+    private final String javaIdentifier;
+    private final short bedrockId;
+
+    Potion(int bedrockId) {
+        this.javaIdentifier = "minecraft:" + this.name().toLowerCase(Locale.ENGLISH);
+        this.bedrockId = (short) bedrockId;
+    }
+
+    public static Potion getByJavaIdentifier(String javaIdentifier) {
+        for (Potion potion : Potion.values()) {
+            if (potion.javaIdentifier.equals(javaIdentifier)) {
+                return potion;
+            }
+        }
+        return null;
+    }
+
+    public static Potion getByBedrockId(short bedrockId) {
+        for (Potion potion : Potion.values()) {
+            if (potion.bedrockId == bedrockId) {
+                return potion;
+            }
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,15 @@
+package org.geysermc.connector.network.translators.item;
+
+import lombok.Getter;
+
+@Getter
+public class ToolItemEntry extends ItemEntry {
+    private final String toolType;
+    private final String toolTier;
+
+    public ToolItemEntry(String javaIdentifier, int javaId, int bedrockId, int bedrockData, String toolType, String toolTier) {
+        super(javaIdentifier, javaId, bedrockId, bedrockData);
+        this.toolType = toolType;
+        this.toolTier = toolTier;
+    }
+}

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

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.item.translators;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
+import com.github.steveice10.opennbt.tag.builtin.Tag;
+import com.nukkitx.protocol.bedrock.data.ItemData;
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.network.translators.ItemStackTranslator;
+import org.geysermc.connector.network.translators.ItemRemapper;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+import org.geysermc.connector.network.translators.item.Potion;
+import org.geysermc.connector.utils.Toolbox;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@ItemRemapper
+public class PotionTranslator extends ItemStackTranslator {
+
+    private List<ItemEntry> appliedItems;
+
+    public PotionTranslator() {
+        appliedItems = Toolbox.ITEM_ENTRIES.values().stream().filter(entry -> entry.getJavaIdentifier().endsWith("potion")).collect(Collectors.toList());
+    }
+
+    @Override
+    public ItemData translateToBedrock(ItemStack itemStack, ItemEntry itemEntry) {
+        if (itemStack.getNbt() == null) return super.translateToBedrock(itemStack, itemEntry);
+        Tag potionTag = itemStack.getNbt().get("Potion");
+        if (potionTag instanceof StringTag) {
+            Potion potion = Potion.getByJavaIdentifier(((StringTag) potionTag).getValue());
+            if (potion != null) {
+                return ItemData.of(itemEntry.getBedrockId(), potion.getBedrockId(), itemStack.getAmount(), translateNbtToBedrock(itemStack.getNbt()));
+            }
+            GeyserConnector.getInstance().getLogger().debug("Unknown java potion: " + potionTag.getValue());
+        }
+        return super.translateToBedrock(itemStack, itemEntry);
+    }
+
+    @Override
+    public ItemStack translateToJava(ItemData itemData, ItemEntry itemEntry) {
+        Potion potion = Potion.getByBedrockId(itemData.getDamage());
+        ItemStack itemStack = super.translateToJava(itemData, itemEntry);
+        if (potion != null) {
+            StringTag potionTag = new StringTag("Potion", potion.getJavaIdentifier());
+            itemStack.getNbt().put(potionTag);
+        }
+        return itemStack;
+    }
+
+    @Override
+    public List<ItemEntry> getAppliedItems() {
+        return appliedItems;
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantedBookTranslator.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.item.translators.nbt;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.github.steveice10.opennbt.tag.builtin.Tag;
+import org.geysermc.connector.network.translators.ItemRemapper;
+import org.geysermc.connector.network.translators.NbtItemStackTranslator;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+
+@ItemRemapper(priority = 1)
+public class EnchantedBookTranslator extends NbtItemStackTranslator {
+
+    @Override
+    public void translateToBedrock(CompoundTag itemTag, ItemEntry itemEntry) {
+        if (itemTag.contains("StoredEnchantments")) {
+            Tag enchTag = itemTag.get("StoredEnchantments");
+            if (enchTag instanceof ListTag) {
+                enchTag = new ListTag("Enchantments", ((ListTag) enchTag).getValue());
+                itemTag.remove("StoredEnchantments");
+                itemTag.put(enchTag);
+            }
+        }
+    }
+
+    @Override
+    public void translateToJava(CompoundTag itemTag, ItemEntry itemEntry) {
+        if (itemTag.contains("Enchantments")) {
+            Tag enchTag = itemTag.get("Enchantments");
+            if (enchTag instanceof ListTag) {
+                enchTag = new ListTag("StoredEnchantments", ((ListTag) enchTag).getValue());
+                itemTag.remove("Enchantments");
+                itemTag.put(enchTag);
+            }
+        }
+    }
+
+    @Override
+    public boolean acceptItem(ItemEntry itemEntry) {
+        return "minecraft:enchanted_book".equals(itemEntry.getJavaIdentifier());
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/EnchantmentTranslator.java

@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.item.translators.nbt;
+
+import com.github.steveice10.opennbt.tag.builtin.*;
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.network.translators.ItemRemapper;
+import org.geysermc.connector.network.translators.NbtItemStackTranslator;
+import org.geysermc.connector.network.translators.item.Enchantment;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@ItemRemapper
+public class EnchantmentTranslator extends NbtItemStackTranslator {
+
+    @Override
+    public void translateToBedrock(CompoundTag itemTag, ItemEntry itemEntry) {
+        List<Tag> newTags = new ArrayList<>();
+        if (itemTag.contains("Enchantments")) {
+            ListTag enchantmentTag = itemTag.get("Enchantments");
+            for (Tag tag : enchantmentTag.getValue()) {
+                if (!(tag instanceof CompoundTag)) continue;
+
+                CompoundTag bedrockTag = remapEnchantment((CompoundTag) tag);
+                newTags.add(bedrockTag);
+            }
+            itemTag.remove("Enchantments");
+        }
+        if (itemTag.contains("StoredEnchantments")) {
+            ListTag enchantmentTag = itemTag.get("StoredEnchantments");
+            for (Tag tag : enchantmentTag.getValue()) {
+                if (!(tag instanceof CompoundTag)) continue;
+
+                CompoundTag bedrockTag = remapEnchantment((CompoundTag) tag);
+                bedrockTag.put(new ShortTag("GeyserStoredEnchantment", (short) 0));
+                newTags.add(bedrockTag);
+            }
+            itemTag.remove("StoredEnchantments");
+        }
+
+        if (!newTags.isEmpty()) {
+            itemTag.put(new ListTag("ench", newTags));
+        }
+    }
+
+    @Override
+    public void translateToJava(CompoundTag itemTag, ItemEntry itemEntry) {
+        if (itemTag.contains("ench")) {
+            ListTag enchantmentTag = itemTag.get("ench");
+            List<Tag> enchantments = new ArrayList<>();
+            List<Tag> storedEnchantments = new ArrayList<>();
+            for (Tag value : enchantmentTag.getValue()) {
+                if (!(value instanceof CompoundTag))
+                    continue;
+
+                CompoundTag tagValue = (CompoundTag) value;
+                ShortTag bedrockId = tagValue.get("id");
+                if (bedrockId == null) continue;
+
+                ShortTag geyserStoredEnchantmentTag = tagValue.get("GeyserStoredEnchantment");
+
+                Enchantment enchantment = Enchantment.getByBedrockId(bedrockId.getValue());
+                if (enchantment != null) {
+                    CompoundTag javaTag = new CompoundTag("");
+                    Map<String, Tag> javaValue = javaTag.getValue();
+                    javaValue.put("id", new StringTag("id", enchantment.getJavaIdentifier()));
+                    ShortTag levelTag = tagValue.get("lvl");
+                    javaValue.put("lvl", new IntTag("lvl", levelTag != null ? levelTag.getValue() : 1));
+                    javaTag.setValue(javaValue);
+
+
+                    if (geyserStoredEnchantmentTag != null) {
+                        tagValue.remove("GeyserStoredEnchantment");
+                        storedEnchantments.add(javaTag);
+                    } else {
+                        enchantments.add(javaTag);
+                    }
+                } else {
+                    GeyserConnector.getInstance().getLogger().debug("Unknown bedrock enchantment: " + bedrockId);
+                }
+            }
+            if (!enchantments.isEmpty()) {
+                itemTag.put(new ListTag("Enchantments", enchantments));
+            }
+            if (!storedEnchantments.isEmpty()) {
+                itemTag.put(new ListTag("StoredEnchantments", enchantments));
+            }
+            itemTag.remove("ench");
+        }
+    }
+
+
+    private CompoundTag remapEnchantment(CompoundTag tag) {
+        Tag javaEnchLvl = ((CompoundTag) tag).get("lvl");
+        if (!(javaEnchLvl instanceof ShortTag))
+            return null;
+
+        Tag javaEnchId = ((CompoundTag) tag).get("id");
+        if (!(javaEnchId instanceof StringTag))
+            return null;
+
+        Enchantment enchantment = Enchantment.getByJavaIdentifier(((StringTag) javaEnchId).getValue());
+        if (enchantment == null) {
+            GeyserConnector.getInstance().getLogger().debug("Unknown java enchantment: " + javaEnchId.getValue());
+            return null;
+        }
+
+        CompoundTag bedrockTag = new CompoundTag("");
+        bedrockTag.put(new ShortTag("id", (short) enchantment.ordinal()));
+        bedrockTag.put(new ShortTag("lvl", ((ShortTag) javaEnchLvl).getValue()));
+        return bedrockTag;
+    }
+
+}

connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/LeatherArmorTranslator.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.item.translators.nbt;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.IntTag;
+import org.geysermc.connector.network.translators.ItemRemapper;
+import org.geysermc.connector.network.translators.NbtItemStackTranslator;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+
+@ItemRemapper
+public class LeatherArmorTranslator extends NbtItemStackTranslator {
+
+    private static final String[] ITEMS = new String[]{"minecraft:leather_helmet", "minecraft:leather_chestplate", "minecraft:leather_leggings", "minecraft:leather_boots"};
+
+    @Override
+    public void translateToBedrock(CompoundTag itemTag, ItemEntry itemEntry) {
+        if (itemTag.contains("display")) {
+            CompoundTag displayTag = itemTag.get("display");
+            if (displayTag.contains("color")) {
+                IntTag color = displayTag.get("color");
+                if (color != null) {
+                    itemTag.put(new IntTag("customColor", color.getValue()));
+                    displayTag.remove("color");
+                }
+            }
+        }
+    }
+
+    @Override
+    public void translateToJava(CompoundTag itemTag, ItemEntry itemEntry) {
+        if (itemTag.contains("customColor")) {
+            IntTag color = itemTag.get("customColor");
+            CompoundTag displayTag = itemTag.get("display");
+            if (displayTag == null) {
+                displayTag = new CompoundTag("display");
+            }
+            displayTag.put(color);
+            itemTag.remove("customColor");
+        }
+    }
+
+    @Override
+    public boolean acceptItem(ItemEntry itemEntry) {
+        for (String item : ITEMS) {
+            if (itemEntry.getJavaIdentifier().equals(item)) return true;
+        }
+        return false;
+    }
+}

connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/MapItemTranslator.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.item.translators.nbt;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.IntTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
+import org.geysermc.connector.network.translators.ItemRemapper;
+import org.geysermc.connector.network.translators.NbtItemStackTranslator;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+
+@ItemRemapper
+public class MapItemTranslator extends NbtItemStackTranslator {
+
+    @Override
+    public void translateToBedrock(CompoundTag itemTag, ItemEntry itemEntry) {
+        IntTag mapId = itemTag.get("map");
+
+        if (mapId != null) {
+            itemTag.put(new StringTag("map_uuid", mapId.getValue().toString()));
+            itemTag.put(new IntTag("map_name_index", mapId.getValue()));
+            itemTag.remove("map");
+        }
+    }
+
+    @Override
+    public void translateToJava(CompoundTag itemTag, ItemEntry itemEntry) {
+        IntTag tag = itemTag.get("map_name_index");
+        if (tag != null) {
+            itemTag.put(new IntTag("map", tag.getValue()));
+            itemTag.remove("map_name_index");
+            itemTag.remove("map_uuid");
+        }
+    }
+}

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

@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2019-2020 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.network.translators.java;
+
+import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
+import com.github.steveice10.mc.protocol.data.game.recipe.Recipe;
+import com.github.steveice10.mc.protocol.data.game.recipe.data.ShapedRecipeData;
+import com.github.steveice10.mc.protocol.data.game.recipe.data.ShapelessRecipeData;
+import com.github.steveice10.mc.protocol.packet.ingame.server.ServerDeclareRecipesPacket;
+import com.nukkitx.nbt.tag.CompoundTag;
+import com.nukkitx.protocol.bedrock.data.CraftingData;
+import com.nukkitx.protocol.bedrock.data.ItemData;
+import com.nukkitx.protocol.bedrock.data.PotionMixData;
+import com.nukkitx.protocol.bedrock.packet.CraftingDataPacket;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import org.geysermc.connector.network.session.GeyserSession;
+import org.geysermc.connector.network.translators.PacketTranslator;
+import org.geysermc.connector.network.translators.Translator;
+import org.geysermc.connector.network.translators.Translators;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+import org.geysermc.connector.utils.Toolbox;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Translator(packet = ServerDeclareRecipesPacket.class)
+public class JavaDeclareRecipesTranslator extends PacketTranslator<ServerDeclareRecipesPacket> {
+    private static final Collection<PotionMixData> POTION_MIXES =
+            Arrays.stream(new int[]{372, 331, 348, 376, 289, 437, 353, 414, 382, 375, 462, 378, 396, 377, 370, 469, 470})
+            .mapToObj(ingredient -> new PotionMixData(0, ingredient, 0))
+            .collect(Collectors.toList());
+
+    @Override
+    public void translate(ServerDeclareRecipesPacket packet, GeyserSession session) {
+        CraftingDataPacket craftingDataPacket = new CraftingDataPacket();
+        craftingDataPacket.setCleanRecipes(true);
+        for (Recipe recipe : packet.getRecipes()) {
+            switch (recipe.getType()) {
+                case CRAFTING_SHAPELESS: {
+                    ShapelessRecipeData shapelessRecipeData = (ShapelessRecipeData) recipe.getData();
+                    ItemData output = Translators.getItemTranslator().translateToBedrock(session, shapelessRecipeData.getResult());
+                    output = ItemData.of(output.getId(), output.getDamage(), output.getCount()); //strip NBT
+                    ItemData[][] inputCombinations = combinations(session, shapelessRecipeData.getIngredients());
+                    for (ItemData[] inputs : inputCombinations) {
+                        UUID uuid = UUID.randomUUID();
+                        craftingDataPacket.getCraftingData().add(CraftingData.fromShapeless(uuid.toString(),
+                                inputs, new ItemData[]{output}, uuid, "crafting_table", 0));
+                    }
+                    break;
+                }
+                case CRAFTING_SHAPED: {
+                    ShapedRecipeData shapedRecipeData = (ShapedRecipeData) recipe.getData();
+                    ItemData output = Translators.getItemTranslator().translateToBedrock(session, shapedRecipeData.getResult());
+                    output = ItemData.of(output.getId(), output.getDamage(), output.getCount()); //strip NBT
+                    ItemData[][] inputCombinations = combinations(session, shapedRecipeData.getIngredients());
+                    for (ItemData[] inputs : inputCombinations) {
+                        UUID uuid = UUID.randomUUID();
+                        craftingDataPacket.getCraftingData().add(CraftingData.fromShaped(uuid.toString(),
+                                shapedRecipeData.getWidth(), shapedRecipeData.getHeight(), inputs,
+                                new ItemData[]{output}, uuid, "crafting_table", 0));
+                    }
+                    break;
+                }
+            }
+        }
+        craftingDataPacket.getPotionMixData().addAll(POTION_MIXES);
+        session.getUpstream().sendPacket(craftingDataPacket);
+    }
+
+    //TODO: rewrite
+    private ItemData[][] combinations(GeyserSession session, Ingredient[] ingredients) {
+        Map<Set<ItemData>, IntSet> squashedOptions = new HashMap<>();
+        for (int i = 0; i < ingredients.length; i++) {
+            if (ingredients[i].getOptions().length == 0) {
+                squashedOptions.computeIfAbsent(Collections.singleton(ItemData.AIR), k -> new IntOpenHashSet()).add(i);
+                continue;
+            }
+            Ingredient ingredient = ingredients[i];
+            Map<GroupedItem, List<ItemData>> groupedByIds = Arrays.stream(ingredient.getOptions())
+                    .map(item -> Translators.getItemTranslator().translateToBedrock(session, item))
+                    .collect(Collectors.groupingBy(item -> new GroupedItem(item.getId(), item.getCount(), item.getTag())));
+            Set<ItemData> optionSet = new HashSet<>(groupedByIds.size());
+            for (Map.Entry<GroupedItem, List<ItemData>> entry : groupedByIds.entrySet()) {
+                if (entry.getValue().size() > 1) {
+                    GroupedItem groupedItem = entry.getKey();
+                    int idCount = 0;
+                    //not optimal
+                    for (ItemEntry itemEntry : Toolbox.ITEM_ENTRIES.values()) {
+                        if (itemEntry.getBedrockId() == groupedItem.id) {
+                            idCount++;
+                        }
+                    }
+                    if (entry.getValue().size() < idCount) {
+                        optionSet.addAll(entry.getValue());
+                    } else {
+                        optionSet.add(ItemData.of(groupedItem.id, (short) -1, groupedItem.count, groupedItem.tag));
+                    }
+                } else {
+                    ItemData item = entry.getValue().get(0);
+                    optionSet.add(item);
+                }
+            }
+            squashedOptions.computeIfAbsent(optionSet, k -> new IntOpenHashSet()).add(i);
+        }
+        int totalCombinations = 1;
+        for (Set optionSet : squashedOptions.keySet()) {
+            totalCombinations *= optionSet.size();
+        }
+        if (totalCombinations > 500) {
+            ItemData[] translatedItems = new ItemData[ingredients.length];
+            for (int i = 0; i < ingredients.length; i++) {
+                if (ingredients[i].getOptions().length > 0) {
+                    translatedItems[i] = Translators.getItemTranslator().translateToBedrock(session, ingredients[i].getOptions()[0]);
+                } else {
+                    translatedItems[i] = ItemData.AIR;
+                }
+            }
+            return new ItemData[][]{translatedItems};
+        }
+        List<Set<ItemData>> sortedSets = new ArrayList<>(squashedOptions.keySet());
+        sortedSets.sort(Comparator.comparing(Set::size, Comparator.reverseOrder()));
+        ItemData[][] combinations = new ItemData[totalCombinations][ingredients.length];
+        int x = 1;
+        for (Set<ItemData> set : sortedSets) {
+            IntSet slotSet = squashedOptions.get(set);
+            int i = 0;
+            for (ItemData item : set) {
+                for (int j = 0; j < totalCombinations / set.size(); j++) {
+                    final int comboIndex = (i * x) + (j % x) + ((j / x) * set.size() * x);
+                    for (int slot : slotSet) {
+                        combinations[comboIndex][slot] = item;
+                    }
+                }
+                i++;
+            }
+            x *= set.size();
+        }
+        return combinations;
+    }
+
+    @EqualsAndHashCode
+    @AllArgsConstructor
+    private static class GroupedItem {
+        int id;
+        int count;
+        CompoundTag tag;
+    }
+}

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

@@ -53,6 +53,8 @@ public class JavaRespawnTranslator extends PacketTranslator<ServerRespawnPacket>
         // Max health must be divisible by two in bedrock
         entity.getAttributes().put(AttributeType.HEALTH, AttributeType.HEALTH.getAttribute(maxHealth, (maxHealth % 2 == 1 ? maxHealth + 1 : maxHealth)));
 
+        session.getInventoryCache().setOpenInventory(null);
+
         SetPlayerGameTypePacket playerGameTypePacket = new SetPlayerGameTypePacket();
         playerGameTypePacket.setGamemode(packet.getGamemode().ordinal());
         session.getUpstream().sendPacket(playerGameTypePacket);

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

@@ -55,7 +55,7 @@ public class JavaServerDeclareCommandsTranslator extends PacketTranslator<Server
         for (int nodeIndex : rootNode.getChildIndices()) {
             CommandNode node = packet.getNodes()[nodeIndex];
 
-            // Make sure we dont have duplicated commands (happens if there is more than 1 root node)
+            // Make sure we don't have duplicated commands (happens if there is more than 1 root node)
             if (commands.containsKey(nodeIndex)) { continue; }
 
             // Get and update the commandArgs list with the found arguments
@@ -81,10 +81,10 @@ public class JavaServerDeclareCommandsTranslator extends PacketTranslator<Server
             CommandEnumData aliases = new CommandEnumData( commandName + "Aliases", new String[] { commandName.toLowerCase() }, false);
 
             // Get and parse all params
-            CommandParamData[][] params = getParams(commandID, packet.getNodes()[commandID], packet.getNodes());
+            CommandParamData[][] params = getParams(packet.getNodes()[commandID], packet.getNodes());
 
             // Build the completed command and add it to the final list
-            CommandData data = new CommandData(commandName, "", flags, (byte) 0, aliases, params);
+            CommandData data = new CommandData(commandName, session.getConnector().getCommandManager().getDescription(commandName), flags, (byte) 0, aliases, params);
             commandData.add(data);
         }
 
@@ -100,7 +100,15 @@ public class JavaServerDeclareCommandsTranslator extends PacketTranslator<Server
         session.getUpstream().sendPacket(availableCommandsPacket);
     }
 
-    private CommandParamData[][] getParams(int commandID, CommandNode commandNode, CommandNode[] allNodes) {
+    /**
+     * Build the command parameter array for the given command
+     *
+     * @param commandNode The command to build the parameters for
+     * @param allNodes Every command node
+     *
+     * @return An array of parameter option arrays
+     */
+    private CommandParamData[][] getParams(CommandNode commandNode, CommandNode[] allNodes) {
         // Check if the command is an alias and redirect it
         if (commandNode.getRedirectIndex() != -1) {
             GeyserConnector.getInstance().getLogger().debug("Redirecting command " + commandNode.getName() + " to " + allNodes[commandNode.getRedirectIndex()].getName());
@@ -128,6 +136,13 @@ public class JavaServerDeclareCommandsTranslator extends PacketTranslator<Server
         return new CommandParamData[0][0];
     }
 
+    /**
+     * Convert Java edition command types to Bedrock edition
+     *
+     * @param parser Command type to convert
+     *
+     * @return Bedrock parameter data type
+     */
     private CommandParamData.Type mapCommandType(CommandParser parser) {
         if (parser == null) { return CommandParamData.Type.STRING; }
 
@@ -204,12 +219,23 @@ public class JavaServerDeclareCommandsTranslator extends PacketTranslator<Server
         private CommandParamData paramData;
         private List<ParamInfo> children;
 
+        /**
+         * Create a new parameter info object
+         *
+         * @param paramNode CommandNode the parameter is for
+         * @param paramData The existing parameters for the command
+         */
         public ParamInfo(CommandNode paramNode, CommandParamData paramData) {
             this.paramNode = paramNode;
             this.paramData = paramData;
             this.children = new ArrayList<>();
         }
 
+        /**
+         * Build the array of all the child parameters (recursive)
+         *
+         * @param allNodes Every command node
+         */
         public void buildChildren(CommandNode[] allNodes) {
             int enumIndex = -1;
 
@@ -247,6 +273,11 @@ public class JavaServerDeclareCommandsTranslator extends PacketTranslator<Server
             }
         }
 
+        /**
+         * Get the tree of every parameter node (recursive)
+         *
+         * @return List of parameter options arrays for the command
+         */
         public List<CommandParamData[]> getTree() {
             List<CommandParamData[]> treeParamData = new ArrayList<>();