Skip to content

fix fortress generation for 1.16+ #8

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix fortress generation for 1.16+ #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 15 additions & 11 deletions src/main/java/com/seedfinding/mcfeature/structure/generator/structure/FortressGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,11 +438,15 @@ private boolean intersectsAny(int xMin, int yMin, int zMin, int xMax, int yMax,
}

private void setSeed(ChunkRand rand, long worldSeed, int chunkX, int chunkZ) {
rand.setSeed((chunkX >> 4) ^ (chunkZ >> 4 << 4) ^ worldSeed);
rand.nextInt();
rand.nextInt(3);
rand.nextInt(8);
rand.nextInt(8);
if (version.isOlderOrEqualTo(MCVersion.v1_15)) {
rand.setSeed((chunkX >> 4) ^ (chunkZ >> 4 << 4) ^ worldSeed);
rand.nextInt();
rand.nextInt(3);
rand.nextInt(8);
rand.nextInt(8);
} else {
rand.setCarverSeed(worldSeed, chunkX, chunkZ, version);
}
}

public static void main(String[] args) {
Expand Down Expand Up @@ -487,12 +491,12 @@ private interface Extender {
void extend(PieceInfo pieceInfo, ChunkRand rand);
}

private static class PieceInfo {
private final int type;
private final int depth;
private final int xMin, yMin, zMin;
private final int xMax, yMax, zMax;
private final int facing;
public static class PieceInfo {
public final int type;
public final int depth;
public final int xMin, yMin, zMin;
public final int xMax, yMax, zMax;
public final int facing;

public PieceInfo(int type, int depth, int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, int facing) {
this.type = type;
Expand Down