Skip to content

Commit caf4a6f

Browse files
kennytvkennytv
authored
Remove or replace a few dumb deprecations (#7760)
1 parent 16f224a commit caf4a6f

6 files changed

+100
-12
lines changed

‎patches/api/0175-Fix-Spigot-annotation-mistakes.patch‎

Lines changed: 90 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ a ton of noise to plugin developers.
99
These do not help plugin developers if they bring moise noise than value.
1010

1111
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
12-
index c1e106a7af9acf3d84b9c3e377608fa0c3f7eb17..c8580174d88674a8ab115976e93f225bb20b5854 100644
12+
index 29e62cca52c0264a9662d0c0fb7f0bec877c706e..5e145a95c1259e084aeed08a3b1d773843939e3f 100644
1313
--- a/src/main/java/org/bukkit/Bukkit.java
1414
+++ b/src/main/java/org/bukkit/Bukkit.java
1515
@@ -1696,7 +1696,7 @@ public final class Bukkit {
@@ -79,8 +79,29 @@ index 53d1609e2a75c007cb7e5e8f963b0deb53bae5f7..a8561434d56f7db7e4f52283759b282e
7979
public boolean isLegacy() {
8080
return legacy;
8181
}
82+
diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
83+
index 01bcb3a1bdb5accdf844d0178cec3d25746b3eaa..236c9aea9ffc36269e5c32eacc9f1fd6bd039c88 100644
84+
--- a/src/main/java/org/bukkit/NamespacedKey.java
85+
+++ b/src/main/java/org/bukkit/NamespacedKey.java
86+
@@ -39,12 +39,14 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
87+
88+
/**
89+
* Create a key in a specific namespace.
90+
+ * <p>
91+
+ * For most plugin related code, you should prefer using the
92+
+ * {@link NamespacedKey#NamespacedKey(Plugin, String)} constructor.
93+
*
94+
* @param namespace namespace
95+
* @param key key
96+
- * @deprecated should never be used by plugins, for internal use only!!
97+
+ * @see #NamespacedKey(Plugin, String)
98+
*/
99+
- @Deprecated
100+
public NamespacedKey(@NotNull String namespace, @NotNull String key) {
101+
Preconditions.checkArgument(namespace != null && VALID_NAMESPACE.matcher(namespace).matches(), "Invalid namespace. Must be [a-z0-9._-]: %s", namespace);
102+
Preconditions.checkArgument(key != null && VALID_KEY.matcher(key).matches(), "Invalid key. Must be [a-z0-9/._-]: %s", key);
82103
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
83-
index 71b32c1ca960a58ae9757e470626fa3e16d3c28b..f673927df360702b07f1fd197a3de07bc47b60cd 100644
104+
index ec6a47d46cba718e8f5a947ce11f5a6919dbe343..e32e6b87fefa95c07a0aef58cac33c99efea2631 100644
84105
--- a/src/main/java/org/bukkit/Server.java
85106
+++ b/src/main/java/org/bukkit/Server.java
86107
@@ -1442,7 +1442,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -117,6 +138,43 @@ index f124b35ec76e6cb6a1a0dc464005087043c3efd0..94a2fef0dc9e13c754cd31d5eabc1bde
117138
*/
118139
+@Deprecated // Paper
119140
public interface LingeringPotion extends ThrownPotion { }
141+
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
142+
index 98b856d068c765a277d1e218a04e05588e18fdcb..2c3aba0b8d89d74bfa22ae01232712c8e3516b6b 100644
143+
--- a/src/main/java/org/bukkit/entity/Player.java
144+
+++ b/src/main/java/org/bukkit/entity/Player.java
145+
@@ -1356,9 +1356,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
146+
*
147+
* @param plugin Plugin that wants to hide the entity
148+
* @param entity Entity to hide
149+
- * @deprecated draft API
150+
*/
151+
- @Deprecated
152+
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
153+
public void hideEntity(@NotNull Plugin plugin, @NotNull Entity entity);
154+
155+
/**
156+
@@ -1368,9 +1367,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
157+
*
158+
* @param plugin Plugin that wants to show the entity
159+
* @param entity Entity to show
160+
- * @deprecated draft API
161+
*/
162+
- @Deprecated
163+
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
164+
public void showEntity(@NotNull Plugin plugin, @NotNull Entity entity);
165+
166+
/**
167+
@@ -1379,9 +1377,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
168+
* @param entity Entity to check
169+
* @return True if the provided entity is not being hidden from this
170+
* player
171+
- * @deprecated draft API
172+
*/
173+
- @Deprecated
174+
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper
175+
public boolean canSee(@NotNull Entity entity);
176+
177+
/**
120178
diff --git a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java b/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
121179
index 2ff1b1308571d8f8056d3359e8a8ba4a589c3726..8eb6f4090578d9e1b12aff813840108fdeece730 100644
122180
--- a/src/main/java/org/bukkit/event/enchantment/PrepareItemEnchantEvent.java
@@ -148,6 +206,36 @@ index 2ff1b1308571d8f8056d3359e8a8ba4a589c3726..8eb6f4090578d9e1b12aff813840108f
148206
return offers;
149207
}
150208

209+
diff --git a/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
210+
index d8a73cd22268e90eb438f522b9019f826f343275..78869fdb9cf4c541dff7d67b51866914987abf18 100644
211+
--- a/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
212+
+++ b/src/main/java/org/bukkit/event/player/PlayerHideEntityEvent.java
213+
@@ -15,9 +15,8 @@ import org.jetbrains.annotations.NotNull;
214+
* This event is called regardless of if the entity was within tracking range.
215+
*
216+
* @see Player#hideEntity(org.bukkit.plugin.Plugin, org.bukkit.entity.Entity)
217+
- * @deprecated draft API
218+
*/
219+
-@Deprecated
220+
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
221+
@Warning(false)
222+
public class PlayerHideEntityEvent extends PlayerEvent {
223+
224+
diff --git a/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
225+
index 5408a8c123942a56ef11597ae6cdb77e14f741e3..29bb84145be18ef9162abdfc8820f2b3f7fd0db5 100644
226+
--- a/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
227+
+++ b/src/main/java/org/bukkit/event/player/PlayerShowEntityEvent.java
228+
@@ -16,9 +16,8 @@ import org.jetbrains.annotations.NotNull;
229+
* range.
230+
*
231+
* @see Player#showEntity(org.bukkit.plugin.Plugin, org.bukkit.entity.Entity)
232+
- * @deprecated draft API
233+
*/
234+
-@Deprecated
235+
+@org.jetbrains.annotations.ApiStatus.Experimental // Paper
236+
@Warning(false)
237+
public class PlayerShowEntityEvent extends PlayerEvent {
238+
151239
diff --git a/src/main/java/org/bukkit/inventory/CraftingInventory.java b/src/main/java/org/bukkit/inventory/CraftingInventory.java
152240
index df81bac9ecff697f98941e5c8490e10391e90090..a32977ba3ba60a1c9aee6e469d5d6cd1887c55a2 100644
153241
--- a/src/main/java/org/bukkit/inventory/CraftingInventory.java

‎patches/api/0194-Add-Player-Client-Options-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ index 0000000000000000000000000000000000000000..f7f171c4ee0b8339b2f8fbe82442d65f
193193
+ }
194194
+}
195195
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
196-
index 98b856d068c765a277d1e218a04e05588e18fdcb..5ec612d01f36099b5079b598ad484b78e2dda959 100644
196+
index 2c3aba0b8d89d74bfa22ae01232712c8e3516b6b..4a4edce470d7f8e58c6da958fb87a996bf0aa359 100644
197197
--- a/src/main/java/org/bukkit/entity/Player.java
198198
+++ b/src/main/java/org/bukkit/entity/Player.java
199199
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@@ -204,7 +204,7 @@ index 98b856d068c765a277d1e218a04e05588e18fdcb..5ec612d01f36099b5079b598ad484b78
204204
import com.destroystokyo.paper.Title; // Paper
205205
import net.kyori.adventure.text.Component;
206206
import org.bukkit.DyeColor;
207-
@@ -2469,6 +2470,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
207+
@@ -2466,6 +2467,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
208208
* Reset the cooldown counter to 0, effectively starting the cooldown period.
209209
*/
210210
void resetCooldown();

‎patches/api/0218-Brand-support.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 5ec612d01f36099b5079b598ad484b78e2dda959..b992ad3eb087c27a407b22d54d5ce38ece7fe44a 100644
8+
index 4a4edce470d7f8e58c6da958fb87a996bf0aa359..d65caed1df1cca6a3b9fbba9e109537adbc778d8 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -2604,6 +2604,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -2601,6 +2601,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
// Paper end
1313
}
1414

‎patches/api/0227-Player-elytra-boost-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index b992ad3eb087c27a407b22d54d5ce38ece7fe44a..02ef1d5dc98ea969bc7d65d22d86a64a6c9305d6 100644
8+
index d65caed1df1cca6a3b9fbba9e109537adbc778d8..6b2444d431e2305dd1e2e435b4a92a42e83d1927 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -2476,6 +2476,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -2473,6 +2473,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
*/
1313
@NotNull
1414
<T> T getClientOption(@NotNull ClientOption<T> option);

‎patches/api/0255-Add-sendOpLevel-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 02ef1d5dc98ea969bc7d65d22d86a64a6c9305d6..8b37b895b7de99a0be6b54c2aedfc0faddb06435 100644
8+
index 6b2444d431e2305dd1e2e435b4a92a42e83d1927..f4a2e1166836af002e5e0a426d1f44c2e539515f 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -2489,6 +2489,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -2486,6 +2486,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
*/
1313
@Nullable
1414
Firework boostElytra(@NotNull ItemStack firework);

‎patches/api/0342-Add-player-health-update-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 826faf48f9e2f7441a0cb5434dd1b3372cf12b33..9afd41a99d1d9fb5cde3ed9c64f91fac41753f69 100644
8+
index 16d692aceddb60fe39d5e8971723eb74ad4c5f9e..e2348a236f9dadad2cc27ffaa5fea27ee7412dc4 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -1877,6 +1877,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -1874,6 +1874,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
*/
1313
public double getHealthScale();
1414

0 commit comments

Comments
 (0)