From 662ddb5ac67e2c0a5e8558a220a48d0e3972b8fe Mon Sep 17 00:00:00 2001 From: lumiscosity Date: Fri, 9 Aug 2024 22:12:00 +0000 Subject: [PATCH] finish block data, add ocean rocks --- .../rounded/worldgen/OceanRockFeature.java | 56 +++++++++++++++++++ .../rounded/worldgen/RegisterFeatures.java | 22 ++++++-- .../structure/OceanMonumentGenerator.java | 4 ++ .../structure/OceanMonumentStructure.java | 4 ++ .../worldgen/structure/monument.json | 26 +++++++++ .../building_blocks/bladderwrack_block.json | 32 +++++++++++ .../chiseled_prismarine_bricks.json | 26 +++++++++ .../dead_bladderwrack_block.json | 32 +++++++++++ .../furnace/smooth_prismarine.json | 32 +++++++++++ .../building_blocks/moisture_detector.json | 32 +++++++++++ .../building_blocks/prismarine_lantern.json | 32 +++++++++++ .../smooth_prismarine_slab.json | 26 +++++++++ .../loot_table/blocks/bladderwrack.json | 33 +++++++++++ .../loot_table/blocks/bladderwrack_block.json | 47 ++++++++++++++++ .../blocks/chiseled_prismarine_bricks.json | 21 +++++++ .../loot_table/blocks/dead_bladderwrack.json | 33 +++++++++++ .../blocks/dead_bladderwrack_block.json | 21 +++++++ .../loot_table/blocks/moisture_detector.json | 21 +++++++ .../loot_table/blocks/prismarine_lantern.json | 21 +++++++ .../loot_table/blocks/smooth_prismarine.json | 21 +++++++ .../blocks/smooth_prismarine_slab.json | 21 +++++++ ...cks.json => has_andesite_ocean_rocks.json} | 0 ...ocks.json => has_diorite_ocean_rocks.json} | 0 ...son => has_smooth_basalt_ocean_rocks.json} | 0 .../andesite_ocean_rock.json | 11 ++++ .../diorite_ocean_rock.json | 11 ++++ .../smooth_basalt_ocean_rock.json | 11 ++++ .../placed_feature/andesite_ocean_rock.json | 15 +++++ .../placed_feature/diorite_ocean_rock.json | 15 +++++ .../smooth_basalt_ocean_rock.json | 15 +++++ src/main/resources/fabric.mod.json | 2 +- 31 files changed, 638 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/lumiscosity/rounded/worldgen/OceanRockFeature.java create mode 100644 src/main/java/com/lumiscosity/rounded/worldgen/structure/OceanMonumentGenerator.java create mode 100644 src/main/java/com/lumiscosity/rounded/worldgen/structure/OceanMonumentStructure.java create mode 100644 src/main/resources/data/minecraft/worldgen/structure/monument.json create mode 100644 src/main/resources/data/rounded/advancement/recipes/building_blocks/bladderwrack_block.json create mode 100644 src/main/resources/data/rounded/advancement/recipes/building_blocks/chiseled_prismarine_bricks.json create mode 100644 src/main/resources/data/rounded/advancement/recipes/building_blocks/dead_bladderwrack_block.json create mode 100644 src/main/resources/data/rounded/advancement/recipes/building_blocks/furnace/smooth_prismarine.json create mode 100644 src/main/resources/data/rounded/advancement/recipes/building_blocks/moisture_detector.json create mode 100644 src/main/resources/data/rounded/advancement/recipes/building_blocks/prismarine_lantern.json create mode 100644 src/main/resources/data/rounded/advancement/recipes/building_blocks/smooth_prismarine_slab.json create mode 100644 src/main/resources/data/rounded/loot_table/blocks/bladderwrack.json create mode 100644 src/main/resources/data/rounded/loot_table/blocks/bladderwrack_block.json create mode 100644 src/main/resources/data/rounded/loot_table/blocks/chiseled_prismarine_bricks.json create mode 100644 src/main/resources/data/rounded/loot_table/blocks/dead_bladderwrack.json create mode 100644 src/main/resources/data/rounded/loot_table/blocks/dead_bladderwrack_block.json create mode 100644 src/main/resources/data/rounded/loot_table/blocks/moisture_detector.json create mode 100644 src/main/resources/data/rounded/loot_table/blocks/prismarine_lantern.json create mode 100644 src/main/resources/data/rounded/loot_table/blocks/smooth_prismarine.json create mode 100644 src/main/resources/data/rounded/loot_table/blocks/smooth_prismarine_slab.json rename src/main/resources/data/rounded/tags/worldgen/biome/{has_andesite_sea_rocks.json => has_andesite_ocean_rocks.json} (100%) rename src/main/resources/data/rounded/tags/worldgen/biome/{has_diorite_sea_rocks.json => has_diorite_ocean_rocks.json} (100%) rename src/main/resources/data/rounded/tags/worldgen/biome/{has_smooth_basalt_sea_rocks.json => has_smooth_basalt_ocean_rocks.json} (100%) create mode 100644 src/main/resources/data/rounded/worldgen/configured_feature/andesite_ocean_rock.json create mode 100644 src/main/resources/data/rounded/worldgen/configured_feature/diorite_ocean_rock.json create mode 100644 src/main/resources/data/rounded/worldgen/configured_feature/smooth_basalt_ocean_rock.json create mode 100644 src/main/resources/data/rounded/worldgen/placed_feature/andesite_ocean_rock.json create mode 100644 src/main/resources/data/rounded/worldgen/placed_feature/diorite_ocean_rock.json create mode 100644 src/main/resources/data/rounded/worldgen/placed_feature/smooth_basalt_ocean_rock.json diff --git a/src/main/java/com/lumiscosity/rounded/worldgen/OceanRockFeature.java b/src/main/java/com/lumiscosity/rounded/worldgen/OceanRockFeature.java new file mode 100644 index 0000000..c27c402 --- /dev/null +++ b/src/main/java/com/lumiscosity/rounded/worldgen/OceanRockFeature.java @@ -0,0 +1,56 @@ +package com.lumiscosity.rounded.worldgen; + +import com.mojang.serialization.Codec; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; +import net.minecraft.world.StructureWorldAccess; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.SimpleBlockFeatureConfig; +import net.minecraft.world.gen.feature.util.FeatureContext; + +public class OceanRockFeature extends Feature { + public OceanRockFeature(Codec codec) { + super(codec); + } + + @Override + public boolean generate(FeatureContext context) { + BlockPos origin = context.getOrigin(); + StructureWorldAccess structureWorldAccess = context.getWorld(); + Random random = context.getRandom(); + + SimpleBlockFeatureConfig SimpleBlockFeatureConfig; + for (SimpleBlockFeatureConfig = context.getConfig(); origin.getY() > structureWorldAccess.getBottomY() + 3; origin = origin.down()) { + if (!structureWorldAccess.isAir(origin.down())) { + BlockState blockState = structureWorldAccess.getBlockState(origin.down()); + if (isSoil(blockState) || isStone(blockState)) { + break; + } + } + } + + if (origin.getY() <= structureWorldAccess.getBottomY() + 9) { + return false; + } else { + int[] heights = { + random.nextInt(7), random.nextInt(8), random.nextInt(7), + random.nextInt(8), random.nextInt(9), random.nextInt(8), + random.nextInt(7), random.nextInt(8), random.nextInt(7) + }; + + BlockPos.Mutable pos = new BlockPos.Mutable(); + for (int i = 0; i < 9; i++) { + pos.set(origin.getX() + i % 3,origin.getY() - random.nextInt(3),origin.getZ() + i / 3); + for (int j = 0; j < heights[i]; j++) { + structureWorldAccess.setBlockState(pos, SimpleBlockFeatureConfig.toPlace().get(random, pos), Block.NOTIFY_ALL); + pos.move(Direction.UP); + } + } + + return true; + } + } +} diff --git a/src/main/java/com/lumiscosity/rounded/worldgen/RegisterFeatures.java b/src/main/java/com/lumiscosity/rounded/worldgen/RegisterFeatures.java index abe3036..3183686 100644 --- a/src/main/java/com/lumiscosity/rounded/worldgen/RegisterFeatures.java +++ b/src/main/java/com/lumiscosity/rounded/worldgen/RegisterFeatures.java @@ -9,9 +9,7 @@ import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.FeatureConfig; -import net.minecraft.world.gen.feature.HugeMushroomFeatureConfig; +import net.minecraft.world.gen.feature.*; import static com.lumiscosity.rounded.Rounded.MOD_ID; @@ -37,7 +35,23 @@ public static void initFeatures() { RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "bladderwrack")) ); - // Ocean floor rocks + // Ocean rocks + register_feature("ocean_rock", new OceanRockFeature(SimpleBlockFeatureConfig.CODEC)); + BiomeModifications.addFeature( + BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_andesite_ocean_rocks"))), + GenerationStep.Feature.LOCAL_MODIFICATIONS, + RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "andesite_ocean_rock")) + ); + BiomeModifications.addFeature( + BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_diorite_ocean_rocks"))), + GenerationStep.Feature.LOCAL_MODIFICATIONS, + RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "diorite_ocean_rock")) + ); + BiomeModifications.addFeature( + BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_smooth_basalt_ocean_rocks"))), + GenerationStep.Feature.LOCAL_MODIFICATIONS, + RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "smooth_basalt_ocean_rock")) + ); } private static > F register_feature(String name, F feature) { diff --git a/src/main/java/com/lumiscosity/rounded/worldgen/structure/OceanMonumentGenerator.java b/src/main/java/com/lumiscosity/rounded/worldgen/structure/OceanMonumentGenerator.java new file mode 100644 index 0000000..b969818 --- /dev/null +++ b/src/main/java/com/lumiscosity/rounded/worldgen/structure/OceanMonumentGenerator.java @@ -0,0 +1,4 @@ +package com.lumiscosity.rounded.worldgen.structure; + +public class OceanMonumentGenerator { +} diff --git a/src/main/java/com/lumiscosity/rounded/worldgen/structure/OceanMonumentStructure.java b/src/main/java/com/lumiscosity/rounded/worldgen/structure/OceanMonumentStructure.java new file mode 100644 index 0000000..987f78e --- /dev/null +++ b/src/main/java/com/lumiscosity/rounded/worldgen/structure/OceanMonumentStructure.java @@ -0,0 +1,4 @@ +package com.lumiscosity.rounded.worldgen.structure; + +public class OceanMonumentStructure { +} diff --git a/src/main/resources/data/minecraft/worldgen/structure/monument.json b/src/main/resources/data/minecraft/worldgen/structure/monument.json new file mode 100644 index 0000000..52cb78a --- /dev/null +++ b/src/main/resources/data/minecraft/worldgen/structure/monument.json @@ -0,0 +1,26 @@ +{ + "type": "rounded:ocean_monument", + "biomes": "#minecraft:has_structure/ocean_monument", + "spawn_overrides": { + "axolotls": { + "bounding_box": "full", + "spawns": [] + }, + "monster": { + "bounding_box": "full", + "spawns": [ + { + "type": "minecraft:guardian", + "maxCount": 4, + "minCount": 2, + "weight": 1 + } + ] + }, + "underground_water_creature": { + "bounding_box": "full", + "spawns": [] + } + }, + "step": "surface_structures" +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/advancement/recipes/building_blocks/bladderwrack_block.json b/src/main/resources/data/rounded/advancement/recipes/building_blocks/bladderwrack_block.json new file mode 100644 index 0000000..ac716ed --- /dev/null +++ b/src/main/resources/data/rounded/advancement/recipes/building_blocks/bladderwrack_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_log": { + "conditions": { + "items": [ + { + "items": "rounded:bladderwrack" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "rounded:bladderwrack_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_log" + ] + ], + "rewards": { + "recipes": [ + "rounded:bladderwrack_block" + ] + } +} diff --git a/src/main/resources/data/rounded/advancement/recipes/building_blocks/chiseled_prismarine_bricks.json b/src/main/resources/data/rounded/advancement/recipes/building_blocks/chiseled_prismarine_bricks.json new file mode 100644 index 0000000..51a2c1b --- /dev/null +++ b/src/main/resources/data/rounded/advancement/recipes/building_blocks/chiseled_prismarine_bricks.json @@ -0,0 +1,26 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_log": { + "conditions": { + "items": [ + { + "items": "minecraft:prismarine_bricks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_log" + ] + ], + "rewards": { + "recipes": [ + "rounded:chiseled_prismarine_bricks", + "rounded:stonecutter/chiseled_prismarine_bricks" + ] + } +} diff --git a/src/main/resources/data/rounded/advancement/recipes/building_blocks/dead_bladderwrack_block.json b/src/main/resources/data/rounded/advancement/recipes/building_blocks/dead_bladderwrack_block.json new file mode 100644 index 0000000..41258f9 --- /dev/null +++ b/src/main/resources/data/rounded/advancement/recipes/building_blocks/dead_bladderwrack_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_log": { + "conditions": { + "items": [ + { + "items": "rounded:dead_bladderwrack" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "rounded:dead_bladderwrack_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_log" + ] + ], + "rewards": { + "recipes": [ + "rounded:dead_bladderwrack_block" + ] + } +} diff --git a/src/main/resources/data/rounded/advancement/recipes/building_blocks/furnace/smooth_prismarine.json b/src/main/resources/data/rounded/advancement/recipes/building_blocks/furnace/smooth_prismarine.json new file mode 100644 index 0000000..ff9d9e8 --- /dev/null +++ b/src/main/resources/data/rounded/advancement/recipes/building_blocks/furnace/smooth_prismarine.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_log": { + "conditions": { + "items": [ + { + "items": "minecraft:prismarine" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "rounded:furnace/smooth_prismarine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_log" + ] + ], + "rewards": { + "recipes": [ + "rounded:furnace/smooth_prismarine" + ] + } +} diff --git a/src/main/resources/data/rounded/advancement/recipes/building_blocks/moisture_detector.json b/src/main/resources/data/rounded/advancement/recipes/building_blocks/moisture_detector.json new file mode 100644 index 0000000..8964085 --- /dev/null +++ b/src/main/resources/data/rounded/advancement/recipes/building_blocks/moisture_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_log": { + "conditions": { + "items": [ + { + "items": "rounded:smooth_prismarine" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "rounded:moisture_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_log" + ] + ], + "rewards": { + "recipes": [ + "rounded:moisture_detector" + ] + } +} diff --git a/src/main/resources/data/rounded/advancement/recipes/building_blocks/prismarine_lantern.json b/src/main/resources/data/rounded/advancement/recipes/building_blocks/prismarine_lantern.json new file mode 100644 index 0000000..02d4fd4 --- /dev/null +++ b/src/main/resources/data/rounded/advancement/recipes/building_blocks/prismarine_lantern.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_log": { + "conditions": { + "items": [ + { + "items": "minecraft:prismarine_crystals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "rounded:prismarine_lantern" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_log" + ] + ], + "rewards": { + "recipes": [ + "rounded:prismarine_lantern" + ] + } +} diff --git a/src/main/resources/data/rounded/advancement/recipes/building_blocks/smooth_prismarine_slab.json b/src/main/resources/data/rounded/advancement/recipes/building_blocks/smooth_prismarine_slab.json new file mode 100644 index 0000000..b62a83c --- /dev/null +++ b/src/main/resources/data/rounded/advancement/recipes/building_blocks/smooth_prismarine_slab.json @@ -0,0 +1,26 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_log": { + "conditions": { + "items": [ + { + "items": "rounded:smooth_prismarine" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_log" + ] + ], + "rewards": { + "recipes": [ + "rounded:smooth_prismarine_slab", + "rounded:stonecutter/smooth_prismarine_slab" + ] + } +} diff --git a/src/main/resources/data/rounded/loot_table/blocks/bladderwrack.json b/src/main/resources/data/rounded/loot_table/blocks/bladderwrack.json new file mode 100644 index 0000000..3eec8f7 --- /dev/null +++ b/src/main/resources/data/rounded/loot_table/blocks/bladderwrack.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "rounded:bladderwrack" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "rounded:blocks/bladderwrack" +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/loot_table/blocks/bladderwrack_block.json b/src/main/resources/data/rounded/loot_table/blocks/bladderwrack_block.json new file mode 100644 index 0000000..2e60cd8 --- /dev/null +++ b/src/main/resources/data/rounded/loot_table/blocks/bladderwrack_block.json @@ -0,0 +1,47 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "rounded:bladderwrack_block" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "name": "rounded:dead_bladderwrack_block" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "rounded:blocks/bladderwrack_block" +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/loot_table/blocks/chiseled_prismarine_bricks.json b/src/main/resources/data/rounded/loot_table/blocks/chiseled_prismarine_bricks.json new file mode 100644 index 0000000..12c8156 --- /dev/null +++ b/src/main/resources/data/rounded/loot_table/blocks/chiseled_prismarine_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "rounded:chiseled_prismarine_bricks" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "rounded:blocks/chiseled_prismarine_bricks" +} diff --git a/src/main/resources/data/rounded/loot_table/blocks/dead_bladderwrack.json b/src/main/resources/data/rounded/loot_table/blocks/dead_bladderwrack.json new file mode 100644 index 0000000..7c7524a --- /dev/null +++ b/src/main/resources/data/rounded/loot_table/blocks/dead_bladderwrack.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "rounded:dead_bladderwrack" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "rounded:blocks/dead_bladderwrack" +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/loot_table/blocks/dead_bladderwrack_block.json b/src/main/resources/data/rounded/loot_table/blocks/dead_bladderwrack_block.json new file mode 100644 index 0000000..b1f66a8 --- /dev/null +++ b/src/main/resources/data/rounded/loot_table/blocks/dead_bladderwrack_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "rounded:dead_bladderwrack_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "rounded:blocks/dead_bladderwrack_block" +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/loot_table/blocks/moisture_detector.json b/src/main/resources/data/rounded/loot_table/blocks/moisture_detector.json new file mode 100644 index 0000000..871a695 --- /dev/null +++ b/src/main/resources/data/rounded/loot_table/blocks/moisture_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "rounded:moisture_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "rounded:blocks/moisture_detector" +} diff --git a/src/main/resources/data/rounded/loot_table/blocks/prismarine_lantern.json b/src/main/resources/data/rounded/loot_table/blocks/prismarine_lantern.json new file mode 100644 index 0000000..1ff23fa --- /dev/null +++ b/src/main/resources/data/rounded/loot_table/blocks/prismarine_lantern.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "rounded:prismarine_lantern" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "rounded:blocks/prismarine_lantern" +} diff --git a/src/main/resources/data/rounded/loot_table/blocks/smooth_prismarine.json b/src/main/resources/data/rounded/loot_table/blocks/smooth_prismarine.json new file mode 100644 index 0000000..da97915 --- /dev/null +++ b/src/main/resources/data/rounded/loot_table/blocks/smooth_prismarine.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "rounded:smooth_prismarine" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "rounded:blocks/smooth_prismarine" +} diff --git a/src/main/resources/data/rounded/loot_table/blocks/smooth_prismarine_slab.json b/src/main/resources/data/rounded/loot_table/blocks/smooth_prismarine_slab.json new file mode 100644 index 0000000..bc0e2f4 --- /dev/null +++ b/src/main/resources/data/rounded/loot_table/blocks/smooth_prismarine_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "rounded:smooth_prismarine_slab" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "rounded:blocks/smooth_prismarine_slab" +} diff --git a/src/main/resources/data/rounded/tags/worldgen/biome/has_andesite_sea_rocks.json b/src/main/resources/data/rounded/tags/worldgen/biome/has_andesite_ocean_rocks.json similarity index 100% rename from src/main/resources/data/rounded/tags/worldgen/biome/has_andesite_sea_rocks.json rename to src/main/resources/data/rounded/tags/worldgen/biome/has_andesite_ocean_rocks.json diff --git a/src/main/resources/data/rounded/tags/worldgen/biome/has_diorite_sea_rocks.json b/src/main/resources/data/rounded/tags/worldgen/biome/has_diorite_ocean_rocks.json similarity index 100% rename from src/main/resources/data/rounded/tags/worldgen/biome/has_diorite_sea_rocks.json rename to src/main/resources/data/rounded/tags/worldgen/biome/has_diorite_ocean_rocks.json diff --git a/src/main/resources/data/rounded/tags/worldgen/biome/has_smooth_basalt_sea_rocks.json b/src/main/resources/data/rounded/tags/worldgen/biome/has_smooth_basalt_ocean_rocks.json similarity index 100% rename from src/main/resources/data/rounded/tags/worldgen/biome/has_smooth_basalt_sea_rocks.json rename to src/main/resources/data/rounded/tags/worldgen/biome/has_smooth_basalt_ocean_rocks.json diff --git a/src/main/resources/data/rounded/worldgen/configured_feature/andesite_ocean_rock.json b/src/main/resources/data/rounded/worldgen/configured_feature/andesite_ocean_rock.json new file mode 100644 index 0000000..3a85931 --- /dev/null +++ b/src/main/resources/data/rounded/worldgen/configured_feature/andesite_ocean_rock.json @@ -0,0 +1,11 @@ +{ + "type": "rounded:ocean_rock", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:andesite" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/worldgen/configured_feature/diorite_ocean_rock.json b/src/main/resources/data/rounded/worldgen/configured_feature/diorite_ocean_rock.json new file mode 100644 index 0000000..cabaf7d --- /dev/null +++ b/src/main/resources/data/rounded/worldgen/configured_feature/diorite_ocean_rock.json @@ -0,0 +1,11 @@ +{ + "type": "rounded:ocean_rock", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:diorite" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/worldgen/configured_feature/smooth_basalt_ocean_rock.json b/src/main/resources/data/rounded/worldgen/configured_feature/smooth_basalt_ocean_rock.json new file mode 100644 index 0000000..6b1f5d4 --- /dev/null +++ b/src/main/resources/data/rounded/worldgen/configured_feature/smooth_basalt_ocean_rock.json @@ -0,0 +1,11 @@ +{ + "type": "rounded:ocean_rock", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:smooth_basalt" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/worldgen/placed_feature/andesite_ocean_rock.json b/src/main/resources/data/rounded/worldgen/placed_feature/andesite_ocean_rock.json new file mode 100644 index 0000000..39be428 --- /dev/null +++ b/src/main/resources/data/rounded/worldgen/placed_feature/andesite_ocean_rock.json @@ -0,0 +1,15 @@ +{ + "feature": "rounded:andesite_ocean_rock", + "placement": [ + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/worldgen/placed_feature/diorite_ocean_rock.json b/src/main/resources/data/rounded/worldgen/placed_feature/diorite_ocean_rock.json new file mode 100644 index 0000000..61ce81a --- /dev/null +++ b/src/main/resources/data/rounded/worldgen/placed_feature/diorite_ocean_rock.json @@ -0,0 +1,15 @@ +{ + "feature": "rounded:diorite_ocean_rock", + "placement": [ + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/rounded/worldgen/placed_feature/smooth_basalt_ocean_rock.json b/src/main/resources/data/rounded/worldgen/placed_feature/smooth_basalt_ocean_rock.json new file mode 100644 index 0000000..c54ea82 --- /dev/null +++ b/src/main/resources/data/rounded/worldgen/placed_feature/smooth_basalt_ocean_rock.json @@ -0,0 +1,15 @@ +{ + "feature": "rounded:smooth_basalt_ocean_rock", + "placement": [ + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5cc5f0f..3c4d48f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -36,6 +36,6 @@ "java": ">=21", "fabric-api": "*" }, - "suggests": { + "conflicts": { } } \ No newline at end of file