spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-08-31 22:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert GameEvent

Browse source
This commit is contained in:
DerFrZocker 2023-05-31 12:43:25 +02:00
parent ffbf67a145
commit bba2eb5fbc
No known key found for this signature in database
GPG key ID: 713F71FFFE1DDF91
2 changed files with 16 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/main/java/org/bukkit/GameEvent.java
View file

@ -1,19 +1,16 @@
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;
/**
* Represents a generic Mojang game event.
*/
public final class GameEvent implements Keyed {
private static final Map<NamespacedKey, GameEvent> GAME_EVENTS = new HashMap<>();
//
public abstract class GameEvent implements Keyed {
public static final GameEvent BLOCK_ACTIVATE = getEvent("block_activate");
public static final GameEvent BLOCK_ATTACH = getEvent("block_attach");
public static final GameEvent BLOCK_CHANGE = getEvent("block_change");
@ -23,35 +20,17 @@ public final class GameEvent implements Keyed {
public static final GameEvent BLOCK_DETACH = getEvent("block_detach");
public static final GameEvent BLOCK_OPEN = getEvent("block_open");
public static final GameEvent BLOCK_PLACE = getEvent("block_place");
@Deprecated
public static final GameEvent BLOCK_PRESS = getEvent("block_activate");
@Deprecated
public static final GameEvent BLOCK_SWITCH = getEvent("block_activate");
@Deprecated
public static final GameEvent BLOCK_UNPRESS = getEvent("block_deactivate");
@Deprecated
public static final GameEvent BLOCK_UNSWITCH = getEvent("block_deactivate");
public static final GameEvent CONTAINER_CLOSE = getEvent("container_close");
public static final GameEvent CONTAINER_OPEN = getEvent("container_open");
public static final GameEvent DISPENSE_FAIL = getEvent("dispense_fail");
public static final GameEvent DRINK = getEvent("drink");
@Deprecated
public static final GameEvent DRINKING_FINISH = getEvent("drink");
public static final GameEvent EAT = getEvent("eat");
@Deprecated
public static final GameEvent ELYTRA_FREE_FALL = getEvent("elytra_glide");
public static final GameEvent ELYTRA_GLIDE = getEvent("elytra_glide");
public static final GameEvent ENTITY_DAMAGE = getEvent("entity_damage");
@Deprecated
public static final GameEvent ENTITY_DAMAGED = getEvent("entity_damage");
public static final GameEvent ENTITY_DIE = getEvent("entity_die");
public static final GameEvent ENTITY_DISMOUNT = getEvent("entity_dismount");
@Deprecated
public static final GameEvent ENTITY_DYING = getEvent("entity_die");
public static final GameEvent ENTITY_INTERACT = getEvent("entity_interact");
public static final GameEvent ENTITY_MOUNT = getEvent("entity_mount");
@Deprecated
public static final GameEvent ENTITY_KILLED = getEvent("entity_die");
public static final GameEvent ENTITY_PLACE = getEvent("entity_place");
public static final GameEvent ENTITY_ROAR = getEvent("entity_roar");
public static final GameEvent ENTITY_SHAKE = getEvent("entity_shake");
@ -67,68 +46,50 @@ public final class GameEvent implements Keyed {
public static final GameEvent JUKEBOX_PLAY = getEvent("jukebox_play");
public static final GameEvent JUKEBOX_STOP_PLAY = getEvent("jukebox_stop_play");
public static final GameEvent LIGHTNING_STRIKE = getEvent("lightning_strike");
@Deprecated
public static final GameEvent MOB_INTERACT = getEvent("entity_interact");
public static final GameEvent NOTE_BLOCK_PLAY = getEvent("note_block_play");
public static final GameEvent PISTON_CONTRACT = getEvent("piston_contract");
public static final GameEvent PISTON_EXTEND = getEvent("piston_extend");
public static final GameEvent PRIME_FUSE = getEvent("prime_fuse");
public static final GameEvent PROJECTILE_LAND = getEvent("projectile_land");
public static final GameEvent PROJECTILE_SHOOT = getEvent("projectile_shoot");
@Deprecated
public static final GameEvent RAVAGER_ROAR = getEvent("entity_roar");
@Deprecated
public static final GameEvent RING_BELL = getEvent("block_change");
public static final GameEvent SCULK_SENSOR_TENDRILS_CLICKING = getEvent("sculk_sensor_tendrils_clicking");
public static final GameEvent SHEAR = getEvent("shear");
public static final GameEvent SHRIEK = getEvent("shriek");
@Deprecated
public static final GameEvent SHULKER_CLOSE = getEvent("container_close");
@Deprecated
public static final GameEvent SHULKER_OPEN = getEvent("container_open");
public static final GameEvent SPLASH = getEvent("splash");
public static final GameEvent STEP = getEvent("step");
public static final GameEvent SWIM = getEvent("swim");
public static final GameEvent TELEPORT = getEvent("teleport");
@Deprecated
public static final GameEvent WOLF_SHAKING = getEvent("entity_shake");
//
private final NamespacedKey key;
private GameEvent(NamespacedKey key) {
this.key = key;
GAME_EVENTS.put(key, this);
}
@NotNull
@Override
public NamespacedKey getKey() {
return key;
}
/**
* Returns a {@link GameEvent} by a {@link NamespacedKey}.
*
* @param namespacedKey the key
* @return the event or null
* @deprecated Use {@link Registry#get(NamespacedKey)} instead.
*/
@Nullable
@Deprecated
public static GameEvent getByKey(@NotNull NamespacedKey namespacedKey) {
return GAME_EVENTS.get(namespacedKey);
return Registry.GAME_EVENT.get(namespacedKey);
}
/**
* Returns the set of all GameEvents.
*
* @return the memoryKeys
* @deprecated use {@link Registry#iterator()}.
*/
@NotNull
@Deprecated
public static Collection<GameEvent> values() {
return Collections.unmodifiableCollection(GAME_EVENTS.values());
return Collections.unmodifiableCollection(Lists.newArrayList(Registry.GAME_EVENT));
}
private static GameEvent getEvent(String vanilla) {
return new GameEvent(NamespacedKey.minecraft(vanilla));
@NotNull
private static GameEvent getEvent(@NotNull String vanilla) {
NamespacedKey namespacedKey = NamespacedKey.minecraft(vanilla);
GameEvent gameEvent = Registry.GAME_EVENT.get(namespacedKey);
Preconditions.checkNotNull(gameEvent, "No GameEvent found for %s. This is a bug.", namespacedKey);
return gameEvent;
}
}

16
src/main/java/org/bukkit/Registry.java
View file

@ -247,21 +247,7 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
*
* @see GameEvent
*/
Registry<GameEvent> GAME_EVENT = new Registry<GameEvent>() {
@NotNull
@Override
public Iterator iterator() {
return GameEvent.values().iterator();
}
@Nullable
@Override
public GameEvent get(@NotNull NamespacedKey key) {
return GameEvent.getByKey(key);
}
};
Registry<GameEvent> GAME_EVENT = Objects.requireNonNull(Bukkit.getRegistry(GameEvent.class), "No registry present for GameEvent. This is a bug.");
/**
* Server potion effect types.
*