Cleanup

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

@@ -108,9 +108,6 @@ public class GeyserSession implements Player {
     @Setter
     private int craftSlot = 0;
 
-    @Setter
-    private int reopeningWindow = -1;
-
     public GeyserSession(GeyserConnector connector, BedrockServerSession bedrockServerSession) {
         this.connector = connector;
         this.upstream = new UpstreamSession(bedrockServerSession);

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

@@ -47,17 +47,6 @@ public class BedrockContainerCloseTranslator extends PacketTranslator<ContainerC
                 windowId = 0;
             }
         }
-
-        if (session.getReopeningWindow() != -1) {
-            Inventory inventory = session.getInventoryCache().getInventories().get(session.getReopeningWindow());
-            session.setReopeningWindow(-1);
-            if (inventory != null) {
-                InventoryTranslator translator = TranslatorsInit.getInventoryTranslators().get(inventory.getWindowType());
-                translator.openInventory(session, inventory);
-                translator.updateInventory(session, inventory);
-                return;
-            }
-        }
         ClientCloseWindowPacket closeWindowPacket = new ClientCloseWindowPacket(windowId);
         session.getDownstream().getSession().send(closeWindowPacket);
         InventoryUtils.closeInventory(session, windowId);

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

@@ -1,6 +1,30 @@
+/*
+ * Copyright (c) 2019 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.math.vector.Vector3i;
 import com.nukkitx.protocol.bedrock.data.ContainerId;
 import com.nukkitx.protocol.bedrock.data.ContainerType;
 import com.nukkitx.protocol.bedrock.data.InventoryAction;

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

@@ -90,8 +90,6 @@ public class PlayerInventoryTranslator extends InventoryTranslator {
             }
             slotPacket.setSlot(TranslatorsInit.getItemTranslator().translateToBedrock(inventory.getItem(slot)));
             session.getUpstream().sendPacket(slotPacket);
-        } else if (slot == 0) {
-            //TODO: crafting output
         } else if (slot == 45) {
             InventoryContentPacket offhandPacket = new InventoryContentPacket();
             offhandPacket.setContainerId(ContainerId.OFFHAND);

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

@@ -155,7 +155,7 @@ public class ItemTranslator {
 
         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() + '"');
+            return new StringTag(stringTag.getName(), stringTag.getValue());
         }
 
         if (tag instanceof com.nukkitx.nbt.tag.ListTag) {

connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaSetSlotTranslator.java

@@ -26,11 +26,6 @@
 package org.geysermc.connector.network.translators.java.window;
 
 import com.github.steveice10.mc.protocol.packet.ingame.server.window.ServerSetSlotPacket;
-import com.nukkitx.protocol.bedrock.data.ContainerId;
-import com.nukkitx.protocol.bedrock.data.ItemData;
-import com.nukkitx.protocol.bedrock.packet.ContainerClosePacket;
-import com.nukkitx.protocol.bedrock.packet.InventorySlotPacket;
-import org.geysermc.api.Geyser;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
@@ -38,7 +33,6 @@ import org.geysermc.connector.network.translators.TranslatorsInit;
 import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
 
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 
 public class JavaSetSlotTranslator extends PacketTranslator<ServerSetSlotPacket> {
 
@@ -49,26 +43,7 @@ public class JavaSetSlotTranslator extends PacketTranslator<ServerSetSlotPacket>
                 return;
             if (session.getCraftSlot() != 0)
                 return;
-
+            //bedrock client is bugged when changing the cursor. do not send slot update packet
-            //bedrock client is bugged when changing the cursor. reopen inventory after changing it
-            //TODO: fix this. too buggy rn
-            /*if (packet.getItem() == null && session.getInventory().getCursor() != null) {
-                InventorySlotPacket cursorPacket = new InventorySlotPacket();
-                cursorPacket.setContainerId(ContainerId.CURSOR);
-                cursorPacket.setSlot(ItemData.AIR);
-                session.getUpstream().sendPacket(cursorPacket);
-
-                Inventory inventory = session.getInventoryCache().getOpenInventory();
-                if (inventory != null) {
-                    session.setReopeningWindow(inventory.getId());
-                } else {
-                    inventory = session.getInventory();
-                }
-                ContainerClosePacket closePacket = new ContainerClosePacket();
-                closePacket.setWindowId((byte) inventory.getId());
-                Geyser.getGeneralThreadPool().schedule(() -> session.getUpstream().sendPacket(closePacket), 150, TimeUnit.MILLISECONDS);
-            }*/
-
             session.getInventory().setCursor(packet.getItem());
             return;
         }

connector/src/main/java/org/geysermc/connector/network/translators/java/window/JavaWindowPropertyTranslator.java

@@ -1,9 +1,33 @@
+/*
+ * Copyright (c) 2019 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.window;
 
 import com.github.steveice10.mc.protocol.packet.ingame.server.window.ServerWindowPropertyPacket;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
-import org.geysermc.connector.network.session.cache.InventoryCache;
 import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.TranslatorsInit;
 import org.geysermc.connector.network.translators.inventory.InventoryTranslator;

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

@@ -1,10 +1,5 @@
 package org.geysermc.connector.utils;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.window.WindowType;
-import com.github.steveice10.mc.protocol.packet.ingame.server.window.ServerOpenWindowPacket;
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.nukkitx.protocol.bedrock.data.ItemData;
 import org.geysermc.api.Geyser;
 import org.geysermc.connector.inventory.Inventory;
 import org.geysermc.connector.network.session.GeyserSession;
@@ -12,7 +7,6 @@ import org.geysermc.connector.network.translators.TranslatorsInit;
 import org.geysermc.connector.network.translators.inventory.DoubleChestInventoryTranslator;
 import org.geysermc.connector.network.translators.inventory.InventoryTranslator;
 
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 public class InventoryUtils {
@@ -52,11 +46,4 @@ public class InventoryUtils {
         session.setCraftSlot(0);
         session.getInventory().setCursor(null);
     }
-
-    //NPE if nbt tag is null
-    public static ItemStack fixStack(ItemStack stack) {
-        if (stack == null || stack.getId() == 0)
-            return null;
-        return new ItemStack(stack.getId(), stack.getAmount(), stack.getNbt() == null ? new CompoundTag("") : stack.getNbt());
-    }
 }