Skip to content

Commit c065539

Browse files
Lulu13022002Lulu13022002
committed
rebase
1 parent 0e7dcae commit c065539

File tree

13 files changed

+38
-37
lines changed

13 files changed

+38
-37
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.6")
26+
@GeneratedFrom("1.21.8")
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"SpellCheckingInspection"
2424
})
2525
@NullMarked
26-
@GeneratedFrom("1.21.6")
26+
@GeneratedFrom("1.21.8")
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public final class CustomStatistics {
1111

1212
// Start generate - CustomStatistics
13-
// @GeneratedFrom 1.21.6
13+
// @GeneratedFrom 1.21.8
1414
public static final CustomStatistic ANIMALS_BRED = get("animals_bred");
1515

1616
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public final class StatisticTypes {
1414

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

1919
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
@@ -2224,7 +2224,7 @@ public static ScoreboardManager getScoreboardManager() {
22242224
* @deprecated use constants in {@link Criteria} or {@link io.papermc.paper.statistic.Statistic}
22252225
*/
22262226
@NotNull
2227-
@Deprecated(since = "1.21.6", forRemoval = true)
2227+
@Deprecated(since = "1.21.8", forRemoval = true)
22282228
public static Criteria getScoreboardCriteria(@NotNull String name) {
22292229
return server.getScoreboardCriteria(name);
22302230
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ default void incrementStatistic(final io.papermc.paper.statistic.Statistic<?> st
390390
* additional parameter
391391
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic)}
392392
*/
393-
@Deprecated(since = "1.21.6")
393+
@Deprecated(since = "1.21.8")
394394
default void incrementStatistic(Statistic statistic) throws IllegalArgumentException {
395395
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
396396
this.incrementStatistic(statistic.toModern(null, null));
@@ -409,7 +409,7 @@ default void incrementStatistic(Statistic statistic) throws IllegalArgumentExcep
409409
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
410410
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic)}
411411
*/
412-
@Deprecated(since = "1.21.6")
412+
@Deprecated(since = "1.21.8")
413413
default void decrementStatistic(Statistic statistic) throws IllegalArgumentException {
414414
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
415415
this.decrementStatistic(statistic.toModern(null, null));
@@ -426,7 +426,7 @@ default void decrementStatistic(Statistic statistic) throws IllegalArgumentExcep
426426
* @throws IllegalArgumentException if amount isn't positive
427427
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic, int)}
428428
*/
429-
@Deprecated(since = "1.21.6")
429+
@Deprecated(since = "1.21.8")
430430
default void incrementStatistic(Statistic statistic, int amount) throws IllegalArgumentException {
431431
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
432432
this.incrementStatistic(statistic.toModern(null, null), amount);
@@ -444,7 +444,7 @@ default void incrementStatistic(Statistic statistic, int amount) throws IllegalA
444444
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
445445
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic, int)}
446446
*/
447-
@Deprecated(since = "1.21.6")
447+
@Deprecated(since = "1.21.8")
448448
default void decrementStatistic(Statistic statistic, int amount) throws IllegalArgumentException {
449449
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
450450
this.decrementStatistic(statistic.toModern(null, null), amount);
@@ -461,7 +461,7 @@ default void decrementStatistic(Statistic statistic, int amount) throws IllegalA
461461
* additional parameter
462462
* @deprecated use {@link #setStatistic(io.papermc.paper.statistic.Statistic, int)}
463463
*/
464-
@Deprecated(since = "1.21.6")
464+
@Deprecated(since = "1.21.8")
465465
default void setStatistic(Statistic statistic, int newValue) throws IllegalArgumentException {
466466
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
467467
this.setStatistic(statistic.toModern(null, null), newValue);
@@ -477,7 +477,7 @@ default void setStatistic(Statistic statistic, int newValue) throws IllegalArgum
477477
* additional parameter
478478
* @deprecated use {@link #getStatistic(io.papermc.paper.statistic.Statistic)}
479479
*/
480-
@Deprecated(since = "1.21.6")
480+
@Deprecated(since = "1.21.8")
481481
default int getStatistic(Statistic statistic) throws IllegalArgumentException {
482482
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
483483
return this.getStatistic(statistic.toModern(null, null));
@@ -497,7 +497,7 @@ default int getStatistic(Statistic statistic) throws IllegalArgumentException {
497497
* for the statistic
498498
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic)}
499499
*/
500-
@Deprecated(since = "1.21.6")
500+
@Deprecated(since = "1.21.8")
501501
default void incrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
502502
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
503503
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -519,7 +519,7 @@ default void incrementStatistic(Statistic statistic, Material material) throws I
519519
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
520520
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic)}
521521
*/
522-
@Deprecated(since = "1.21.6")
522+
@Deprecated(since = "1.21.8")
523523
default void decrementStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
524524
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
525525
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -538,7 +538,7 @@ default void decrementStatistic(Statistic statistic, Material material) throws I
538538
* for the statistic
539539
* @deprecated use {@link #getStatistic(io.papermc.paper.statistic.Statistic)}
540540
*/
541-
@Deprecated(since = "1.21.6")
541+
@Deprecated(since = "1.21.8")
542542
default int getStatistic(Statistic statistic, Material material) throws IllegalArgumentException {
543543
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
544544
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -558,7 +558,7 @@ default int getStatistic(Statistic statistic, Material material) throws IllegalA
558558
* for the statistic
559559
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic, int)}
560560
*/
561-
@Deprecated(since = "1.21.6")
561+
@Deprecated(since = "1.21.8")
562562
default void incrementStatistic(Statistic statistic, Material material, int amount) throws IllegalArgumentException {
563563
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
564564
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -579,7 +579,7 @@ default void incrementStatistic(Statistic statistic, Material material, int amou
579579
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
580580
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic, int)}
581581
*/
582-
@Deprecated(since = "1.21.6")
582+
@Deprecated(since = "1.21.8")
583583
default void decrementStatistic(Statistic statistic, Material material, int amount) throws IllegalArgumentException {
584584
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
585585
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -599,7 +599,7 @@ default void decrementStatistic(Statistic statistic, Material material, int amou
599599
* for the statistic
600600
* @deprecated use {@link #setStatistic(io.papermc.paper.statistic.Statistic, int)}
601601
*/
602-
@Deprecated(since = "1.21.6")
602+
@Deprecated(since = "1.21.8")
603603
default void setStatistic(Statistic statistic, Material material, int newValue) throws IllegalArgumentException {
604604
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
605605
Preconditions.checkArgument(material != null, "Material cannot be null");
@@ -620,7 +620,7 @@ default void setStatistic(Statistic statistic, Material material, int newValue)
620620
* for the statistic
621621
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic)}
622622
*/
623-
@Deprecated(since = "1.21.6")
623+
@Deprecated(since = "1.21.8")
624624
default void incrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
625625
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
626626
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -642,7 +642,7 @@ default void incrementStatistic(Statistic statistic, EntityType entityType) thro
642642
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
643643
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic)}
644644
*/
645-
@Deprecated(since = "1.21.6")
645+
@Deprecated(since = "1.21.8")
646646
default void decrementStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
647647
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
648648
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -661,7 +661,7 @@ default void decrementStatistic(Statistic statistic, EntityType entityType) thro
661661
* for the statistic
662662
* @deprecated use {@link #getStatistic(io.papermc.paper.statistic.Statistic)}
663663
*/
664-
@Deprecated(since = "1.21.6")
664+
@Deprecated(since = "1.21.8")
665665
default int getStatistic(Statistic statistic, EntityType entityType) throws IllegalArgumentException {
666666
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
667667
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -681,7 +681,7 @@ default int getStatistic(Statistic statistic, EntityType entityType) throws Ille
681681
* for the statistic
682682
* @deprecated use {@link #incrementStatistic(io.papermc.paper.statistic.Statistic, int)}
683683
*/
684-
@Deprecated(since = "1.21.6")
684+
@Deprecated(since = "1.21.8")
685685
default void incrementStatistic(Statistic statistic, EntityType entityType, int amount) throws IllegalArgumentException {
686686
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
687687
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -702,7 +702,7 @@ default void incrementStatistic(Statistic statistic, EntityType entityType, int
702702
* @throws IllegalArgumentException if the statistic would have a negative value after decrementing it
703703
* @deprecated use {@link #decrementStatistic(io.papermc.paper.statistic.Statistic, int)}
704704
*/
705-
@Deprecated(since = "1.21.6")
705+
@Deprecated(since = "1.21.8")
706706
default void decrementStatistic(Statistic statistic, EntityType entityType, int amount) {
707707
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
708708
Preconditions.checkArgument(entityType != null, "EntityType cannot be null");
@@ -722,7 +722,7 @@ default void decrementStatistic(Statistic statistic, EntityType entityType, int
722722
* for the statistic
723723
* @deprecated use {@link #setStatistic(io.papermc.paper.statistic.Statistic, int)}
724724
*/
725-
@Deprecated(since = "1.21.6")
725+
@Deprecated(since = "1.21.8")
726726
default void setStatistic(Statistic statistic, EntityType entityType, int newValue) {
727727
Preconditions.checkArgument(statistic != null, "Statistic cannot be null");
728728
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.8", 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
@@ -1942,7 +1942,7 @@ default int broadcast(net.kyori.adventure.text.@NotNull Component message) {
19421942
* @see Criteria Criteria for a list of constants
19431943
* @deprecated use constants in {@link Criteria} or {@link io.papermc.paper.statistic.Statistic}
19441944
*/
1945-
@Deprecated(forRemoval = true, since = "1.21.6")
1945+
@Deprecated(forRemoval = true, since = "1.21.8")
19461946
@NotNull
19471947
Criteria getScoreboardCriteria(@NotNull String name);
19481948

0 commit comments

Comments
 (0)