mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add since to deprecated for removals (#10848)

Browse source
This commit is contained in:
Jake Potrebic 2024-06-04 12:40:18 -07:00 • committed by GitHub
commit 79c1ce1844
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 144 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/api/0292-Missing-Entity-API.patch
View file

@ -630,7 +630,7 @@ index 6b3c9bef9a8a34ddc6ff42cf358541a2665bf5e3..9c618a27d590f186f29c5d9094fc565e
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 62a301f2f87b053bcfbf16c9870c3f740eb70022..ce5cf587ce44f2410c1d0bcf459b6309ec70bfee 100644
index 4ba92fe8979ed127c18cb78c2b8204daa2425ed7..73247ab2cd2cf0035cf88c98250736f9bc9ee517 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -994,6 +994,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@ -812,7 +812,7 @@ index 5fd723c9fdda81595db8b150d967ff3bd5cea608..91d31e5418a5ab7cefd7c02a41bbec84
+ // Paper end - Missing Entity API
}
diff --git a/src/main/java/org/bukkit/entity/Panda.java b/src/main/java/org/bukkit/entity/Panda.java
index 1f027927a1194f4f8e86c1375a2772e6e261c151..aa5686df134185334a74429576ff0709a604dbfd 100644
index 1f027927a1194f4f8e86c1375a2772e6e261c151..4f06870cc8d8aab93aa83b1b8165e6714884372c 100644
--- a/src/main/java/org/bukkit/entity/Panda.java
+++ b/src/main/java/org/bukkit/entity/Panda.java
@@ -107,6 +107,98 @@ public interface Panda extends Animals, Sittable {
@ -867,7 +867,7 @@ index 1f027927a1194f4f8e86c1375a2772e6e261c151..aa5686df134185334a74429576ff0709
+ * @param onBack is on its back
+ * @deprecated use {@link #setOnBack(boolean)}
+ */
+ @Deprecated(forRemoval = true)
+ @Deprecated(forRemoval = true, since = "1.19")
+ default void setIsOnBack(boolean onBack) {
+ this.setOnBack(onBack);
+ }
@ -878,7 +878,7 @@ index 1f027927a1194f4f8e86c1375a2772e6e261c151..aa5686df134185334a74429576ff0709
+ * @param sitting is currently sitting
+ * @deprecated use {@link #setSitting(boolean)}
+ */
+ @Deprecated(forRemoval = true)
+ @Deprecated(forRemoval = true, since = "1.19")
+ default void setIsSitting(boolean sitting) {
+ this.setSitting(sitting);
+ }
@ -1464,7 +1464,7 @@ index 7cc1d9a966454af70b7c25735fe474fe3eb97eb4..ac6fd8ca95771c185c145f4589ddd5b2
+ // Paper end - missing entity behaviour api - converting without entity event
}
diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
index db69687a7ad4b18d17ab1677cae5d8dd4dcd3678..304b05aeaea5febf493fc40d433a23acb384b4f0 100644
index db69687a7ad4b18d17ab1677cae5d8dd4dcd3678..261bacee2a48580f781876683efea68c32ed7282 100644
--- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
+++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
@@ -24,4 +24,23 @@ public interface HopperMinecart extends Minecart, InventoryHolder, LootableEntit
@ -1478,7 +1478,7 @@ index db69687a7ad4b18d17ab1677cae5d8dd4dcd3678..304b05aeaea5febf493fc40d433a23ac
+ * @return ticks left on cooldown
+ * @deprecated Hopper minecarts don't have cooldowns anymore
+ */
+ @Deprecated(forRemoval = true)
+ @Deprecated(forRemoval = true, since = "1.19.4")
+ int getPickupCooldown();
+
+ /**
@ -1487,7 +1487,7 @@ index db69687a7ad4b18d17ab1677cae5d8dd4dcd3678..304b05aeaea5febf493fc40d433a23ac
+ * @param cooldown cooldown length in ticks
+ * @deprecated Hopper minecarts don't have cooldowns anymore
+ */
+ @Deprecated(forRemoval = true)
+ @Deprecated(forRemoval = true, since = "1.19.4")
+ void setPickupCooldown(int cooldown);
+ // Paper end
}