Update to Minecraft 1.17

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

paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/npc/EntityVillagerTrader.java
 +++ b/net/minecraft/world/entity/npc/EntityVillagerTrader.java
-@@ -46,6 +46,13 @@
+@@ -45,6 +45,13 @@
  import net.minecraft.world.level.World;
  import net.minecraft.world.phys.Vec3D;
  
@@ -13,16 +13,16 @@
 +
  public class EntityVillagerTrader extends EntityVillagerAbstract {
  
-     @Nullable
-@@ -55,6 +62,7 @@
+     private static final int NUMBER_OF_TRADE_OFFERS = 5;
+@@ -54,6 +61,7 @@
+ 
      public EntityVillagerTrader(EntityTypes<? extends EntityVillagerTrader> entitytypes, World world) {
          super(entitytypes, world);
-         this.attachedToPlayer = true;
 +        this.setDespawnDelay(48000); // CraftBukkit - set default from MobSpawnerTrader
      }
  
      @Override
-@@ -132,7 +140,16 @@
+@@ -131,7 +139,16 @@
              MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
  
              if (merchantrecipe != null) {