Skip to content

Commit ebd1340

Browse files
Lulu13022002Lulu13022002
committed
rebase
1 parent 2234098 commit ebd1340

File tree

14 files changed

+40
-41
lines changed

14 files changed

+40
-41
lines changed

‎paper-api/src/generated/java/io/papermc/paper/registry/keys/CustomStatisticKeys.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static net.kyori.adventure.key.Key.key;
44

5-
import io.papermc.paper.generated.GeneratedFrom;
5+
import io.papermc.paper.annotation.GeneratedClass;
66
import io.papermc.paper.registry.RegistryKey;
77
import io.papermc.paper.registry.TypedKey;
88
import io.papermc.paper.statistic.CustomStatistic;
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.6")
26+
@GeneratedClass
2727
public final class CustomStatisticKeys {
2828
/**
2929
* {@code minecraft:animals_bred}

‎paper-api/src/generated/java/io/papermc/paper/registry/keys/StatisticTypeKeys.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static net.kyori.adventure.key.Key.key;
44

5-
import io.papermc.paper.generated.GeneratedFrom;
5+
import io.papermc.paper.annotation.GeneratedClass;
66
import io.papermc.paper.registry.RegistryKey;
77
import io.papermc.paper.registry.TypedKey;
88
import io.papermc.paper.statistic.StatisticType;
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.6")
26+
@GeneratedClass
2727
public final class StatisticTypeKeys {
2828
/**
2929
* {@code minecraft:broken}

‎paper-api/src/main/java/io/papermc/paper/statistic/CustomStatistic.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
/**
88
* Represents a statistic of the type {@link StatisticTypes#CUSTOM}.
9+
*
910
* @see CustomStatistics
1011
*/
1112
@ApiStatus.NonExtendable

‎paper-api/src/main/java/io/papermc/paper/statistic/CustomStatistics.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
public final class CustomStatistics {
1111

1212
// Start generate - CustomStatistics
13-
// @GeneratedFrom 1.21.6
1413
public static final CustomStatistic ANIMALS_BRED = get("animals_bred");
1514

1615
public static final CustomStatistic AVIATE_ONE_CM = get("aviate_one_cm");

‎paper-api/src/main/java/io/papermc/paper/statistic/StatisticType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface StatisticType<S> extends Keyed, Translatable {
2020
*
2121
* @param value what you want the stat of
2222
* @return the statistic for that thing
23-
* @throws IllegalArgumentException if the thing is not valid for this this type
23+
* @throws IllegalArgumentException if the thing is not valid for this type
2424
*/
2525
Statistic<S> forValue(S value);
2626

‎paper-api/src/main/java/io/papermc/paper/statistic/StatisticTypes.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
public final class StatisticTypes {
1414

1515
// Start generate - StatisticTypes
16-
// @GeneratedFrom 1.21.6
1716
public static final StatisticType<BlockType> BLOCK_MINED = get("mined");
1817

1918
public static final StatisticType<CustomStatistic> CUSTOM = get("custom");

‎paper-api/src/main/java/org/bukkit/Bukkit.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2211,7 +2211,7 @@ public static ScoreboardManager getScoreboardManager() {
22112211
* @deprecated use constants in {@link Criteria} or {@link io.papermc.paper.statistic.Statistic}
22122212
*/
22132213
@NotNull
2214-
@Deprecated(since = "1.21.6", forRemoval = true)
2214+
@Deprecated(since = "1.21.10", forRemoval = true)
22152215
public static Criteria getScoreboardCriteria(@NotNull String name) {
22162216
return server.getScoreboardCriteria(name);
22172217
}

‎paper-api/src/main/java/org/bukkit/OfflinePlayer.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ default void incrementStatistic(final io.papermc.paper.statistic.Statistic<?> st
392392
* additional parameter
393393
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic)}
394394
*/
395-
@Deprecated(since = "1.21.6")
395+
@Deprecated(since = "1.21.10")
396396
default void incrementStatistic(Statistic statistic) throws IllegalArgumentException {
397397
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
398398
this.incrementStatistic(statistic.toModern(null, null));
@@ -411,7 +411,7 @@ default void incrementStatistic(Statistic statistic) throws IllegalArgumentExcep
411411
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
412412
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic)}
413413
*/
414-
@Deprecated(since = "1.21.6")
414+
@Deprecated(since = "1.21.10")
415415
default void decrementStatistic(Statistic statistic) throws IllegalArgumentException {
416416
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
417417
this.decrementStatistic(statistic.toModern(null, null));
@@ -428,7 +428,7 @@ default void decrementStatistic(Statistic statistic) throws IllegalArgumentExcep
428428
* @throws IllegalArgumentException if amount isn't positive
429429
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic, int)}
430430
*/
431-
@Deprecated(since = "1.21.6")
431+
@Deprecated(since = "1.21.10")
432432
default void incrementStatistic(Statistic statistic, int amount) throws IllegalArgumentException {
433433
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
434434
this.incrementStatistic(statistic.toModern(null, null), amount);
@@ -446,7 +446,7 @@ default void incrementStatistic(Statistic statistic, int amount) throws IllegalA
446446
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
447447
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic, int)}
448448
*/
449-
@Deprecated(since = "1.21.6")
449+
@Deprecated(since = "1.21.10")
450450
default void decrementStatistic(Statistic statistic, int amount) throws IllegalArgumentException {
451451
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
452452
this.decrementStatistic(statistic.toModern(null, null), amount);
@@ -463,7 +463,7 @@ default void decrementStatistic(Statistic statistic, int amount) throws IllegalA
463463
* additional parameter
464464
* @deprecated use {@link #setStatistic(io.papermc.paper.statistic.Statistic, int)}
465465
*/
466-
@Deprecated(since = "1.21.6")
466+
@Deprecated(since = "1.21.10")
467467
default void setStatistic(Statistic statistic, int newValue) throws IllegalArgumentException {
468468
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
469469
this.setStatistic(statistic.toModern(null, null), newValue);
@@ -479,7 +479,7 @@ default void setStatistic(Statistic statistic, int newValue) throws IllegalArgum
479479
* additional parameter
480480
* @deprecated use {@link #getStatistic(io.papermc.paper.statistic.Statistic)}
481481
*/
482-
@Deprecated(since = "1.21.6")
482+
@Deprecated(since = "1.21.10")
483483
default int getStatistic(Statistic statistic) throws IllegalArgumentException {
484484
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
485485
return this.getStatistic(statistic.toModern(null, null));
@@ -499,7 +499,7 @@ default int getStatistic(Statistic statistic) throws IllegalArgumentException {
499499
* for the statistic
500500
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic)}
501501
*/
502-
@Deprecated(since = "1.21.6")
502+
@Deprecated(since = "1.21.10")
503503
default void incrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
504504
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
505505
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -521,7 +521,7 @@ default void incrementStatistic(Statistic statistic, Material material) throws I
521521
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
522522
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic)}
523523
*/
524-
@Deprecated(since = "1.21.6")
524+
@Deprecated(since = "1.21.10")
525525
default void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
526526
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
527527
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -540,7 +540,7 @@ default void decrementStatistic(Statistic statistic, Material material) throws I
540540
* for the statistic
541541
* @deprecated use {@link #getStatistic(io.papermc.paper.statistic.Statistic)}
542542
*/
543-
@Deprecated(since = "1.21.6")
543+
@Deprecated(since = "1.21.10")
544544
default int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
545545
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
546546
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -560,7 +560,7 @@ default int getStatistic(Statistic statistic, Material material) throws IllegalA
560560
* for the statistic
561561
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic, int)}
562562
*/
563-
@Deprecated(since = "1.21.6")
563+
@Deprecated(since = "1.21.10")
564564
default void incrementStatistic(Statistic statistic, Material material, int amount) throws IllegalArgumentException {
565565
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
566566
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -581,7 +581,7 @@ default void incrementStatistic(Statistic statistic, Material material, int amou
581581
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
582582
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic, int)}
583583
*/
584-
@Deprecated(since = "1.21.6")
584+
@Deprecated(since = "1.21.10")
585585
default void decrementStatistic(Statistic statistic, Material material, int amount) throws IllegalArgumentException {
586586
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
587587
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -601,7 +601,7 @@ default void decrementStatistic(Statistic statistic, Material material, int amou
601601
* for the statistic
602602
* @deprecated use {@link #setStatistic(io.papermc.paper.statistic.Statistic, int)}
603603
*/
604-
@Deprecated(since = "1.21.6")
604+
@Deprecated(since = "1.21.10")
605605
default void setStatistic(Statistic statistic, Material material, int newValue) throws IllegalArgumentException {
606606
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
607607
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -622,7 +622,7 @@ default void setStatistic(Statistic statistic, Material material, int newValue)
622622
* for the statistic
623623
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic)}
624624
*/
625-
@Deprecated(since = "1.21.6")
625+
@Deprecated(since = "1.21.10")
626626
default void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
627627
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
628628
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -644,7 +644,7 @@ default void incrementStatistic(Statistic statistic, EntityType entityType) thro
644644
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
645645
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic)}
646646
*/
647-
@Deprecated(since = "1.21.6")
647+
@Deprecated(since = "1.21.10")
648648
default void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
649649
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
650650
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -663,7 +663,7 @@ default void decrementStatistic(Statistic statistic, EntityType entityType) thro
663663
* for the statistic
664664
* @deprecated use {@link #getStatistic(io.papermc.paper.statistic.Statistic)}
665665
*/
666-
@Deprecated(since = "1.21.6")
666+
@Deprecated(since = "1.21.10")
667667
default int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
668668
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
669669
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -683,7 +683,7 @@ default int getStatistic(Statistic statistic, EntityType entityType) throws Ille
683683
* for the statistic
684684
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic, int)}
685685
*/
686-
@Deprecated(since = "1.21.6")
686+
@Deprecated(since = "1.21.10")
687687
default void incrementStatistic(Statistic statistic, EntityType entityType, int amount) throws IllegalArgumentException {
688688
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
689689
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -704,7 +704,7 @@ default void incrementStatistic(Statistic statistic, EntityType entityType, int
704704
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
705705
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic, int)}
706706
*/
707-
@Deprecated(since = "1.21.6")
707+
@Deprecated(since = "1.21.10")
708708
default void decrementStatistic(Statistic statistic, EntityType entityType, int amount) {
709709
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
710710
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -724,7 +724,7 @@ default void decrementStatistic(Statistic statistic, EntityType entityType, int
724724
* for the statistic
725725
* @deprecated use {@link #setStatistic(io.papermc.paper.statistic.Statistic, int)}
726726
*/
727-
@Deprecated(since = "1.21.6")
727+
@Deprecated(since = "1.21.10")
728728
default void setStatistic(Statistic statistic, EntityType entityType, int newValue) {
729729
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
730730
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");

‎paper-api/src/main/java/org/bukkit/Registry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public Iterator<KeyedBossBar> iterator() {
224224
* @see Statistic
225225
* @deprecated use {@link #CUSTOM_STAT} and {@link #STAT_TYPE}
226226
*/
227-
@Deprecated(since = "1.21.6", forRemoval = true)
227+
@Deprecated(since = "1.21.10", forRemoval = true)
228228
Registry<Statistic> STATISTIC = new SimpleRegistry<>(Statistic.class);
229229
/**
230230
* Server structures.

‎paper-api/src/main/java/org/bukkit/Server.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1979,8 +1979,8 @@ default int getAmbientSpawnLimit() {
19791979
* @see Criteria Criteria for a list of constants
19801980
* @deprecated use constants in {@link Criteria} or {@link io.papermc.paper.statistic.Statistic}
19811981
*/
1982-
@Deprecated(forRemoval = true, since = "1.21.6")
19831982
@NotNull
1983+
@Deprecated(since = "1.21.10", forRemoval = true)
19841984
Criteria getScoreboardCriteria(@NotNull String name);
19851985

19861986
/**

0 commit comments

Comments
 (0)