Skip to content

Database Source reflow #8084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
LlmDl wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Database Source reflow #8084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b809c9
Commit restoring/modernizing most of the changes left from the UUID DB
LlmDl Jan 20, 2026
39d9b4c
Pass the original exception with the ObjectSaveException messages.
LlmDl Jan 21, 2026
2f08f00
Changes to the TownyUniverse registering/unregistering of objects.
LlmDl Jan 21, 2026
7913174
Review of object database fields complete.
LlmDl Jan 23, 2026
f4c3832
Remove the commented-out old stuff from flatfile source.
LlmDl Jan 23, 2026
49a5e7e
Add manual nation level saving/loading.
LlmDl Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
311 changes: 232 additions & 79 deletions Towny/src/main/java/com/palmergames/bukkit/towny/TownyUniverse.java
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions Towny/src/main/java/com/palmergames/bukkit/towny/command/NationCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,9 +963,8 @@ public static void newNation(CommandSender sender, String name, Town capitalTown
public static Nation newNation(String name, Town town) throws TownyException {
TownyUniverse townyUniverse = TownyUniverse.getInstance();

UUID nationUUID = UUID.randomUUID();
townyUniverse.getDataSource().newNation(name, nationUUID);
Nation nation = townyUniverse.getNation(nationUUID);
townyUniverse.newNation(name);
Nation nation = townyUniverse.getNation(name);

// Should never happen.
if (nation == null) {
Expand Down
21 changes: 12 additions & 9 deletions Towny/src/main/java/com/palmergames/bukkit/towny/db/FlatFileSaveTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,32 @@
import com.palmergames.bukkit.towny.TownyMessaging;
import com.palmergames.util.FileMgmt;

import java.util.List;
import java.nio.file.Paths;
import java.util.Map;
import java.io.IOException;

public class FlatFileSaveTask implements Runnable {

private final List<String> list;
private final Map<String, Object> map;
private final String path;

/**
* Constructor to save a list
* @param list - list to save.
* @param path - path on filesystem.
* Constructor to save a Map to a file.
* @param map Map to save.
* @param path String path on filesystem.
*/
public FlatFileSaveTask(List<String> list, String path) {
this.list = list;
public FlatFileSaveTask(Map<String, Object> map, String path) {
this.map = map;
this.path = path;
}

@Override
public void run() {
try {
FileMgmt.listToFile(list, path);
} catch (NullPointerException ex) {
FileMgmt.mapToFile(map, Paths.get(path));
} catch (IOException ex) {
TownyMessaging.sendErrorMsg("Null Error saving to file - " + path);
ex.printStackTrace();
}
}
}
4 changes: 2 additions & 2 deletions Towny/src/main/java/com/palmergames/bukkit/towny/db/SQLSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,11 +377,11 @@ private static List<ColumnData> getTownBlockColumns() {
columns.add(new ColumnData("taxed", "bool NOT NULL DEFAULT '1'"));
columns.add(new ColumnData("town", "mediumtext"));
columns.add(new ColumnData("resident", "mediumtext"));
columns.add(new ColumnData("type", "TINYINT NOT NULL DEFAULT '0'"));
columns.add(new ColumnData("type", "TINYINT NOT NULL DEFAULT '0'")); // TODO: Check if this is still used.
columns.add(new ColumnData("typeName", "mediumtext"));
columns.add(new ColumnData("outpost", "bool NOT NULL DEFAULT '0'"));
columns.add(new ColumnData("permissions", "mediumtext NOT NULL"));
columns.add(new ColumnData("locked", "bool NOT NULL DEFAULT '0'"));
columns.add(new ColumnData("locked", "bool NOT NULL DEFAULT '0'")); // TODO: Check if this is still used.
columns.add(new ColumnData("changed", "bool NOT NULL DEFAULT '0'"));
columns.add(new ColumnData("metadata", "mediumtext DEFAULT NULL"));
columns.add(new ColumnData("groupID", "VARCHAR(36) DEFAULT NULL"));
Expand Down
Loading
Loading