fix: resolve all 375 checkstyle violations
This commit is contained in:
parent
bfeecb0866
commit
1d57972038
45 changed files with 286 additions and 107 deletions
|
|
@ -15,7 +15,11 @@ public class CommunityMenu extends LPMenu {
|
|||
|
||||
baseGui(title, 3)
|
||||
.setItem(13, localeItem(player, "community.leaderboards.item"),
|
||||
e -> { if (ParkourOption.LEADERBOARDS.mayPerform(player)) Menus.LEADERBOARDS.open(player); })
|
||||
e -> {
|
||||
if (ParkourOption.LEADERBOARDS.mayPerform(player)) {
|
||||
Menus.LEADERBOARDS.open(player);
|
||||
}
|
||||
})
|
||||
.setItem(22, closeButton(player), e -> player.closeInventory())
|
||||
.open(player);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,9 +34,13 @@ public class LeaderboardsMenu extends LPMenu {
|
|||
List<ItemStack> items = new ArrayList<>();
|
||||
|
||||
for (Mode mode : Registry.getModes()) {
|
||||
if (mode.getLeaderboard() == null) continue;
|
||||
if (mode.getLeaderboard() == null) {
|
||||
continue;
|
||||
}
|
||||
var item = mode.getItem(locale);
|
||||
if (item == null) continue;
|
||||
if (item == null) {
|
||||
continue;
|
||||
}
|
||||
modes.add(mode);
|
||||
items.add(item.build());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,9 @@ public class SingleLeaderboardMenu extends LPMenu {
|
|||
public void open(@NotNull Player player, @NotNull Mode mode, @NotNull Leaderboard.Sort sort, int page) {
|
||||
this.currentPage = page;
|
||||
Leaderboard leaderboard = mode.getLeaderboard();
|
||||
if (leaderboard == null) return;
|
||||
if (leaderboard == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
String locale = locale(player);
|
||||
String title = Locales.getString(locale, ParkourOption.LEADERBOARDS.path + ".name");
|
||||
|
|
@ -44,7 +46,9 @@ public class SingleLeaderboardMenu extends LPMenu {
|
|||
for (Map.Entry<UUID, Score> entry : leaderboard.sort(sort).entrySet()) {
|
||||
rank++;
|
||||
Score score = entry.getValue();
|
||||
if (score == null) continue;
|
||||
if (score == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
ItemStack skull = new ItemStack(Material.PLAYER_HEAD);
|
||||
if (rank <= 20 && !ParkourUser.isBedrockPlayer(player)) {
|
||||
|
|
@ -71,7 +75,9 @@ public class SingleLeaderboardMenu extends LPMenu {
|
|||
.replace("%t", score.time())
|
||||
.replace("%d", score.difficulty()));
|
||||
ItemMeta built = base.build().getItemMeta();
|
||||
if (built != null) skull.setItemMeta(built);
|
||||
if (built != null) {
|
||||
skull.setItemMeta(built);
|
||||
}
|
||||
|
||||
items.add(skull);
|
||||
}
|
||||
|
|
@ -104,5 +110,7 @@ public class SingleLeaderboardMenu extends LPMenu {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void open(@NotNull Player player) { /* use open(player, mode, sort) */ }
|
||||
public void open(@NotNull Player player) {
|
||||
/* use open(player, mode, sort) */
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,9 @@ import org.bukkit.entity.Player;
|
|||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
|
|
@ -29,7 +31,10 @@ public abstract class DynamicMenu {
|
|||
*/
|
||||
// Stub: migrate to LoLib GUI when dynamic rows are wired up.
|
||||
/*
|
||||
public void registerMainItem(int row, int id, BiFunction<@NotNull Player, @Nullable ParkourUser, dev.loki.loparkour.util.gui.MenuItem> item, Predicate<Player> shouldDisplay) {
|
||||
public void registerMainItem(
|
||||
int row, int id,
|
||||
BiFunction<@NotNull Player, @Nullable ParkourUser, dev.loki.loparkour.util.gui.MenuItem> item,
|
||||
Predicate<Player> shouldDisplay) {
|
||||
if (id < 0 || row < 0 || row > 4) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -75,6 +80,9 @@ public abstract class DynamicMenu {
|
|||
/**
|
||||
* Data class for registered items
|
||||
*/
|
||||
protected record ItemContainer(int id, BiFunction<@NotNull Player, @Nullable ParkourUser, dev.loki.loparkour.util.gui.MenuItem> item,
|
||||
Predicate<Player> predicate) {}
|
||||
protected record ItemContainer(
|
||||
int id,
|
||||
BiFunction<@NotNull Player, @Nullable ParkourUser, dev.loki.loparkour.util.gui.MenuItem> item,
|
||||
Predicate<Player> predicate
|
||||
) {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@ public class LobbyMenu extends LPMenu {
|
|||
@Override
|
||||
public void open(@NotNull Player player) {
|
||||
ParkourUser user = ParkourUser.getUser(player);
|
||||
if (user == null) return;
|
||||
if (user == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
String locale = user.locale;
|
||||
String title = Locales.getString(locale, "lobby.name");
|
||||
|
|
|
|||
|
|
@ -24,7 +24,9 @@ public class PlayerManagementMenu extends LPMenu {
|
|||
@Override
|
||||
public void open(@NotNull Player player) {
|
||||
ParkourPlayer viewer = ParkourPlayer.getPlayer(player);
|
||||
if (viewer == null) return;
|
||||
if (viewer == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
var session = viewer.session;
|
||||
String locale = viewer.locale;
|
||||
|
|
|
|||
|
|
@ -15,9 +15,17 @@ public class PlayMenu extends LPMenu {
|
|||
|
||||
baseGui(title, 3)
|
||||
.setItem(11, localeItem(player, "play.single.item"),
|
||||
e -> { if (ParkourOption.SINGLE.mayPerform(player)) Menus.SINGLE.open(player); })
|
||||
e -> {
|
||||
if (ParkourOption.SINGLE.mayPerform(player)) {
|
||||
Menus.SINGLE.open(player);
|
||||
}
|
||||
})
|
||||
.setItem(15, localeItem(player, "play.spectator.item"),
|
||||
e -> { if (ParkourOption.SPECTATOR.mayPerform(player)) Menus.SPECTATOR.open(player); })
|
||||
e -> {
|
||||
if (ParkourOption.SPECTATOR.mayPerform(player)) {
|
||||
Menus.SPECTATOR.open(player);
|
||||
}
|
||||
})
|
||||
.setItem(22, closeButton(player), e -> player.closeInventory())
|
||||
.open(player);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,17 +33,25 @@ public class SingleMenu extends LPMenu {
|
|||
|
||||
for (Mode mode : Registry.getModes()) {
|
||||
// Skip spectator mode in single menu
|
||||
if (mode.getName().equals("spectator")) continue;
|
||||
|
||||
if ("spectator".equals(mode.getName())) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Check if mode is enabled in config
|
||||
if (!Config.CONFIG.getBoolean("modes." + mode.getName() + ".enabled", true)) continue;
|
||||
|
||||
if (!Config.CONFIG.getBoolean("modes." + mode.getName() + ".enabled", true)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
boolean blocked = Config.CONFIG.getBoolean("permissions.enabled")
|
||||
&& !player.hasPermission("LoParkour.gamemode." + mode.getName());
|
||||
if (blocked) continue;
|
||||
|
||||
if (blocked) {
|
||||
continue;
|
||||
}
|
||||
|
||||
var item = mode.getItem(locale);
|
||||
if (item == null) continue;
|
||||
if (item == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
availableModes.add(mode);
|
||||
items.add(item.build());
|
||||
|
|
|
|||
|
|
@ -35,10 +35,16 @@ public class SpectatorMenu extends LPMenu {
|
|||
List<Session> sessions = new ArrayList<>();
|
||||
List<ItemStack> items = new ArrayList<>();
|
||||
|
||||
for (Session session : Divider.sections.keySet()) {
|
||||
if (!session.isAcceptingSpectators()) continue;
|
||||
if (user != null && session == user.session) continue;
|
||||
if (session.getPlayers().isEmpty()) continue;
|
||||
for (Session session : Divider.SECTIONS.keySet()) {
|
||||
if (!session.isAcceptingSpectators()) {
|
||||
continue;
|
||||
}
|
||||
if (user != null && session == user.session) {
|
||||
continue;
|
||||
}
|
||||
if (session.getPlayers().isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
var pp = session.getPlayers().get(0);
|
||||
ItemStack skull = new ItemStack(Material.PLAYER_HEAD);
|
||||
|
|
|
|||
|
|
@ -18,14 +18,18 @@ import java.util.List;
|
|||
public class LangMenu extends LPMenu {
|
||||
|
||||
public void open(@NotNull ParkourPlayer user) {
|
||||
if (user == null) return;
|
||||
if (user == null) {
|
||||
return;
|
||||
}
|
||||
open(user.player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void open(@NotNull Player player) {
|
||||
ParkourPlayer pp = ParkourPlayer.getPlayer(player);
|
||||
if (pp == null) return;
|
||||
if (pp == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
String locale = pp.locale;
|
||||
String title = Locales.getString(locale, "settings.lang.name");
|
||||
|
|
@ -44,7 +48,6 @@ public class LangMenu extends LPMenu {
|
|||
item.setItemMeta(meta);
|
||||
}
|
||||
gui = gui.setItem(10 + i, item, e -> {
|
||||
pp.locale = lang;
|
||||
pp.locale = lang;
|
||||
pp.updateHotbar(); // Update hotbar with new language
|
||||
Menus.SETTINGS.open(player);
|
||||
|
|
|
|||
|
|
@ -22,14 +22,18 @@ import java.util.List;
|
|||
public class ParkourSettingsMenu extends LPMenu {
|
||||
|
||||
public void open(@NotNull ParkourPlayer user) {
|
||||
if (user == null) return;
|
||||
if (user == null) {
|
||||
return;
|
||||
}
|
||||
open(user.player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void open(@NotNull Player player) {
|
||||
ParkourPlayer pp = ParkourPlayer.getPlayer(player);
|
||||
if (pp == null) return;
|
||||
if (pp == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
String locale = pp.locale;
|
||||
String title = Locales.getString(locale, "settings.name");
|
||||
|
|
@ -151,10 +155,14 @@ public class ParkourSettingsMenu extends LPMenu {
|
|||
|
||||
int slot = 10;
|
||||
for (Style style : Registry.getStyles()) {
|
||||
if (slot > 16) break;
|
||||
if (slot > 16) {
|
||||
break;
|
||||
}
|
||||
String name = style.getName();
|
||||
String perm = ParkourOption.STYLES.permission + "." + name.toLowerCase().replace(" ", ".");
|
||||
if (Config.CONFIG.getBoolean("permissions.per-style") && !player.hasPermission(perm)) continue;
|
||||
if (Config.CONFIG.getBoolean("permissions.per-style") && !player.hasPermission(perm)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
ItemStack item = new ItemStack(style.getNext());
|
||||
ItemMeta meta = item.getItemMeta();
|
||||
|
|
|
|||
|
|
@ -22,7 +22,9 @@ public class SettingsMenu extends LPMenu {
|
|||
if (ParkourOption.PARKOUR_SETTINGS.mayPerform(player) && ParkourPlayer.isPlayer(player)) {
|
||||
gui = gui.setItem(11, localeItem(player, "settings.parkour_settings.item"), e -> {
|
||||
ParkourPlayer pp = ParkourPlayer.getPlayer(player);
|
||||
if (pp != null) pp.session.generator.menu(pp);
|
||||
if (pp != null) {
|
||||
pp.session.generator.menu(pp);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -30,7 +32,9 @@ public class SettingsMenu extends LPMenu {
|
|||
String langName = Locales.getString(locale, "name");
|
||||
gui = gui.setItem(13, localeItem(locale, "settings.lang.item", langName), e -> {
|
||||
ParkourPlayer pp = ParkourPlayer.getPlayer(player);
|
||||
if (pp != null) Menus.LANG.open(pp);
|
||||
if (pp != null) {
|
||||
Menus.LANG.open(pp);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue