Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove instance from request

This commit is contained in:
themode 2022-01-12 14:39:59 +01:00
parent d3b98b1c8e
commit 0abc787350
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/instance/InstanceContainer.java
View File

@ -297,16 +297,10 @@ public class InstanceContainer extends Instance {
Check.notNull(chunk, "Chunks supplied by a ChunkSupplier cannot be null.");
Generator generator = getGenerator();
if (generator != null && chunk.shouldGenerate()) {
final Instance instance = this;
AtomicReference<CompletableFuture<?>> stage = new AtomicReference<>(null);
var chunkUnit = GeneratorImpl.chunk(getSectionMinY(), getSectionMaxY(),
new GeneratorImpl.ChunkEntry(chunk));
generator.generate(new GenerationRequest() {
@Override
public @NotNull Instance instance() {
return instance;
}
@Override
public void returnAsync(@NotNull CompletableFuture<?> future) {
stage.set(future);

3
src/main/java/net/minestom/server/instance/generator/GenerationRequest.java
View File

@ -1,13 +1,10 @@
package net.minestom.server.instance.generator;
import net.minestom.server.instance.Instance;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.CompletableFuture;
public interface GenerationRequest {
@NotNull Instance instance();
void returnAsync(@NotNull CompletableFuture<?> future);
@NotNull GenerationUnit unit();

21
src/test/java/net/minestom/server/instance/GeneratorTest.java
View File

@ -93,7 +93,7 @@ public class GeneratorTest {
modifier.setBlock(56, 0, 40, Block.STONE);
modifier.setBlock(56, 17, 40, Block.STONE);
};
generator.generate(request(null, chunkUnits));
generator.generate(request(chunkUnits));
assertEquals(Block.STONE.stateId(), sections[0].blockPalette().get(8, 0, 8));
assertEquals(Block.STONE.stateId(), sections[1].blockPalette().get(8, 1, 8));
}
@ -121,7 +121,7 @@ public class GeneratorTest {
});
assertEquals(16 * 16 * 16 * sectionCount, points.size());
};
generator.generate(request(null, chunkUnits));
generator.generate(request(chunkUnits));
for (var section : sections) {
section.blockPalette().getAll((x, y, z, value) ->
assertEquals(Block.STONE.stateId(), value));
@ -151,7 +151,7 @@ public class GeneratorTest {
modifier.setRelative(0, 16, 2, Block.STONE);
modifier.setRelative(5, 33, 5, Block.STONE);
};
generator.generate(request(null, chunkUnits));
generator.generate(request(chunkUnits));
assertEquals(Block.STONE.stateId(), sections[0].blockPalette().get(0, 0, 0));
assertEquals(Block.STONE.stateId(), sections[1].blockPalette().get(0, 0, 2));
assertEquals(Block.STONE.stateId(), sections[2].blockPalette().get(5, 1, 5));
@ -181,7 +181,7 @@ public class GeneratorTest {
});
assertEquals(16 * 16 * 16 * sectionCount, points.size());
};
generator.generate(request(null, chunkUnits));
generator.generate(request(chunkUnits));
for (var section : sections) {
section.blockPalette().getAll((x, y, z, value) ->
assertEquals(Block.STONE.stateId(), value));
@ -205,7 +205,7 @@ public class GeneratorTest {
modifier.setBiome(48, 0, 32, Biome.PLAINS);
modifier.setBiome(48 + 8, 0, 32, Biome.PLAINS);
};
generator.generate(request(null, chunkUnits));
generator.generate(request(chunkUnits));
assertEquals(Biome.PLAINS.id(), sections[0].biomePalette().get(0, 0, 0));
assertEquals(0, sections[0].biomePalette().get(1, 0, 0));
assertEquals(Biome.PLAINS.id(), sections[0].biomePalette().get(2, 0, 0));
@ -227,7 +227,7 @@ public class GeneratorTest {
var modifier = chunk.modifier();
modifier.fillBiome(Biome.PLAINS);
};
generator.generate(request(null, chunkUnits));
generator.generate(request(chunkUnits));
for (var section : sections) {
section.biomePalette().getAll((x, y, z, value) ->
assertEquals(Biome.PLAINS.id(), value));
@ -239,18 +239,13 @@ public class GeneratorTest {
Section section = new Section();
var chunkUnit = GeneratorImpl.section(section, -1, -1, 0);
Generator generator = request -> request.unit().modifier().fill(Block.STONE);
generator.generate(request(null, chunkUnit));
generator.generate(request(chunkUnit));
section.blockPalette().getAll((x, y, z, value) ->
assertEquals(Block.STONE.stateId(), value));
}
private GenerationRequest request(Instance instance, GenerationUnit unit) {
private GenerationRequest request(GenerationUnit unit) {
return new GenerationRequest() {
@Override
public @NotNull Instance instance() {
return instance;
}
@Override
public void returnAsync(@NotNull CompletableFuture<?> future) {
// Empty