Updated Upstream (Paper, Tuinity, & Airplane)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
bca97a8f7 replace spaces in world key (touches #5397)
de94f6485 Refactor chat message composition (#5396)
e27f334bb [CI-SKIP] Fix makemcdevsrc.sh for nms relocations (#5389)
ae15e85da Updated Upstream (CraftBukkit)
26fe0ac5a Only set despawnTimer for Wandering Traders spawned by MobSpawnerTrader (#5391)
b748eb7b8 Fix VanillaMobGoalTest#testBukkitMap (#5390)
18dbbb578 [Auto] Updated Upstream (CraftBukkit)
fac9cc5d5 [CI-SKIP] Ignore .gitignore
087aa70e7 Deprecate ItemStack#setLore(List<String>) and ItemStack#getLore, add Component based alternatives
9889c651c apply fixup
c310f0a61 Updated Upstream (Bukkit/CraftBukkit)
f17560ab0 wtf is this t file -jmp
347f3a9b8 fix compile
700e9e6a5 rebase
cf4dc464a Revert de5f4e469...c270abe96
6870db613 script & POM fix
743c6533c Replace ** with * (BSD/macOS)
376d7b097 Don't remove the .java
fcb3fd42a Fix macOS/BSD support
8cfc05249 Link correctly
ba1031ca7 Rename work dir
c8d844ab7 Actually fix preloading this time
e62aa5e3e Fix class preloading
1c03cf898 It's mojang math, not minecraft math
1034873df Apply fixups
39b125771 Use revision file
956150da7 Welcome to 1.16.5-R0.2
ccb217c01 Change cache keys
0d217001c more work
f6d820f07 It compiles
0f78e9525 More work
1718f61bf Updated Upstream (CraftBukkit/Spigot)
b28d46114 Update scripts for NMS repackaging

Tuinity Changes:
9bdcb9b8e Delete work dir when running jar
6351d7ca7 Update Upstream (Paper)
932c199a6 Generate md-dev correctly
bf3e73778 Make packet limiter work from IDE
1686f3861 Fix packet limiter config
f40f7b425 Update README.md styling (#264)
da1c3ace5 GH Actions Changes (#213)
5f325ecf1 Update Upstream (Paper)
0f83fe48d Update Upstream (Paper)

Airplane Changes:
f94d39947 Merge pull request #18 from notOM3GA/upstream/nms-repackage
0fc622631 Force build for Flare update
08439d6a9 Update Upstream (Tuinity)

patches/server/0090-Phantoms-burn-in-light.patch

@@ -4,11 +4,27 @@ Date: Sun, 12 Apr 2020 20:41:59 -0700
 Subject: [PATCH] Phantoms burn in light
 
 
-diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index dfce36368da9bdd9285c490a802f7a0cc4a339f6..bdfe073dcd255a7359127f9ae3a962642be5526d 100644
---- a/src/main/java/net/minecraft/server/EntityPhantom.java
-+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
-@@ -13,6 +13,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
+index daf738e8f0987aa6ab200189d7a26d166918b8fc..07ede7b75a65a5815f1ae1ebf03ec0fdb4621afb 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
++++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
+@@ -18,6 +18,7 @@ import net.minecraft.sounds.SoundEffect;
+ import net.minecraft.sounds.SoundEffects;
+ import net.minecraft.util.MathHelper;
+ import net.minecraft.world.DifficultyDamageScaler;
++import net.minecraft.world.EnumHand;
+ import net.minecraft.world.damagesource.DamageSource;
+ import net.minecraft.world.entity.Entity;
+ import net.minecraft.world.entity.EntityFlying;
+@@ -41,6 +42,7 @@ import net.minecraft.world.entity.boss.enderdragon.EntityEnderCrystal;
+ import net.minecraft.world.entity.player.EntityHuman;
+ import net.minecraft.world.item.ItemStack;
+ import net.minecraft.world.item.Items;
++import net.minecraft.world.item.crafting.RecipeItemStack;
+ import net.minecraft.world.level.World;
+ import net.minecraft.world.level.WorldAccess;
+ import net.minecraft.world.level.levelgen.HeightMap;
+@@ -54,6 +56,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
      private BlockPosition d; public void setHome(BlockPosition home) { this.d = home; } public BlockPosition getHome() { return this.d; } // Purpur - OBFHELPER
      private EntityPhantom.AttackPhase bo; public AttackPhase getAttackPhase() { return this.bo; } // Purpur - OBFHELPER
      private Vec3D crystalPosition; // Purpur
@@ -16,7 +32,7 @@ index dfce36368da9bdd9285c490a802f7a0cc4a339f6..bdfe073dcd255a7359127f9ae3a96264
  
      public EntityPhantom(EntityTypes<? extends EntityPhantom> entitytypes, World world) {
          super(entitytypes, world);
-@@ -125,7 +126,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+@@ -166,7 +169,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
  
      @Override
      public void movementTick() {
@@ -25,7 +41,7 @@ index dfce36368da9bdd9285c490a802f7a0cc4a339f6..bdfe073dcd255a7359127f9ae3a96264
              this.setOnFire(8);
          }
  
-@@ -374,7 +375,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+@@ -416,7 +419,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
              } else {
                  this.c = 60;
                  List<EntityHuman> list = EntityPhantom.this.world.a(this.b, (EntityLiving) EntityPhantom.this, EntityPhantom.this.getBoundingBox().grow(16.0D, 64.0D, 16.0D));
@@ -34,7 +50,7 @@ index dfce36368da9bdd9285c490a802f7a0cc4a339f6..bdfe073dcd255a7359127f9ae3a96264
                  if (!list.isEmpty()) {
                      list.sort(Comparator.comparing(Entity::locY).reversed());
                      Iterator iterator = list.iterator();
-@@ -473,6 +474,12 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+@@ -515,6 +518,12 @@ public class EntityPhantom extends EntityFlying implements IMonster {
                  return false;
              } else if (entityliving instanceof EntityHuman && (((EntityHuman) entityliving).isSpectator() || ((EntityHuman) entityliving).isCreative())) {
                  return false;
@@ -47,11 +63,11 @@ index dfce36368da9bdd9285c490a802f7a0cc4a339f6..bdfe073dcd255a7359127f9ae3a96264
              } else if (!this.a()) {
                  return false;
              } else {
-diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 4c379916d8d7797038d2980761c49f44c010dea8..ea6b61c9b88f33d29f7266d7614c80372db31b72 100644
---- a/src/main/java/net/minecraft/server/Items.java
-+++ b/src/main/java/net/minecraft/server/Items.java
-@@ -173,7 +173,7 @@ public class Items {
+diff --git a/src/main/java/net/minecraft/world/item/Items.java b/src/main/java/net/minecraft/world/item/Items.java
+index 993a88a5937417016821ef9d7cd58e4ee097491c..64b4fcf6f43c39db0fe57fc7a74f0d954e966a61 100644
+--- a/src/main/java/net/minecraft/world/item/Items.java
++++ b/src/main/java/net/minecraft/world/item/Items.java
+@@ -187,7 +187,7 @@ public class Items {
      public static final Item cm = a(Blocks.BOOKSHELF, CreativeModeTab.b);
      public static final Item cn = a(Blocks.MOSSY_COBBLESTONE, CreativeModeTab.b);
      public static final Item co = a(Blocks.OBSIDIAN, CreativeModeTab.b);
@@ -60,7 +76,7 @@ index 4c379916d8d7797038d2980761c49f44c010dea8..ea6b61c9b88f33d29f7266d7614c8037
      public static final Item cq = a(Blocks.END_ROD, CreativeModeTab.c);
      public static final Item cr = a(Blocks.CHORUS_PLANT, CreativeModeTab.c);
      public static final Item cs = a(Blocks.CHORUS_FLOWER, CreativeModeTab.c);
-@@ -225,7 +225,7 @@ public class Items {
+@@ -239,7 +239,7 @@ public class Items {
      public static final Item dm = a(Blocks.SOUL_SOIL, CreativeModeTab.b);
      public static final Item dn = a(Blocks.BASALT, CreativeModeTab.b);
      public static final Item do_ = a(Blocks.cP, CreativeModeTab.b);
@@ -70,7 +86,7 @@ index 4c379916d8d7797038d2980761c49f44c010dea8..ea6b61c9b88f33d29f7266d7614c8037
      public static final Item dr = a(Blocks.JACK_O_LANTERN, CreativeModeTab.b);
      public static final Item ds = a(Blocks.OAK_TRAPDOOR, CreativeModeTab.d);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 32bb2524641722d16b6bafcc6b1af2793c1d9a45..fd7eabb033d8900bfab28c3d4a06626f7c0c3ef3 100644
+index cdb7a97ecececa78a200acc898535d33c950a668..0a6b27327b0252911ac68f0584643e2d1c5bf09a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -408,6 +408,9 @@ public class PurpurWorldConfig {