Skip to content

[Serialiser] Fix some inputs sometimes not being saved #245

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.

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

Merged
merged 1 commit into from
May 5, 2025
Merged
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions src/main/java/com/minecrafttas/tasmod/util/FileThread.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;

/**
* Thread for writing files to disc
Expand All @@ -21,34 +20,35 @@ public class FileThread extends Thread {
private final PrintWriter stream;
private boolean end = false;

private final List<String> output = new ArrayList<>();
private final ConcurrentLinkedQueue<String> output = new ConcurrentLinkedQueue<>();

public FileThread(Path fileLocation, boolean append) throws IOException {
super("TASmod FileWriter Thread");
OutputStream outStream = Files.newOutputStream(fileLocation, StandardOpenOption.CREATE, append ? StandardOpenOption.APPEND : StandardOpenOption.TRUNCATE_EXISTING);
stream = new PrintWriter(new OutputStreamWriter(outStream, StandardCharsets.UTF_8));
stream = new PrintWriter(new OutputStreamWriter(outStream, StandardCharsets.UTF_8), true);
}

public void addLine(String line) {
synchronized (output) {
output.add(line + "\n");
}
output.add(line + "\n");
}

@Override
public void run() {
while (!end) {
synchronized (output) {
ArrayList<String> newList = new ArrayList<String>(output);
output.clear();
for (String line : newList) {
stream.print(line);
}
}
writeOutput();
}
writeOutput(); // Print any remaining lines, just to be safe...

stream.flush();
stream.close();
}

private void writeOutput() {
String line;
while ((line = output.poll()) != null)
stream.print(line);
}

public void close() {
end = true;
}
Expand Down
Loading