1 files changed, 102 insertions, 0 deletions
diff --git a/patches/server/0921-Improve-Registry.patch b/patches/server/0921-Improve-Registry.patch
new file mode 100644
index 0000000000..14131191a6
--- /dev/null
+++ b/patches/server/0921-Improve-Registry.patch
@@ -0,0 +1,102 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Wed, 20 Dec 2023 02:03:05 -0800
+Subject: [PATCH] Improve Registry
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
+index f8cf246913040ea4064f8addee0ec6927eb06237..334447e222d88bb24676bb154e7057a4147d0f41 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
+@@ -144,6 +144,7 @@ public class CraftRegistry<B extends Keyed, M> implements Registry<B> {
+ 
+     private final Class<?> bukkitClass; // Paper - relax preload class
+     private final Map<NamespacedKey, B> cache = new HashMap<>();
++    private final Map<B, NamespacedKey> byValue = new java.util.IdentityHashMap<>(); // Paper - improve Registry
+     private final net.minecraft.core.Registry<M> minecraftRegistry;
+     private final BiFunction<NamespacedKey, M, B> minecraftToBukkit;
+     private final BiFunction<NamespacedKey, ApiVersion, NamespacedKey> serializationUpdater; // Paper - rename to make it *clear* what it is *only* for
+@@ -192,6 +193,7 @@ public class CraftRegistry<B extends Keyed, M> implements Registry<B> {
+         }
+ 
+         this.cache.put(namespacedKey, bukkit);
++        this.byValue.put(bukkit, namespacedKey); // Paper - improve Registry
+ 
+         return bukkit;
+     }
+@@ -214,4 +216,11 @@ public class CraftRegistry<B extends Keyed, M> implements Registry<B> {
+ 
+         return this.minecraftToBukkit.apply(namespacedKey, minecraft);
+     }
++
++    // Paper start - improve Registry
++    @Override
++    public NamespacedKey getKey(final B value) {
++        return this.byValue.get(value);
++    }
++    // Paper end - improve Registry
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/trim/CraftTrimMaterial.java b/src/main/java/org/bukkit/craftbukkit/inventory/trim/CraftTrimMaterial.java
+index cd3e35867075e65f46051fb88d8a2460a8bb4b53..76627683f256a034a147765db693a9fd2ab9613f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/trim/CraftTrimMaterial.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/trim/CraftTrimMaterial.java
+@@ -54,6 +54,7 @@ public class CraftTrimMaterial implements TrimMaterial, Handleable<net.minecraft
+     @Override
+     @NotNull
+     public NamespacedKey getKey() {
++        if (true) return java.util.Objects.requireNonNull(org.bukkit.Registry.TRIM_MATERIAL.getKey(this), () -> this + " doesn't have a key"); // Paper
+         return this.key;
+     }
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/trim/CraftTrimPattern.java b/src/main/java/org/bukkit/craftbukkit/inventory/trim/CraftTrimPattern.java
+index 364f8d7a7106259401154d91b1b79869d014a469..f336bf98574e4fdeabc3b210629834393ec11a74 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/trim/CraftTrimPattern.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/trim/CraftTrimPattern.java
+@@ -54,6 +54,7 @@ public class CraftTrimPattern implements TrimPattern, Handleable<net.minecraft.w
+     @Override
+     @NotNull
+     public NamespacedKey getKey() {
++        if (true) return java.util.Objects.requireNonNull(org.bukkit.Registry.TRIM_PATTERN.getKey(this), () -> this + " doesn't have a key"); // Paper
+         return this.key;
+     }
+ 
+diff --git a/src/test/java/org/bukkit/registry/PerRegistryTest.java b/src/test/java/org/bukkit/registry/PerRegistryTest.java
+index 4e4ea083063daf22f1bb785ef212958ea889c43b..dad7935f9a4c7c8bb2a755cc0631330a59834233 100644
+--- a/src/test/java/org/bukkit/registry/PerRegistryTest.java
++++ b/src/test/java/org/bukkit/registry/PerRegistryTest.java
+@@ -48,19 +48,22 @@ public class PerRegistryTest extends AbstractTestingBase {
+ 
+     @ParameterizedTest
+     @MethodSource("data")
+-    public void testGet(Registry<?> registry) {
++    public <T extends Keyed> void testGet(Registry<T> registry) { // Paper - improve Registry
+         registry.forEach(element -> {
++            NamespacedKey key = registry.getKey(element); // Paper - improve Registry
++            assertNotNull(key); // Paper - improve Registry
+             // Values in the registry should be referentially equal to what is returned with #get()
+             // This ensures that new instances are not created each time #get() is invoked
+-            assertSame(element, registry.get(element.getKey()));
++            assertSame(element, registry.get(key)); // Paper - improve Registry
+         });
+     }
+ 
+     @ParameterizedTest
+     @MethodSource("data")
+-    public void testMatch(Registry<?> registry) {
++    public <T extends Keyed> void testMatch(Registry<T> registry) { // Paper - improve Registry
+         registry.forEach(element -> {
+-            NamespacedKey key = element.getKey();
++            NamespacedKey key = registry.getKey(element); // Paper - improve Registry
++            assertNotNull(key); // Paper - improve Registry
+ 
+             this.assertSameMatchWithKeyMessage(registry, element, key.toString()); // namespace:key
+             this.assertSameMatchWithKeyMessage(registry, element, key.getKey()); // key
+@@ -71,7 +74,7 @@ public class PerRegistryTest extends AbstractTestingBase {
+         });
+     }
+ 
+-    private void assertSameMatchWithKeyMessage(Registry<?> registry, Keyed element, String key) {
++    private <T extends Keyed> void assertSameMatchWithKeyMessage(Registry<T> registry, T element, String key) { // Paper - improve Registry
+         assertSame(element, registry.match(key), key);
+     }
+