[#931/Enum] Merge remote-tracking branch 'origin/pr/931' into experimental

src/main/java/org/bukkit/craftbukkit/CraftServer.java

@@ -2348,7 +2348,7 @@ public final class CraftServer implements Server {
     }
 
     @Override
-    public <T extends Keyed> Registry<T> getRegistry(Class<T> aClass) {
+    public <T extends Keyed> Registry<? extends T> getRegistry(Class<T> aClass) {
         return (Registry<T>) registries.computeIfAbsent(aClass, key -> CraftRegistry.createRegistry(aClass, console.registryAccess()));
     }
 

src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryKey.java

@@ -14,6 +14,6 @@ public final class CraftMemoryKey {
     }
 
     public static <T, U> MemoryKey<U> toMemoryKey(IRegistry<MemoryModuleType<?>> registry, MemoryModuleType<T> memoryModuleType) {
-        return MemoryKey.getByKey(CraftNamespacedKey.fromMinecraft(registry.getKey(memoryModuleType)));
+        return (MemoryKey<U>) MemoryKey.getByKey(CraftNamespacedKey.fromMinecraft(registry.getKey(memoryModuleType)));
     }
 }

src/test/java/org/bukkit/RegistryConstantsTest.java

@@ -169,7 +169,7 @@ public class RegistryConstantsTest extends AbstractTestingBase {
         this.testMissingConstants(MusicInstrument.class, Registries.INSTRUMENT);
     }
 
-    private <T extends Keyed> void testExcessConstants(Class<T> clazz, Registry<T> registry) {
+    private <T extends Keyed> void testExcessConstants(Class<T> clazz, Registry<? extends T> registry) {
         List<NamespacedKey> excessKeys = new ArrayList<>();
 
         for (Field field : clazz.getFields()) {