From ca8ac019468c7eef259e2658602e16037f05badb Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 12 Jun 2024 16:02:41 +0100
Subject: [PATCH] Cleanup

---
 .../sk89q/worldedit/world/biome/BiomeType.java    | 15 +++++++++++++--
 .../sk89q/worldedit/world/entity/EntityType.java  | 11 ++++++++++-
 .../sk89q/worldedit/world/fluid/FluidType.java    | 14 ++++++++++++--
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeType.java
index 35bd9f58b..6be1d3a3d 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeType.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeType.java
@@ -43,6 +43,17 @@ public class BiomeType implements RegistryItem, Keyed, BiomePattern {
         this.id = id;
     }
 
+    /**
+     * Gets the ID of this biome.
+     *
+     * @return The id
+     * @since TODO
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
     public int getLegacyId() {
         return legacyId;
     }
@@ -64,12 +75,12 @@ public class BiomeType implements RegistryItem, Keyed, BiomePattern {
     /**
      * Gets the ID of this biome.
      *
-     * @return The id
+     * @return the id
      * @deprecated use {@link #id()}
      */
     @Deprecated(forRemoval = true, since = "TODO")
     @Override
-    public String id() {
+    public String getId() {
         return this.id;
     }
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityType.java
index a71404c85..1faf3bc4c 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityType.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityType.java
@@ -46,11 +46,20 @@ public class EntityType implements RegistryItem, Keyed {
      *
      * @return the id
      * @since TODO
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Gets the id of this entity type.
+     *
+     * @return the id
      * @deprecated use {@link #id()}
      */
     @Deprecated(forRemoval = true, since = "TODO")
     @Override
-    public String id() {
+    public String getId() {
         return this.id;
     }
 
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidType.java
index 418eaf06a..36517a2b0 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidType.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidType.java
@@ -40,15 +40,25 @@ public class FluidType implements RegistryItem, Keyed {
     }
 
     /**
-     * Gets the ID of this block.
+     * Gets the ID of this fluid.
      *
      * @return The id
      * @since TODO
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Gets the ID of this fluid.
+     *
+     * @return the id
      * @deprecated use {@link #id()}
      */
     @Deprecated(forRemoval = true, since = "TODO")
     @Override
-    public String id() {
+    public String getId() {
         return this.id;
     }