Skip to content

Commit faa48cd

Browse files
DevlrxxhDevlrxxh
committed
Fixed Warnings
1 parent 55735d8 commit faa48cd

39 files changed

+85
-140
lines changed

‎.idea/compiler.xml‎

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Plugin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
<artifactId>maven-compiler-plugin</artifactId>
143143
<version>3.8.1</version>
144144
<configuration>
145-
<source>19</source>
146-
<target>19</target>
145+
<source>21</source>
146+
<target>21</target>
147147
<annotationProcessorPaths>
148148
<path>
149149
<groupId>org.projectlombok</groupId>

‎Plugin/src/main/java/com/jonahseguin/drink/provider/spigot/PlayerProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ public String argumentDescription() {
6060
@Override
6161
public List<String> getSuggestions(@Nonnull String prefix) {
6262
final String finalPrefix = prefix.toLowerCase();
63-
return plugin.getServer().getOnlinePlayers().stream().map(p -> p.getName()).filter(s -> finalPrefix.length() == 0 || s.toLowerCase().startsWith(finalPrefix)).collect(Collectors.toList());
63+
return plugin.getServer().getOnlinePlayers().stream().map(p -> p.getName()).filter(s -> s.toLowerCase().startsWith(finalPrefix)).collect(Collectors.toList());
6464
}
6565
}

‎Plugin/src/main/java/dev/lrxh/neptune/feature/hotbar/HotbarService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void load() {
8787
if (!enabled) continue;
8888

8989
try {
90-
Item item = new Item(ItemAction.valueOf(itemName), displayName, material, lore, enabled, slot, customModelData);
90+
Item item = new Item(ItemAction.valueOf(itemName), displayName, material, lore, true, slot, customModelData);
9191
if (slot >= 0 && slot < inventory.getSlots().length) {
9292
inventory.setSlot(slot, item);
9393
}

‎Plugin/src/main/java/dev/lrxh/neptune/feature/itembrowser/ItemBrowserMenu.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.ArrayList;
1313
import java.util.List;
1414
import java.util.function.Consumer;
15-
import java.util.stream.Collectors;
1615

1716
public class ItemBrowserMenu extends PaginatedMenu {
1817

@@ -38,7 +37,7 @@ public List<Button> getAllPagesButtons(Player player) {
3837
if (!search.isEmpty()) {
3938
items = items.stream()
4039
.filter(mat -> mat.name().toLowerCase().contains(search.toLowerCase()))
41-
.collect(Collectors.toList());
40+
.toList();
4241
}
4342
List<Button> buttons = new ArrayList<>();
4443
int i = 0;

‎Plugin/src/main/java/dev/lrxh/neptune/feature/leaderboard/LeaderboardService.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,7 @@ private void addOrUpdatePlayerEntry(Kit kit, PlayerEntry newEntry, LeaderboardTy
170170
if (kitLeaderboards == null)
171171
return;
172172

173-
List<PlayerEntry> entries = kitLeaderboards.get(leaderboardType);
174-
if (entries == null) {
175-
entries = new ArrayList<>();
176-
kitLeaderboards.put(leaderboardType, entries);
177-
}
173+
List<PlayerEntry> entries = kitLeaderboards.computeIfAbsent(leaderboardType, k -> new ArrayList<>());
178174

179175
entries.removeIf(e -> e.getUuid().equals(newEntry.getUuid()));
180176

‎Plugin/src/main/java/dev/lrxh/neptune/feature/party/PartyService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import java.util.HashMap;
66
import java.util.UUID;
77

8+
@Getter
89
public class PartyService {
910
private static PartyService instance;
10-
@Getter
11-
private HashMap<UUID, Party> parties = new HashMap<>();
11+
private final HashMap<UUID, Party> parties = new HashMap<>();
1212

1313
public static PartyService get() {
1414
if (instance == null) instance = new PartyService();

‎Plugin/src/main/java/dev/lrxh/neptune/game/kit/procedure/KitProcedureListener.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,6 @@ public void onChat(AsyncChatEvent event) {
9393
p.getGameData().get(kit).setKitLoadout(kit.getItems());
9494
}
9595

96-
//IDatabase#getAll was removed due to performence
97-
// DatabaseService.get().getDatabase().getAll().thenAccept(dataDocuments -> {
98-
// for (DataDocument document : dataDocuments) {
99-
// DataDocument kitStatistics = document.getDataDocument("kitData");
100-
// DataDocument kitDocument = kitStatistics.getDataDocument(profile.getKitProcedure().getKit().getName());
101-
102-
// kitDocument.put("kit", "");
103-
104-
// kitStatistics.put("kitData", kitDocument);
105-
106-
// DatabaseService.get().getDatabase().replace(document.getString("uuid"), document);
107-
// }
108-
// });
109-
11096
player.sendMessage(CC.success("Set new inv"));
11197
new KitManagementMenu(profile.getKitProcedure().getKit()).open(player);
11298
Bukkit.getScheduler().runTask(Neptune.get(), () -> {

‎Plugin/src/main/java/dev/lrxh/neptune/game/match/listener/MatchListener.java‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ public void onCreeperSpawn(PlayerInteractEvent event) {
184184
if (!profileOpt.get().getMatch().getKit().getRules().get(KitRule.AUTO_IGNITE))
185185
return;
186186
Location spawnLocation = event.getInteractionPoint();
187+
if (spawnLocation == null)
188+
return;
187189
Creeper creeper = (Creeper) spawnLocation.getWorld().spawnEntity(spawnLocation, EntityType.CREEPER,
188190
CreatureSpawnEvent.SpawnReason.SPAWNER_EGG);
189191
creeper.ignite();
@@ -202,7 +204,7 @@ public void onEntityDamage(EntityDamageByEntityEvent event) {
202204
if (API.getProfile(event.getDamager().getUniqueId()).getState().equals(ProfileState.IN_CUSTOM))
203205
return;
204206
if (event.getEntity() instanceof EnderCrystal crystal && event.getDamager() instanceof Player player) {
205-
if (!getProfile(player).isPresent()) {
207+
if (getProfile(player).isEmpty()) {
206208
event.setCancelled(true);
207209
return;
208210
}
@@ -214,7 +216,7 @@ public void onEntityDamage(EntityDamageByEntityEvent event) {
214216
}
215217

216218
if (event.getEntity() instanceof Creeper creeper && event.getDamager() instanceof Player player) {
217-
if (!getProfile(player).isPresent()) {
219+
if (getProfile(player).isEmpty()) {
218220
event.setCancelled(true);
219221
return;
220222
}
@@ -224,7 +226,7 @@ public void onEntityDamage(EntityDamageByEntityEvent event) {
224226
player.getUniqueId().toString());
225227
}
226228
if (event.getEntity() instanceof TNTPrimed tnt && event.getDamager() instanceof Player player) {
227-
if (!getProfile(player).isPresent()) {
229+
if (getProfile(player).isEmpty()) {
228230
event.setCancelled(true);
229231
return;
230232
}
@@ -309,7 +311,7 @@ public void onEnderPearlUse(PlayerInteractEvent event) {
309311
if (ProfileService.get().getByUUID(player.getUniqueId()).getState().equals(ProfileState.IN_CUSTOM)) {
310312
return;
311313
}
312-
if (!profileOpt.isPresent()) {
314+
if (profileOpt.isEmpty()) {
313315
event.setCancelled(true);
314316
return;
315317
}
@@ -377,7 +379,7 @@ public void onEntityPush(EntityPushedByEntityAttackEvent event) {
377379
}
378380

379381
// Check if both players are in matches
380-
if (!getProfile(shooter).isPresent() || !getProfile(target).isPresent()) {
382+
if (getProfile(shooter).isEmpty() || getProfile(target).isEmpty()) {
381383
event.setCancelled(true);
382384
return;
383385
}
@@ -391,7 +393,7 @@ public void onEntityPush(EntityPushedByEntityAttackEvent event) {
391393
if (item.getType() == Material.MACE) {
392394
if (!(event.getEntity() instanceof Player victim))
393395
return;
394-
if (!getProfile(attacker).isPresent() || !getProfile(victim).isPresent()) {
396+
if (getProfile(attacker).isEmpty() || getProfile(victim).isEmpty()) {
395397
event.setCancelled(true);
396398
return;
397399
}
@@ -410,7 +412,7 @@ public void onPlayerDeathEvent(PlayerDeathEvent event) {
410412
event.getDrops().clear();
411413

412414
Optional<Profile> profileOpt = getProfile(player);
413-
if (!profileOpt.isPresent())
415+
if (profileOpt.isEmpty())
414416
return;
415417

416418
Profile profile = profileOpt.get();
@@ -462,7 +464,7 @@ public void onPressurePlate(PlayerInteractEvent event) {
462464
return;
463465

464466
Optional<Profile> profileOpt = getProfile(player);
465-
if (!profileOpt.isPresent())
467+
if (profileOpt.isEmpty())
466468
return;
467469

468470
Profile profile = profileOpt.get();
@@ -518,7 +520,7 @@ public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
518520
return;
519521

520522
Optional<Profile> profileOpt = getProfile(player);
521-
if (!profileOpt.isPresent()) {
523+
if (profileOpt.isEmpty()) {
522524
event.setCancelled(true);
523525
return;
524526
}
@@ -629,7 +631,7 @@ public void onDamage(EntityDamageEvent event) {
629631

630632
Optional<Profile> profileOpt = getProfile(player);
631633

632-
if (!profileOpt.isPresent())
634+
if (profileOpt.isEmpty())
633635
return;
634636

635637
if (!(event.getFinalDamage() >= player.getHealth()))
@@ -654,7 +656,7 @@ public void onPlayerMoveEvent(PlayerMoveEvent event) {
654656
Player player = event.getPlayer();
655657

656658
Optional<Profile> profileOpt = getProfile(player);
657-
if (!profileOpt.isPresent())
659+
if (profileOpt.isEmpty())
658660
return;
659661

660662
Profile profile = profileOpt.get();
@@ -758,7 +760,7 @@ public void onEntityDamage(EntityDamageEvent event) {
758760
}
759761

760762
Optional<Profile> profileOpt = getProfile(player);
761-
if (!profileOpt.isPresent()) {
763+
if (profileOpt.isEmpty()) {
762764
event.setCancelled(true);
763765
return;
764766
}
@@ -844,7 +846,7 @@ public void onBlockBreakEvent(BlockBreakEvent event) {
844846
if (playerProfile != null && playerProfile.getState().equals(ProfileState.IN_CUSTOM)) return;
845847

846848
Optional<Profile> profileOpt = getProfile(player);
847-
if (!profileOpt.isPresent()) {
849+
if (profileOpt.isEmpty()) {
848850
event.setCancelled(true);
849851
return;
850852
}
@@ -900,7 +902,7 @@ public void onBedBreak(BlockBreakEvent event) {
900902
if (playerProfile != null && playerProfile.getState().equals(ProfileState.IN_CUSTOM)) return;
901903

902904
Optional<Profile> profileOpt = getProfile(player);
903-
if (!profileOpt.isPresent()) {
905+
if (profileOpt.isEmpty()) {
904906
event.setCancelled(true);
905907
return;
906908
}
@@ -1013,7 +1015,7 @@ public void onItemDrop(PlayerDropItemEvent event) {
10131015
return;
10141016

10151017
Optional<Profile> profileOpt = getProfile(player);
1016-
if (!profileOpt.isPresent()) {
1018+
if (profileOpt.isEmpty()) {
10171019
event.setCancelled(true);
10181020
} else {
10191021
Profile profile = profileOpt.get();

‎Plugin/src/main/java/dev/lrxh/neptune/profile/impl/Profile.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ public static CompletableFuture<Profile> load(Profile profile) {
128128
settingData.setKillMessagePackage(
129129
CosmeticService.get().getDeathMessagePackage(settings.getString("deathMessagePackage")));
130130

131-
// DataDocument globalCustomPersistentData = dataDocument.getDataDocument("customPersistentData");
132-
// if (globalCustomPersistentData != null) {
133-
// for (String key : globalCustomPersistentData.data.keySet()) {
134-
// gameData.setPersistentData(key, globalCustomPersistentData.data.get(key));
135-
// }
136-
// }
131+
DataDocument globalCustomPersistentData = dataDocument.getDataDocument("customPersistentData");
132+
if (globalCustomPersistentData != null) {
133+
for (String key : globalCustomPersistentData.data.keySet()) {
134+
gameData.setPersistentData(key, globalCustomPersistentData.data.get(key));
135+
}
136+
}
137137

138138
gameData.getGlobalStats().update();
139139

0 commit comments

Comments
 (0)