Skip to content

Commit 3a96711

Browse files
Strokkur424kezz
authored andcommitted
chore: migrate to jspecify
1 parent 6087c88 commit 3a96711

337 files changed

Lines changed: 2806 additions & 3139 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

api/src/main/java/net/kyori/adventure/audience/Audience.java

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import net.kyori.adventure.text.ComponentLike;
5151
import net.kyori.adventure.title.Title;
5252
import net.kyori.adventure.title.TitlePart;
53-
import org.jetbrains.annotations.NotNull;
5453

5554
/**
5655
* A receiver of Minecraft media.
@@ -106,7 +105,7 @@ public interface Audience extends Pointered {
106105
* @return a do-nothing audience
107106
* @since 4.0.0
108107
*/
109-
static @NotNull Audience empty() {
108+
static Audience empty() {
110109
return EmptyAudience.INSTANCE;
111110
}
112111

@@ -118,7 +117,7 @@ public interface Audience extends Pointered {
118117
* @see ForwardingAudience
119118
* @since 4.0.0
120119
*/
121-
static @NotNull Audience audience(final @NotNull Audience@NotNull... audiences) {
120+
static Audience audience(final Audience... audiences) {
122121
final int length = audiences.length;
123122
if (length == 0) {
124123
return empty();
@@ -139,7 +138,7 @@ public interface Audience extends Pointered {
139138
* @see ForwardingAudience
140139
* @since 4.0.0
141140
*/
142-
static @NotNull ForwardingAudience audience(final @NotNull Iterable<? extends Audience> audiences) {
141+
static ForwardingAudience audience(final Iterable<? extends Audience> audiences) {
143142
return () -> audiences;
144143
}
145144

@@ -151,7 +150,7 @@ public interface Audience extends Pointered {
151150
* @return a collector to create a forwarding audience
152151
* @since 4.0.0
153152
*/
154-
static @NotNull Collector<? super Audience, ?, ForwardingAudience> toAudience() {
153+
static Collector<? super Audience, ?, ForwardingAudience> toAudience() {
155154
return Audiences.COLLECTOR;
156155
}
157156

@@ -168,7 +167,7 @@ public interface Audience extends Pointered {
168167
* @return an audience providing a snapshot of all audiences that match the predicate when this method is invoked
169168
* @since 4.9.0
170169
*/
171-
default @NotNull Audience filterAudience(final @NotNull Predicate<? super Audience> filter) {
170+
default Audience filterAudience(final Predicate<? super Audience> filter) {
172171
return filter.test(this)
173172
? this
174173
: empty();
@@ -187,7 +186,7 @@ public interface Audience extends Pointered {
187186
* @param action the action
188187
* @since 4.9.0
189188
*/
190-
default void forEachAudience(final @NotNull Consumer<? super Audience> action) {
189+
default void forEachAudience(final Consumer<? super Audience> action) {
191190
action.accept(this);
192191
}
193192

@@ -200,7 +199,7 @@ default void forEachAudience(final @NotNull Consumer<? super Audience> action) {
200199
* @since 4.1.0
201200
*/
202201
@ForwardingAudienceOverrideNotRequired
203-
default void sendMessage(final @NotNull ComponentLike message) {
202+
default void sendMessage(final ComponentLike message) {
204203
this.sendMessage(message.asComponent());
205204
}
206205

@@ -211,7 +210,7 @@ default void sendMessage(final @NotNull ComponentLike message) {
211210
* @see Component
212211
* @since 4.1.0
213212
*/
214-
default void sendMessage(final @NotNull Component message) {
213+
default void sendMessage(final Component message) {
215214
}
216215
/* End: system messages */
217216

@@ -224,7 +223,7 @@ default void sendMessage(final @NotNull Component message) {
224223
* @since 4.12.0
225224
* @sinceMinecraft 1.19
226225
*/
227-
default void sendMessage(final @NotNull Component message, final ChatType.@NotNull Bound boundChatType) {
226+
default void sendMessage(final Component message, final ChatType.Bound boundChatType) {
228227
}
229228

230229
/**
@@ -236,7 +235,7 @@ default void sendMessage(final @NotNull Component message, final ChatType.@NotNu
236235
* @sinceMinecraft 1.19
237236
*/
238237
@ForwardingAudienceOverrideNotRequired
239-
default void sendMessage(final @NotNull ComponentLike message, final ChatType.@NotNull Bound boundChatType) {
238+
default void sendMessage(final ComponentLike message, final ChatType.Bound boundChatType) {
240239
this.sendMessage(message.asComponent(), boundChatType);
241240
}
242241
/* End: disguised player messages
@@ -250,7 +249,7 @@ default void sendMessage(final @NotNull ComponentLike message, final ChatType.@N
250249
* @since 4.12.0
251250
* @sinceMinecraft 1.19
252251
*/
253-
default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatType.@NotNull Bound boundChatType) {
252+
default void sendMessage(final SignedMessage signedMessage, final ChatType.Bound boundChatType) {
254253
}
255254

256255
/**
@@ -262,7 +261,7 @@ default void sendMessage(final @NotNull SignedMessage signedMessage, final ChatT
262261
* @sinceMinecraft 1.19
263262
*/
264263
@ForwardingAudienceOverrideNotRequired
265-
default void deleteMessage(final @NotNull SignedMessage signedMessage) {
264+
default void deleteMessage(final SignedMessage signedMessage) {
266265
if (signedMessage.canDelete()) {
267266
this.deleteMessage(Objects.requireNonNull(signedMessage.signature()));
268267
}
@@ -275,7 +274,7 @@ default void deleteMessage(final @NotNull SignedMessage signedMessage) {
275274
* @since 4.12.0
276275
* @sinceMinecraft 1.19
277276
*/
278-
default void deleteMessage(final SignedMessage.@NotNull Signature signature) {
277+
default void deleteMessage(final SignedMessage.Signature signature) {
279278
}
280279
/* End: signed player messages */
281280

@@ -287,7 +286,7 @@ default void deleteMessage(final SignedMessage.@NotNull Signature signature) {
287286
* @since 4.0.0
288287
*/
289288
@ForwardingAudienceOverrideNotRequired
290-
default void sendActionBar(final @NotNull ComponentLike message) {
289+
default void sendActionBar(final ComponentLike message) {
291290
this.sendActionBar(message.asComponent());
292291
}
293292

@@ -298,7 +297,7 @@ default void sendActionBar(final @NotNull ComponentLike message) {
298297
* @see Component
299298
* @since 4.0.0
300299
*/
301-
default void sendActionBar(final @NotNull Component message) {
300+
default void sendActionBar(final Component message) {
302301
}
303302

304303
/**
@@ -311,7 +310,7 @@ default void sendActionBar(final @NotNull Component message) {
311310
* @since 4.3.0
312311
*/
313312
@ForwardingAudienceOverrideNotRequired
314-
default void sendPlayerListHeader(final @NotNull ComponentLike header) {
313+
default void sendPlayerListHeader(final ComponentLike header) {
315314
this.sendPlayerListHeader(header.asComponent());
316315
}
317316

@@ -324,7 +323,7 @@ default void sendPlayerListHeader(final @NotNull ComponentLike header) {
324323
* @param header the header
325324
* @since 4.3.0
326325
*/
327-
default void sendPlayerListHeader(final @NotNull Component header) {
326+
default void sendPlayerListHeader(final Component header) {
328327
this.sendPlayerListHeaderAndFooter(header, Component.empty());
329328
}
330329

@@ -338,7 +337,7 @@ default void sendPlayerListHeader(final @NotNull Component header) {
338337
* @since 4.3.0
339338
*/
340339
@ForwardingAudienceOverrideNotRequired
341-
default void sendPlayerListFooter(final @NotNull ComponentLike footer) {
340+
default void sendPlayerListFooter(final ComponentLike footer) {
342341
this.sendPlayerListFooter(footer.asComponent());
343342
}
344343

@@ -351,7 +350,7 @@ default void sendPlayerListFooter(final @NotNull ComponentLike footer) {
351350
* @param footer the footer
352351
* @since 4.3.0
353352
*/
354-
default void sendPlayerListFooter(final @NotNull Component footer) {
353+
default void sendPlayerListFooter(final Component footer) {
355354
this.sendPlayerListHeaderAndFooter(Component.empty(), footer);
356355
}
357356

@@ -363,7 +362,7 @@ default void sendPlayerListFooter(final @NotNull Component footer) {
363362
* @since 4.3.0
364363
*/
365364
@ForwardingAudienceOverrideNotRequired
366-
default void sendPlayerListHeaderAndFooter(final @NotNull ComponentLike header, final @NotNull ComponentLike footer) {
365+
default void sendPlayerListHeaderAndFooter(final ComponentLike header, final ComponentLike footer) {
367366
this.sendPlayerListHeaderAndFooter(header.asComponent(), footer.asComponent());
368367
}
369368

@@ -374,7 +373,7 @@ default void sendPlayerListHeaderAndFooter(final @NotNull ComponentLike header,
374373
* @param footer the footer
375374
* @since 4.3.0
376375
*/
377-
default void sendPlayerListHeaderAndFooter(final @NotNull Component header, final @NotNull Component footer) {
376+
default void sendPlayerListHeaderAndFooter(final Component header, final Component footer) {
378377
}
379378

380379
/**
@@ -385,7 +384,7 @@ default void sendPlayerListHeaderAndFooter(final @NotNull Component header, fina
385384
* @since 4.0.0
386385
*/
387386
@ForwardingAudienceOverrideNotRequired
388-
default void showTitle(final @NotNull Title title) {
387+
default void showTitle(final Title title) {
389388
final Title.Times times = title.times();
390389
if (times != null) this.sendTitlePart(TitlePart.TIMES, times);
391390

@@ -401,7 +400,7 @@ default void showTitle(final @NotNull Title title) {
401400
* @param <T> the type of the value of the part
402401
* @since 4.9.0
403402
*/
404-
default <T> void sendTitlePart(final @NotNull TitlePart<T> part, final @NotNull T value) {
403+
default <T> void sendTitlePart(final TitlePart<T> part, final T value) {
405404
}
406405

407406
/**
@@ -429,7 +428,7 @@ default void resetTitle() {
429428
* @see BossBar
430429
* @since 4.0.0
431430
*/
432-
default void showBossBar(final @NotNull BossBar bar) {
431+
default void showBossBar(final BossBar bar) {
433432
}
434433

435434
/**
@@ -439,7 +438,7 @@ default void showBossBar(final @NotNull BossBar bar) {
439438
* @see BossBar
440439
* @since 4.0.0
441440
*/
442-
default void hideBossBar(final @NotNull BossBar bar) {
441+
default void hideBossBar(final BossBar bar) {
443442
}
444443

445444
/**
@@ -451,7 +450,7 @@ default void hideBossBar(final @NotNull BossBar bar) {
451450
* @see Sound
452451
* @since 4.0.0
453452
*/
454-
default void playSound(final @NotNull Sound sound) {
453+
default void playSound(final Sound sound) {
455454
}
456455

457456
/**
@@ -464,7 +463,7 @@ default void playSound(final @NotNull Sound sound) {
464463
* @see Sound
465464
* @since 4.0.0
466465
*/
467-
default void playSound(final @NotNull Sound sound, final double x, final double y, final double z) {
466+
default void playSound(final Sound sound, final double x, final double y, final double z) {
468467
}
469468

470469
/**
@@ -481,7 +480,7 @@ default void playSound(final @NotNull Sound sound, final double x, final double
481480
* @param emitter an emitter
482481
* @since 4.8.0
483482
*/
484-
default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter emitter) {
483+
default void playSound(final Sound sound, final Sound.Emitter emitter) {
485484
}
486485

487486
/**
@@ -491,7 +490,7 @@ default void playSound(final @NotNull Sound sound, final Sound.@NotNull Emitter
491490
* @since 4.8.0
492491
*/
493492
@ForwardingAudienceOverrideNotRequired
494-
default void stopSound(final @NotNull Sound sound) {
493+
default void stopSound(final Sound sound) {
495494
this.stopSound(Objects.requireNonNull(sound, "sound").asStop());
496495
}
497496

@@ -502,7 +501,7 @@ default void stopSound(final @NotNull Sound sound) {
502501
* @see SoundStop
503502
* @since 4.0.0
504503
*/
505-
default void stopSound(final @NotNull SoundStop stop) {
504+
default void stopSound(final SoundStop stop) {
506505
}
507506

508507
/**
@@ -515,7 +514,7 @@ default void stopSound(final @NotNull SoundStop stop) {
515514
* @since 4.0.0
516515
*/
517516
@ForwardingAudienceOverrideNotRequired
518-
default void openBook(final Book.@NotNull Builder book) {
517+
default void openBook(final Book.Builder book) {
519518
this.openBook(book.build());
520519
}
521520

@@ -528,7 +527,7 @@ default void openBook(final Book.@NotNull Builder book) {
528527
* @see Book
529528
* @since 4.0.0
530529
*/
531-
default void openBook(final @NotNull Book book) {
530+
default void openBook(final Book book) {
532531
}
533532

534533
// ------------------------
@@ -546,7 +545,7 @@ default void openBook(final @NotNull Book book) {
546545
* @since 4.15.0
547546
*/
548547
@ForwardingAudienceOverrideNotRequired
549-
default void sendResourcePacks(final @NotNull ResourcePackInfoLike first, final @NotNull ResourcePackInfoLike... others) {
548+
default void sendResourcePacks(final ResourcePackInfoLike first, final ResourcePackInfoLike... others) {
550549
this.sendResourcePacks(ResourcePackRequest.addingRequest(first, others));
551550
}
552551

@@ -560,7 +559,7 @@ default void sendResourcePacks(final @NotNull ResourcePackInfoLike first, final
560559
* @since 4.15.0
561560
*/
562561
@ForwardingAudienceOverrideNotRequired
563-
default void sendResourcePacks(final @NotNull ResourcePackRequestLike request) {
562+
default void sendResourcePacks(final ResourcePackRequestLike request) {
564563
this.sendResourcePacks(request.asResourcePackRequest());
565564
}
566565

@@ -573,7 +572,7 @@ default void sendResourcePacks(final @NotNull ResourcePackRequestLike request) {
573572
* @see ResourcePackInfo
574573
* @since 4.15.0
575574
*/
576-
default void sendResourcePacks(final @NotNull ResourcePackRequest request) {
575+
default void sendResourcePacks(final ResourcePackRequest request) {
577576
}
578577

579578
/**
@@ -584,7 +583,7 @@ default void sendResourcePacks(final @NotNull ResourcePackRequest request) {
584583
* @sinceMinecraft 1.20.3
585584
*/
586585
@ForwardingAudienceOverrideNotRequired
587-
default void removeResourcePacks(final @NotNull ResourcePackRequestLike request) {
586+
default void removeResourcePacks(final ResourcePackRequestLike request) {
588587
this.removeResourcePacks(request.asResourcePackRequest());
589588
}
590589

@@ -596,7 +595,7 @@ default void removeResourcePacks(final @NotNull ResourcePackRequestLike request)
596595
* @sinceMinecraft 1.20.3
597596
*/
598597
@ForwardingAudienceOverrideNotRequired
599-
default void removeResourcePacks(final @NotNull ResourcePackRequest request) {
598+
default void removeResourcePacks(final ResourcePackRequest request) {
600599
final List<ResourcePackInfo> infos = request.packs();
601600
if (infos.size() == 1) {
602601
this.removeResourcePacks(infos.getFirst().id());
@@ -620,7 +619,7 @@ default void removeResourcePacks(final @NotNull ResourcePackRequest request) {
620619
* @sinceMinecraft 1.20.3
621620
*/
622621
@ForwardingAudienceOverrideNotRequired
623-
default void removeResourcePacks(final @NotNull ResourcePackInfoLike request, final @NotNull ResourcePackInfoLike @NotNull... others) {
622+
default void removeResourcePacks(final ResourcePackInfoLike request, final ResourcePackInfoLike ... others) {
624623
final UUID[] otherReqs = new UUID[others.length];
625624
for (int i = 0; i < others.length; i++) {
626625
otherReqs[i] = others[i].asResourcePackInfo().id();
@@ -635,7 +634,7 @@ default void removeResourcePacks(final @NotNull ResourcePackInfoLike request, fi
635634
* @since 4.16.0
636635
* @sinceMinecraft 1.20.3
637636
*/
638-
default void removeResourcePacks(final @NotNull Iterable<UUID> ids) {
637+
default void removeResourcePacks(final Iterable<UUID> ids) {
639638
// break these out to id + arrays
640639
final Iterator<UUID> it = ids.iterator();
641640
if (!it.hasNext()) return;
@@ -668,7 +667,7 @@ default void removeResourcePacks(final @NotNull Iterable<UUID> ids) {
668667
* @since 4.15.0
669668
* @sinceMinecraft 1.20.3
670669
*/
671-
default void removeResourcePacks(final @NotNull UUID id, final @NotNull UUID@NotNull... others) {
670+
default void removeResourcePacks(final UUID id, final UUID... others) {
672671
}
673672

674673
/**
@@ -693,7 +692,7 @@ default void clearResourcePacks() {
693692
* @since 4.22.0
694693
* @sinceMinecraft 1.21.6
695694
*/
696-
default void showDialog(final @NotNull DialogLike dialog) {
695+
default void showDialog(final DialogLike dialog) {
697696
}
698697

699698
/**

api/src/main/java/net/kyori/adventure/audience/Audiences.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.stream.Collectors;
3131
import net.kyori.adventure.resource.ResourcePackCallback;
3232
import net.kyori.adventure.text.ComponentLike;
33-
import org.jetbrains.annotations.NotNull;
3433

3534
/**
3635
* {@link Audience}-related utilities.
@@ -53,11 +52,11 @@ private Audiences() {
5352
* @return an action to send a message
5453
* @since 4.13.0
5554
*/
56-
public static @NotNull Consumer<? super Audience> sendingMessage(final @NotNull ComponentLike message) {
55+
public static Consumer<? super Audience> sendingMessage(final ComponentLike message) {
5756
return audience -> audience.sendMessage(message);
5857
}
5958

60-
static @NotNull ResourcePackCallback unwrapCallback(final Audience forwarding, final Audience dest, final @NotNull ResourcePackCallback cb) {
59+
static ResourcePackCallback unwrapCallback(final Audience forwarding, final Audience dest, final ResourcePackCallback cb) {
6160
if (cb == ResourcePackCallback.noOp()) return cb;
6261

6362
return (uuid, status, audience) -> {

0 commit comments

Comments
 (0)