Update upstream and remove hopper patch for #1270

Spigot-Server-Patches/Optimize-RegistryID.c.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
 This is a frequent hotspot for world loading/saving.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index bde5714d..a01cda9d 100644
+index bde5714dd6..a01cda9d81 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 { // Paper - decompile fix
@@ -63,6 +63,4 @@ index bde5714d..a01cda9d 100644
      }
  
      public int b() {
--- 
-2.17.0 (Apple Git-106)
-
+--