Update remote item matching option

Author: kennytv

paper-server/build.gradle.kts

@@ -20,9 +20,9 @@ paperweight {
     minecraftVersion = providers.gradleProperty("mcVersion")
     gitFilePatches = false
 
-    updatingMinecraft {
-        oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365"
-    }
+    //updatingMinecraft {
+    //    oldPaperCommit = "f4f275519f7c1fbe9db173b7144a4fe81440e365"
+    //}
 
     spigot {
         buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"

paper-server/patches/sources/net/minecraft/network/HashedStack.java.patch

@@ -0,0 +1,33 @@
+--- a/net/minecraft/network/HashedStack.java
++++ b/net/minecraft/network/HashedStack.java
+@@ -17,7 +_,7 @@
+         }
+ 
+         @Override
+-        public boolean matches(ItemStack stack, HashedPatchMap.HashGenerator hashGenerator) {
++        public boolean matches(ItemStack stack, HashedPatchMap.HashGenerator hashGenerator, final boolean simplifyMatching) { // Paper - add flag to simplify remote matching logic
+             return stack.isEmpty();
+         }
+     };
+@@ -27,7 +_,7 @@
+             hashedStack -> hashedStack instanceof HashedStack.ActualItem actualItem ? Optional.of(actualItem) : Optional.empty()
+         );
+ 
+-    boolean matches(ItemStack stack, HashedPatchMap.HashGenerator hashGenerator);
++    boolean matches(ItemStack stack, HashedPatchMap.HashGenerator hashGenerator, final boolean simplifyMatching); // Paper - add flag to simplify remote matching logic
+ 
+     static HashedStack create(ItemStack stack, HashedPatchMap.HashGenerator hashGenerator) {
+         return (HashedStack)(stack.isEmpty()
+@@ -47,10 +_,10 @@
+         );
+ 
+         @Override
+-        public boolean matches(ItemStack stack, HashedPatchMap.HashGenerator hashGenerator) {
++        public boolean matches(ItemStack stack, HashedPatchMap.HashGenerator hashGenerator, final boolean simplifyMatching) { // Paper - add flag to simplify remote matching logic
+             return this.count == stack.getCount()
+                 && this.item.equals(stack.getItemHolder())
+-                && this.components.matches(stack.getComponentsPatch(), hashGenerator);
++                && (simplifyMatching || this.components.matches(stack.getComponentsPatch(), hashGenerator)); // Paper - add flag to simplify remote matching logic
+         }
+     }
+ }

paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

@@ -31,6 +31,15 @@
          @Override
          public void sendSlotChange(AbstractContainerMenu container, int slot, ItemStack itemStack) {
              ServerPlayer.this.connection.send(new ClientboundContainerSetSlotPacket(container.containerId, container.incrementStateId(), slot, itemStack));
+@@ -302,7 +_,7 @@
+ 
+         @Override
+         public RemoteSlot createSlot() {
+-            return new RemoteSlot.Synchronized(this.cache::getUnchecked);
++            return new RemoteSlot.Synchronized(this.cache::getUnchecked, ServerPlayer.this.getBukkitEntity().simplifyContainerDesyncCheck()); // Paper - add flag to simplify remote matching logic
+         }
+     };
+     private final ContainerListener containerListener = new ContainerListener() {
 @@ -316,6 +_,32 @@
              }
          }

paper-server/patches/sources/net/minecraft/world/inventory/RemoteSlot.java.patch

@@ -0,0 +1,27 @@
+--- a/net/minecraft/world/inventory/RemoteSlot.java
++++ b/net/minecraft/world/inventory/RemoteSlot.java
+@@ -29,12 +_,14 @@
+ 
+     public static class Synchronized implements RemoteSlot {
+         private final HashedPatchMap.HashGenerator hasher;
++        private final boolean simplifyMatching; // Paper - add flag to simplify remote matching logic
+         @Nullable
+         private ItemStack remoteStack = null;
+         @Nullable
+         private HashedStack remoteHash = null;
+ 
+-        public Synchronized(HashedPatchMap.HashGenerator hasher) {
++        public Synchronized(HashedPatchMap.HashGenerator hasher, final boolean simplifyMatching) { // Paper - add flag to simplify remote matching logic
++            this.simplifyMatching = simplifyMatching; // Paper - add flag to simplify remote matching logic
+             this.hasher = hasher;
+         }
+ 
+@@ -54,7 +_,7 @@
+         public boolean matches(ItemStack stack) {
+             if (this.remoteStack != null) {
+                 return ItemStack.matches(this.remoteStack, stack);
+-            } else if (this.remoteHash != null && this.remoteHash.matches(stack, this.hasher)) {
++            } else if (this.remoteHash != null && this.remoteHash.matches(stack, this.hasher, this.simplifyMatching)) { // Paper - add flag to simplify remote matching logic
+                 this.remoteStack = stack.copy();
+                 return true;
+             } else {