TheCreeperCow / CraftBukkit / e7aab549321

Commits

DerFrZocker authored and md_5 committed e7aab549321 15 Nov 2022

SPIGOT-6765: Pass WorldInfo, Random and coordinates to ChunkGenerator should methods

src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java

Modified

-4
+import com.mojang.serialization.Codec;
-5
+import java.util.List;
-6
+import java.util.Random;
-7
+import java.util.concurrent.CompletableFuture;
-8
+import java.util.concurrent.Executor;
-9
+import net.minecraft.core.BlockPosition;
-10
+import net.minecraft.core.Holder;
-11
+import net.minecraft.core.IRegistryCustom;
-12
+import net.minecraft.server.level.RegionLimitedWorldAccess;
-13
+import net.minecraft.server.level.WorldServer;
-+
+import net.minecraft.util.MathHelper;
-15
+import net.minecraft.util.random.WeightedRandomList;
-16
+import net.minecraft.world.entity.EnumCreatureType;
-17
+import net.minecraft.world.level.BlockColumn;
-18
+import net.minecraft.world.level.GeneratorAccessSeed;
-19
+import net.minecraft.world.level.LevelHeightAccessor;
-20
+import net.minecraft.world.level.StructureManager;
-21
+import net.minecraft.world.level.biome.BiomeBase;
-22
+import net.minecraft.world.level.biome.BiomeManager;
-23
+import net.minecraft.world.level.biome.BiomeSettingsMobs;
-24
+import net.minecraft.world.level.biome.WorldChunkManager;
-111
+        return delegate.getMinY();
-112
+    }
-113
-114
+    @Override
-115
+    public int getSeaLevel() {
-116
+        return delegate.getSeaLevel();
-117
+    }
-118
-119
+    @Override
-120
+    public void createStructures(IRegistryCustom iregistrycustom, RandomState randomstate, StructureManager structuremanager, IChunkAccess ichunkaccess, StructureTemplateManager structuretemplatemanager, long i) {
--
+        if (generator.shouldGenerateStructures()) {
-+
+        SeededRandom random = getSeededRandom();
-+
+        int x = ichunkaccess.getPos().x;
-+
+        int z = ichunkaccess.getPos().z;
-+
-+
+        random.setSeed(MathHelper.getSeed(x, "should-structures".hashCode(), z) ^ i);
-+
+        if (generator.shouldGenerateStructures(this.world.getWorld(), new RandomSourceWrapper.RandomWrapper(random), x, z)) {
-127
+            super.createStructures(iregistrycustom, randomstate, structuremanager, ichunkaccess, structuretemplatemanager, i);
-128
+        }
-129
+    }
-130
-131
+    @Override
-132
+    public void buildSurface(RegionLimitedWorldAccess regionlimitedworldaccess, StructureManager structuremanager, RandomState randomstate, IChunkAccess ichunkaccess) {
--
+        if (generator.shouldGenerateSurface()) {
-+
+        SeededRandom random = getSeededRandom();
-+
+        int x = ichunkaccess.getPos().x;
-+
+        int z = ichunkaccess.getPos().z;
-+
-+
+        random.setSeed(MathHelper.getSeed(x, "should-surface".hashCode(), z) ^ regionlimitedworldaccess.getSeed());
-+
+        if (generator.shouldGenerateSurface(this.world.getWorld(), new RandomSourceWrapper.RandomWrapper(random), x, z)) {
-139
+            delegate.buildSurface(regionlimitedworldaccess, structuremanager, randomstate, ichunkaccess);
-140
+        }
-141
-142
+        CraftChunkData chunkData = new CraftChunkData(this.world.getWorld(), ichunkaccess);
--
+        SeededRandom random = getSeededRandom();
--
+        int x = ichunkaccess.getPos().x;
--
+        int z = ichunkaccess.getPos().z;
-+
-144
+        random.setSeed((long) x * 341873128712L + (long) z * 132897987541L);
-145
+        generator.generateSurface(this.world.getWorld(), new RandomSourceWrapper.RandomWrapper(random), x, z, chunkData);
-146
-147
+        if (generator.shouldGenerateBedrock()) {
-148
+            random = getSeededRandom();
-149
+            random.setSeed((long) x * 341873128712L + (long) z * 132897987541L);
-150
+            // delegate.buildBedrock(ichunkaccess, random);
-151
+        }
-152
-153
+        random = getSeededRandom();
-224
+        }
-225
-226
+        // Apply captured light blocks
-227
+        for (BlockPosition lightPosition : craftData.getLights()) {
-228
+            ((ProtoChunk) ichunkaccess).addLight(new BlockPosition((x << 4) + lightPosition.getX(), lightPosition.getY(), (z << 4) + lightPosition.getZ()));
-229
+        }
-230
+    }
-231
-232
+    @Override
-233
+    public void applyCarvers(RegionLimitedWorldAccess regionlimitedworldaccess, long seed, RandomState randomstate, BiomeManager biomemanager, StructureManager structuremanager, IChunkAccess ichunkaccess, WorldGenStage.Features worldgenstage_features) {
--
+        if (generator.shouldGenerateCaves()) {
-+
+        SeededRandom random = getSeededRandom();
-+
+        int x = ichunkaccess.getPos().x;
-+
+        int z = ichunkaccess.getPos().z;
-+
-+
+        random.setSeed(MathHelper.getSeed(x, "should-caves".hashCode(), z) ^ regionlimitedworldaccess.getSeed());
-+
+        if (generator.shouldGenerateCaves(this.world.getWorld(), new RandomSourceWrapper.RandomWrapper(random), x, z)) {
-240
+            delegate.applyCarvers(regionlimitedworldaccess, seed, randomstate, biomemanager, structuremanager, ichunkaccess, worldgenstage_features);
-241
+        }
-242
-243
+        if (worldgenstage_features == WorldGenStage.Features.LIQUID) { // stage check ensures that the method is only called once
-244
+            CraftChunkData chunkData = new CraftChunkData(this.world.getWorld(), ichunkaccess);
--
+            SeededRandom random = getSeededRandom();
--
+            int x = ichunkaccess.getPos().x;
--
+            int z = ichunkaccess.getPos().z;
-245
+            random.setDecorationSeed(seed, 0, 0);
-246
-247
+            generator.generateCaves(this.world.getWorld(), new RandomSourceWrapper.RandomWrapper(random), x, z, chunkData);
-248
+            chunkData.breakLink();
-249
+        }
-250
+    }
-251
-252
+    @Override
-253
+    public CompletableFuture<IChunkAccess> fillFromNoise(Executor executor, Blender blender, RandomState randomstate, StructureManager structuremanager, IChunkAccess ichunkaccess) {
-254
+        CompletableFuture<IChunkAccess> future = null;
--
+        if (generator.shouldGenerateNoise()) {
-+
+        SeededRandom random = getSeededRandom();
-+
+        int x = ichunkaccess.getPos().x;
-+
+        int z = ichunkaccess.getPos().z;
-+
-+
+        random.setSeed(MathHelper.getSeed(x, "should-noise".hashCode(), z) ^ this.world.getSeed());
-+
+        if (generator.shouldGenerateNoise(this.world.getWorld(), new RandomSourceWrapper.RandomWrapper(random), x, z)) {
-261
+            future = delegate.fillFromNoise(executor, blender, randomstate, structuremanager, ichunkaccess);
-262
+        }
-263
-264
+        java.util.function.Function<IChunkAccess, IChunkAccess> function = (ichunkaccess1) -> {
-265
+            CraftChunkData chunkData = new CraftChunkData(this.world.getWorld(), ichunkaccess1);
--
+            SeededRandom random = getSeededRandom();
--
+            int x = ichunkaccess1.getPos().x;
--
+            int z = ichunkaccess1.getPos().z;
-266
+            random.setSeed((long) x * 341873128712L + (long) z * 132897987541L);
-267
-268
+            generator.generateNoise(this.world.getWorld(), new RandomSourceWrapper.RandomWrapper(random), x, z, chunkData);
-269
+            chunkData.breakLink();
-270
+            return ichunkaccess1;
-271
+        };
-272
-273
+        return future == null ? CompletableFuture.supplyAsync(() -> function.apply(ichunkaccess), net.minecraft.SystemUtils.backgroundExecutor()) : future.thenApply(function);
-274
+    }
-275
-291
+        return delegate.getBaseHeight(i, j, heightmap_type, levelheightaccessor, randomstate);
-292
+    }
-293
-294
+    @Override
-295
+    public WeightedRandomList<BiomeSettingsMobs.c> getMobsAt(Holder<BiomeBase> holder, StructureManager structuremanager, EnumCreatureType enumcreaturetype, BlockPosition blockposition) {
-296
+        return delegate.getMobsAt(holder, structuremanager, enumcreaturetype, blockposition);
-297
+    }
-298
-299
+    @Override
-300
+    public void applyBiomeDecoration(GeneratorAccessSeed generatoraccessseed, IChunkAccess ichunkaccess, StructureManager structuremanager) {
--
+        super.applyBiomeDecoration(generatoraccessseed, ichunkaccess, structuremanager, generator.shouldGenerateDecorations());
-+
+        SeededRandom random = getSeededRandom();
-+
+        int x = ichunkaccess.getPos().x;
-+
+        int z = ichunkaccess.getPos().z;
-+
-+
+        random.setSeed(MathHelper.getSeed(x, "should-decoration".hashCode(), z) ^ generatoraccessseed.getSeed());
-+
+        super.applyBiomeDecoration(generatoraccessseed, ichunkaccess, structuremanager, generator.shouldGenerateDecorations(this.world.getWorld(), new RandomSourceWrapper.RandomWrapper(random), x, z));
-307
+    }
-308
-309
+    @Override
-310
+    public void addDebugScreenInfo(List<String> list, RandomState randomstate, BlockPosition blockposition) {
-311
+        delegate.addDebugScreenInfo(list, randomstate, blockposition);
-312
+    }
-313
-314
+    @Override
-315
+    public void spawnOriginalMobs(RegionLimitedWorldAccess regionlimitedworldaccess) {
--
+        if (generator.shouldGenerateMobs()) {
-+
+        SeededRandom random = getSeededRandom();
-+
+        int x = regionlimitedworldaccess.getCenter().x;
-+
+        int z = regionlimitedworldaccess.getCenter().z;
-+
-+
+        random.setSeed(MathHelper.getSeed(x, "should-mobs".hashCode(), z) ^ regionlimitedworldaccess.getSeed());
-+
+        if (generator.shouldGenerateMobs(this.world.getWorld(), new RandomSourceWrapper.RandomWrapper(random), x, z)) {
-322
+            delegate.spawnOriginalMobs(regionlimitedworldaccess);
-323
+        }
-324
+    }
-325
-326
+    @Override
-327
+    public int getSpawnHeight(LevelHeightAccessor levelheightaccessor) {
-328
+        return delegate.getSpawnHeight(levelheightaccessor);
-329
+    }
-330
-331
+    @Override

CraftBukkit

Commits

Jira Issues

Add shortcut