Skip to content

Commit e161afb

Browse files
committed
Say the Fabric changes were run, and write them the way this codebase writes
Two things the pre-push audit turned up, neither of them a defect in behaviour. status.md said all three of the window's fixes were re-checked in the running application. Two were. The third needs a second install into a real Minecraft, which has not been done; what covers it is tests over the merge itself. Now said that way. The adapter changes were compiled and not run, which the commits said accurately but which left the standing gate unexercised over three behavioural changes to the coordinator. It has now been run: 158 chunks enqueued, none dropped, no snapshot failures, all seven corpus shapes present, and a fingerprint byte-identical to the committed reference. The rest is prose. Comparing the added lines against the codebase found the " -- " aside used at roughly seven times the rate this project uses it, which is a voice that is not its own. Rewritten into colons, commas and full stops; what remains in these files is the author's own from before.
1 parent dd4dcf9 commit e161afb

16 files changed

Lines changed: 25 additions & 25 deletions

File tree

adapters/fabric/src/client/java/org/worldledger/fabric/WorldLedgerRuntime.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ public static void onBiomeUpdate(ClientboundChunksBiomesPacket packet) {
110110
*
111111
* <p>Nothing this mod does is worth that. Capture is a passenger: it records
112112
* what the client was shown, and a session that records nothing is a session
113-
* that recorded nothing. A player losing their connection -- or their
114-
* afternoon -- because a chunk could not be read is the one outcome that is
113+
* that recorded nothing. A player losing their connection, or their
114+
* afternoon, because a chunk could not be read is the one outcome that is
115115
* worse than not capturing at all.
116116
*
117117
* <p>Errors are not caught. An OutOfMemoryError or a linkage failure is not

adapters/fabric/src/main/java/org/worldledger/fabric/CaptureNotices.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public static String reloaded(String contributor, boolean sessionRunning) {
116116
// The one case where being vague would matter most. A player who
117117
// blanks their name mid-session is asking to stop, and this used to
118118
// answer "capture stays off" flatly while the running session kept
119-
// recording under the name it took at join -- the setting changed,
119+
// recording under the name it took at join. The setting changed,
120120
// the session's copy of it did not.
121121
//
122122
// The session is now ended for them, so the sentence is true when it

cmd/worldledger/export.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ func (r worldRequest) write(snapshot epoch.Snapshot, prepared []anvil.PreparedCh
258258
for _, path := range report.RegionFiles {
259259
fmt.Printf(" %s\n", path)
260260
}
261-
// Said even when it is none, because the question it answers -- what
262-
// happened to what was already in that world -- is one somebody has whether
261+
// Said even when it is none. The question it answers, what
262+
// happened to what was already in that world, is one somebody has whether
263263
// or not the answer is reassuring.
264264
if report.Kept > 0 {
265265
fmt.Printf("%d chunk(s) already in those files were left as they were\n", report.Kept)

cmd/worldledger/translate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func translateForTarget(prepared []anvil.PreparedChunk, dimensionID string, opti
9393
// Refusal was decided inside the translator, which only sees blocks, biomes
9494
// and the build range. Block entities are dropped out here, so a conversion
9595
// whose only loss was every chest, sign and furnace in the world reported
96-
// them and then wrote the world anyway -- under the one policy whose entire
96+
// them and then wrote the world anyway, under the one policy whose entire
9797
// purpose is to write nothing and tell you what would have gone.
9898
if report.Policy == translate.PolicyReport && droppedBlockEntities > 0 {
9999
return nil, 0, fmt.Errorf(

desktop/internal/api/installing.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func saveManifest(dir string, manifest installer.Manifest) string {
230230
// usually one step. Replacing the record with that one step is how Remove
231231
// came to remove a single jar and report "Your Minecraft is back to what it
232232
// was" while the Fabric profile, the launcher entry, Fabric API and
233-
// capture.properties all stayed -- and the play screen sends people back to
233+
// capture.properties all stayed. The play screen sends people back to
234234
// Set up for exactly the case that causes it, a launcher that replaced the
235235
// mods folder.
236236
if previous, err := os.ReadFile(path); err == nil {
@@ -258,7 +258,7 @@ func saveManifest(dir string, manifest installer.Manifest) string {
258258
// Where both touched the same file the two halves come from different places,
259259
// and getting that backwards undoes the wrong thing. The digest has to be the
260260
// new one, because that is what is on disk now and an uninstall compares against
261-
// it before removing anything -- keeping the old digest would make every
261+
// it before removing anything. Keeping the old digest would make every
262262
// reinstalled file look changed by somebody else and be left behind. The backup
263263
// has to be the oldest one, because that is what was there before this
264264
// application first touched the file; the later backup is a copy of our own

desktop/internal/api/manifest_merge_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
// A plan only contains steps for what is missing, so a second set-up is usually
1111
// one step. Writing that over the record is how Remove came to remove a single
12-
// jar and report "Your Minecraft is back to what it was" -- and the play screen
12+
// jar and report "Your Minecraft is back to what it was", while the play screen
1313
// sends people back to Set up for exactly the case that causes it, a launcher
1414
// that replaced the mods folder.
1515

desktop/internal/api/status.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ type Server struct {
6363
// The page never sent one, so export, moments and travel all defaulted to
6464
// the overworld while this count summed every dimension. A player whose
6565
// evening was in the Nether was told "800 places recorded" and then, on the
66-
// next screen, that there was nothing recorded at that moment -- three
66+
// next screen, that there was nothing recorded at that moment. Three
6767
// screens disagreeing about the same archive, and none of them ever saying
6868
// the word "overworld".
6969
Dimensions []Dimension `json:"dimensions"`
@@ -184,7 +184,7 @@ func readSpoolState() *SpoolState {
184184
}
185185
// A folder that cannot be read is not an empty folder. Returning zero
186186
// counts made the play screen say "Nothing new since last time" about a
187-
// folder it had failed to open -- while the import screen, given the
187+
// folder it had failed to open, while the import screen, given the
188188
// same folder, said so honestly. Two screens disagreeing about one
189189
// directory, and the reassuring one was wrong.
190190
return &SpoolState{Dir: dir, Unreadable: err.Error()}

desktop/internal/installer/apply.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,8 @@ func removeLauncherEntry(path, versionID string) error {
335335
// without saying so.
336336
//
337337
// So an existing file is edited: the contributor line is set wherever it is, and
338-
// every other line -- settings, comments, blank lines, whatever somebody added
339-
// of their own -- is passed through as it stands. Only an absent or contributed
338+
// every other line is passed through as it stands: settings, comments, blank
339+
// lines, whatever somebody added of their own. Only an absent or contributed
340340
// file gets written from scratch.
341341
func captureProperties(contributor string, existing []byte) []byte {
342342
if len(bytes.TrimSpace(existing)) == 0 {

docs/status.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ The window is now told to draw at the display's real resolution. It never declar
101101

102102
And the path ended without saying what had happened. It ended in one green line where the whole screen had been — no count, no folder, no files, nothing about what was already in that world. The last screen now answers the four questions that are actually asked there: what went in, what was already there and survived, where it is, and what to do next. On the same run, the install had also refused *after* the person had typed a name, read five file paths and agreed to all five, because a build from source carries no address for the mod; that refusal now happens before the asking, since consent collected for something that cannot happen is worse than not asking.
103103

104-
**Three more the window had, found by looking for the same shapes again.** None of them fails anything, and all three are now fixed with the running application checked afterwards.
104+
**Three more the window had, found by looking for the same shapes again.** None of them fails anything. Two were re-checked in the running application afterwards and the third, which needs a second install into a real Minecraft, is covered by tests over the merge itself and is marked as such below.
105105

106106
Reloading the page broke the application, and in browser mode killed it. The token arrives in the address and is stripped immediately so it does not reach history — and it lived only in a variable, so pressing F5 left the page with no token, every call answering 401, and the keepalive silenced, which ended the process forty-five seconds later. F5 on a screen that looks stuck is the most natural recovery action there is. The token now survives in `sessionStorage`, which is not what the original note was about: it empties when the tab closes and is shared with no other tab, and a token only ever works for the server that minted it. Checked in the running application: after a reload the address carries no token, the token is recovered, `/api/status` answers 200 and the page draws.
107107

108108
Those four rejections were also the only failures in the application that came back as bare text, so the page could say "the application answered 401" and had nothing to suggest. All four now carry a problem and a next step, with a test over every one.
109109

110-
A second set-up destroyed the record of the first. A plan holds steps only for what is missing, so a second run is usually one step, and the record was written over rather than added to — leaving Remove able to delete one jar while reporting "Your Minecraft is back to what it was", with the Fabric profile, the launcher entry, Fabric API and `capture.properties` all still there. The play screen sends people to Set up for exactly the case that causes it. Records merge now: the digest from the newer install, because that is what an uninstall compares against, and the backup from the older one, because that is what was there before this application first touched the file.
110+
A second set-up destroyed the record of the first. A plan holds steps only for what is missing, so a second run is usually one step, and the record was written over rather than added to — leaving Remove able to delete one jar while reporting "Your Minecraft is back to what it was", with the Fabric profile, the launcher entry, Fabric API and `capture.properties` all still there. The play screen sends people to Set up for exactly the case that causes it. Records merge now: the digest from the newer install, because that is what an uninstall compares against, and the backup from the older one, because that is what was there before this application first touched the file. Reproducing that end to end means installing into a real Minecraft twice, which has not been done; what is covered is the merge itself, by tests, including that a first install is unchanged by passing through it.
111111

112112
And the whole application only ever meant the overworld. The page sent no dimension, so export, moments and travel all defaulted to it while the server's chunk count summed every dimension — so an evening in the Nether showed "800 places recorded" on one screen and "nothing recorded at that moment" on the next, with the word overworld appearing nowhere. The status now reports each dimension and its count, and both screens have a World chooser beside the server one.
113113

internal/anvil/export.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ func readObject(source ObjectSource, ref model.BlobRef) ([]byte, error) {
366366
// The temporary name is unique rather than the target's with ".tmp" on the end.
367367
// A fixed name is only safe while one writer exists at a time, and there is no
368368
// such guarantee here: the desktop application's export lock is in-process, so a
369-
// command line export and the window running together -- or two exports into the
370-
// same world -- opened the same temporary with O_TRUNC, interleaved their bytes,
369+
// command line export and the window running together, or two exports into the
370+
// same world, opened the same temporary with O_TRUNC, interleaved their bytes,
371371
// and both renamed the mixture over a region file in somebody's save.
372372
//
373373
// The contents are forced to disk before the rename. This writes into a world

0 commit comments

Comments
 (0)