twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 11:45:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

#895: Load GameEvent and MusicInstrument from registry

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
Bukkit/Spigot
2023-09-02 12:55:16 +10:00
parent 641a55cbc5
commit 32643feee7
3 changed files with 40 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
paper-api/src/main/java/org/bukkit/MusicInstrument.java
View File

@@ -1,17 +1,14 @@
package org.bukkit;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public final class MusicInstrument implements Keyed {
public abstract class MusicInstrument implements Keyed {
private static final Map<NamespacedKey, MusicInstrument> INSTRUMENTS = new HashMap<>();
//
public static final MusicInstrument PONDER = getInstrument("ponder_goat_horn");
public static final MusicInstrument SING = getInstrument("sing_goat_horn");
public static final MusicInstrument SEEK = getInstrument("seek_goat_horn");
@@ -20,47 +17,39 @@ public final class MusicInstrument implements Keyed {
public static final MusicInstrument CALL = getInstrument("call_goat_horn");
public static final MusicInstrument YEARN = getInstrument("yearn_goat_horn");
public static final MusicInstrument DREAM = getInstrument("dream_goat_horn");
//
private final NamespacedKey key;
private MusicInstrument(NamespacedKey key) {
this.key = key;
INSTRUMENTS.put(key, this);
}
@NotNull
@Override
public NamespacedKey getKey() {
return key;
}
/**
* Returns a {@link MusicInstrument} by a {@link NamespacedKey}.
*
* @param namespacedKey the key
* @return the event or null
* @deprecated Use {@link Registry#get(NamespacedKey)} instead.
*/
@Nullable
@Deprecated
public static MusicInstrument getByKey(@NotNull NamespacedKey namespacedKey) {
Preconditions.checkArgument(namespacedKey != null, "NamespacedKey cannot be null");
return INSTRUMENTS.get(namespacedKey);
return Registry.INSTRUMENT.get(namespacedKey);
}
/**
* Returns all known MusicInstruments.
*
* @return the memoryKeys
* @deprecated use {@link Registry#iterator()}.
*/
@NotNull
@Deprecated
public static Collection<MusicInstrument> values() {
return Collections.unmodifiableCollection(INSTRUMENTS.values());
return Collections.unmodifiableCollection(Lists.newArrayList(Registry.INSTRUMENT));
}
private static MusicInstrument getInstrument(@NotNull String name) {
Preconditions.checkArgument(name != null, "Instrument name cannot be null");
@NotNull
private static MusicInstrument getInstrument(@NotNull String key) {
NamespacedKey namespacedKey = NamespacedKey.minecraft(key);
MusicInstrument instrument = Registry.INSTRUMENT.get(namespacedKey);
return new MusicInstrument(NamespacedKey.minecraft(name));
Preconditions.checkNotNull(instrument, "No MusicInstrument found for %s. This is a bug.", namespacedKey);
return instrument;
}
}