forked from neoforged/NeoForge
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[1.20.4] Improve NeoForge's chunk generation command (neoforged#364)
Special thanks to Jasmine and Gegy for allowing us to use their Fabric Chunk Pregenerator as a basis for this PR. https://github.com/jaskarth/fabric-chunkpregenerator/tree/master Fixes neoforged#331
- Loading branch information
1 parent
0358748
commit 823e543
Showing
8 changed files
with
604 additions
and
149 deletions.
There are no files selected for viewing
127 changes: 0 additions & 127 deletions
127
src/main/java/net/neoforged/neoforge/server/command/ChunkGenWorker.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
src/main/java/net/neoforged/neoforge/server/command/generation/CoarseOnionIterator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * Copyright (c) NeoForged and contributors | ||
| * SPDX-License-Identifier: LGPL-2.1-only | ||
| */ | ||
|
|
||
| package net.neoforged.neoforge.server.command.generation; | ||
|
|
||
| import com.google.common.collect.AbstractIterator; | ||
| import java.util.Iterator; | ||
| import java.util.NoSuchElementException; | ||
| import net.minecraft.world.level.ChunkPos; | ||
|
|
||
| /** | ||
| * Special thanks to Jasmine and Gegy for allowing us to use their pregenerator mod as a model to use in NeoForge! | ||
| * Original code: <a href="https://github.com/jaskarth/fabric-chunkpregenerator">https://github.com/jaskarth/fabric-chunkpregenerator</a> | ||
| */ | ||
| public class CoarseOnionIterator extends AbstractIterator<ChunkPos> { | ||
| private final int radius; | ||
| private final int cellSize; | ||
|
|
||
| private final OnionIterator cells; | ||
| private CellIterator cell; | ||
|
|
||
| public CoarseOnionIterator(int radius, int cellSize) { | ||
| this.radius = radius; | ||
| this.cellSize = cellSize; | ||
|
|
||
| this.cells = new OnionIterator((radius + cellSize - 1) / cellSize); | ||
| } | ||
|
|
||
| @Override | ||
| protected ChunkPos computeNext() { | ||
| OnionIterator cells = this.cells; | ||
| CellIterator cell = this.cell; | ||
| while (cell == null || !cell.hasNext()) { | ||
| if (!cells.hasNext()) { | ||
| return this.endOfData(); | ||
| } | ||
|
|
||
| ChunkPos cellPos = cells.next(); | ||
| this.cell = cell = this.createCellIterator(cellPos); | ||
| } | ||
|
|
||
| return cell.next(); | ||
| } | ||
|
|
||
| private CellIterator createCellIterator(ChunkPos pos) { | ||
| int size = this.cellSize; | ||
| int radius = this.radius; | ||
|
|
||
| int x0 = pos.x * size; | ||
| int z0 = pos.z * size; | ||
| int x1 = x0 + size - 1; | ||
| int z1 = z0 + size - 1; | ||
| return new CellIterator( | ||
| Math.max(x0, -radius), Math.max(z0, -radius), | ||
| Math.min(x1, radius), Math.min(z1, radius)); | ||
| } | ||
|
|
||
| private static final class CellIterator implements Iterator<ChunkPos> { | ||
| private final int x0; | ||
| private final int x1; | ||
| private final int z1; | ||
|
|
||
| private int x; | ||
| private int z; | ||
|
|
||
| private CellIterator(int x0, int z0, int x1, int z1) { | ||
| this.x = x0; | ||
| this.z = z0; | ||
| this.x0 = x0; | ||
| this.x1 = x1; | ||
| this.z1 = z1; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| return this.z <= this.z1; | ||
| } | ||
|
|
||
| @Override | ||
| public ChunkPos next() { | ||
| if (!this.hasNext()) { | ||
| throw new NoSuchElementException(); | ||
| } | ||
|
|
||
| ChunkPos pos = new ChunkPos(this.x, this.z); | ||
| if (this.x++ >= this.x1) { | ||
| this.x = this.x0; | ||
| this.z++; | ||
| } | ||
|
|
||
| return pos; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.