Skip to content

Resolve cyclic dependency between static initializers of EmptyWorld and EmptyDimension. #1905

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
leMaik merged 2 commits into from
Jul 26, 2026
Merged

Resolve cyclic dependency between static initializers of EmptyWorld and EmptyDimension. #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01d2548
Resolve cyclic dependency between static initializers of EmptyWorld a…
leMaik Jul 26, 2026
fd5e387
Ensure that EmptyWorld cannot change dimension.
leMaik Jul 26, 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
2 changes: 1 addition & 1 deletion chunky/src/java/se/llbit/chunky/world/EmptyChunk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class EmptyChunk extends Chunk {
}

private EmptyChunk() {
super(new ChunkPosition(0, 0), EmptyDimension.INSTANCE);
super(new ChunkPosition(0, 0), EmptyWorld.INSTANCE.currentDimension());
surface = IconLayer.CORRUPT;
}

Expand Down
4 changes: 1 addition & 3 deletions chunky/src/java/se/llbit/chunky/world/EmptyDimension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
import java.util.Collections;

public class EmptyDimension extends Dimension {
public static final EmptyDimension INSTANCE = new EmptyDimension();

private EmptyDimension() {
EmptyDimension() {
super(EmptyWorld.INSTANCE, Dimension.Identifier.OVERWORLD, null, Collections.emptySet());
}

Expand Down
2 changes: 1 addition & 1 deletion chunky/src/java/se/llbit/chunky/world/EmptyRegionChunk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class EmptyRegionChunk extends Chunk {
}

private EmptyRegionChunk() {
super(new ChunkPosition(0, 0), EmptyDimension.INSTANCE);
super(new ChunkPosition(0, 0), EmptyWorld.INSTANCE.currentDimension());
surface = IconLayer.CORRUPT;
}

Expand Down
10 changes: 8 additions & 2 deletions chunky/src/java/se/llbit/chunky/world/EmptyWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,16 @@ public class EmptyWorld extends World {

private EmptyWorld() {
super("[empty world]", null, 0, -1);
this.currentDimension = EmptyDimension.INSTANCE;
this.currentDimension = new EmptyDimension();
}

@Override public String toString() {
@Override
public void loadDimension(Dimension.Identifier dimensionId) {
// no-op
}

@Override
public String toString() {
return "[empty world]";
}

Expand Down
Loading