Initial 1.18 update

patches/api/0363-Expand-the-Registry-API.patch

@@ -34,27 +34,3 @@ index 6242336de18fdd708cc3d7b745cbbace13140bc0..661d424c609a01ad9bee837b4069d9e4
      // Paper end
  
      /**
-diff --git a/src/main/java/org/bukkit/StructureType.java b/src/main/java/org/bukkit/StructureType.java
-index 8acb2b9de398ab5f4b18c46e9ab9eb964df8be3f..5558daa9512212a4b05f174b64c4c998ebbccfcc 100644
---- a/src/main/java/org/bukkit/StructureType.java
-+++ b/src/main/java/org/bukkit/StructureType.java
-@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
-  * The registration of new {@link StructureType}s is case-sensitive.
-  */
- // Order is retrieved from WorldGenFactory
--public final class StructureType {
-+public final class StructureType implements Keyed { // Paper - implement keyed
- 
-     private static final Map<String, StructureType> structureTypeMap = new HashMap<>();
- 
-@@ -244,4 +244,10 @@ public final class StructureType {
-     public static Map<String, StructureType> getStructureTypes() {
-         return ImmutableMap.copyOf(structureTypeMap);
-     }
-+    // Paper start
-+    @Override
-+    public @NotNull NamespacedKey getKey() {
-+        return NamespacedKey.minecraft(this.name);
-+    }
-+    // Paper end
- }