Cynthia Yantis / Bukkit / 6dd5810888a

Commits

DerFrZocker authored and md_5 committed 6dd5810888a 28 Oct 2024

#1071: Make Fluid an interface and add missing entry

src/main/java/org/bukkit/Fluid.java

Modified

-1
+package org.bukkit;
-2
-+
+import com.google.common.base.Preconditions;
-+
+import com.google.common.collect.Lists;
-5
+import java.util.Locale;
-+
+import org.bukkit.util.OldEnum;
-7
+import org.jetbrains.annotations.NotNull;
-8
-9
+/**
-10
+ * Represents a fluid type.
-11
+ */
--
+public enum Fluid implements Keyed {
-+
+public interface Fluid extends OldEnum<Fluid>, Keyed {
-13
-+
+    /**
-+
+     * No fluid.
-+
+     */
-+
+    Fluid EMPTY = getFluid("empty");
-18
+    /**
-19
+     * Stationary water.
-20
+     */
--
+    WATER,
-+
+    Fluid WATER = getFluid("water");
-22
+    /**
-23
+     * Flowing water.
-24
+     */
--
+    FLOWING_WATER,
-+
+    Fluid FLOWING_WATER = getFluid("flowing_water");
-26
+    /**
-27
+     * Stationary lava.
-28
+     */
--
+    LAVA,
-+
+    Fluid LAVA = getFluid("lava");
-30
+    /**
-31
+     * Flowing lava.
-32
+     */
--
+    FLOWING_LAVA;
-+
+    Fluid FLOWING_LAVA = getFluid("flowing_lava");
-34
--
+    private final NamespacedKey key;
-+
+    @NotNull
-+
+    private static Fluid getFluid(@NotNull String key) {
-+
+        return Registry.FLUID.getOrThrow(NamespacedKey.minecraft(key));
-+
+    }
-39
--
+    private Fluid() {
--
+        this.key = NamespacedKey.minecraft(this.name().toLowerCase(Locale.ROOT));
-+
+    /**
-+
+     * @param name of the fluid.
-+
+     * @return the fluid with the given name.
-+
+     * @deprecated only for backwards compatibility, use {@link Registry#get(NamespacedKey)} instead.
-+
+     */
-+
+    @NotNull
-+
+    @Deprecated(since = "1.21.3")
-+
+    static Fluid valueOf(@NotNull String name) {
-+
+        Fluid fluid = Bukkit.getUnsafe().get(Registry.FLUID, NamespacedKey.fromString(name.toLowerCase(Locale.ROOT)));
-+
+        Preconditions.checkArgument(fluid != null, "No fluid found with the name %s", name);
-+
+        return fluid;
-51
+    }
-52
-+
+    /**
-+
+     * @return an array of all known fluids.
-+
+     * @deprecated use {@link Registry#iterator()}.
-+
+     */
-57
+    @NotNull
--
+    @Override
--
+    public NamespacedKey getKey() {
--
+        return key;
-+
+    @Deprecated(since = "1.21.3")
-+
+    static Fluid[] values() {
-+
+        return Lists.newArrayList(Registry.FLUID).toArray(new Fluid[0]);
-61
+    }
-62
+}

Bukkit

Commits

Jira Issues

Add shortcut