103 Zeilen
5.3 KiB
Diff
103 Zeilen
5.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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 c7d377dbb53cdc1f823a839e3a113136efc16349..73472890e30180dc3cb6aa1bd9c5815087334682 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegistry.java
|
|
@@ -150,6 +150,7 @@ public class CraftRegistry<B extends Keyed, M> implements Registry<B> {
|
|
|
|
private final Class<? super B> bukkitClass;
|
|
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 boolean init;
|
|
@@ -194,6 +195,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;
|
|
}
|
|
@@ -216,4 +218,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 1c4966520b6401e6571aa44d5934dfa280bc80e3..010de6fbb75eb5d51639695d260f916072fdb22d 100644
|
|
--- a/src/test/java/org/bukkit/registry/PerRegistryTest.java
|
|
+++ b/src/test/java/org/bukkit/registry/PerRegistryTest.java
|
|
@@ -49,19 +49,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
|
|
@@ -72,7 +75,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);
|
|
}
|
|
|