Skip to content

Commit 7791273

Browse files
Update to newer java usage
1 parent dc81156 commit 7791273

File tree

8 files changed

+8
-18
lines changed

8 files changed

+8
-18
lines changed

PistonChat/src/main/java/net/pistonmaster/pistonchat/api/PistonChatAPI.java

-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
package net.pistonmaster.pistonchat.api;
22

3-
import com.google.common.base.Preconditions;
43
import net.pistonmaster.pistonchat.PistonChat;
5-
import net.pistonmaster.pistonchat.tools.IgnoreTool;
6-
import org.bukkit.OfflinePlayer;
7-
import org.bukkit.command.CommandSender;
8-
import org.bukkit.entity.Player;
94

10-
import javax.annotation.Nonnull;
11-
import java.util.Map;
125
import java.util.Objects;
136

147
/**

PistonChat/src/main/java/net/pistonmaster/pistonchat/commands/ignore/SoftIgnoreCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
2626
return true;
2727
}
2828

29-
if (args.length <= 0) {
29+
if (args.length == 0) {
3030
return false;
3131
}
3232

PistonChat/src/main/java/net/pistonmaster/pistonchat/commands/whisper/LastCommand.java

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import lombok.RequiredArgsConstructor;
44
import net.pistonmaster.pistonchat.PistonChat;
55
import net.pistonmaster.pistonchat.tools.CommonTool;
6-
import net.pistonmaster.pistonchat.tools.SoftIgnoreTool;
76
import org.bukkit.command.Command;
87
import org.bukkit.command.CommandExecutor;
98
import org.bukkit.command.CommandSender;

PistonChat/src/main/java/net/pistonmaster/pistonchat/tools/CacheTool.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Optional<CommandSender> getLastSentTo(CommandSender sender) {
4848
return Optional.empty();
4949
}
5050

51-
sentTo = UUID.fromString(values.get(0).asString());
51+
sentTo = UUID.fromString(values.getFirst().asString());
5252
} else {
5353
indexConsole(sender);
5454
sentTo = customMap.get(sender).sentTo;
@@ -76,7 +76,7 @@ public Optional<CommandSender> getLastMessagedOf(CommandSender sender) {
7676
return Optional.empty();
7777
}
7878

79-
messagedOf = UUID.fromString(values.get(0).asString());
79+
messagedOf = UUID.fromString(values.getFirst().asString());
8080
} else {
8181
indexConsole(sender);
8282
messagedOf = customMap.get(sender).messagedOf;

PistonChat/src/main/java/net/pistonmaster/pistonchat/tools/SoftIgnoreTool.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected List<UUID> getStoredList(Player player) {
4545
return new ArrayList<>();
4646
}
4747

48-
return gson.<List<String>>fromJson(values.get(0).asString(), List.class).stream().map(UUID::fromString).toList();
48+
return gson.<List<String>>fromJson(values.getFirst().asString(), List.class).stream().map(UUID::fromString).toList();
4949
}
5050

5151
public void clearIgnoredPlayers(Player player) {

PistonChat/src/main/java/net/pistonmaster/pistonchat/tools/TempDataTool.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.pistonmaster.pistonchat.tools;
22

3-
import com.github.benmanes.caffeine.cache.Cache;
43
import com.github.benmanes.caffeine.cache.Caffeine;
54
import com.github.benmanes.caffeine.cache.LoadingCache;
65
import lombok.RequiredArgsConstructor;

PistonFilter/src/main/java/net/pistonmaster/pistonfilter/utils/MessageInfo.java

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import java.time.Instant;
77
import java.util.Arrays;
8-
import java.util.stream.Collectors;
98

109
@Getter
1110
@ToString

PistonFilter/src/main/java/net/pistonmaster/pistonfilter/utils/StringHelper.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public static boolean containsDigit(String s) {
4545
private static String stripAccents(final String input) {
4646
StringBuilder decomposed = new StringBuilder(Normalizer.normalize(input, Normalizer.Form.NFD));
4747
for (int i = 0; i < decomposed.length(); i++) {
48-
if (decomposed.charAt(i) == '\u0141') {
48+
if (decomposed.charAt(i) == 'Ł') {
4949
decomposed.setCharAt(i, 'L');
50-
} else if (decomposed.charAt(i) == '\u0142') {
50+
} else if (decomposed.charAt(i) == 'ł') {
5151
decomposed.setCharAt(i, 'l');
52-
} else if (decomposed.charAt(i) == '\u00D8') {
52+
} else if (decomposed.charAt(i) == 'Ø') {
5353
decomposed.setCharAt(i, 'O');
54-
} else if (decomposed.charAt(i) == '\u00F8') {
54+
} else if (decomposed.charAt(i) == 'ø') {
5555
decomposed.setCharAt(i, 'o');
5656
}
5757
}

0 commit comments

Comments
 (0)