Skip to content

Commit f4237f1

Browse files
authored
Avoid issues on modern and migrate to JSpecify (#9)
* Avoid issues on modern and migrate to JSpecify * Bump ACF
1 parent dc06ff8 commit f4237f1

4 files changed

Lines changed: 11 additions & 13 deletions

File tree

pom.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
</repositories>
3535

3636
<dependencies>
37-
<!-- SportBukkit 1.8 -->
37+
<!-- Bukkit/Paper API -->
3838
<dependency>
3939
<groupId>dev.pgm.paper</groupId>
4040
<artifactId>paper-api</artifactId>
41-
<version>1.8_1.21.11-SNAPSHOT</version>
41+
<version>1.8_1.21.10-SNAPSHOT</version>
4242
<scope>provided</scope>
4343
</dependency>
4444

@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>co.aikar</groupId>
6060
<artifactId>acf-bukkit</artifactId>
61-
<version>0.5.0-SNAPSHOT</version>
61+
<version>0.5.1-SNAPSHOT</version>
6262
</dependency>
6363

6464
<!-- Minecraft dependencies -->
@@ -71,10 +71,9 @@
7171

7272
<!-- Annotations -->
7373
<dependency>
74-
<groupId>org.jetbrains</groupId>
75-
<artifactId>annotations</artifactId>
76-
<version>26.0.2</version>
77-
<scope>provided</scope>
74+
<groupId>org.jspecify</groupId>
75+
<artifactId>jspecify</artifactId>
76+
<version>1.0.0</version>
7877
</dependency>
7978

8079
</dependencies>

src/main/java/tc/oc/occ/idly/IdlyListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
public class IdlyListener implements Listener {
1616

17-
private IdlyConfig config;
18-
private IdlyManager manager;
17+
private final IdlyConfig config;
18+
private final IdlyManager manager;
1919

2020
public IdlyListener(IdlyManager manager, IdlyConfig config) {
2121
this.manager = manager;

src/main/java/tc/oc/occ/idly/IdlyManager.java

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

33
import static net.kyori.adventure.text.Component.text;
44

5-
import com.google.common.base.Objects;
65
import java.util.Map;
76
import java.util.UUID;
87
import net.kyori.adventure.audience.Audience;
@@ -11,7 +10,7 @@
1110
import net.kyori.adventure.text.format.NamedTextColor;
1211
import org.bukkit.Bukkit;
1312
import org.bukkit.entity.Player;
14-
import org.jetbrains.annotations.Nullable;
13+
import org.jspecify.annotations.Nullable;
1514
import tc.oc.occ.idly.utils.OnlinePlayerUUIDMapAdapter;
1615
import tc.oc.pgm.api.match.Match;
1716
import tc.oc.pgm.api.player.MatchPlayer;
@@ -64,7 +63,7 @@ private void checkPlayers() {
6463
private void checkPlayer(Player player) {
6564
int inactivity =
6665
playerInactivityTicks.compute(
67-
player.getUniqueId(), (p, t) -> Objects.firstNonNull(t, 0) + TICK_FREQUENCY);
66+
player.getUniqueId(), (p, t) -> (t != null ? t : 0) + TICK_FREQUENCY);
6867

6968
boolean isPlaying = plugin.getAPI().isPlaying(player);
7069

src/main/java/tc/oc/occ/idly/IdlyUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package tc.oc.occ.idly;
22

33
import org.bukkit.entity.Player;
4-
import org.jetbrains.annotations.Nullable;
4+
import org.jspecify.annotations.Nullable;
55
import tc.oc.pgm.api.PGM;
66
import tc.oc.pgm.api.player.MatchPlayer;
77

0 commit comments

Comments
 (0)