outputLines = merge(defaultLines, diskLines, diskKeys, ignored);
+
+ // Only write if something actually changed
+ if (!outputLines.equals(diskLines)) {
+ writeLines(diskFile, outputLines);
+ plugin.getLogger().info("[ConfigUpdater] Updated " + resourceName
+ + " — added " + countNew(diskLines, outputLines) + " new key(s).");
+ }
+ }
+
+ // ── Merge ─────────────────────────────────────────────────────────────────
+
+ /**
+ * Merges default lines into disk lines.
+ *
+ * Strategy: walk disk lines first, emit them as-is. Then walk default
+ * lines; for each key block (comment + key line) whose key is absent on
+ * disk and not ignored, append it at the correct indentation level.
+ */
+ private static List merge(
+ List defaultLines,
+ List diskLines,
+ Set diskKeys,
+ Set ignored
+ ) {
+ // We need to insert missing keys at the right position.
+ // Build a copy of disk lines we will extend.
+ List result = new ArrayList<>(diskLines);
+
+ // Collect blocks from the default file: each block = list of comment
+ // lines + the key line itself. We track the "path stack" to know the
+ // full dotted path of every key.
+ Deque pathStack = new ArrayDeque<>();
+ List pendingComments = new ArrayList<>();
+
+ for (int i = 0; i < defaultLines.size(); i++) {
+ String raw = defaultLines.get(i);
+ String trimmed = raw.stripLeading();
+
+ // Blank line → flush pending comments, keep as separator
+ if (trimmed.isBlank()) {
+ pendingComments.add(raw);
+ continue;
+ }
+
+ // Comment line → accumulate
+ if (trimmed.startsWith("#")) {
+ pendingComments.add(raw);
+ continue;
+ }
+
+ // Key line
+ int indent = raw.length() - trimmed.length();
+ int depth = indent / 2; // assume 2-space indentation
+
+ // Pop stack back to current depth
+ while (pathStack.size() > depth) pathStack.pollLast();
+
+ // Parse key name (everything before ':')
+ String keyPart = trimmed.split(":")[0].trim();
+ pathStack.addLast(keyPart);
+ String fullPath = String.join(".", pathStack);
+
+ boolean isSection = trimmed.endsWith(":") || trimmed.matches(".*:\\s*$");
+ boolean isIgnored = isIgnored(fullPath, ignored);
+
+ if (!isIgnored && !diskKeys.contains(fullPath) && !isSection) {
+ // This key is missing on disk — inject it
+ // Find the best insertion point: after the last line that
+ // belongs to the parent section on disk
+ int insertAt = findInsertionPoint(result, pathStack, depth);
+
+ // Insert blank separator + comments + key line
+ List block = new ArrayList<>();
+ if (insertAt == result.size() || !result.get(Math.max(0, insertAt - 1)).isBlank()) {
+ block.add("");
+ }
+ block.addAll(pendingComments);
+ block.add(raw);
+ result.addAll(insertAt, block);
+ }
+
+ // Clear pending comments regardless
+ pendingComments.clear();
+ }
+
+ return result;
+ }
+
+ /**
+ * Finds the line index where a missing key should be inserted.
+ * Inserts after the last line of its parent section.
+ */
+ private static int findInsertionPoint(List lines, Deque pathStack, int depth) {
+ if (depth == 0) {
+ // Top-level key → append at end
+ return lines.size();
+ }
+
+ // Parent path
+ List parts = new ArrayList<>(pathStack);
+ String parentKey = parts.get(depth - 1);
+ int parentIndent = (depth - 1) * 2;
+
+ // Find the parent key line in the result
+ int parentLine = -1;
+ for (int i = 0; i < lines.size(); i++) {
+ String l = lines.get(i);
+ int ind = l.length() - l.stripLeading().length();
+ if (ind == parentIndent && l.stripLeading().startsWith(parentKey + ":")) {
+ parentLine = i;
+ break;
+ }
+ }
+
+ if (parentLine < 0) return lines.size();
+
+ // Find end of parent section: next line with same or lower indent that isn't blank/comment
+ for (int i = parentLine + 1; i < lines.size(); i++) {
+ String l = lines.get(i);
+ if (l.isBlank() || l.stripLeading().startsWith("#")) continue;
+ int ind = l.length() - l.stripLeading().length();
+ if (ind <= parentIndent) return i;
+ }
+
+ return lines.size();
+ }
+
+ // ── IO helpers ─────────────────────────────────────────────────────────────
+
+ /** Reads a resource from the jar as a list of lines. Returns null if not found. */
+ @Nullable
+ private static List readResource(Plugin plugin, String name) {
+ try (InputStream in = plugin.getResource(name)) {
+ if (in == null) return null;
+ return readLines(in);
+ } catch (IOException ex) {
+ plugin.getLogger().log(Level.SEVERE, "Failed to read resource: " + name, ex);
+ return null;
+ }
+ }
+
+ private static List readLines(File file) throws IOException {
+ try (BufferedReader r = new BufferedReader(
+ new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) {
+ return readLines(r);
+ }
+ }
+
+ private static List readLines(InputStream in) throws IOException {
+ try (BufferedReader r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
+ return readLines(r);
+ }
+ }
+
+ private static List readLines(BufferedReader reader) throws IOException {
+ List lines = new ArrayList<>();
+ String line;
+ while ((line = reader.readLine()) != null) lines.add(line);
+ return lines;
+ }
+
+ private static void writeLines(File file, List lines) throws IOException {
+ try (BufferedWriter w = new BufferedWriter(
+ new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8))) {
+ for (int i = 0; i < lines.size(); i++) {
+ w.write(lines.get(i));
+ if (i < lines.size() - 1) w.newLine();
+ }
+ }
+ }
+
+ // ── Key extraction ─────────────────────────────────────────────────────────
+
+ /**
+ * Returns the flat set of dotted-path keys present in the file.
+ * Only leaf keys (not sections) are returned.
+ */
+ private static Set flatKeys(File file) throws IOException {
+ Set keys = new LinkedHashSet<>();
+ Deque stack = new ArrayDeque<>();
+
+ List lines = readLines(file);
+ for (String raw : lines) {
+ String trimmed = raw.stripLeading();
+ if (trimmed.isBlank() || trimmed.startsWith("#")) continue;
+
+ int indent = raw.length() - trimmed.length();
+ int depth = indent / 2;
+
+ while (stack.size() > depth) stack.pollLast();
+
+ if (!trimmed.contains(":")) continue;
+ String keyPart = trimmed.split(":")[0].trim();
+ stack.addLast(keyPart);
+
+ boolean isSection = trimmed.matches("[^:]+:\\s*$");
+ if (!isSection) {
+ keys.add(String.join(".", stack));
+ }
+ }
+ return keys;
+ }
+
+ // ── Helpers ────────────────────────────────────────────────────────────────
+
+ private static Set normalizedIgnored(@Nullable List list) {
+ if (list == null || list.isEmpty()) return Collections.emptySet();
+ Set result = new LinkedHashSet<>();
+ for (String s : list) result.add(s.toLowerCase(Locale.ROOT).trim());
+ return result;
+ }
+
+ private static boolean isIgnored(String fullPath, Set ignored) {
+ String lower = fullPath.toLowerCase(Locale.ROOT);
+ for (String prefix : ignored) {
+ if (lower.equals(prefix) || lower.startsWith(prefix + ".")) return true;
+ }
+ return false;
+ }
+
+ private static int countNew(List before, List after) {
+ return Math.max(0, after.size() - before.size());
+ }
+}
diff --git a/src/main/java/dev/loki/loparkour/generator/BlockSelector.java b/src/main/java/dev/loki/loparkour/generator/BlockSelector.java
deleted file mode 100644
index fb39565..0000000
--- a/src/main/java/dev/loki/loparkour/generator/BlockSelector.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package dev.loki.loparkour.generator;
-
-/**
- * @deprecated Logic merged into {@link BlockPlacer}. Delete this file.
- */
-@Deprecated
-class BlockSelector {}
diff --git a/src/main/java/dev/loki/loparkour/generator/GeneratorTick.java b/src/main/java/dev/loki/loparkour/generator/GeneratorTick.java
deleted file mode 100644
index 2d28a8b..0000000
--- a/src/main/java/dev/loki/loparkour/generator/GeneratorTick.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dev.loki.loparkour.generator;
-
-/**
- * @deprecated Tick logic was merged back into {@link ParkourGenerator#tick()}.
- * Delete this file.
- */
-@Deprecated
-class GeneratorTick {}
diff --git a/src/main/java/dev/loki/loparkour/generator/ParkourGenerator.java b/src/main/java/dev/loki/loparkour/generator/ParkourGenerator.java
index c8e96ba..011fcca 100644
--- a/src/main/java/dev/loki/loparkour/generator/ParkourGenerator.java
+++ b/src/main/java/dev/loki/loparkour/generator/ParkourGenerator.java
@@ -1,4 +1,4 @@
-package dev.loki.loparkour.generator;
+package dev.loki.loparkour.generator;
import dev.loki.loparkour.LoParkour;
import dev.loki.loparkour.config.Config;
diff --git a/src/main/java/dev/loki/loparkour/generator/ScoreManager.java b/src/main/java/dev/loki/loparkour/generator/ScoreManager.java
deleted file mode 100644
index 10ff3b6..0000000
--- a/src/main/java/dev/loki/loparkour/generator/ScoreManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package dev.loki.loparkour.generator;
-
-/**
- * @deprecated Score logic lives in {@link GeneratorLifecycle}.
- * This class was created but never wired in. Delete this file.
- */
-@Deprecated
-class ScoreManager {}
diff --git a/src/main/java/dev/loki/loparkour/generator/EffectManager.java b/src/main/java/dev/loki/loparkour/generator/effect/EffectManager.java
similarity index 92%
rename from src/main/java/dev/loki/loparkour/generator/EffectManager.java
rename to src/main/java/dev/loki/loparkour/generator/effect/EffectManager.java
index 8836eaa..640816e 100644
--- a/src/main/java/dev/loki/loparkour/generator/EffectManager.java
+++ b/src/main/java/dev/loki/loparkour/generator/effect/EffectManager.java
@@ -54,12 +54,11 @@ public class EffectManager {
);
viewers.forEach(p -> p.player.spawnParticle(
Option.PARTICLE_TYPE, center, 5, 0.1, 0.1, 0.1, 0,
- Option.PARTICLE_DATA != null ? Option.PARTICLE_DATA.data() : null
+ Option.PARTICLE_DATA
));
}
case CIRCLE -> ParticleUtil.circle(
- min.clone().add(0.5, 0.5, 0.5), max.getWorld(), Option.PARTICLE_TYPE,
- viewers.stream().map(p -> p.player).toList(), 0.5, 8
+ min.clone().add(0.5, 0.5, 0.5), Option.PARTICLE_TYPE, 8, 1
);
case BOX -> ParticleUtil.box(
org.bukkit.util.BoundingBox.of(min, max), max.getWorld(), Option.PARTICLE_TYPE,
diff --git a/src/main/java/dev/loki/loparkour/generator/BlockPlacer.java b/src/main/java/dev/loki/loparkour/generator/jump/BlockPlacer.java
similarity index 100%
rename from src/main/java/dev/loki/loparkour/generator/BlockPlacer.java
rename to src/main/java/dev/loki/loparkour/generator/jump/BlockPlacer.java
diff --git a/src/main/java/dev/loki/loparkour/generator/JumpDirector.java b/src/main/java/dev/loki/loparkour/generator/jump/JumpDirector.java
similarity index 100%
rename from src/main/java/dev/loki/loparkour/generator/JumpDirector.java
rename to src/main/java/dev/loki/loparkour/generator/jump/JumpDirector.java
diff --git a/src/main/java/dev/loki/loparkour/generator/JumpOffsetGenerator.java b/src/main/java/dev/loki/loparkour/generator/jump/JumpOffsetGenerator.java
similarity index 100%
rename from src/main/java/dev/loki/loparkour/generator/JumpOffsetGenerator.java
rename to src/main/java/dev/loki/loparkour/generator/jump/JumpOffsetGenerator.java
diff --git a/src/main/java/dev/loki/loparkour/generator/JumpType.java b/src/main/java/dev/loki/loparkour/generator/jump/JumpType.java
similarity index 100%
rename from src/main/java/dev/loki/loparkour/generator/JumpType.java
rename to src/main/java/dev/loki/loparkour/generator/jump/JumpType.java
diff --git a/src/main/java/dev/loki/loparkour/generator/JumpValidator.java b/src/main/java/dev/loki/loparkour/generator/jump/JumpValidator.java
similarity index 100%
rename from src/main/java/dev/loki/loparkour/generator/JumpValidator.java
rename to src/main/java/dev/loki/loparkour/generator/jump/JumpValidator.java
diff --git a/src/main/java/dev/loki/loparkour/generator/GeneratorLifecycle.java b/src/main/java/dev/loki/loparkour/generator/lifecycle/GeneratorLifecycle.java
similarity index 100%
rename from src/main/java/dev/loki/loparkour/generator/GeneratorLifecycle.java
rename to src/main/java/dev/loki/loparkour/generator/lifecycle/GeneratorLifecycle.java
diff --git a/src/main/java/dev/loki/loparkour/hook/PAPIHook.java b/src/main/java/dev/loki/loparkour/hook/PAPIHook.java
index 1e662f4..672bf24 100644
--- a/src/main/java/dev/loki/loparkour/hook/PAPIHook.java
+++ b/src/main/java/dev/loki/loparkour/hook/PAPIHook.java
@@ -106,7 +106,7 @@ public class PAPIHook extends PlaceholderExpansion {
ParkourGenerator generator = pp.session.generator;
switch (params) {
case "score", "current_score" -> {
- return Integer.toString(generator.score);
+ return Integer.toString(generator.state.score);
}
case "time", "current_time" -> {
return generator.getFormattedTime();
@@ -134,7 +134,7 @@ public class PAPIHook extends PlaceholderExpansion {
String replaced = params.replace("score_until_", "");
int interval = Integer.parseInt(replaced);
if (interval > 0) {
- return Integer.toString(interval - (generator.totalScore % interval)); // 100 - (5 % 100) = 95
+ return Integer.toString(interval - (generator.state.score % interval));
} else {
return "0";
}
diff --git a/src/main/java/dev/loki/loparkour/menu/settings/ParkourSettingsMenu.java b/src/main/java/dev/loki/loparkour/menu/settings/ParkourSettingsMenu.java
index 3f9c441..d75a419 100644
--- a/src/main/java/dev/loki/loparkour/menu/settings/ParkourSettingsMenu.java
+++ b/src/main/java/dev/loki/loparkour/menu/settings/ParkourSettingsMenu.java
@@ -46,7 +46,7 @@ public class ParkourSettingsMenu extends LPMenu {
open(pp);
})
.setItem(12, toggleItem(locale, "special_blocks", pp.useSpecialBlocks), e -> {
- if (pp.session.generator.score == 0) {
+ if (pp.session.generator.state.score == 0) {
pp.useSpecialBlocks = !pp.useSpecialBlocks;
pp.updateGeneratorSettings(pp.session.generator);
}
@@ -65,7 +65,7 @@ public class ParkourSettingsMenu extends LPMenu {
.setItem(19, localeItem(player, "settings.parkour_settings.styles.item"),
e -> openStyleMenu(pp))
.setItem(20, schemDiffItem(pp), e -> {
- if (pp.session.generator.score == 0) {
+ if (pp.session.generator.state.score == 0) {
List diffs = List.of(0.0, 0.25, 0.5, 0.75, 1.0);
int idx = diffs.indexOf(pp.schematicDifficulty);
pp.schematicDifficulty = diffs.get((idx + 1) % diffs.size());
diff --git a/src/main/java/dev/loki/loparkour/mode/ElytraGenerator.java b/src/main/java/dev/loki/loparkour/mode/ElytraGenerator.java
new file mode 100644
index 0000000..c9e254b
--- /dev/null
+++ b/src/main/java/dev/loki/loparkour/mode/ElytraGenerator.java
@@ -0,0 +1,20 @@
+package dev.loki.loparkour.mode;
+
+import dev.loki.loparkour.generator.ParkourGenerator;
+import dev.loki.loparkour.session.Session;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Generator for Elytra mode parkour
+ */
+public class ElytraGenerator extends ParkourGenerator {
+
+ public ElytraGenerator(@NotNull Session session) {
+ super(session);
+ }
+
+ @Override
+ public Mode getMode() {
+ return Modes.ELYTRA;
+ }
+}
diff --git a/src/main/java/dev/loki/loparkour/player/ParkourPlayer.java b/src/main/java/dev/loki/loparkour/player/ParkourPlayer.java
index d83dff5..64d01ae 100644
--- a/src/main/java/dev/loki/loparkour/player/ParkourPlayer.java
+++ b/src/main/java/dev/loki/loparkour/player/ParkourPlayer.java
@@ -36,7 +36,7 @@ import java.util.function.BiConsumer;
*/
public class ParkourPlayer extends ParkourUser {
- public static final Map PLAYER_COLUMNS = PlayerSettingsManager.getColumnMappings();
+ public static final Map PLAYER_COLUMNS = PlayerSettingsManager.getColumnMappings();
public @Expose Double schematicDifficulty;
public @Expose Integer blockLead;
diff --git a/src/main/java/dev/loki/loparkour/player/PlayerSettingsManager.java b/src/main/java/dev/loki/loparkour/player/PlayerSettingsManager.java
index 5f24278..992698d 100644
--- a/src/main/java/dev/loki/loparkour/player/PlayerSettingsManager.java
+++ b/src/main/java/dev/loki/loparkour/player/PlayerSettingsManager.java
@@ -14,7 +14,7 @@ import java.util.function.BiConsumer;
*
* @since 5.0.0
*/
-class PlayerSettingsManager {
+public class PlayerSettingsManager {
private static final Map COLUMN_MAPPINGS = new HashMap<>();
diff --git a/src/main/java/dev/loki/loparkour/player/UserRegistry.java b/src/main/java/dev/loki/loparkour/player/UserRegistry.java
index e4126a5..97fa70c 100644
--- a/src/main/java/dev/loki/loparkour/player/UserRegistry.java
+++ b/src/main/java/dev/loki/loparkour/player/UserRegistry.java
@@ -92,7 +92,9 @@ public class UserRegistry {
}
public static int getJoinCount() {
- return joinCount;
+ int count = joinCount;
+ joinCount = 0;
+ return count;
}
private static void resetScoreboard(ParkourUser user) {