From 4091f0ae8c06b3cc5cdc4009ea4fd51e9ce3ea73 Mon Sep 17 00:00:00 2001 From: themode Date: Sun, 19 Dec 2021 20:17:44 +0100 Subject: [PATCH] More registry types can become record --- .../minestom/server/item/EnchantmentImpl.java | 13 +----------- .../minestom/server/item/MaterialImpl.java | 13 +----------- .../server/particle/ParticleImpl.java | 20 +------------------ 3 files changed, 3 insertions(+), 43 deletions(-) diff --git a/src/main/java/net/minestom/server/item/EnchantmentImpl.java b/src/main/java/net/minestom/server/item/EnchantmentImpl.java index 787062f0c..f838f6355 100644 --- a/src/main/java/net/minestom/server/item/EnchantmentImpl.java +++ b/src/main/java/net/minestom/server/item/EnchantmentImpl.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -final class EnchantmentImpl implements Enchantment { +record EnchantmentImpl(Registry.EnchantmentEntry registry) implements Enchantment { private static final Registry.Container CONTAINER = new Registry.Container<>(Registry.Resource.ENCHANTMENTS, (container, namespace, object) -> container.register(new EnchantmentImpl(Registry.enchantment(namespace, object, null)))); @@ -25,17 +25,6 @@ final class EnchantmentImpl implements Enchantment { return CONTAINER.values(); } - private final Registry.EnchantmentEntry registry; - - EnchantmentImpl(Registry.EnchantmentEntry registry) { - this.registry = registry; - } - - @Override - public @NotNull Registry.EnchantmentEntry registry() { - return registry; - } - @Override public String toString() { return name(); diff --git a/src/main/java/net/minestom/server/item/MaterialImpl.java b/src/main/java/net/minestom/server/item/MaterialImpl.java index 061561f95..59ca72cf2 100644 --- a/src/main/java/net/minestom/server/item/MaterialImpl.java +++ b/src/main/java/net/minestom/server/item/MaterialImpl.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -final class MaterialImpl implements Material { +record MaterialImpl(Registry.MaterialEntry registry) implements Material { private static final Registry.Container CONTAINER = new Registry.Container<>(Registry.Resource.ITEMS, (container, namespace, object) -> container.register(new MaterialImpl(Registry.material(namespace, object, null)))); @@ -25,17 +25,6 @@ final class MaterialImpl implements Material { return CONTAINER.values(); } - private final Registry.MaterialEntry registry; - - MaterialImpl(Registry.MaterialEntry registry) { - this.registry = registry; - } - - @Override - public @NotNull Registry.MaterialEntry registry() { - return registry; - } - @Override public String toString() { return name(); diff --git a/src/main/java/net/minestom/server/particle/ParticleImpl.java b/src/main/java/net/minestom/server/particle/ParticleImpl.java index adb5df3f3..fa28a5f25 100644 --- a/src/main/java/net/minestom/server/particle/ParticleImpl.java +++ b/src/main/java/net/minestom/server/particle/ParticleImpl.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -final class ParticleImpl implements Particle { +record ParticleImpl(NamespaceID namespace, int id) implements Particle { private static final Registry.Container CONTAINER = new Registry.Container<>(Registry.Resource.PARTICLES, (loader, namespace, object) -> { final int id = ((Number) object.get("id")).intValue(); @@ -29,24 +29,6 @@ final class ParticleImpl implements Particle { return CONTAINER.values(); } - private final NamespaceID namespaceID; - private final int id; - - ParticleImpl(NamespaceID namespaceID, int id) { - this.namespaceID = namespaceID; - this.id = id; - } - - @Override - public @NotNull NamespaceID namespace() { - return namespaceID; - } - - @Override - public int id() { - return id; - } - @Override public String toString() { return name();