Cynthia Yantis / CraftBukkit / 442838fdaef

Commits

Doc authored and md_5 committed 442838fdaef 16 Jan 2025

#1053: Add MusicInstrument fields for description, range, duration and sound

src/main/java/org/bukkit/craftbukkit/CraftMusicInstrument.java

Modified

-6
+import com.mojang.datafixers.util.Pair;
-7
+import com.mojang.serialization.DataResult;
-8
+import com.mojang.serialization.JsonOps;
-9
+import net.minecraft.core.Holder;
-10
+import net.minecraft.core.registries.Registries;
-11
+import net.minecraft.resources.RegistryOps;
-12
+import net.minecraft.world.item.Instrument;
-13
+import org.bukkit.MusicInstrument;
-14
+import org.bukkit.NamespacedKey;
-15
+import org.bukkit.Registry;
-+
+import org.bukkit.Sound;
-+
+import org.bukkit.craftbukkit.util.CraftChatMessage;
-18
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-19
+import org.bukkit.craftbukkit.util.HolderHandleable;
-20
+import org.jetbrains.annotations.NotNull;
-21
+import org.jetbrains.annotations.Nullable;
-22
-23
+public class CraftMusicInstrument extends MusicInstrument implements HolderHandleable<Instrument> {
-24
-25
+    public static MusicInstrument minecraftToBukkit(Instrument minecraft) {
-26
+        return CraftRegistry.minecraftToBukkit(minecraft, Registries.INSTRUMENT, Registry.INSTRUMENT);
-27
+    }
-85
+    @Override
-86
+    public Instrument getHandle() {
-87
+        return handle.value();
-88
+    }
-89
-90
+    @Override
-91
+    public Holder<Instrument> getHandleHolder() {
-92
+        return handle;
-93
+    }
-94
-+
+    @Override
-+
+    public String getDescription() {
-+
+        return CraftChatMessage.fromComponent(this.getHandle().description());
-+
+    }
-+
-+
+    @Override
-+
+    public float getDuration() {
-+
+        return this.getHandle().useDuration();
-+
+    }
-+
-+
+    @Override
-+
+    public float getRange() {
-+
+        return this.getHandle().range();
-+
+    }
-+
-+
+    @Override
-+
+    public Sound getSoundEvent() {
-+
+        return CraftSound.minecraftHolderToBukkit(this.getHandle().soundEvent());
-+
+    }
-+
-115
+    @NotNull
-116
+    @Override
-117
+    public NamespacedKey getKey() {
-118
+        return getKeyOrThrow();
-119
+    }
-120
-121
+    @Override
-122
+    public boolean equals(Object o) {
-123
+        if (this == o) {
-124
+            return true;

CraftBukkit

Commits

Jira Issues

Add shortcut