Update upstream BD/B/CB/S

Note to other developers: This commit may require you to wipe your
workspace as a result of the changes to BD.

--- work/BuildData
Submodule work/BuildData f527a8ff..d56672db:
  > Mappings Update

--- work/Bukkit
Submodule work/Bukkit 0c1d258bb..db06c80d7:
  > Add list of entities to EntityTransformEvent
  > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks

---work/CraftBukkit
Submodule work/CraftBukkit 6a398ac44..068dab5be:
  > Enable optional source JAR shading via profile shadeSourcesJar
  > Use ImmutableList rather than AbstractList for CraftMetaBook
  > Fix setRecipes(List) not setting Knowledge Book recipes.
  > Mappings Update
  > Add list of entities to EntityTransformEvent & move die calls
  > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks
  > Add Vanilla help to default permissions

--- work/Spigot
Submodule work/Spigot a1f2566f6..e769fe4d9:
  > Mappings Update
  > Rebuild patches

Spigot-Server-Patches/MC-Dev-fixes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index a553fb7476..4048937c63 100644
+index a553fb747..4048937c6 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -0,0 +0,0 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -18,7 +18,7 @@ index a553fb7476..4048937c63 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 7f8802b2ef..6ffc535146 100644
+index 7f8802b2e..6ffc53514 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
@@ -52,7 +52,7 @@ index 7f8802b2ef..6ffc535146 100644
                  }
              };
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 3bd0c56d46..304e47bf20 100644
+index 3bd0c56d4..304e47bf2 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -0,0 +0,0 @@ public class DataPaletteBlock<T> implements DataPaletteExpandable<T> {
@@ -88,7 +88,7 @@ index 3bd0c56d46..304e47bf20 100644
              DataBits databits = new DataBits(ix, 4096, along);
  
 diff --git a/src/main/java/net/minecraft/server/DedicatedPlayerList.java b/src/main/java/net/minecraft/server/DedicatedPlayerList.java
-index 5eded6dc20..11f9642e6e 100644
+index 5eded6dc2..11f9642e6 100644
 --- a/src/main/java/net/minecraft/server/DedicatedPlayerList.java
 +++ b/src/main/java/net/minecraft/server/DedicatedPlayerList.java
 @@ -0,0 +0,0 @@ public class DedicatedPlayerList extends PlayerList {
@@ -101,7 +101,7 @@ index 5eded6dc20..11f9642e6e 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index 4dd4b01c82..987d944dbd 100644
+index 8bfa218a6..e2e60d3ed 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -0,0 +0,0 @@ public class DefinedStructure {
@@ -139,7 +139,7 @@ index 4dd4b01c82..987d944dbd 100644
              arraylist.add(definedstructure$a);
  
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 5c2d50f974..fd6df39f17 100644
+index 5c2d50f97..fd6df39f1 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -0,0 +0,0 @@ public class EnchantmentManager {
@@ -188,7 +188,7 @@ index 5c2d50f974..fd6df39f17 100644
          boolean flag1 = itemstack.getItem() == Items.BOOK;
  
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index 04cff50cb7..e746a6a0da 100644
+index 04cff50cb..e746a6a0d 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -0,0 +0,0 @@ public class EntityDragonFireball extends EntityFireball {
@@ -201,7 +201,7 @@ index 04cff50cb7..e746a6a0da 100644
                  entityareaeffectcloud.setSource(this.shooter);
                  entityareaeffectcloud.setParticle(Particles.j);
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 38c85f4ab7..c0853f0fcd 100644
+index 38c85f4ab..c0853f0fc 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -0,0 +0,0 @@ public enum EnumDirection implements INamable {
@@ -250,7 +250,7 @@ index 38c85f4ab7..c0853f0fcd 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
-index 3f5d6c3239..286c1b14f6 100644
+index 3f5d6c323..286c1b14f 100644
 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
 +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
 @@ -0,0 +0,0 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
@@ -269,7 +269,7 @@ index 3f5d6c3239..286c1b14f6 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 0c9249cd8d..0648c76a07 100644
+index 0c9249cd8..0648c76a0 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -0,0 +0,0 @@ public class LocaleLanguage {
@@ -282,7 +282,7 @@ index 0c9249cd8d..0648c76a07 100644
                  this.d.put(entry.getKey(), s);
              }
 diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java
-index 9d01b70c7f..8daccdd6e9 100644
+index 9d01b70c7..8daccdd6e 100644
 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java
 @@ -0,0 +0,0 @@ public abstract class LootSelectorEntry {
@@ -301,7 +301,7 @@ index 9d01b70c7f..8daccdd6e9 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/NBTBase.java b/src/main/java/net/minecraft/server/NBTBase.java
-index 7e88bcd6e4..b98dfe27d5 100644
+index 48d04b540..de9168a9c 100644
 --- a/src/main/java/net/minecraft/server/NBTBase.java
 +++ b/src/main/java/net/minecraft/server/NBTBase.java
 @@ -0,0 +0,0 @@ public interface NBTBase {
@@ -311,10 +311,10 @@ index 7e88bcd6e4..b98dfe27d5 100644
 -    NBTBase clone();
 +    public NBTBase clone(); // Paper - decompile fix
  
-     default String b_() {
+     default String asString() {
          return this.toString();
 diff --git a/src/main/java/net/minecraft/server/NBTList.java b/src/main/java/net/minecraft/server/NBTList.java
-index 456b5f4925..54f2935c08 100644
+index 456b5f492..54f2935c0 100644
 --- a/src/main/java/net/minecraft/server/NBTList.java
 +++ b/src/main/java/net/minecraft/server/NBTList.java
 @@ -0,0 +0,0 @@ public abstract class NBTList<T extends NBTBase> extends AbstractList<T> impleme
@@ -337,7 +337,7 @@ index 456b5f4925..54f2935c08 100644
 +    // Paper end- Decompile fix
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
-index 11ffa6c342..5d61cf70bc 100644
+index 86881a22d..81ff1fd69 100644
 --- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
 @@ -0,0 +0,0 @@ public class NBTTagByteArray extends NBTList<NBTTagByte> {
@@ -351,7 +351,7 @@ index 11ffa6c342..5d61cf70bc 100644
  
          System.arraycopy(this.data, 0, abyte, 0, this.data.length);
 diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
-index f5c9b97d5c..d121ad4f7a 100644
+index 40f6179cd..ebc44ec9e 100644
 --- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
 @@ -0,0 +0,0 @@ public class NBTTagIntArray extends NBTList<NBTTagInt> {
@@ -364,7 +364,7 @@ index f5c9b97d5c..d121ad4f7a 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index 5b54cbde18..769d599c59 100644
+index 24a66f95a..2e7c96056 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
@@ -391,7 +391,7 @@ index 5b54cbde18..769d599c59 100644
 +    */ // Paper end - Decompile fix
  }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 113e8780a8..8e312c7617 100644
+index 113e8780a..8e312c761 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -0,0 +0,0 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -404,7 +404,7 @@ index 113e8780a8..8e312c7617 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/Registry.java b/src/main/java/net/minecraft/server/Registry.java
-index 5be9f0ff2f..9efec49d66 100644
+index 5be9f0ff2..9efec49d6 100644
 --- a/src/main/java/net/minecraft/server/Registry.java
 +++ b/src/main/java/net/minecraft/server/Registry.java
 @@ -0,0 +0,0 @@
@@ -418,7 +418,7 @@ index 5be9f0ff2f..9efec49d66 100644
 +    Iterator<T> iterator(); // Paper - decompile fix
  }
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index 8d1f9237aa..a21006290c 100644
+index 8d1f9237a..a21006290 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -0,0 +0,0 @@ public class RegistryBlockID<T> implements Registry<T> {
@@ -431,7 +431,7 @@ index 8d1f9237aa..a21006290c 100644
  
          this.c.set(i, object);
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index 03c6033622..d03ac0e70c 100644
+index 03c603362..d03ac0e70 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -0,0 +0,0 @@ public class RegistryID<K> implements Registry<K> {
@@ -444,7 +444,7 @@ index 03c6033622..d03ac0e70c 100644
          this.b = (K[])(new Object[i]);
          this.c = new int[i];
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index 7b8a8064b8..615aa2cd04 100644
+index 7b8a8064b..615aa2cd0 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -0,0 +0,0 @@ public class ServerPing {
@@ -493,7 +493,7 @@ index 7b8a8064b8..615aa2cd04 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/ShapeDetector.java b/src/main/java/net/minecraft/server/ShapeDetector.java
-index ef9d8e06fe..0c9910d9a5 100644
+index ef9d8e06f..0c9910d9a 100644
 --- a/src/main/java/net/minecraft/server/ShapeDetector.java
 +++ b/src/main/java/net/minecraft/server/ShapeDetector.java
 @@ -0,0 +0,0 @@ public class ShapeDetector {