Skip to content

fix: don't bypass history with //ores #3258

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 2 commits into
base: main
Choose a base branch
from
Open

fix: don't bypass history with //ores #3258

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
182f2b7
fix: don't bypass history with //ores
dordsor21 Aug 1, 2025
635f393
Bring ores closer in line with vanilla generation
dordsor21 Aug 3, 2025
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
16 changes: 9 additions & 7 deletions worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/FaweRegionExtent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
public abstract class FaweRegionExtent extends ResettableExtent implements IBatchProcessor {

private final FaweLimit limit;
private final boolean hasLimit;

/**
* Create a new instance.
Expand All @@ -36,6 +37,7 @@ public abstract class FaweRegionExtent extends ResettableExtent implements IBatc
public FaweRegionExtent(Extent extent, FaweLimit limit) {
super(extent);
this.limit = limit;
this.hasLimit = limit != null;
}

@Override
Expand Down Expand Up @@ -75,7 +77,7 @@ public final boolean contains(BlockVector2 p) {
public <B extends BlockStateHolder<B>> boolean setBlock(int x, int y, int z, B block)
throws WorldEditException {
if (!contains(x, y, z)) {
if (!limit.MAX_FAILS()) {
if (hasLimit && !limit.MAX_FAILS()) {
WEManager.weManager().cancelEditSafe(this, FaweCache.OUTSIDE_REGION);
}
return false;
Expand All @@ -86,7 +88,7 @@ public <B extends BlockStateHolder<B>> boolean setBlock(int x, int y, int z, B b
@Override
public boolean setBiome(int x, int y, int z, BiomeType biome) {
if (!contains(x, y, z)) {
if (!limit.MAX_FAILS()) {
if (hasLimit && !limit.MAX_FAILS()) {
WEManager.weManager().cancelEditSafe(this, FaweCache.OUTSIDE_REGION);
}
return false;
Expand All @@ -102,7 +104,7 @@ public BiomeType getBiome(BlockVector3 position) {
@Override
public BiomeType getBiomeType(int x, int y, int z) {
if (!contains(x, y, z)) {
if (!limit.MAX_FAILS()) {
if (hasLimit && !limit.MAX_FAILS()) {
WEManager.weManager().cancelEditSafe(this, FaweCache.OUTSIDE_REGION);
}
return null;
Expand All @@ -118,7 +120,7 @@ public BaseBlock getFullBlock(BlockVector3 position) {
@Override
public BaseBlock getFullBlock(int x, int y, int z) {
if (!contains(x, y, z)) {
if (!limit.MAX_FAILS()) {
if (hasLimit && !limit.MAX_FAILS()) {
WEManager.weManager().cancelEditSafe(this, FaweCache.OUTSIDE_REGION);
}
return BlockTypes.AIR.getDefaultState().toBaseBlock();
Expand All @@ -134,7 +136,7 @@ public BlockState getBlock(BlockVector3 position) {
@Override
public BlockState getBlock(int x, int y, int z) {
if (!contains(x, y, z)) {
if (!limit.MAX_FAILS()) {
if (hasLimit && !limit.MAX_FAILS()) {
WEManager.weManager().cancelEditSafe(this, FaweCache.OUTSIDE_REGION);
}
return BlockTypes.AIR.getDefaultState();
Expand All @@ -146,7 +148,7 @@ public BlockState getBlock(int x, int y, int z) {
@Override
public Entity createEntity(Location location, BaseEntity entity) {
if (!contains(location.getBlockX(), location.getBlockY(), location.getBlockZ())) {
if (!limit.MAX_FAILS()) {
if (hasLimit && !limit.MAX_FAILS()) {
WEManager.weManager().cancelEditSafe(this, FaweCache.OUTSIDE_REGION);
}
return null;
Expand All @@ -158,7 +160,7 @@ public Entity createEntity(Location location, BaseEntity entity) {
@Override
public Entity createEntity(Location location, BaseEntity entity, UUID uuid) {
if (!contains(location.getBlockX(), location.getBlockY(), location.getBlockZ())) {
if (!limit.MAX_FAILS()) {
if (hasLimit && !limit.MAX_FAILS()) {
WEManager.weManager().cancelEditSafe(this, FaweCache.OUTSIDE_REGION);
}
return null;
Expand Down
5 changes: 0 additions & 5 deletions worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/PassthroughExtent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,6 @@ public void addOre(Region region, Mask mask, Pattern material, int size, int fre
getExtent().addOre(region, mask, material, size, frequency, rarity, minY, maxY);
}

@Override
public void addOres(Region region, Mask mask) throws WorldEditException {
getExtent().addOres(region, mask);
}

@Override
public List<Countable<BlockType>> getBlockDistribution(Region region) {
return getExtent().getBlockDistribution(region);
Expand Down
37 changes: 36 additions & 1 deletion worldedit-core/src/main/java/com/fastasyncworldedit/core/function/generator/OreGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,38 @@ public class OreGen implements Resource {
private final Extent extent;
private final Mask mask;
private final MutableBlockVector3 mutable = new MutableBlockVector3();
private final boolean triangular;

private final double ONE_2 = 1 / 2F;
private final double ONE_8 = 1 / 8F;
private final double ONE_16 = 1 / 16F;

public OreGen(Extent extent, Mask mask, Pattern pattern, int size, int minY, int maxY) {
this(extent, mask, pattern, size, minY, maxY, false);
}

/**
* Generate ore-like deposits with the given pattern and settings
*
* @param extent Extent to write to
* @param mask mask of where to place
* @param pattern pattern to place
* @param size maximum size of deposits
* @param minY min Y to consider generation from (important for triangular generation)
* @param maxY max Y to consider generation from (important for triangular generation)
* @param triangular if a triangular distribution of ores should be used (rather than
* @throws WorldEditException on error
* @since TODO
*/
public OreGen(
Extent extent,
Mask mask,
Pattern pattern,
int size,
int minY,
int maxY,
boolean triangular
) {
this.maxSize = size;
this.maxSizeO8 = size * ONE_8;
this.maxSizeO16 = size * ONE_16;
Expand All @@ -36,11 +62,20 @@ public OreGen(Extent extent, Mask mask, Pattern pattern, int size, int minY, int
this.mask = mask;
this.pattern = pattern;
this.extent = extent;
this.triangular = triangular;
}

@Override
public boolean spawn(Random rand, int x, int z) throws WorldEditException {
int y = rand.nextInt(maxY - minY) + minY;
int y;
if (this.triangular) {
int range = maxY - minY;
int mid = range / 2;
int upperMid = range - mid;
y = minY + rand.nextInt(mid) + rand.nextInt(upperMid);
} else {
y = rand.nextInt(maxY - minY) + minY;
}
if (!mask.test(mutable.setComponents(x, y, z))) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4117,7 +4117,7 @@ public void removeEntity(int x, int y, int z, UUID uuid) {
@Override
public void generate(Region region, GenBase gen) throws WorldEditException {
for (BlockVector2 chunkPos : region.getChunks()) {
gen.generate(chunkPos, new SingleRegionExtent(this, getLimit(), region));
gen.generate(chunkPos, new SingleRegionExtent(this, null, region));
}
}

Expand Down
6 changes: 4 additions & 2 deletions worldedit-core/src/main/java/com/sk89q/worldedit/command/GenerationCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,10 +622,12 @@ public void ores(
LocalSession session,
EditSession editSession,
@Selection Region region,
@Arg(desc = "Mask") Mask mask
@Arg(desc = "Mask") Mask mask,
@Switch(name = 'b', desc = "Make all ores deepslate equivalent for y<0") boolean deepslateBelowZero,
@Switch(name = 'd', desc = "Make all ores deepslate equivalent when placed into deepslate, tuff, etc.") boolean deepslateWhereDeepslate
) throws WorldEditException {
new MaskTraverser(mask).setNewExtent(editSession);
editSession.addOres(region, mask);
editSession.addOres(region, mask, deepslateBelowZero, deepslateWhereDeepslate);
actor.print(Caption.of("fawe.worldedit.visitor.visitor.block", editSession.getBlockChangeCount()));
}

Expand Down
Loading
Loading