mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-24 13:43:26 +02:00
* Updated Upstream (Bukkit/CraftBukkit) 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: a6a9d2a4 Remove some old ApiStatus.Experimental annotations be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration 08f86d1c PR-971: Add Player methods for client-side potion effects 2e3024a9 PR-963: Add API for in-world structures a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality 1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent CraftBukkit Changes: 38fd4bd50 Fix accidentally renamed internal damage method 80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage 7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects 4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration 22a541a29 Improve support for per-world game rules cb7dccce2 PR-1348: Add Player methods for client-side potion effects b8d6109f0 PR-1335: Add API for in-world structures 4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity e74107678 Fix Crafter maximum stack size 0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality 4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason 20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette 3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook 333701839 SPIGOT-7572: Bee nests generated without bees f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
159 lines
5.8 KiB
Diff
159 lines
5.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 27 May 2021 21:58:33 -0700
|
|
Subject: [PATCH] More PotionEffectType API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
|
|
index 4bc53793aade0887fa650a4bbf51d2e57678bd90..18c672f3855a329bf8f87a9de81b677e8e360b41 100644
|
|
--- a/src/main/java/org/bukkit/Registry.java
|
|
+++ b/src/main/java/org/bukkit/Registry.java
|
|
@@ -277,6 +277,31 @@ public interface Registry<T extends Keyed> extends Iterable<T> {
|
|
*/
|
|
@Deprecated(forRemoval = true)
|
|
Registry<io.papermc.paper.world.structure.ConfiguredStructure> CONFIGURED_STRUCTURE = Bukkit.getRegistry(io.papermc.paper.world.structure.ConfiguredStructure.class);
|
|
+
|
|
+ /**
|
|
+ * Potion effect types.
|
|
+ *
|
|
+ * @see org.bukkit.potion.PotionEffectType
|
|
+ */
|
|
+ Registry<org.bukkit.potion.PotionEffectType> POTION_EFFECT_TYPE = new Registry<org.bukkit.potion.PotionEffectType>() {
|
|
+
|
|
+ @Nullable
|
|
+ @Override
|
|
+ public org.bukkit.potion.PotionEffectType get(@NotNull NamespacedKey key) {
|
|
+ return org.bukkit.potion.PotionEffectType.getByKey(key);
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public Iterator<org.bukkit.potion.PotionEffectType> iterator() {
|
|
+ return java.util.Arrays.stream(org.bukkit.potion.PotionEffectType.values()).iterator();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull Stream<org.bukkit.potion.PotionEffectType> stream() {
|
|
+ return StreamSupport.stream(this.spliterator(), false);
|
|
+ }
|
|
+ };
|
|
// Paper end
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
|
|
index 3070f039a583647e7c9a8f15d63291cd265db9fc..0d81e2d36e01128b9c697ec6f5c98083ee492d84 100644
|
|
--- a/src/main/java/org/bukkit/potion/PotionEffectType.java
|
|
+++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
|
|
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable;
|
|
/**
|
|
* Represents a type of potion and its effect on an entity.
|
|
*/
|
|
-public abstract class PotionEffectType implements Keyed {
|
|
+public abstract class PotionEffectType implements Keyed, net.kyori.adventure.translation.Translatable { // Paper - implement Translatable
|
|
private static final BiMap<Integer, PotionEffectType> ID_MAP = HashBiMap.create();
|
|
|
|
/**
|
|
@@ -351,4 +351,56 @@ public abstract class PotionEffectType implements Keyed {
|
|
|
|
return from;
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the effect attributes in an immutable map.
|
|
+ *
|
|
+ * @return the attribute map
|
|
+ */
|
|
+ public abstract @NotNull java.util.Map<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> getEffectAttributes();
|
|
+
|
|
+ /**
|
|
+ * Gets the true modifier amount based on the effect amplifier.
|
|
+ *
|
|
+ * @param attribute the attribute
|
|
+ * @param effectAmplifier the effect amplifier (0 indexed)
|
|
+ * @return the modifier amount
|
|
+ * @throws IllegalArgumentException if the supplied attribute is not present in the map from {@link #getEffectAttributes()}
|
|
+ */
|
|
+ public abstract double getAttributeModifierAmount(@NotNull org.bukkit.attribute.Attribute attribute, int effectAmplifier);
|
|
+
|
|
+ /**
|
|
+ * Gets the category of this effect
|
|
+ *
|
|
+ * @return the category
|
|
+ */
|
|
+ public abstract @NotNull PotionEffectType.Category getEffectCategory();
|
|
+
|
|
+ /**
|
|
+ * Category of {@link PotionEffectType}s
|
|
+ */
|
|
+ public enum Category {
|
|
+
|
|
+ BENEFICIAL(net.kyori.adventure.text.format.NamedTextColor.BLUE),
|
|
+ HARMFUL(net.kyori.adventure.text.format.NamedTextColor.RED),
|
|
+ NEUTRAL(net.kyori.adventure.text.format.NamedTextColor.BLUE);
|
|
+
|
|
+ private final net.kyori.adventure.text.format.TextColor color;
|
|
+
|
|
+ Category(net.kyori.adventure.text.format.TextColor color) {
|
|
+ this.color = color;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the text color used when displaying potions
|
|
+ * of this category.
|
|
+ *
|
|
+ * @return the text color
|
|
+ */
|
|
+ @NotNull
|
|
+ public net.kyori.adventure.text.format.TextColor getColor() {
|
|
+ return color;
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java b/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
|
|
index a613debb03f6440583f57dd1adb7bb1bebbd636b..718f216c9153a5f03b91ce1de9ee9574e867e32b 100644
|
|
--- a/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
|
|
+++ b/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
|
|
@@ -19,4 +19,41 @@ public abstract class PotionEffectTypeWrapper extends PotionEffectType {
|
|
public PotionEffectType getType() {
|
|
return this;
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public boolean isInstant() {
|
|
+ return getType().isInstant();
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public org.bukkit.Color getColor() {
|
|
+ return getType().getColor();
|
|
+ }
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public @NotNull org.bukkit.NamespacedKey getKey() {
|
|
+ return this.getType().getKey();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull java.util.Map<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> getEffectAttributes() {
|
|
+ return this.getType().getEffectAttributes();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public double getAttributeModifierAmount(@NotNull org.bukkit.attribute.Attribute attribute, int effectAmplifier) {
|
|
+ return this.getType().getAttributeModifierAmount(attribute, effectAmplifier);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull PotionEffectType.Category getEffectCategory() {
|
|
+ return this.getType().getEffectCategory();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull String translationKey() {
|
|
+ return this.getType().translationKey();
|
|
+ }
|
|
+ // Paper end
|
|
}
|