Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
12dec20 Bump paerweight to 1.1.7
e33ed89 Get short commit ref using a more proper method
7d6147d Remove now unneeded patch due to paperweight 1.1.7
e72fa41 Update task dependency for includeMappings so the new task isn't skipped
0ad5526 Trim whitspace off of git hash (oops)

Tuinity Changes:
e878ba9 Update paper
2bd2849 Bring back fix codec spam patch

patches/server/0150-Add-StructureGenerateEvent.patch

@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nahuel <nahueldolores@hotmail.com>
-Date: Sat, 9 Jan 2021 15:36:59 +0100
-Subject: [PATCH] Add StructureGenerateEvent
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
-
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index c2b0b1adcff5baf169901710d492317d44b93846..0e07c6b4ddb599bd9e32147dda64ea6ac2abacbd 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -311,7 +311,14 @@ public abstract class ChunkGenerator {
- 
-         if (structuresettingsfeature != null) {
-             StructureStart<?> structurestart1 = feature.generate(registryManager, this, this.biomeSource, structureManager, worldSeed, chunkcoordintpair, biome, j, structuresettingsfeature, chunk);
--
-+            // Purpur start
-+            if (new net.pl3x.purpur.event.world.StructureGenerateEvent(
-+                    accessor.getWorld().getWorld(),
-+                    org.bukkit.StructureType.getStructureTypes().get(feature.feature.getFeatureName().toLowerCase()),
-+                    chunkcoordintpair.x,
-+                    chunkcoordintpair.z
-+            ).callEvent())
-+            // Purpur end
-             accessor.setStartForFeature(sectionposition, feature.feature, structurestart1, chunk);
-         }
-