lava rocks and moisture detector fix

Author: lumiscosity

src/main/java/com/lumiscosity/rounded/blocks/RegisterBlocks.java

@@ -1,15 +1,11 @@
 package com.lumiscosity.rounded.blocks;
 
-import com.mojang.datafixers.types.Type;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.fabricmc.fabric.api.registry.LandPathNodeTypesRegistry;
 import net.minecraft.block.*;
-import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
-import net.minecraft.block.entity.JukeboxBlockEntity;
 import net.minecraft.block.enums.NoteBlockInstrument;
 import net.minecraft.block.piston.PistonBehavior;
-import net.minecraft.datafixer.TypeReferences;
 import net.minecraft.entity.ai.pathing.PathNodeType;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
@@ -20,9 +16,7 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.Util;
 
-import static com.lumiscosity.rounded.Rounded.LOGGER;
 import static com.lumiscosity.rounded.Rounded.MOD_ID;
 
 public class RegisterBlocks {
@@ -194,7 +188,7 @@ public class RegisterBlocks {
 
     // Moisture Detector
     public static final Block MOISTURE_DETECTOR = new MoistureDetectorBlock(
-            AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND_BLUE).instrument(NoteBlockInstrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F)
+            AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND_BLUE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F)
     );
     public static final BlockItem MOISTURE_DETECTOR_ITEM = new BlockItem(MOISTURE_DETECTOR, new Item.Settings());
     public static final BlockEntityType<MoistureDetectorBlock.MoistureDetectorBlockEntity> MOISTURE_DETECTOR_BE = Registry.register(

src/main/java/com/lumiscosity/rounded/worldgen/OceanRockFeature.java

@@ -3,6 +3,7 @@
 import com.mojang.serialization.Codec;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.random.Random;
@@ -26,13 +27,13 @@ public boolean generate(FeatureContext<SimpleBlockFeatureConfig> context) {
         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)) {
+                if (isSoil(blockState) || isStone(blockState) || blockState.isIn(BlockTags.BASE_STONE_NETHER)) {
                     break;
                 }
             }
         }
 
-        if (origin.getY() <= structureWorldAccess.getBottomY() + 9) {
+        if (origin.getY() <= structureWorldAccess.getBottomY() + 3) {
             return false;
         } else {
             int[] heights = {

src/main/java/com/lumiscosity/rounded/worldgen/RegisterFeatures.java

@@ -52,6 +52,11 @@ public static void initFeatures() {
                 GenerationStep.Feature.LOCAL_MODIFICATIONS,
                 RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "smooth_basalt_ocean_rock"))
         );
+        BiomeModifications.addFeature(
+                BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_lava_ocean_rocks"))),
+                GenerationStep.Feature.LOCAL_MODIFICATIONS,
+                RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "lava_ocean_rock"))
+        );
     }
 
     private static <C extends FeatureConfig, F extends Feature<C>> F register_feature(String name, F feature) {

src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -9,6 +9,7 @@
     "rounded:dead_bladderwrack",
     "rounded:bladderwrack",
     "rounded:dead_bladderwrack_block",
-    "rounded:bladderwrack_block"
+    "rounded:bladderwrack_block",
+    "rounded:moisture_detector"
   ]
 }

src/main/resources/data/rounded/tags/worldgen/biome/has_lava_ocean_rocks.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "#c:is_nether"
+  ]
+}

src/main/resources/data/rounded/worldgen/configured_feature/lava_ocean_rock.json

@@ -0,0 +1,11 @@
+{
+  "type": "rounded:ocean_rock",
+  "config": {
+    "to_place": {
+      "type": "minecraft:simple_state_provider",
+      "state": {
+        "Name": "minecraft:blackstone"
+      }
+    }
+  }
+}

src/main/resources/data/rounded/worldgen/placed_feature/lava_ocean_rock.json

@@ -0,0 +1,23 @@
+{
+  "feature": "rounded:lava_ocean_rock",
+  "placement": [
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:uniform",
+        "max_inclusive": {
+          "absolute": 32
+        },
+        "min_inclusive": {
+          "above_bottom": 10
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}