Remove unneeded GeyserItemStack constructor and add comments

bundabrg · Jan 4, 2021 · 50f295b · 50f295b
1 parent 8928d55
commit 50f295b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/connector/src/main/java/org/geysermc/connector/inventory/GeyserItemStack.java b/connector/src/main/java/org/geysermc/connector/inventory/GeyserItemStack.java
@@ -91,11 +91,7 @@ public void sub(int sub) {
     }
 
     public static GeyserItemStack from(ItemStack itemStack) {
-        return from(itemStack, 1);
-    }
-
-    public static GeyserItemStack from(ItemStack itemStack, int netId) {
-        return itemStack == null ? EMPTY : new GeyserItemStack(itemStack.getId(), itemStack.getAmount(), itemStack.getNbt(), netId);
+        return itemStack == null ? EMPTY : new GeyserItemStack(itemStack.getId(), itemStack.getAmount(), itemStack.getNbt());
     }
 
     public ItemStack getItemStack() {

diff --git a/...c/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java b/...c/main/java/org/geysermc/connector/network/translators/inventory/InventoryTranslator.java
@@ -757,7 +757,7 @@ public ItemStackResponsePacket.Response translateCreativeRequest(GeyserSession s
                     ItemStack javaCreativeItem = ItemTranslator.translateToJava(creativeItem);
 
                     if (isCursor(transferAction.getDestination())) {
-                        session.getPlayerInventory().setCursor(GeyserItemStack.from(javaCreativeItem, session.getNextItemNetId()), session);
+                        session.getPlayerInventory().setCursor(GeyserItemStack.from(javaCreativeItem), session);
                         return acceptRequest(request, Collections.singletonList(
                                 new ItemStackResponsePacket.ContainerEntry(ContainerSlotType.CURSOR,
                                         Collections.singletonList(makeItemEntry(0, session.getPlayerInventory().getCursor())))));
@@ -769,7 +769,7 @@ public ItemStackResponsePacket.Response translateCreativeRequest(GeyserSession s
                             existingItem.setAmount(existingItem.getAmount() + transferAction.getCount());
                             javaCreativeItem = existingItem.getItemStack();
                         } else {
-                            inventory.setItem(javaSlot, GeyserItemStack.from(javaCreativeItem, session.getNextItemNetId()), session);
+                            inventory.setItem(javaSlot, GeyserItemStack.from(javaCreativeItem), session);
                         }
                         ClientCreativeInventoryActionPacket creativeActionPacket = new ClientCreativeInventoryActionPacket(
                                 javaSlot,

diff --git a/...c/connector/network/translators/inventory/translators/StonecutterInventoryTranslator.java b/...c/connector/network/translators/inventory/translators/StonecutterInventoryTranslator.java
@@ -86,7 +86,7 @@ public ItemStackResponsePacket.Response translateSpecialRequest(GeyserSession se
             container.setStonecutterButton(button);
             if (inventory.getItem(1).getJavaId() != javaOutput.getId()) {
                 // We don't know there is an output here, so we tell ourselves that there is
-                inventory.setItem(1, GeyserItemStack.from(javaOutput, session.getNextItemNetId()), session);
+                inventory.setItem(1, GeyserItemStack.from(javaOutput), session);
             }
         }
         return translateRequest(session, inventory, request);

diff --git a/...in/java/org/geysermc/connector/network/translators/java/JavaDeclareRecipesTranslator.java b/...in/java/org/geysermc/connector/network/translators/java/JavaDeclareRecipesTranslator.java
@@ -47,6 +47,11 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+/**
+ * Used to send all valid recipes from Java to Bedrock.
+ *
+ * Bedrock REQUIRES a CraftingDataPacket to be sent in order to craft anything.
+ */
 @Translator(packet = ServerDeclareRecipesPacket.class)
 public class JavaDeclareRecipesTranslator extends PacketTranslator<ServerDeclareRecipesPacket> {
 

diff --git a/...ain/java/org/geysermc/connector/network/translators/java/JavaUnlockRecipesTranslator.java b/...ain/java/org/geysermc/connector/network/translators/java/JavaUnlockRecipesTranslator.java
@@ -33,6 +33,9 @@
 
 import java.util.Arrays;
 
+/**
+ * Used to list recipes that we can definitely use the recipe book for (and therefore save on packet usage)
+ */
 @Translator(packet = ServerUnlockRecipesPacket.class)
 public class JavaUnlockRecipesTranslator extends PacketTranslator<ServerUnlockRecipesPacket> {