Added ocean village

https://github.com/TelepathicGrunt/RepurposedStructures-Quilt/issues/4

Author: TelepathicGrunt

CHANGELOG.md

@@ -1,29 +1,5 @@
-### **(V.6.2.2 Changes) (1.19.0-1.19.2 Minecraft) (Config Datapack updated)**
+### **(V.6.3.0 Changes) (1.19.0-1.19.2 Minecraft) (Config Datapack updated)**
 
-#### Loot Tables:
-Cleaned up and organized loot table files. Rebalanced lucky banner chances. Added more lucky banners variants!
-
-
-### **(V.6.2.1 Changes) (1.19.0-1.19.2 Minecraft) (Config Datapack updated)**
-
-#### Ancient Cities:
-End Ancient Cities's End Gateway Block will now teleport you to 0,0 coordinate in the End dimension on topmost land at that spot.
-
-
-### **(V.6.2.0 Changes) (1.19.0-1.19.2 Minecraft) (Config Datapack updated)**
-
-#### Ancient Cities:
-Added an Ocean, Nether, and End variants of the Ancient City! Very rare structure! 
- Ocean Ancient City can be located with a map from Wandering Traders!
-
-#### Loot Tables:
-All RS loot table's secret lucky banner pool has been standardized and rebalanced.
-
-More secret banners have been added to all RS loot table's lucky banner pool!
-
-#### Advancements:
-Changed the name and description of many advancements for RS so it is less boring lol.
-
-#### Mod Compat:
-Fixed villages and a few other structures that would not spawn if William Wyther's Overhauled Overworld mod/datapack is on. 
- Also, please update WWOO to v3.1.2 for best compatibility with Repurposed Structures.
+#### Villages:
+Ocean Village now added! Spawns only in deep ocean biomes. Explore the bottom of the sea to see this village's tragic ending!
+ Can be located with Dolphins

CHANGELOG_OLD.md

@@ -1,3 +1,34 @@
+### **(V.6.2.2 Changes) (1.19.0-1.19.2 Minecraft) (Config Datapack updated)**
+
+#### Loot Tables:
+Cleaned up and organized loot table files. Rebalanced lucky banner chances. Added more lucky banners variants!
+
+
+### **(V.6.2.1 Changes) (1.19.0-1.19.2 Minecraft) (Config Datapack updated)**
+
+#### Ancient Cities:
+End Ancient Cities's End Gateway Block will now teleport you to 0,0 coordinate in the End dimension on topmost land at that spot.
+
+
+### **(V.6.2.0 Changes) (1.19.0-1.19.2 Minecraft) (Config Datapack updated)**
+
+#### Ancient Cities:
+Added an Ocean, Nether, and End variants of the Ancient City! Very rare structure!
+Ocean Ancient City can be located with a map from Wandering Traders!
+
+#### Loot Tables:
+All RS loot table's secret lucky banner pool has been standardized and rebalanced.
+
+More secret banners have been added to all RS loot table's lucky banner pool!
+
+#### Advancements:
+Changed the name and description of many advancements for RS so it is less boring lol.
+
+#### Mod Compat:
+Fixed villages and a few other structures that would not spawn if William Wyther's Overhauled Overworld mod/datapack is on.
+Also, please update WWOO to v3.1.2 for best compatibility with Repurposed Structures.
+
+
 ### **(V.6.1.4 Changes) (1.19.0 Minecraft) (Config Datapack updated)**
 
 #### Mansions:

gradle.properties

@@ -3,6 +3,6 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 modid=repurposed_structures
-mod_version=6.2.2
+mod_version=6.3.0
 mc_version=1.19.2
 forge_version=43.0.0

src/main/java/com/telepathicgrunt/repurposedstructures/misc/lootmanager/StructureModdedLootImporter.java

@@ -180,6 +180,8 @@ private static Map<ResourceLocation, ResourceLocation> createMap() {
         tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/mountains_house"), new ResourceLocation("minecraft:chests/village/village_snowy_house"));
         tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/mushroom_house"), new ResourceLocation("minecraft:chests/village/village_plains_house"));
         tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/oak_house"), new ResourceLocation("minecraft:chests/village/village_plains_house"));
+        tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/ocean_house"), new ResourceLocation("minecraft:chests/village/village_plains_house"));
+        tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/ocean_cartographer"), new ResourceLocation("minecraft:chests/village/village_cartographer"));
         tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/swamp_house"), new ResourceLocation("minecraft:chests/village/village_plains_house"));
         tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/crimson_cartographer"), new ResourceLocation("minecraft:chests/village/village_cartographer"));
         tableMap.put(new ResourceLocation(RepurposedStructures.MODID, "chests/villages/crimson_fisher"), new ResourceLocation("minecraft:chests/village/village_fisher"));

src/main/java/com/telepathicgrunt/repurposedstructures/modinit/RSFeatures.java

@@ -14,6 +14,7 @@
 import com.telepathicgrunt.repurposedstructures.world.features.configs.StructureTargetConfig;
 import com.telepathicgrunt.repurposedstructures.world.features.configs.StructureTargetLengthRangeConfig;
 import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration;
 import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -47,6 +48,7 @@ public final class RSFeatures {
 	public static final RegistryObject<Feature<StructureTargetAndRangeConfig>> STRUCTURE_GRASS = FEATURES.register("structure_grass", () -> new StructureGrass(StructureTargetAndRangeConfig.CODEC));
 	public static final RegistryObject<Feature<StructureTargetAndRangeConfig>> STRUCTURE_FLOWERS = FEATURES.register("structure_flowers", () -> new StructureFlowers(StructureTargetAndRangeConfig.CODEC));
 	public static final RegistryObject<Feature<StructureRangeConfig>> STRUCTURE_POWDER_SNOW = FEATURES.register("structure_powder_snow", () -> new StructurePowderSnow(StructureRangeConfig.CODEC));
+	public static final RegistryObject<Feature<BlockPileConfiguration>> UNDERWATER_BLOCK_PILE = FEATURES.register("underwater_block_pile", () -> new UnderwaterBlockPileFeature(BlockPileConfiguration.CODEC));
 
 	public static final RegistryObject<Feature<MinecartConfig>> MINESHAFT_MINECARTS = FEATURES.register("mineshaft_minecarts", () -> new MinecartFeature(MinecartConfig.CODEC));
 	public static final RegistryObject<Feature<MineshaftSupportConfig>> MINESHAFT_SUPPORTS = FEATURES.register("mineshaft_supports", () -> new MineshaftSupport(MineshaftSupportConfig.CODEC));

src/main/java/com/telepathicgrunt/repurposedstructures/modinit/RSProcessors.java

@@ -1,25 +1,7 @@
 package com.telepathicgrunt.repurposedstructures.modinit;
 
 import com.telepathicgrunt.repurposedstructures.RepurposedStructures;
-import com.telepathicgrunt.repurposedstructures.world.processors.AirProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.CeilingVinePostProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.CloseOffAirSourcesProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.CloseOffFluidSourcesProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.EndGatewayProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.FillEndPortalFrameProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.FloodWithWaterProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.MineshaftSkyViewProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.NoiseReplaceWithPropertiesProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.PillarProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.RandomReplaceWithPropertiesProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.RemoveFloatingBlocksProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.ReplaceAirOnlyProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.ReplaceLiquidOnlyProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.SpawnerRandomizingProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.StructureVoidProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.TickBlocksProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.WallVinePostProcessor;
-import com.telepathicgrunt.repurposedstructures.world.processors.WaterloggingFixProcessor;
+import com.telepathicgrunt.repurposedstructures.world.processors.*;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType;
 import net.minecraftforge.registries.DeferredRegister;
@@ -45,6 +27,7 @@ public final class RSProcessors {
     public static final RegistryObject<StructureProcessorType<RandomReplaceWithPropertiesProcessor>> RANDOM_REPLACE_WITH_PROPERTIES_PROCESSOR = STRUCTURE_PROCESSOR.register("random_replace_with_properties_processor", () -> () -> RandomReplaceWithPropertiesProcessor.CODEC);
     public static final RegistryObject<StructureProcessorType<NoiseReplaceWithPropertiesProcessor>> NOISE_REPLACE_WITH_PROPERTIES_PROCESSOR = STRUCTURE_PROCESSOR.register("noise_replace_with_properties_processor", () -> () -> NoiseReplaceWithPropertiesProcessor.CODEC);
     public static final RegistryObject<StructureProcessorType<WaterloggingFixProcessor>> WATERLOGGING_FIX_PROCESSOR = STRUCTURE_PROCESSOR.register("waterlogging_fix_processor", () -> () -> WaterloggingFixProcessor.CODEC);
+    public static final RegistryObject<StructureProcessorType<SuperGravityProcessor>> SUPER_GRAVITY_PROCESSOR = STRUCTURE_PROCESSOR.register("super_gravity_processor", () -> () -> SuperGravityProcessor.CODEC);
 
     public static final RegistryObject<StructureProcessorType<WallVinePostProcessor>> WALL_VINE_POST_PROCESSOR = STRUCTURE_PROCESSOR.register("wall_vine_post_processor", () -> () -> WallVinePostProcessor.CODEC);
     public static final RegistryObject<StructureProcessorType<CeilingVinePostProcessor>> CEILING_VINE_POST_PROCESSOR = STRUCTURE_PROCESSOR.register("ceiling_vine_post_processor", () -> () -> CeilingVinePostProcessor.CODEC);

src/main/java/com/telepathicgrunt/repurposedstructures/modinit/RSStructurePieces.java

@@ -1,6 +1,7 @@
 package com.telepathicgrunt.repurposedstructures.modinit;
 
 import com.telepathicgrunt.repurposedstructures.RepurposedStructures;
+import com.telepathicgrunt.repurposedstructures.world.structures.pieces.LegacyOceanBottomSinglePoolElement;
 import com.telepathicgrunt.repurposedstructures.world.structures.pieces.MansionStructurePiece;
 import com.telepathicgrunt.repurposedstructures.world.structures.pieces.MirroringSingleJigsawPiece;
 import net.minecraft.core.Registry;
@@ -15,5 +16,6 @@ public final class RSStructurePieces {
     public static final DeferredRegister<StructurePieceType> STRUCTURE_PIECE = DeferredRegister.create(Registry.STRUCTURE_PIECE_REGISTRY, RepurposedStructures.MODID);
 
     public static final RegistryObject<StructurePoolElementType<MirroringSingleJigsawPiece>> MIRROR_SINGLE = STRUCTURE_POOL_ELEMENT.register("mirroring_single_pool_element", () -> () -> MirroringSingleJigsawPiece.CODEC);
+    public static final RegistryObject<StructurePoolElementType<LegacyOceanBottomSinglePoolElement>> LEGACY_OCEAN_BOTTOM = STRUCTURE_POOL_ELEMENT.register("legacy_ocean_bottom_single_pool_element", () -> () -> LegacyOceanBottomSinglePoolElement.CODEC);
     public static final RegistryObject<StructurePieceType> MANSION_STRUCTURE_PIECE = STRUCTURE_PIECE.register("mansion_structure_piece", () -> MansionStructurePiece::new);
 }

src/main/java/com/telepathicgrunt/repurposedstructures/world/features/UnderwaterBlockPileFeature.java

@@ -0,0 +1,75 @@
+package com.telepathicgrunt.repurposedstructures.world.features;
+
+import com.mojang.serialization.Codec;
+import com.telepathicgrunt.repurposedstructures.utils.GeneralUtils;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.tags.FluidTags;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.entity.monster.Drowned;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.levelgen.feature.Feature;
+import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
+import net.minecraft.world.level.levelgen.feature.configurations.BlockPileConfiguration;
+import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
+
+
+public class UnderwaterBlockPileFeature extends Feature<BlockPileConfiguration> {
+    public UnderwaterBlockPileFeature(Codec<BlockPileConfiguration> blockPileConfigurationCodec) {
+        super(blockPileConfigurationCodec);
+    }
+
+    public boolean place(FeaturePlaceContext<BlockPileConfiguration> placeContext) {
+        BlockPos blockpos = placeContext.origin();
+        WorldGenLevel worldgenlevel = placeContext.level();
+        RandomSource randomsource = placeContext.random();
+        BlockPileConfiguration blockpileconfiguration = placeContext.config();
+        if (blockpos.getY() < worldgenlevel.getMinBuildHeight() + 5) {
+            return false;
+        }
+        else {
+            int i = 2 + randomsource.nextInt(2);
+            int j = 2 + randomsource.nextInt(2);
+
+            for(BlockPos blockpos1 : BlockPos.betweenClosed(blockpos.offset(-i, 0, -j), blockpos.offset(i, 1, j))) {
+                int xOffset = blockpos.getX() - blockpos1.getX();
+                int zOffset = blockpos.getZ() - blockpos1.getZ();
+                if ((float)(xOffset * xOffset + zOffset * zOffset) <= randomsource.nextFloat() * 10.0F - randomsource.nextFloat() * 6.0F) {
+                    this.tryPlaceBlock(worldgenlevel, blockpos1, randomsource, blockpileconfiguration);
+                }
+                else if ((double)randomsource.nextFloat() < 0.031D) {
+                    this.tryPlaceBlock(worldgenlevel, blockpos1, randomsource, blockpileconfiguration);
+                }
+            }
+
+            return true;
+        }
+    }
+
+    private boolean mayPlaceOn(LevelAccessor levelAccessor, BlockPos pos, RandomSource randomSource) {
+        BlockPos blockpos = pos.below();
+        BlockState blockstate = levelAccessor.getBlockState(blockpos);
+        return blockstate.is(Blocks.DIRT_PATH) ? randomSource.nextBoolean() : blockstate.isFaceSturdy(levelAccessor, blockpos, Direction.UP);
+    }
+
+    private void tryPlaceBlock(LevelAccessor levelAccessor, BlockPos blockPos, RandomSource randomSource, BlockPileConfiguration stateProvider) {
+        boolean isWaterLocation = levelAccessor.isWaterAt(blockPos);
+        if ((levelAccessor.isEmptyBlock(blockPos) || isWaterLocation) && this.mayPlaceOn(levelAccessor, blockPos, randomSource)) {
+            BlockState resultState = stateProvider.stateProvider.getState(randomSource, blockPos);
+            if (isWaterLocation && resultState.hasProperty(BlockStateProperties.WATERLOGGED)) {
+                resultState = resultState.setValue(BlockStateProperties.WATERLOGGED, true);
+            }
+            levelAccessor.setBlock(blockPos, resultState, 4);
+        }
+    }
+}