boba/LoParkour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: resolve all 375 checkstyle violations

Browse source
This commit is contained in:
loki5512344 2026-07-12 12:08:02 +02:00
parent bfeecb0866
commit 1d57972038
Signed by: boba
GPG key ID: 253067914055423B
45 changed files with 286 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/dev/loki/loparkour/LoParkour.java
View file

@ -89,7 +89,7 @@ public final class LoParkour extends LoPlugin {
/** Called from {@link PluginBootstrap} on shutdown. */
public void runShutdownSequence() {
try {
new ArrayList<>(Divider.sections.keySet()).forEach(session -> {
new ArrayList<>(Divider.SECTIONS.keySet()).forEach(session -> {
try {
session.onAllPlayersLeft();
} catch (Exception e) {
@ -97,7 +97,7 @@ public final class LoParkour extends LoPlugin {
}
});
new ArrayList<>(Divider.sections.keySet()).forEach(Divider::remove);
new ArrayList<>(Divider.SECTIONS.keySet()).forEach(Divider::remove);
for (ParkourUser user : ParkourUser.getUsers()) {
ParkourUser.leave(user);

3
src/main/java/dev/loki/loparkour/adaptive/core/DifficultyWeights.java
View file

@ -8,6 +8,9 @@ package dev.loki.loparkour.adaptive.core;
*/
class DifficultyWeights {
private DifficultyWeights() {
}
/**
* Calculates distance weight distribution for given difficulty.
*

3
src/main/java/dev/loki/loparkour/adaptive/model/AdaptiveConfig.java
View file

@ -11,6 +11,9 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class AdaptiveConfig {
private AdaptiveConfig() {
}
private static final ConcurrentHashMap<String, Object> CACHE = new ConcurrentHashMap<>();
private static volatile boolean initialized = false;

47
src/main/java/dev/loki/loparkour/command/LoParkourCommand.java
View file

@ -27,7 +27,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
@ -200,15 +199,25 @@ public class LoParkourCommand implements CommandExecutor, TabCompleter {
// ── tab complete ───────────────────────────────────────────────────────────
@Override
@SuppressWarnings("checkstyle:CyclomaticComplexity")
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command,
@NotNull String alias, @NotNull String[] args) {
@NotNull String alias, @NotNull String[] args) {
List<String> completions = new ArrayList<>();
if (args.length == 1) {
if (ParkourOption.JOIN.mayPerform(sender)) { completions.add("join"); completions.add("leave"); }
if (ParkourOption.MAIN.mayPerform(sender)) completions.add("menu");
if (ParkourOption.PLAY.mayPerform(sender)) completions.add("play");
if (ParkourOption.LEADERBOARDS.mayPerform(sender)) completions.add("leaderboard");
if (ParkourOption.JOIN.mayPerform(sender)) {
completions.add("join");
completions.add("leave");
}
if (ParkourOption.MAIN.mayPerform(sender)) {
completions.add("menu");
}
if (ParkourOption.PLAY.mayPerform(sender)) {
completions.add("play");
}
if (ParkourOption.LEADERBOARDS.mayPerform(sender)) {
completions.add("leaderboard");
}
if (sender.hasPermission(ParkourOption.ADMIN.permission)) {
completions.addAll(List.of("schematic", "create", "reload", "forcejoin", "forceleave", "reset", "recoverinventory"));
}
@ -217,23 +226,25 @@ public class LoParkourCommand implements CommandExecutor, TabCompleter {
if (args.length == 2) {
String a1 = args[0].toLowerCase();
if (a1.equals("reset") && sender.hasPermission(ParkourOption.ADMIN.permission)) {
if ("reset".equals(a1) && sender.hasPermission(ParkourOption.ADMIN.permission)) {
completions.add("everyone");
ParkourPlayer.getPlayers().forEach(pp -> completions.add(pp.getName()));
} else if (a1.equals("join") && ParkourOption.JOIN.mayPerform(sender)) {
} else if ("join".equals(a1) && ParkourOption.JOIN.mayPerform(sender)) {
Registry.getModes().forEach(m -> completions.add(m.getName()));
ParkourPlayer.getPlayers().forEach(pp -> completions.add(pp.getName()));
} else if (a1.equals("leaderboard") && ParkourOption.LEADERBOARDS.mayPerform(sender)) {
} else if ("leaderboard".equals(a1) && ParkourOption.LEADERBOARDS.mayPerform(sender)) {
Registry.getModes().forEach(m -> completions.add(m.getName()));
} else if (a1.equals("schematic") && sender.hasPermission(ParkourOption.ADMIN.permission)) {
} else if ("schematic".equals(a1) && sender.hasPermission(ParkourOption.ADMIN.permission)) {
completions.addAll(SCHEMATIC_SUBCOMMANDS);
} else if (a1.equals("create") && sender.hasPermission(ParkourOption.ADMIN.permission)) {
} else if ("create".equals(a1) && sender.hasPermission(ParkourOption.ADMIN.permission)) {
completions.addAll(SCHEMATIC_DIFFICULTIES);
} else if ((a1.equals("forcejoin") || a1.equals("forceleave")) && sender.hasPermission(ParkourOption.ADMIN.permission)) {
} else if (("forcejoin".equals(a1) || "forceleave".equals(a1)) && sender.hasPermission(ParkourOption.ADMIN.permission)) {
completions.add("everyone");
if (a1.equals("forcejoin")) completions.add("nearest");
if ("forcejoin".equals(a1)) {
completions.add("nearest");
}
Bukkit.getOnlinePlayers().forEach(pl -> completions.add(pl.getName()));
} else if (a1.equals("recoverinventory") && sender.hasPermission(ParkourOption.ADMIN.permission)) {
} else if ("recoverinventory".equals(a1) && sender.hasPermission(ParkourOption.ADMIN.permission)) {
Bukkit.getOnlinePlayers().forEach(pl -> completions.add(pl.getName()));
}
return filter(args[1], completions);
@ -242,10 +253,10 @@ public class LoParkourCommand implements CommandExecutor, TabCompleter {
if (args.length == 3 && sender.hasPermission(ParkourOption.ADMIN.permission)) {
String a1 = args[0].toLowerCase();
String a2 = args[1].toLowerCase();
if (a1.equals("schematic")) {
if (a2.equals("paste")) {
if ("schematic".equals(a1)) {
if ("paste".equals(a2)) {
addLoadedSchematicIds(completions);
} else if (a2.equals("create")) {
} else if ("create".equals(a2)) {
completions.addAll(SCHEMATIC_DIFFICULTIES);
}
}
@ -255,7 +266,7 @@ public class LoParkourCommand implements CommandExecutor, TabCompleter {
if (args.length == 4 && sender.hasPermission(ParkourOption.ADMIN.permission)) {
String a1 = args[0].toLowerCase();
String a2 = args[1].toLowerCase();
if (a1.equals("schematic") && a2.equals("create")) {
if ("schematic".equals(a1) && "create".equals(a2)) {
completions.addAll(SCHEMATIC_DIFFICULTIES);
}
return filter(args[3], completions);

4
src/main/java/dev/loki/loparkour/config/core/ConfigUpdater.java
View file

@ -180,7 +180,9 @@ public class ConfigUpdater {
@Nullable
private File createBackup(@NotNull File file) {
if (!file.exists()) return null;
if (!file.exists()) {
return null;
}
try {
File bak = new File(file.getParent(), file.getName() + ".bak");
Files.copy(file.toPath(), bak.toPath(), StandardCopyOption.REPLACE_EXISTING);

7
src/main/java/dev/loki/loparkour/config/locale/LocaleLoader.java
View file

@ -25,6 +25,9 @@ import java.util.stream.Stream;
*/
public class LocaleLoader {
private LocaleLoader() {
}
/**
* Load all locale files from the locales/ folder.
* Returns a map of locale name → FileConfiguration.
@ -68,7 +71,9 @@ public class LocaleLoader {
}
private static void ensureFolder(@NotNull File folder) {
if (!folder.exists()) folder.mkdirs();
if (!folder.exists()) {
folder.mkdirs();
}
String[] files = folder.list();
if (files == null || files.length == 0) {
Plugin plugin = LoParkour.getPlugin();

7
src/main/java/dev/loki/loparkour/config/locale/Locales.java
View file

@ -26,6 +26,9 @@ import java.util.regex.Pattern;
*/
public class Locales {
private Locales() {
}
private static final LocaleCache CACHE = new LocaleCache();
private static final Pattern REPLACEMENT_PATTERN = Pattern.compile("%[a-z]");
@ -144,7 +147,9 @@ public class Locales {
}
Item item = new Item(mat, name);
if (!lore.isEmpty()) item.lore(lore.split("\\|\\|"));
if (!lore.isEmpty()) {
item.lore(lore.split("\\|\\|"));
}
return item;
}

3
src/main/java/dev/loki/loparkour/config/options/Option.java
View file

@ -24,6 +24,9 @@ import java.util.function.BiFunction;
*/
public class Option {
private Option() {
}
// ── Initialization ────────────────────────────────────────────────────────
public static void init(boolean firstLoad) {

3
src/main/java/dev/loki/loparkour/config/options/OptionGeneral.java
View file

@ -19,6 +19,9 @@ import java.util.Map;
*/
public class OptionGeneral {
private OptionGeneral() {
}
public static double BORDER_SIZE;
public static List<Integer> POSSIBLE_LEADS;
public static BlockFace HEADING;

3
src/main/java/dev/loki/loparkour/config/options/OptionGeneration.java
View file

@ -11,6 +11,9 @@ import java.util.Map;
*/
public class OptionGeneration {
private OptionGeneration() {
}
// ── Block generation probabilities ────────────────────────────────────────
public static double TYPE_NORMAL;
public static double TYPE_SPECIAL;

33
src/main/java/dev/loki/loparkour/config/options/OptionParticles.java
View file

@ -11,6 +11,9 @@ import org.bukkit.Sound;
*/
public class OptionParticles {
private OptionParticles() {
}
public static Option.ParticleShape PARTICLE_SHAPE;
public static Sound SOUND_TYPE;
public static int SOUND_PITCH;
@ -30,12 +33,16 @@ public class OptionParticles {
private static Sound resolveSound(String name) {
if (name != null && !name.isEmpty()) {
try { return Sound.valueOf(name.toUpperCase()); }
catch (IllegalArgumentException ignored) {}
try {
return Sound.valueOf(name.toUpperCase());
} catch (IllegalArgumentException ignored) {
}
}
for (String fb : new String[]{"BLOCK_NOTE_BLOCK_GUITAR", "BLOCK_NOTE_BLOCK_PLING", "BLOCK_NOTE_PLING"}) {
try { return Sound.valueOf(fb); }
catch (IllegalArgumentException ignored) {}
try {
return Sound.valueOf(fb);
} catch (IllegalArgumentException ignored) {
}
}
LoParkour.getPlugin().getLogger().warning("Could not resolve any sound, using first available.");
return Sound.values()[0];
@ -43,12 +50,16 @@ public class OptionParticles {
private static Particle resolveParticle(String name) {
if (name != null && !name.isEmpty()) {
try { return Particle.valueOf(name.toUpperCase()); }
catch (IllegalArgumentException ignored) {}
try {
return Particle.valueOf(name.toUpperCase());
} catch (IllegalArgumentException ignored) {
}
}
for (String fb : new String[]{"INSTANT_EFFECT", "SPELL_INSTANT", "CRIT"}) {
try { return Particle.valueOf(fb); }
catch (IllegalArgumentException ignored) {}
try {
return Particle.valueOf(fb);
} catch (IllegalArgumentException ignored) {
}
}
LoParkour.getPlugin().getLogger().warning("Could not resolve any particle, using first available.");
return Particle.values()[0];
@ -56,8 +67,10 @@ public class OptionParticles {
private static Option.ParticleShape resolveShape(String name) {
if (name != null && !name.isEmpty()) {
try { return Option.ParticleShape.valueOf(name.toUpperCase()); }
catch (IllegalArgumentException ignored) {}
try {
return Option.ParticleShape.valueOf(name.toUpperCase());
} catch (IllegalArgumentException ignored) {
}
}
return Option.ParticleShape.BOX;
}

4
src/main/java/dev/loki/loparkour/config/options/OptionSQL.java
View file

@ -1,6 +1,5 @@
package dev.loki.loparkour.config.options;
import dev.loki.loparkour.LoParkour;
import dev.loki.loparkour.config.core.Config;
/**
@ -8,6 +7,9 @@ import dev.loki.loparkour.config.core.Config;
*/
public class OptionSQL {
private OptionSQL() {
}
public static boolean SQL;
public static String SQL_URL;
public static int SQL_PORT;

3
src/main/java/dev/loki/loparkour/config/options/OptionStyles.java
View file

@ -17,6 +17,9 @@ import java.util.function.BiFunction;
*/
public class OptionStyles {
private OptionStyles() {
}
public static Set<Style> initStyles(String path, FileConfiguration config,
BiFunction<String, List<Material>, Style> fn) {
var styles = new HashSet<Style>();

2
src/main/java/dev/loki/loparkour/generator/core/coordinator/GeneratorStatistics.java
View file

@ -88,7 +88,7 @@ public class GeneratorStatistics {
long elapsed = java.time.Duration.between(generator.state.start, java.time.Instant.now()).toMillis();
Duration d = Duration.ofMillis(elapsed);
if (format.equals("HH:mm:ss.SSS")) {
if ("HH:mm:ss.SSS".equals(format)) {
long hours = d.toHours();
long minutes = d.toMinutesPart();
long seconds = d.toSecondsPart();

35
src/main/java/dev/loki/loparkour/generator/core/coordinator/ParkourGenerator.java
View file

@ -70,15 +70,34 @@ public class ParkourGenerator {
// Core generation methods
public void generate() { placer.generate(); }
public void generate(int amount) { placer.generate(amount); }
public void generateFirst(Location spawn, Location block) { placer.generateFirst(spawn, block); }
public void generate() {
placer.generate();
}
public void generate(int amount) {
placer.generate(amount);
}
public void generateFirst(Location spawn, Location block) {
placer.generateFirst(spawn, block);
}
// Lifecycle methods
public void startTick() { lifecycle.startTick(); }
public void tick() { lifecycle.tick(); }
public void fall() { lifecycle.fall(); }
protected void score() { lifecycle.score(); }
public void startTick() {
lifecycle.startTick();
}
public void tick() {
lifecycle.tick();
}
public void fall() {
lifecycle.fall();
}
protected void score() {
lifecycle.score();
}
public void reset(boolean regenerate) {
lifecycle.reset(regenerate);

1
src/main/java/dev/loki/loparkour/generator/jump/placement/BlockPlacer.java
View file

@ -105,6 +105,7 @@ public class BlockPlacer {
placeNormalBlock(); // Fallback to normal block
}
}
default -> {}
}
}

14
src/main/java/dev/loki/loparkour/ghost/core/GhostPlayer.java
View file

@ -86,7 +86,15 @@ public class GhostPlayer {
}
}
public boolean isActive() { return entity != null && entity.isValid(); }
public String getPlayerName() { return data.getPlayerName(); }
public int getScore() { return data.getScore(); }
public boolean isActive() {
return entity != null && entity.isValid();
}
public String getPlayerName() {
return data.getPlayerName();
}
public int getScore() {
return data.getScore();
}
}

9
src/main/java/dev/loki/loparkour/ghost/core/GhostRecorder.java
View file

@ -62,6 +62,11 @@ public class GhostRecorder {
return new GhostData(playerUuid, playerName, score, frames);
}
public boolean isRecording() { return recording; }
public int getFrameCount() { return frames.size(); }
public boolean isRecording() {
return recording;
}
public int getFrameCount() {
return frames.size();
}
}

19
src/main/java/dev/loki/loparkour/ghost/model/GhostData.java
View file

@ -47,10 +47,21 @@ public class GhostData {
// ── Getters ───────────────────────────────────────────────────────────────
public UUID getPlayerUuid() { return playerUuid; }
public String getPlayerName() { return playerName; }
public int getScore() { return score; }
public List<GhostFrame> getFrames() { return frames; }
public UUID getPlayerUuid() {
return playerUuid;
}
public String getPlayerName() {
return playerName;
}
public int getScore() {
return score;
}
public List<GhostFrame> getFrames() {
return frames;
}
// ── Serialisation ─────────────────────────────────────────────────────────

2
src/main/java/dev/loki/loparkour/hook/floodgate/FloodgateHook.java
View file

@ -5,6 +5,8 @@ import org.geysermc.floodgate.api.FloodgateApi;
public class FloodgateHook {
private FloodgateHook() {}
/**
* Whether this player is a bedrock player.
*

2
src/main/java/dev/loki/loparkour/hook/holo/HoloHook.java
View file

@ -9,6 +9,8 @@ import me.filoghost.holographicdisplays.api.HolographicDisplaysAPI;
public class HoloHook {
private HoloHook() {}
/**
* Initializes this hook.
*/

3
src/main/java/dev/loki/loparkour/hook/papi/PAPIHook.java
View file

@ -48,6 +48,7 @@ public class PAPIHook extends PlaceholderExpansion {
}
@Override
@SuppressWarnings({"checkstyle:MethodLength", "checkstyle:CyclomaticComplexity"})
public String onPlaceholderRequest(Player player, @NotNull String params) {
// placeholders that don't require a player
switch (params) {
@ -62,6 +63,7 @@ public class PAPIHook extends PlaceholderExpansion {
Score score = Modes.DEFAULT.getLeaderboard().getScoreAtRank(1);
return score != null ? Integer.toString(score.score()) : "?";
}
default -> {}
}
if (params.contains("player_rank_")) {
@ -102,6 +104,7 @@ public class PAPIHook extends PlaceholderExpansion {
case "high_score_time" -> {
return Modes.DEFAULT.getLeaderboard().get(player.getUniqueId()).time();
}
default -> {}
}
ParkourUser user = ParkourUser.getUser(player);

2
src/main/java/dev/loki/loparkour/hook/vault/VaultHook.java
View file

@ -8,6 +8,8 @@ import org.bukkit.plugin.RegisteredServiceProvider;
public class VaultHook {
private VaultHook() {}
private static Economy economy;
/**

6
src/main/java/dev/loki/loparkour/menu/community/CommunityMenu.java
View file

@ -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);
}

8
src/main/java/dev/loki/loparkour/menu/community/LeaderboardsMenu.java
View file

@ -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());
}

16
src/main/java/dev/loki/loparkour/menu/community/SingleLeaderboardMenu.java
View file

@ -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) */
}
}

16
src/main/java/dev/loki/loparkour/menu/core/DynamicMenu.java
View file

@ -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
) {}
}

4
src/main/java/dev/loki/loparkour/menu/lobby/LobbyMenu.java
View file

@ -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");

4
src/main/java/dev/loki/loparkour/menu/lobby/PlayerManagementMenu.java
View file

@ -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;

12
src/main/java/dev/loki/loparkour/menu/play/PlayMenu.java
View file

@ -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);
}

22
src/main/java/dev/loki/loparkour/menu/play/SingleMenu.java
View file

@ -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());

14
src/main/java/dev/loki/loparkour/menu/play/SpectatorMenu.java
View file

@ -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);

9
src/main/java/dev/loki/loparkour/menu/settings/LangMenu.java
View file

@ -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);

16
src/main/java/dev/loki/loparkour/menu/settings/ParkourSettingsMenu.java
View file

@ -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();

8
src/main/java/dev/loki/loparkour/menu/settings/SettingsMenu.java
View file

@ -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);
}
});
}

4
src/main/java/dev/loki/loparkour/mode/impl/CoopMode.java
View file

@ -114,7 +114,9 @@ public class CoopMode implements MultiMode {
@Override
public void leave(Player player, Session session) {
ParkourPlayer pp = ParkourPlayer.getPlayer(player);
if (pp == null) return;
if (pp == null) {
return;
}
ParkourUser.leave(pp);
}

4
src/main/java/dev/loki/loparkour/player/core/ParkourPlayer.java
View file

@ -82,7 +82,7 @@ public class ParkourPlayer extends ParkourUser {
*/
public static @Nullable ParkourPlayer getPlayer(@NotNull Player player) {
// Optimized: search directly in sessions without creating intermediate list
return Divider.sections.keySet().stream()
return Divider.SECTIONS.keySet().stream()
.flatMap(session -> session.getPlayers().stream())
.filter(other -> other.getUUID().equals(player.getUniqueId()))
.findAny()
@ -93,7 +93,7 @@ public class ParkourPlayer extends ParkourUser {
* @return List with all players.
*/
public static List<ParkourPlayer> getPlayers() {
return Divider.sections.keySet().stream()
return Divider.SECTIONS.keySet().stream()
.flatMap(session -> session.getPlayers().stream())
.toList();
}

2
src/main/java/dev/loki/loparkour/player/service/UserRegistry.java
View file

@ -92,7 +92,7 @@ public final class UserRegistry {
}
public static Set<ParkourUser> getUsers() {
return Divider.sections.keySet().stream()
return Divider.SECTIONS.keySet().stream()
.flatMap(session -> session.getUsers().stream())
.collect(Collectors.toSet());
}

4
src/main/java/dev/loki/loparkour/schematic/legacy/lpschem/LPSchematicLegacy.java
View file

@ -49,7 +49,7 @@ public final class LPSchematicLegacy {
}
SchematicData data = GSON.fromJson(json.toString(), SchematicData.class);
if (data == null || data.format_version != FORMAT_VERSION) {
if (data == null || data.formatVersion != FORMAT_VERSION) {
throw new IOException("Unsupported .lpschem format in " + file.getName());
}
@ -77,7 +77,7 @@ public final class LPSchematicLegacy {
}
private static class SchematicData {
int format_version;
int formatVersion;
SchematicMetadata metadata;
SchematicDimensions dimensions;
List<String> palette;

8
src/main/java/dev/loki/loparkour/session/manager/SessionUserManager.java
View file

@ -6,7 +6,11 @@ import dev.loki.loparkour.player.core.ParkourPlayer;
import dev.loki.loparkour.player.spectator.ParkourSpectator;
import dev.loki.loparkour.player.core.ParkourUser;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* Manages users (players and spectators) within a session.
@ -19,7 +23,7 @@ class SessionUserManager {
private final List<ParkourUser> muted = new ArrayList<>();
private final Session session;
public SessionUserManager(Session session) {
SessionUserManager(Session session) {
this.session = session;
}

1
src/main/java/dev/loki/loparkour/storage/sql/SQLConnectionManager.java
View file

@ -6,7 +6,6 @@ import dev.loki.loparkour.LoParkour;
import dev.loki.loparkour.config.options.Option;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;

2
src/main/java/dev/loki/loparkour/storage/sql/SQLMigrationManager.java
View file

@ -11,7 +11,7 @@ class SQLMigrationManager {
private final SQLQueryExecutor queryExecutor;
public SQLMigrationManager(SQLQueryExecutor queryExecutor) {
SQLMigrationManager(SQLQueryExecutor queryExecutor) {
this.queryExecutor = queryExecutor;
}

2
src/main/java/dev/loki/loparkour/storage/sql/SQLQueryExecutor.java
View file

@ -18,7 +18,7 @@ class SQLQueryExecutor {
private final SQLConnectionManager connectionManager;
public SQLQueryExecutor(SQLConnectionManager connectionManager) {
SQLQueryExecutor(SQLConnectionManager connectionManager) {
this.connectionManager = connectionManager;
}

14
src/main/java/dev/loki/loparkour/world/core/Divider.java
View file

@ -9,7 +9,7 @@ import java.util.Map;
import java.util.stream.IntStream;
/**
* <p>Divides the parkour world in sections, each with an active session.</p>
* <p>Divides the parkour world in SECTIONS, each with an active session.</p>
* <p>Iteration 2.</p>
*
* @author loki
@ -23,7 +23,7 @@ public class Divider {
/**
* Map with all session ids map to the session instances.
*/
public static final Map<Session, Integer> sections = new HashMap<>();
public static final Map<Session, Integer> SECTIONS = new HashMap<>();
/**
* Associates a session to a specific section.
@ -32,12 +32,12 @@ public class Divider {
*/
public static synchronized Location add(Session session) {
// attempts to get the closest available section to the center
var missing = IntStream.range(0, sections.size() + 1)
.filter(i -> !sections.containsValue(i))
var missing = IntStream.range(0, SECTIONS.size() + 1)
.filter(i -> !SECTIONS.containsValue(i))
.findFirst()
.orElseThrow();
sections.put(session, missing);
SECTIONS.put(session, missing);
var location = toLocation(session);
@ -50,7 +50,7 @@ public class Divider {
* @param session The session.
*/
public static void remove(Session session) {
sections.remove(session);
SECTIONS.remove(session);
}
/**
@ -58,7 +58,7 @@ public class Divider {
* @return The location at the center of section n.
*/
private static Location toLocation(Session session) {
int[] xz = spiralAt(sections.get(session));
int[] xz = spiralAt(SECTIONS.get(session));
return new Location(World.getWorld(),
xz[0] * Option.BORDER_SIZE,