Update to Minecraft 1.20.5

By: md_5 <git@md-5.net>

paper-server/nms-patches/net/minecraft/world/inventory/ContainerMerchant.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/inventory/ContainerMerchant.java
 +++ b/net/minecraft/world/inventory/ContainerMerchant.java
-@@ -12,6 +12,8 @@
+@@ -13,6 +13,8 @@
  import net.minecraft.world.item.trading.MerchantRecipe;
  import net.minecraft.world.item.trading.MerchantRecipeList;
  
@@ -9,7 +9,7 @@
  public class ContainerMerchant extends Container {
  
      protected static final int PAYMENT1_SLOT = 0;
-@@ -31,6 +33,19 @@
+@@ -32,6 +34,19 @@
      private boolean showProgressBar;
      private boolean canRestock;
  
@@ -29,7 +29,7 @@
      public ContainerMerchant(int i, PlayerInventory playerinventory) {
          this(i, playerinventory, new MerchantWrapper(playerinventory.player));
      }
-@@ -42,6 +57,7 @@
+@@ -43,6 +58,7 @@
          this.addSlot(new Slot(this.tradeContainer, 0, 136, 37));
          this.addSlot(new Slot(this.tradeContainer, 1, 162, 37));
          this.addSlot(new SlotMerchantResult(playerinventory.player, imerchant, this.tradeContainer, 2, 220, 37));
@@ -37,7 +37,7 @@
  
          int j;
  
-@@ -154,7 +170,7 @@
+@@ -155,7 +171,7 @@
      }
  
      private void playTradeSound() {