From 82eec1072cb76d55ffaf46e7a9d8f1cc68116b90 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Fri, 11 Jun 2021 16:45:01 +0200
Subject: [PATCH] Create ProtocolObject

---
 .../minestom/server/instance/block/Block.java | 18 ++-------------
 .../server/registry/ProtocolObject.java       | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/net/minestom/server/registry/ProtocolObject.java

diff --git a/src/main/java/net/minestom/server/instance/block/Block.java b/src/main/java/net/minestom/server/instance/block/Block.java
index 8d3014be5..b5e12313f 100644
--- a/src/main/java/net/minestom/server/instance/block/Block.java
+++ b/src/main/java/net/minestom/server/instance/block/Block.java
@@ -1,7 +1,6 @@
 package net.minestom.server.instance.block;
 
-import net.kyori.adventure.key.Key;
-import net.kyori.adventure.key.Keyed;
+import net.minestom.server.registry.ProtocolObject;
 import net.minestom.server.tag.Tag;
 import net.minestom.server.tag.TagReadable;
 import net.minestom.server.utils.NamespaceID;
@@ -13,7 +12,7 @@ import org.jglrxavpok.hephaistos.nbt.NBTCompound;
 import java.util.Map;
 import java.util.function.BiPredicate;
 
-public interface Block extends Keyed, TagReadable, BlockConstants {
+public interface Block extends ProtocolObject, TagReadable, BlockConstants {
 
     <T> @NotNull Block withProperty(@NotNull BlockProperty<T> property, @NotNull T value);
 
@@ -33,21 +32,8 @@ public interface Block extends Keyed, TagReadable, BlockConstants {
 
     @NotNull Block getDefaultBlock();
 
-    @NotNull NamespaceID getNamespaceId();
-
-    @Override
-    default @NotNull Key key() {
-        return getNamespaceId();
-    }
-
-    default @NotNull String getName() {
-        return getNamespaceId().asString();
-    }
-
     @NotNull Map<String, String> createPropertiesMap();
 
-    int getId();
-
     short getStateId();
 
     @NotNull BlockData getData();
diff --git a/src/main/java/net/minestom/server/registry/ProtocolObject.java b/src/main/java/net/minestom/server/registry/ProtocolObject.java
new file mode 100644
index 000000000..bcfd4d68b
--- /dev/null
+++ b/src/main/java/net/minestom/server/registry/ProtocolObject.java
@@ -0,0 +1,22 @@
+package net.minestom.server.registry;
+
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.key.Keyed;
+import net.minestom.server.utils.NamespaceID;
+import org.jetbrains.annotations.NotNull;
+
+public interface ProtocolObject extends Keyed {
+
+    @NotNull NamespaceID getNamespaceId();
+
+    @Override
+    default @NotNull Key key() {
+        return getNamespaceId();
+    }
+
+    default @NotNull String getName() {
+        return getNamespaceId().asString();
+    }
+
+    int getId();
+}