mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-26 06:33:07 +02:00
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f50ad1f8 PR-798: Add PrepareGrindstoneEvent and refactor related events to use PrepareInventoryResultEvent 0cac7963 SPIGOT-7204: Add TeleportCause#DISMOUNT b4dd47b0 SPIGOT-7202: Deprecate removed door effects CraftBukkit Changes: ab1586c2f PR-1123: Add PrepareGrindstoneEvent b402824ea SPIGOT-7204: Add TeleportCause#DISMOUNT 06a6a1012 PR-1121: Add unit test for spawn egg meta c18668be3 SPIGOT-7192: Call PlayerInteractEvent with Action.LEFT_CLICK_AIR if the entity interacted is hidden to the player 47124f639 Increase outdated build delay 645993470 SPIGOT-7201: Spawner ItemMeta not working as expected
164 lines
5.3 KiB
Diff
164 lines
5.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ivan Pekov <ivan@mrivanplays.com>
|
|
Date: Tue, 5 Jan 2021 10:19:11 +0200
|
|
Subject: [PATCH] Add missing effects
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
|
|
index 879d637691683ca862045402f74b751a892bf3ff..e6573b8bd45e0d3ae4f46d64996fa67f13d29f2b 100644
|
|
--- a/src/main/java/org/bukkit/Effect.java
|
|
+++ b/src/main/java/org/bukkit/Effect.java
|
|
@@ -337,7 +337,100 @@ public enum Effect {
|
|
* block.
|
|
*/
|
|
OXIDISED_COPPER_SCRAPE(3005, Type.VISUAL),
|
|
+ // Paper start - add missing effects
|
|
+ /**
|
|
+ * The sound of a wither spawning
|
|
+ */
|
|
+ WITHER_SPAWNED(1023, Type.SOUND),
|
|
+ /**
|
|
+ * The sound of an ender dragon dying
|
|
+ */
|
|
+ ENDER_DRAGON_DEATH(1028, Type.SOUND),
|
|
+ /**
|
|
+ * The sound of an ender portal being created in the overworld
|
|
+ */
|
|
+ END_PORTAL_CREATED_IN_OVERWORLD(1038, Type.SOUND),
|
|
+ /**
|
|
+ * The sound of phantom's bites
|
|
+ *
|
|
+ * @deprecated use {@link #PHANTOM_BITE}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ PHANTOM_BITES(1039, Type.SOUND),
|
|
+ /**
|
|
+ * The sound of zombie converting to drowned zombie
|
|
+ *
|
|
+ * @deprecated use {@link #ZOMBIE_CONVERTED_TO_DROWNED}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ ZOMBIE_CONVERTS_TO_DROWNED(1040, Type.SOUND),
|
|
+ /**
|
|
+ * The sound of a husk converting to zombie by drowning
|
|
+ *
|
|
+ * @deprecated use {@link #HUSK_CONVERTED_TO_ZOMBIE}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ HUSK_CONVERTS_TO_ZOMBIE(1041, Type.SOUND),
|
|
+ /**
|
|
+ * The sound of a grindstone being used
|
|
+ *
|
|
+ * @deprecated use {@link #GRINDSTONE_USE}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ GRINDSTONE_USED(1042, Type.SOUND),
|
|
+ /**
|
|
+ * The sound of a book page being turned
|
|
+ *
|
|
+ * @deprecated use {@link #BOOK_PAGE_TURN}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ BOOK_PAGE_TURNED(1043, Type.SOUND),
|
|
+ /**
|
|
+ * Particles displayed when a composter composts
|
|
+ *
|
|
+ * @deprecated use {@link #COMPOSTER_FILL_ATTEMPT}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ COMPOSTER_COMPOSTS(1500, Type.VISUAL),
|
|
+ /**
|
|
+ * Particles displayed when lava converts a block (either water to stone, or
|
|
+ * removing existing blocks such as torches)
|
|
+ *
|
|
+ * @deprecated use {@link #LAVA_INTERACT}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ LAVA_CONVERTS_BLOCK(1501, Type.VISUAL),
|
|
+ /**
|
|
+ * Particles displayd when a redstone torch burns out
|
|
+ *
|
|
+ * @deprecated use {@link #REDSTONE_TORCH_BURNOUT}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ REDSTONE_TORCH_BURNS_OUT(1502, Type.VISUAL),
|
|
+ /**
|
|
+ * Particles displayed when an ender eye is placed
|
|
+ *
|
|
+ * @deprecated use {@link #END_PORTAL_FRAME_FILL}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ ENDER_EYE_PLACED(1503, Type.VISUAL),
|
|
+ /**
|
|
+ * Particles displayed when an ender dragon destroys block
|
|
+ *
|
|
+ * @deprecated use {@link #ENDER_DRAGON_DESTROY_BLOCK}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ ENDER_DRAGON_DESTROYS_BLOCK(2008, Type.VISUAL),
|
|
+ /**
|
|
+ * Particles displayed when a wet sponge vaporizes in nether.
|
|
+ *
|
|
+ * @deprecated use {@link #SPONGE_DRY}
|
|
+ */
|
|
+ @Deprecated(forRemoval = true)
|
|
+ WET_SPONGE_VAPORIZES_IN_NETHER(2009, Type.VISUAL),
|
|
;
|
|
+ private static final org.apache.logging.log4j.Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger();
|
|
+ // Paper end
|
|
|
|
private final int id;
|
|
private final Type type;
|
|
@@ -397,10 +490,22 @@ public enum Effect {
|
|
|
|
static {
|
|
for (Effect effect : values()) {
|
|
+ if (!isDeprecated(effect)) // Paper
|
|
BY_ID.put(effect.id, effect);
|
|
}
|
|
}
|
|
|
|
+ // Paper start
|
|
+ private static boolean isDeprecated(Effect effect) {
|
|
+ try {
|
|
+ return Effect.class.getDeclaredField(effect.name()).isAnnotationPresent(Deprecated.class);
|
|
+ } catch (NoSuchFieldException e) {
|
|
+ LOGGER.error("Error getting effect enum field {}", effect.name(), e);
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Represents the type of an effect.
|
|
*/
|
|
diff --git a/src/test/java/org/bukkit/EffectTest.java b/src/test/java/org/bukkit/EffectTest.java
|
|
index 54e621e86e8fe3414099494d419929b282b33489..759081f15992e07271567d65250f27f14f6c99c3 100644
|
|
--- a/src/test/java/org/bukkit/EffectTest.java
|
|
+++ b/src/test/java/org/bukkit/EffectTest.java
|
|
@@ -5,10 +5,24 @@ import static org.junit.Assert.*;
|
|
import org.junit.Test;
|
|
|
|
public class EffectTest {
|
|
+ private static final org.apache.logging.log4j.Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger(); // Paper
|
|
+
|
|
@Test
|
|
public void getById() {
|
|
for (Effect effect : Effect.values()) {
|
|
+ if (!isDeprecated(effect)) // Paper
|
|
assertThat(Effect.getById(effect.getId()), is(effect));
|
|
}
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ private static boolean isDeprecated(Effect effect) {
|
|
+ try {
|
|
+ return Effect.class.getDeclaredField(effect.name()).isAnnotationPresent(Deprecated.class);
|
|
+ } catch (NoSuchFieldException e) {
|
|
+ LOGGER.error("Error getting effect enum field {}", effect.name(), e);
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
}
|