Skip to content

Commit da7f62a

Browse files
committed
Refactored to support @Nullable annotations
Updated method signatures and equality checks across multiple providers to include `@Nullable` annotations. Converted `SuperPermsPermissionController` to a record for simplification and improved consistency.
1 parent 3d598b5 commit da7f62a

8 files changed

Lines changed: 13 additions & 15 deletions

File tree

providers/citizens/src/main/java/net/thenextlvl/service/providers/citizens/CitizensCharacter.java

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

3030
@NullMarked
3131
public final class CitizensCharacter<T extends Entity> implements Character<T> {
32-
protected final NPC npc;
32+
private final NPC npc;
3333

3434
public CitizensCharacter(final NPC npc) {
3535
this.npc = npc;
@@ -277,7 +277,7 @@ public void setTablistEntryHidden(final boolean hidden) {
277277
}
278278

279279
@Override
280-
public boolean equals(final Object o) {
280+
public boolean equals(@Nullable final Object o) {
281281
if (o == null || getClass() != o.getClass()) return false;
282282
final CitizensCharacter<?> that = (CitizensCharacter<?>) o;
283283
return Objects.equals(npc, that.npc);

providers/fancy-holograms-v2/src/main/java/net/thenextlvl/service/providers/fancyholograms/v2/FancyHologramLine.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.bukkit.World;
1111
import org.joml.Vector3f;
1212
import org.jspecify.annotations.NullMarked;
13+
import org.jspecify.annotations.Nullable;
1314

1415
import java.util.Objects;
1516
import java.util.Optional;
@@ -128,7 +129,7 @@ public float getYaw() {
128129
}
129130

130131
@Override
131-
public boolean equals(final Object o) {
132+
public boolean equals(@Nullable final Object o) {
132133
if (o == null || getClass() != o.getClass()) return false;
133134
final FancyHologramLine<?, ?> that = (FancyHologramLine<?, ?>) o;
134135
return Objects.equals(data, that.data);

providers/fancy-holograms-v3/src/main/java/net/thenextlvl/service/providers/fancyholograms/v3/FancyHologramLine.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.bukkit.World;
1111
import org.joml.Vector3f;
1212
import org.jspecify.annotations.NullMarked;
13+
import org.jspecify.annotations.Nullable;
1314

1415
import java.util.Objects;
1516
import java.util.Optional;
@@ -128,7 +129,7 @@ public float getYaw() {
128129
}
129130

130131
@Override
131-
public boolean equals(final Object o) {
132+
public boolean equals(@Nullable final Object o) {
132133
if (o == null || getClass() != o.getClass()) return false;
133134
final FancyHologramLine<?, ?> that = (FancyHologramLine<?, ?>) o;
134135
return Objects.equals(data, that.data);

providers/luckperms/src/main/java/net/thenextlvl/service/providers/luckperms/LuckPermsChatProfile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private boolean unsetSuffix(final int priority) {
116116
}
117117

118118
@Override
119-
public <T> Optional<T> getInfoNode(final String key, final Function<String, @Nullable T> mapper) {
119+
public <T> Optional<T> getInfoNode(final String key, final Function<@Nullable String, @Nullable T> mapper) {
120120
return user().getCachedData().getMetaData(options()).getMetaValue(key, mapper);
121121
}
122122

providers/luckperms/src/main/java/net/thenextlvl/service/providers/luckperms/LuckPermsGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public boolean setPermission(final String permission, final boolean value) {
151151
}
152152

153153
@Override
154-
public <T> Optional<T> getInfoNode(final String key, final Function<String, T> mapper) {
154+
public <T> Optional<T> getInfoNode(final String key, final Function<@Nullable String, @Nullable T> mapper) {
155155
return group().getCachedData().getMetaData(options()).getMetaValue(key, mapper);
156156
}
157157

providers/luckperms/src/main/java/net/thenextlvl/service/providers/luckperms/LuckPermsPermissionHolder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import net.thenextlvl.service.api.group.GroupHolder;
1111
import org.jetbrains.annotations.Unmodifiable;
1212
import org.jspecify.annotations.NullMarked;
13+
import org.jspecify.annotations.Nullable;
1314

1415
import java.util.Map;
1516
import java.util.Optional;
@@ -53,7 +54,7 @@ public boolean setPermission(final String permission, final boolean value) {
5354
}
5455

5556
@Override
56-
public <T> Optional<T> getInfoNode(final String key, final Function<String, T> mapper) {
57+
public <T> Optional<T> getInfoNode(final String key, final Function<@Nullable String, @Nullable T> mapper) {
5758
return user().getCachedData().getMetaData(options()).getMetaValue(key, mapper);
5859
}
5960

providers/superperms/src/main/java/net/thenextlvl/service/providers/superperms/SuperPermsPermissionController.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,7 @@
1616

1717
@DoNotWrap
1818
@NullMarked
19-
public final class SuperPermsPermissionController implements PermissionController {
20-
private final Plugin plugin;
21-
22-
public SuperPermsPermissionController(final Plugin plugin) {
23-
this.plugin = plugin;
24-
}
25-
19+
public record SuperPermsPermissionController(Plugin plugin) implements PermissionController {
2620
@Override
2721
public CompletableFuture<PermissionHolder> loadPermissionHolder(final OfflinePlayer player, @Nullable final World world) {
2822
return CompletableFuture.completedFuture(getPermissionHolder(player.getPlayer()).orElse(null));

providers/superperms/src/main/java/net/thenextlvl/service/providers/superperms/SuperPermsPermissionHolder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.bukkit.permissions.PermissionAttachmentInfo;
77
import org.jetbrains.annotations.Unmodifiable;
88
import org.jspecify.annotations.NullMarked;
9+
import org.jspecify.annotations.Nullable;
910

1011
import java.util.Map;
1112
import java.util.Optional;
@@ -44,7 +45,7 @@ public boolean setPermission(final String permission, final boolean value) {
4445
}
4546

4647
@Override
47-
public <T> Optional<T> getInfoNode(final String key, final Function<String, T> mapper) {
48+
public <T> Optional<T> getInfoNode(final String key, final Function<@Nullable String, @Nullable T> mapper) {
4849
return Optional.empty();
4950
}
5051

0 commit comments

Comments
 (0)