forked from The-Aether-Team/The-Aether
-
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.
feat: Generate Holystone ruins on terrain surface, extending downward…
…s to Bronze Dungeon entrance rooms (The-Aether-Team#2112)
- Loading branch information
Showing
7 changed files
with
187 additions
and
7 deletions.
There are no files selected for viewing
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
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 |
|---|---|---|
|
|
@@ -54,5 +54,5 @@ | |
| "spawns": [] | ||
| } | ||
| }, | ||
| "step": "surface_structures" | ||
| "step": "top_layer_modification" | ||
| } | ||
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
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
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
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
157 changes: 157 additions & 0 deletions
157
...a/com/aetherteam/aether/world/structurepiece/bronzedungeon/BronzeDungeonSurfaceRuins.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,157 @@ | ||
| package com.aetherteam.aether.world.structurepiece.bronzedungeon; | ||
|
|
||
| import com.aetherteam.aether.AetherTags; | ||
| import com.aetherteam.aether.block.AetherBlockStateProperties; | ||
| import com.aetherteam.aether.block.AetherBlocks; | ||
| import com.aetherteam.aether.data.resources.AetherFeatureStates; | ||
| import com.aetherteam.aether.world.structurepiece.AetherStructurePieceTypes; | ||
| import com.aetherteam.nitrogen.data.resources.builders.NitrogenConfiguredFeatureBuilders; | ||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.core.Direction; | ||
| import net.minecraft.nbt.CompoundTag; | ||
| import net.minecraft.util.RandomSource; | ||
| import net.minecraft.util.random.SimpleWeightedRandomList; | ||
| import net.minecraft.world.level.ChunkPos; | ||
| import net.minecraft.world.level.StructureManager; | ||
| import net.minecraft.world.level.WorldGenLevel; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraft.world.level.block.state.properties.BlockStateProperties; | ||
| import net.minecraft.world.level.block.state.properties.SlabType; | ||
| import net.minecraft.world.level.chunk.ChunkGenerator; | ||
| import net.minecraft.world.level.levelgen.Heightmap; | ||
| import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; | ||
| import net.minecraft.world.level.levelgen.feature.Feature; | ||
| import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; | ||
| import net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider; | ||
| import net.minecraft.world.level.levelgen.structure.BoundingBox; | ||
| import net.minecraft.world.level.levelgen.structure.StructurePiece; | ||
| import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSerializationContext; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class BronzeDungeonSurfaceRuins extends StructurePiece { | ||
| private static final BlockStateProvider BLOCKS = new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder() | ||
| .add(AetherBlocks.HOLYSTONE.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true), 3) | ||
| .add(AetherBlocks.MOSSY_HOLYSTONE.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true)) | ||
| .build()); | ||
| private static final BlockStateProvider TOPS = new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder() | ||
| .add(AetherBlocks.HOLYSTONE.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true), 6) | ||
| .add(AetherBlocks.HOLYSTONE_SLAB.get().defaultBlockState(), 6) | ||
| .add(AetherBlocks.MOSSY_HOLYSTONE.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true), 3) | ||
| .add(AetherBlocks.MOSSY_HOLYSTONE_SLAB.get().defaultBlockState(), 3) | ||
| .build()); | ||
| private static final BlockStateProvider BOTTOMS = new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder() | ||
| .add(AetherBlocks.HOLYSTONE.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true), 6) | ||
| .add(AetherBlocks.HOLYSTONE_SLAB.get().defaultBlockState().setValue(BlockStateProperties.SLAB_TYPE, SlabType.TOP), 6) | ||
| .add(AetherBlocks.MOSSY_HOLYSTONE.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true), 3) | ||
| .add(AetherBlocks.MOSSY_HOLYSTONE_SLAB.get().defaultBlockState().setValue(BlockStateProperties.SLAB_TYPE, SlabType.TOP), 3) | ||
| .build()); | ||
| private static final ConfiguredFeature<?, ? extends Feature<?>> MIXED_FLOWER_PATCH = new ConfiguredFeature<>(Feature.FLOWER, NitrogenConfiguredFeatureBuilders.grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.<BlockState>builder() | ||
| .add(AetherFeatureStates.PURPLE_FLOWER, 1) | ||
| .add(AetherFeatureStates.WHITE_FLOWER, 1) | ||
| ), 24)); | ||
|
|
||
| public BronzeDungeonSurfaceRuins(BoundingBox horizontalBounds) { | ||
| super(AetherStructurePieceTypes.BRONZE_SURFACE_RUINS.value(), 0, horizontalBounds); | ||
|
|
||
| this.setOrientation(Direction.SOUTH); | ||
| } | ||
|
|
||
| public BronzeDungeonSurfaceRuins(StructurePieceSerializationContext context, CompoundTag nbt) { | ||
| super(AetherStructurePieceTypes.BRONZE_SURFACE_RUINS.value(), nbt); | ||
|
|
||
| this.setOrientation(Direction.SOUTH); | ||
| } | ||
|
|
||
| @Override | ||
| public void postProcess(WorldGenLevel level, StructureManager manager, ChunkGenerator chunkGen, RandomSource random, BoundingBox chunkBounds, ChunkPos chunkPos, BlockPos structureBottomCenter) { | ||
| for (int x = this.boundingBox.minX(); x <= this.boundingBox.maxX(); x++) { | ||
| this.generateTunnelWallColumn(level, random, chunkBounds, x, this.boundingBox.minZ()); | ||
| this.generateTunnelWallColumn(level, random, chunkBounds, x, this.boundingBox.maxZ()); | ||
| } | ||
|
|
||
| for (int z = this.boundingBox.minZ() + 1; z < this.boundingBox.maxZ(); z++) { | ||
| this.generateTunnelWallColumn(level, random, chunkBounds, this.boundingBox.minX(), z); | ||
| this.generateTunnelWallColumn(level, random, chunkBounds, this.boundingBox.maxX(), z); | ||
| } | ||
|
|
||
| BlockPos pieceCenter = this.boundingBox.getCenter(); | ||
| if (chunkBounds.isInside(pieceCenter)) { | ||
| BlockPos aboveTopBlock = level.getHeightmapPos(Heightmap.Types.OCEAN_FLOOR_WG, chunkBounds.getCenter()); | ||
|
|
||
| MIXED_FLOWER_PATCH.place(level, chunkGen, random, aboveTopBlock); | ||
| } | ||
| } | ||
|
|
||
| private void generateTunnelWallColumn(WorldGenLevel level, RandomSource random, BoundingBox chunkBounds, int x, int z) { | ||
| if (!chunkBounds.isInside(x, this.boundingBox.minY(), z)) | ||
| return; | ||
|
|
||
| // Trimmer is applied only in a checkerboard pattern plus some random extra, but generates suspicious rocks on the surface using tips of the ragged tunnel walls | ||
| // Calling the random twice changes the shape of rng distribution, combinations favoring values towards average than outliers | ||
| int trimmer = ((x + z) & 0b1) == 1 || random.nextBoolean() ? random.nextInt(4) + random.nextInt(4) + 1 : 0; | ||
| int wallColumnHeight = Math.max(random.nextInt(2) - random.nextInt(2) - trimmer, -2); | ||
|
|
||
| int ySurfaceAir = level.getHeight(Heightmap.Types.OCEAN_FLOOR_WG, x, z); | ||
| BlockPos wallColumnStart = new BlockPos(x, ySurfaceAir, z); | ||
|
|
||
| this.placeColumnBlocks(level, random, this.scanColumnForPlacement(level, random, wallColumnHeight, ySurfaceAir, wallColumnStart)); | ||
|
|
||
| BlockPos topPos = wallColumnStart.above(wallColumnHeight); | ||
| // Use full block only if the pillar top is too short (or is underground) | ||
| BlockStateProvider topProvider = wallColumnHeight < 1 ? BLOCKS : TOPS; | ||
| level.setBlock(topPos, topProvider.getState(random, topPos), 0b11); | ||
| } | ||
|
|
||
| private void placeColumnBlocks(WorldGenLevel level, RandomSource random, List<BlockPos> forPlacement) { | ||
| if (forPlacement.isEmpty()) | ||
| return; | ||
|
|
||
| // The list must be ordered with lowest Y values first. scanColumnForPlacement() already handles that, so no sorting is necessary | ||
| BlockPos lastPos = forPlacement.get(0).below(); | ||
|
|
||
| for (BlockPos posAt : forPlacement) { | ||
| boolean hasSkippedGap = posAt.getY() - lastPos.getY() != 1; // If the delta spikes when iterating elements, then the scanning loop has likely skipped over a gap of air | ||
|
|
||
| if (hasSkippedGap) { | ||
| BlockStateProvider tailProvider = level.getBlockState(posAt).isAir() ? BOTTOMS : BLOCKS; | ||
| level.setBlock(posAt, tailProvider.getState(random, posAt), 0b11); | ||
|
|
||
| BlockPos capPos = lastPos.above(); | ||
| BlockStateProvider capProvider = level.getBlockState(capPos).isAir() ? TOPS : BLOCKS; | ||
| level.setBlock(capPos, capProvider.getState(random, capPos), 0b11); | ||
| } else { | ||
| level.setBlock(posAt, BLOCKS.getState(random, posAt), 0b11); | ||
| } | ||
|
|
||
| lastPos = posAt; | ||
| } | ||
| } | ||
|
|
||
| private List<BlockPos> scanColumnForPlacement(WorldGenLevel level, RandomSource random, int wallColumnHeight, int ySurfaceAir, BlockPos wallColumnStart) { | ||
| // The Y-displacement for assigning an offset to this column. Combined with other columns to be a part of the tunnel walls, it produces a ragged edge | ||
| int depthOffset = Math.round(random.nextFloat() * wallColumnHeight); | ||
| // Begin several blocks underground to lure players down to the Carved Stone ceiling | ||
| List<BlockPos> toPlace = new ArrayList<>(); | ||
| for (int dY = this.boundingBox.minY() - ySurfaceAir; dY < wallColumnHeight; dY++) { | ||
| BlockPos posAt = wallColumnStart.above(dY); | ||
|
|
||
| BlockState blockAt = level.getBlockState(posAt); | ||
| if (dY >= -4 // Is the dY above the transition boundary between dirt and stone? | ||
| // Creates a jagged break if there exists a terrain overhang between the surface & the dungeon lobby room | ||
| || (blockAt.is(AetherTags.Blocks.AETHER_ISLAND_BLOCKS) || blockAt.isAir()) && level.getBlockState(posAt.below(depthOffset)).is(AetherTags.Blocks.AETHER_ISLAND_BLOCKS) | ||
| ) { | ||
| // Add passing block to list as position instead of immediately replacing, to avoid interfering with the prior displaced positional check | ||
| toPlace.add(posAt); | ||
| } | ||
| } | ||
|
|
||
| return toPlace; | ||
| } | ||
|
|
||
| @Override | ||
| protected void addAdditionalSaveData(StructurePieceSerializationContext context, CompoundTag nbt) { | ||
| // No-op | ||
| } | ||
| } |