From f46e285bc9ae3f1fa9097d609314ca48dcf8126d Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 4 Dec 2021 23:34:18 -0700 Subject: [PATCH] switch x and z ChunkGenerator params --- .../chunkgenerator/generation/NoiseChunkGenerator3D.java | 3 +-- .../dfsek/terra/api/world/chunk/generation/ChunkGenerator.java | 2 +- .../terra/bukkit/generator/BukkitChunkGeneratorWrapper.java | 3 +-- .../terra/fabric/generation/FabricChunkGeneratorWrapper.java | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java index e599253e3..7d60ff23b 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java @@ -57,8 +57,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { @Override @SuppressWarnings("try") public void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WritableWorld world, - int chunkZ, - int chunkX) { + int chunkX, int chunkZ) { try(ProfileFrame ignore = platform.getProfiler().profile("chunk_base_3d")) { BiomeProvider grid = world.getBiomeProvider(); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java index 43d56bf54..9c6adb20a 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java @@ -21,7 +21,7 @@ import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; public interface ChunkGenerator { void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WritableWorld world, - int chunkZ, int chunkX); + int chunkX, int chunkZ); List getGenerationStages(); diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java index 0264d0a96..b842ed9a6 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Random; import java.util.stream.Collectors; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; @@ -63,7 +62,7 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener this.world = Bukkit.getWorld(worldInfo.getUID()); this.terraWorld = new BukkitServerWorld(world); } - delegate.generateChunkData(new BukkitProtoChunk(chunkData), terraWorld, z, x); + delegate.generateChunkData(new BukkitProtoChunk(chunkData), terraWorld, x, z); } @Override diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java index 47cd37f0e..3dc230616 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java @@ -203,7 +203,7 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C public CompletableFuture populateNoise(Executor executor, Blender arg, StructureAccessor structureAccessor, Chunk chunk) { return CompletableFuture.supplyAsync(() -> { ProtoWorld world = (ProtoWorld) ((StructureAccessorAccessor) structureAccessor).getWorld(); - delegate.generateChunkData((ProtoChunk) chunk, world, chunk.getPos().z, chunk.getPos().x); + delegate.generateChunkData((ProtoChunk) chunk, world, chunk.getPos().x, chunk.getPos().z); delegate.getGenerationStages().forEach(populator -> { if(populator instanceof Chunkified) { populator.populate(world);