From 25f4d1188f196a46e868dfcb8fca5fd1d45294ec Mon Sep 17 00:00:00 2001 From: DerFrZocker Date: Wed, 28 Jun 2023 15:22:49 +0200 Subject: [PATCH] Add wildcard generic --- src/main/java/org/bukkit/Bukkit.java | 2 +- src/main/java/org/bukkit/Particle.java | 2 +- src/main/java/org/bukkit/Registry.java | 14 +++++++------- src/main/java/org/bukkit/Server.java | 2 +- .../java/org/bukkit/entity/memory/MemoryKey.java | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java index 3ad77d2c..f4e0de4e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1974,7 +1974,7 @@ public final class Bukkit { * @return the corresponding registry or null if not present */ @Nullable - public static Registry getRegistry(@NotNull Class tClass) { + public static Registry getRegistry(@NotNull Class tClass) { return server.getRegistry(tClass); } diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java index 0f97cf9f..9ce177d0 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java @@ -128,7 +128,7 @@ public abstract class Particle extends OldEnum> implements Keyed @NotNull private static Particle getParticle(@NotNull String key) { NamespacedKey namespacedKey = NamespacedKey.minecraft(key); - Particle particle = Registry.PARTICLE_TYPE.get(namespacedKey); + Particle particle = (Particle) Registry.PARTICLE_TYPE.get(namespacedKey); Preconditions.checkNotNull(particle, "No particle found for %s. This is a bug.", namespacedKey); return particle; } diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java index d98145f9..9f2c4686 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java @@ -82,7 +82,7 @@ public interface Registry extends Iterable { * * @see BlockType */ - Registry BLOCK = Objects.requireNonNull(Bukkit.getRegistry(BlockType.class), "No registry present for BlockType. This is a bug."); + Registry> BLOCK = Objects.requireNonNull(Bukkit.getRegistry(BlockType.class), "No registry present for BlockType. This is a bug."); /** * Server pattern types. * @@ -118,7 +118,7 @@ public interface Registry extends Iterable { /** * Server enchantments. * - * @see Enchantment#getByKey(org.bukkit.NamespacedKey) + * @see Enchantment */ Registry ENCHANTMENT = Objects.requireNonNull(Bukkit.getRegistry(Enchantment.class), "No registry present for Enchantment. This is a bug."); /** @@ -126,7 +126,7 @@ public interface Registry extends Iterable { * * @see EntityType */ - Registry ENTITY_TYPE = Objects.requireNonNull(Bukkit.getRegistry(EntityType.class), "No registry present for EntityType. This is a bug."); + Registry> ENTITY_TYPE = Objects.requireNonNull(Bukkit.getRegistry(EntityType.class), "No registry present for EntityType. This is a bug."); /** * Server instruments. * @@ -158,7 +158,7 @@ public interface Registry extends Iterable { * * @see Particle */ - Registry PARTICLE_TYPE = Objects.requireNonNull(Bukkit.getRegistry(Particle.class), "No registry present for Particle. This is a bug."); + Registry> PARTICLE_TYPE = Objects.requireNonNull(Bukkit.getRegistry(Particle.class), "No registry present for Particle. This is a bug."); /** * Server potion types. * @@ -220,17 +220,17 @@ public interface Registry extends Iterable { * * @see MemoryKey */ - Registry MEMORY_MODULE_TYPE = new Registry() { + Registry> MEMORY_MODULE_TYPE = new Registry<>() { @NotNull @Override - public Iterator iterator() { + public Iterator> iterator() { return MemoryKey.values().iterator(); } @Nullable @Override - public MemoryKey get(@NotNull NamespacedKey key) { + public MemoryKey get(@NotNull NamespacedKey key) { return MemoryKey.getByKey(key); } }; diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java index 24aee14c..29e67eb0 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1684,7 +1684,7 @@ public interface Server extends PluginMessageRecipient { * @return the corresponding registry or null if not present */ @Nullable - Registry getRegistry(@NotNull Class tClass); + Registry getRegistry(@NotNull Class tClass); /** * @return the unsafe values instance diff --git a/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/src/main/java/org/bukkit/entity/memory/MemoryKey.java index 8f601e85..4fc0fca0 100644 --- a/src/main/java/org/bukkit/entity/memory/MemoryKey.java +++ b/src/main/java/org/bukkit/entity/memory/MemoryKey.java @@ -44,7 +44,7 @@ public final class MemoryKey implements Keyed { return tClass; } - private static final Map MEMORY_KEYS = new HashMap<>(); + private static final Map> MEMORY_KEYS = new HashMap<>(); // public static final MemoryKey HOME = new MemoryKey<>(NamespacedKey.minecraft("home"), Location.class); public static final MemoryKey POTENTIAL_JOB_SITE = new MemoryKey<>(NamespacedKey.minecraft("potential_job_site"), Location.class); @@ -80,7 +80,7 @@ public final class MemoryKey implements Keyed { * available under that key */ @Nullable - public static MemoryKey getByKey(@NotNull NamespacedKey namespacedKey) { + public static MemoryKey getByKey(@NotNull NamespacedKey namespacedKey) { return MEMORY_KEYS.get(namespacedKey); } @@ -90,7 +90,7 @@ public final class MemoryKey implements Keyed { * @return the memoryKeys */ @NotNull - public static Set values() { + public static Set> values() { return new HashSet<>(MEMORY_KEYS.values()); } }