mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-07 04:04:57 +02:00
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices ecfa559a PR-849: Add InventoryView#setTitle 653d7edb SPIGOT-519: Add TNTPrimeEvent 22fccc09 PR-846: Add method to get chunk load level a070a52c PR-844: Add methods to convert Vector to and from JOML vectors cc7111fe PR-276: Add accessors to Wither's invulnerability ticks 777d24e9 SPIGOT-7209: Accessors and events for player's exp cooldown ccb2d01b SPIGOT-6308: Deprecate the location name property of map items cd04a31b PR-780: Add PlayerSpawnChangeEvent 7d1f5b64 SPIGOT-6780: Improve documentation for World#spawnFallingBlock 5696668a SPIGOT-6885: Add test and easier to debug code for reference in yaml configuration comments 2e13cff7 PR-589: Expand the FishHook API 2c7d3da5 PR-279: Minor edits to various Javadocs CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices a7cfc778f PR-1176: Add InventoryView#setTitle 563d42226 SPIGOT-519: Add TNTPrimeEvent ccbc6abca Add test for Chunk.LoadLevel mirroring 2926e0513 PR-1171: Add method to get chunk load level 63cad7f84 PR-375: Add accessors to Wither's invulnerability ticks bfd8b1ac8 SPIGOT-7209: Accessors and events for player's exp cooldown f92a41c39 PR-1181: Consolidate Location conversion code 10f866759 SPIGOT-6308: Deprecate the location name property of map items 82f7b658a PR-1095: Add PlayerSpawnChangeEvent b421af7e4 PR-808: Expand the FishHook API 598ad7b3f Increase outdated build delay Spigot Changes: d1bd3bd2 Rebuild patches e4265cc8 SPIGOT-7297: Entity Tracking Range option for Display entities * Work around javac bug * Call PlayerSpawnChangeEvent * Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices Spigot Changes: 7da74dae Rebuild patches
143 lines
5.4 KiB
Diff
143 lines
5.4 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 39c13a459dede4992f5a3fa7309733820cfa44c5..fbd5a8fae7e72f3fb1098742c9680aeea1297fe7 100644
|
|
--- a/src/main/java/org/bukkit/Registry.java
|
|
+++ b/src/main/java/org/bukkit/Registry.java
|
|
@@ -238,6 +238,26 @@ 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 Arrays.stream(org.bukkit.potion.PotionEffectType.values()).iterator();
|
|
+ }
|
|
+ };
|
|
// Paper end
|
|
|
|
/**
|
|
diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
|
|
index 5f3aa6fd18d57055a6d8494938dff149d51b2803..84fd181ad897f620e450750246d9ea416dcbd48a 100644
|
|
--- a/src/main/java/org/bukkit/potion/PotionEffectType.java
|
|
+++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
|
|
@@ -14,7 +14,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
|
|
/**
|
|
* Increases movement speed.
|
|
*/
|
|
@@ -363,4 +363,56 @@ public abstract class PotionEffectType implements Keyed {
|
|
public static PotionEffectType[] values() {
|
|
return Arrays.copyOfRange(byId, 1, byId.length);
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the effect attributes in an immutable map.
|
|
+ *
|
|
+ * @return the attribute map
|
|
+ */
|
|
+ public abstract @NotNull 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 c3a86bb1910158a8d13a675dfa7236dd6a3f397c..a7653806c0fa76f4b3342ea199fe892c514a4c27 100644
|
|
--- a/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
|
|
+++ b/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
|
|
@@ -40,4 +40,30 @@ public class PotionEffectTypeWrapper extends PotionEffectType {
|
|
public 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
|
|
}
|