Skip to content

Implement autonomous slave self-repair and restrict master error scope #20

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

Merged
Julflips merged 2 commits into from
Mar 21, 2026
Merged

Implement autonomous slave self-repair and restrict master error scope #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a5455a
Implement autonomous slave self-repair and restrict master error scope
anchal12ajay12 Mar 20, 2026
6c8c930
Merge pull request #1 from anchal12ajay12/fix/slave-self-repair
anchal12ajay12 Mar 20, 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
67 changes: 30 additions & 37 deletions src/main/java/com/julflips/nerv_printer/modules/CarpetPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,10 +922,7 @@ private void onTick(TickEvent.Pre event) {
+ MapAreaCache.getCachedBlockState(errorPos).getBlock().getName().getString()
+ ". Should be: " + missingBlockString);
}
if (SlaveSystem.isSlave()) {
// Obfuscate error pas as relative pos
SlaveSystem.queueMasterDM("error:" + relativePos.getX() + ":" + relativePos.getZ());
}
// Slaves no longer send errors to master; they will fix it themselves
}
knownErrors.addAll(newErrors);
if (!knownErrors.isEmpty() && errorAction.get() == ErrorAction.Reset) {
Expand Down Expand Up @@ -995,6 +992,35 @@ private void onTick(TickEvent.Pre event) {
return;
}
if (checkpoints.isEmpty()) {
if (!knownErrors.isEmpty()) {
if (errorAction.get() == ErrorAction.ToggleOff) {
info("Found errors: ");
for (int i = knownErrors.size() - 1; i >= 0; i--) {
info("Pos: " + knownErrors.get(i).toShortString());
}
knownErrors.clear();
checkpoints.add(new Pair(mc.player.getEntityPos(), new Pair("lineEnd", null)));
state = State.Walking;
warning("ErrorAction is ToggleOff: Stopping because of an error...");
toggle();
return;
} else if (errorAction.get() == ErrorAction.Repair) {
info("Fixing errors: ");
for (int i = knownErrors.size() - 1; i >= 0; i--) {
BlockPos errorPos = knownErrors.get(i);
info("Pos: " + errorPos.toShortString());
checkpoints.add(new Pair(errorPos.toCenterPos(), new Pair("break", errorPos)));
}
checkpoints.add(new Pair(dumpStation.getLeft(), new Pair("dump", null)));
for (int i = 0; i < knownErrors.size(); i++) {
String action = (i == knownErrors.size() - 1) ? "lineEnd" : "sprint";
BlockPos errorPos = knownErrors.get(i);
checkpoints.add(new Pair(errorPos.toCenterPos(), new Pair(action, null)));
}
knownErrors.clear();
return;
}
}
if (SlaveSystem.isSlave()) {
SlaveSystem.queueMasterDM("finished");
state = State.AwaitSlaveNextMap;
Expand Down Expand Up @@ -1253,39 +1279,6 @@ private void startBuilding() {
}

private boolean endBuilding() {
if (!knownErrors.isEmpty()) {
if (errorAction.get() == ErrorAction.ToggleOff) {
workingInterval = new Pair<>(0, map.length - 1);
info("Found errors: ");
for (int i = knownErrors.size() - 1; i >= 0; i--) {
info("Pos: " + knownErrors.get(i).toShortString());
}
knownErrors.clear();
checkpoints.add(new Pair(mc.player.getEntityPos(), new Pair("lineEnd", null)));
state = State.Walking;
warning("ErrorAction is ToggleOff: Stopping because of an error...");
toggle();
return false;
}
if (errorAction.get() == ErrorAction.Repair) {
workingInterval = new Pair<>(0, map.length - 1);
info("Fixing errors: ");
for (int i = knownErrors.size() - 1; i >= 0; i--) {
BlockPos errorPos = knownErrors.get(i);
info("Pos: " + errorPos.toShortString());
checkpoints.add(new Pair(errorPos.toCenterPos(), new Pair("break", errorPos)));
}
checkpoints.add(new Pair(dumpStation.getLeft(), new Pair("dump", null)));
for (int i = 0; i < knownErrors.size(); i++) {
String action = (i == knownErrors.size() - 1) ? "lineEnd" : "sprint";
BlockPos errorPos = knownErrors.get(i);
checkpoints.add(new Pair(errorPos.toCenterPos(), new Pair(action, null)));
}
knownErrors.clear();
state = State.Walking;
return true;
}
}
info("Finished building map");
state = State.Walking;
workingInterval = trueInterval;
Expand Down
Loading