This Rocks 1.4.0 - 1.17 and QOL

- Update to 1.17-pre1 and Java 16
- Make starfish items contain variations
- Fix bugs

.gitignore

@@ -1,7 +1,6 @@
 # gradle
-
-.gradle/
 build/
+.gradle/
 out/
 classes/
 

build.gradle

@@ -1,66 +1,67 @@
 plugins {
-	id 'fabric-loom' version '0.4-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
 minecraft {
+	accessWidener =  file("src/main/resources/thisrocks.accesswidener")
 }
 
 repositories {
+	maven { url "https://maven.terraformersmc.com/releases" }
 	maven { url "https://jitpack.io" }
-	maven { url "https://maven.blamejared.com" }
 }
 
 dependencies {
 	//to change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	
-	modImplementation "eu.midnightdust:midnight-hats:${midnighthats_version}"
+	modImplementation "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}"
-    include "eu.midnightdust:midnight-hats:${midnighthats_version}"
+    include "com.github.TeamMidnightDust:MidnightLib:${midnightlib_version}"
 }
 
 processResources {
 	inputs.property "version", project.version
 
-	from(sourceSets.main.resources.srcDirs) {
+	filesMatching("fabric.mod.json") {
-		include "fabric.mod.json"
 		expand "version": project.version
 	}
-
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
-	}
 }
 
+tasks.withType(JavaCompile).configureEach {
 	// ensure that the encoding is set to UTF-8, no matter what the system default is
 	// this fixes some edge cases with special characters not displaying correctly
 	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
+	// If Javadoc is generated, this must be specified in that task too.
-	options.encoding = "UTF-8"
+	it.options.encoding = "UTF-8"
+
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
+	it.options.release = 16
 }
 
+java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
-// If you remove this task, sources will not be generated.
+	// If you remove this line, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
+	withSourcesJar()
-	classifier = "sources"
-	from sourceSets.main.allSource
 }
 
 jar {
-	from "LICENSE"
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
 }
 
 // configure the maven publication
@@ -77,9 +78,11 @@ publishing {
 		}
 	}
 
-	// select the repositories you want to publish to
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
 	repositories {
-		// uncomment to publish to the local maven
+		// Add repositories to publish to here.
-		// mavenLocal()
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
 	}
 }

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.2
+	minecraft_version=1.17-pre1
-	yarn_mappings=1.16.2+build.6
+    yarn_mappings=1.17-pre1+build.9
-	loader_version=0.9.1+build.205
+    loader_version=0.11.3
 
 # Mod Properties
-	mod_version = 1.0.0
+	mod_version = 1.4.0
 	maven_group = eu.midnightdust.motschen
 	archives_base_name = rocks
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.17.2+build.396-1.16
+	fabric_version=0.34.8+1.17
-	midnighthats_version=1.0.2
+	midnightlib_version=v0.2.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
+        0) set -- ;;
-        (1) set -- "$args0" ;;
+        1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
+        2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/eu/midnightdust/motschen/rocks/RocksClient.java

@@ -0,0 +1,14 @@
+package eu.midnightdust.motschen.rocks;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
+import net.minecraft.util.Identifier;
+
+public class RocksClient implements ClientModInitializer {
+    @Override
+    public void onInitializeClient() {
+        FabricModelPredicateProviderRegistry.register(RocksMain.Starfish.asItem(), new Identifier("red"), (stack, world, entity, seed) -> (stack.getTag() != null && stack.getTag().getString("variation").equals("red")) ?  1 : 0);
+        FabricModelPredicateProviderRegistry.register(RocksMain.Starfish.asItem(), new Identifier("pink"), (stack, world, entity, seed) -> (stack.getTag() != null && stack.getTag().getString("variation").equals("pink")) ?  1 : 0);
+        FabricModelPredicateProviderRegistry.register(RocksMain.Starfish.asItem(), new Identifier("orange"), (stack, world, entity, seed) -> (stack.getTag() != null && stack.getTag().getString("variation").equals("orange")) ?  1 : 0);
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/RocksMain.java

@@ -1,13 +1,16 @@
 package eu.midnightdust.motschen.rocks;
 
 import eu.midnightdust.motschen.rocks.block.*;
+import eu.midnightdust.motschen.rocks.block.blockentity.BlockEntityInit;
 import eu.midnightdust.motschen.rocks.blockstates.RockVariation;
 import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
+import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
 import eu.midnightdust.motschen.rocks.blockstates.StickVariation;
-import eu.midnightdust.motschen.rocks.world.FeatureInjector;
+import eu.midnightdust.motschen.rocks.world.*;
-import eu.midnightdust.motschen.rocks.world.MiscFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.MiscFeatures;
-import eu.midnightdust.motschen.rocks.world.RockFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.NetherFeatures;
-import eu.midnightdust.motschen.rocks.world.StickFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.RockFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.StickFeatures;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.minecraft.block.Block;
@@ -25,11 +28,18 @@ public class RocksMain implements ModInitializer {
     public static final EnumProperty<RockVariation> ROCK_VARIATION = EnumProperty.of("variation", RockVariation.class);
     public static final EnumProperty<StickVariation> STICK_VARIATION = EnumProperty.of("variation", StickVariation.class);
     public static final EnumProperty<SeashellVariation> SEASHELL_VARIATION = EnumProperty.of("variation", SeashellVariation.class);
+    public static final EnumProperty<StarfishVariation> STARFISH_VARIATION = EnumProperty.of("variation", StarfishVariation.class);
 
     public static Block Rock = new Rock();
+    public static Block GraniteRock = new Rock();
+    public static Block DioriteRock = new Rock();
+    public static Block AndesiteRock = new Rock();
     public static Block SandRock = new Rock();
     public static Block RedSandRock = new Rock();
+    public static Block GravelRock = new Rock();
     public static Block EndstoneRock = new Rock();
+    public static Block NetherrackRock = new Rock();
+    public static Block SoulSoilRock = new Rock();
 
     public static Block OakStick = new Stick();
     public static Block SpruceStick = new Stick();
@@ -40,22 +50,42 @@ public class RocksMain implements ModInitializer {
 
     public static Block Pinecone = new Pinecone();
     public static Block Seashell = new Seashell();
+    public static Block Starfish = new Starfish();
+    public static Block Geyser = new OverworldGeyser();
+    public static Block NetherGeyser = new NetherGeyser();
 
-    public static Item CobbleStoneSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
+    public static Item CobblestoneSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
+    public static Item GraniteSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
+    public static Item DioriteSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
+    public static Item AndesiteSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
     public static Item SandStoneSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
     public static Item RedSandStoneSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
     public static Item EndStoneSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
+    public static Item NetherrackSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
+    public static Item SoulSoilSplitter = new Item(new Item.Settings().group(RocksMain.RocksGroup));
 
     @Override
     public void onInitialize() {
         Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"rock"), Rock);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"rock"), new BlockItem(Rock, new Item.Settings().group(RocksMain.RocksGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"granite_rock"), GraniteRock);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"granite_rock"), new BlockItem(GraniteRock, new Item.Settings().group(RocksMain.RocksGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"diorite_rock"), DioriteRock);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"diorite_rock"), new BlockItem(DioriteRock, new Item.Settings().group(RocksMain.RocksGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"andesite_rock"), AndesiteRock);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"andesite_rock"), new BlockItem(AndesiteRock, new Item.Settings().group(RocksMain.RocksGroup)));
         Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"sand_rock"), SandRock);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"sand_rock"), new BlockItem(SandRock, new Item.Settings().group(RocksMain.RocksGroup)));
         Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"red_sand_rock"), RedSandRock);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"red_sand_rock"), new BlockItem(RedSandRock, new Item.Settings().group(RocksMain.RocksGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"gravel_rock"), GravelRock);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"gravel_rock"), new BlockItem(GravelRock, new Item.Settings().group(RocksMain.RocksGroup)));
         Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"end_stone_rock"), EndstoneRock);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"end_stone_rock"), new BlockItem(EndstoneRock, new Item.Settings().group(RocksMain.RocksGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"netherrack_rock"), NetherrackRock);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"netherrack_rock"), new BlockItem(NetherrackRock, new Item.Settings().group(RocksMain.RocksGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"soul_soil_rock"), SoulSoilRock);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"soul_soil_rock"), new BlockItem(SoulSoilRock, new Item.Settings().group(RocksMain.RocksGroup)));
 
         Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"oak_stick"), OakStick);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"oak_stick"), new BlockItem(OakStick, new Item.Settings().group(RocksMain.RocksGroup)));
@@ -70,19 +100,33 @@ public class RocksMain implements ModInitializer {
         Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"dark_oak_stick"), DarkOakStick);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"dark_oak_stick"), new BlockItem(DarkOakStick, new Item.Settings().group(RocksMain.RocksGroup)));
 
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"geyser"), Geyser);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"geyser"), new BlockItem(Geyser, new Item.Settings().group(RocksMain.RocksGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"nether_geyser"), NetherGeyser);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"nether_geyser"), new BlockItem(NetherGeyser, new Item.Settings().group(RocksMain.RocksGroup)));
+
         Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"pinecone"), Pinecone);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"pinecone"), new BlockItem(Pinecone, new Item.Settings().group(RocksMain.RocksGroup)));
         Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"seashell"), Seashell);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"seashell"), new BlockItem(Seashell, new Item.Settings().group(RocksMain.RocksGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"starfish"), Starfish);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"starfish"), new BlockItem(Starfish, new Item.Settings().group(RocksMain.RocksGroup)));
 
-        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"cobblestone_splitter"), CobbleStoneSplitter);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"cobblestone_splitter"), CobblestoneSplitter);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"granite_splitter"), GraniteSplitter);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"diorite_splitter"), DioriteSplitter);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"andesite_splitter"), AndesiteSplitter);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"sandstone_splitter"), SandStoneSplitter);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"red_sandstone_splitter"), RedSandStoneSplitter);
         Registry.register(Registry.ITEM, new Identifier(MOD_ID,"end_stone_splitter"), EndStoneSplitter);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"netherrack_splitter"), NetherrackSplitter);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"soul_soil_splitter"), SoulSoilSplitter);
 
         RockFeatures.init();
         StickFeatures.init();
         MiscFeatures.init();
+        NetherFeatures.init();
         FeatureInjector.init();
+        BlockEntityInit.init();
     }
 }

src/main/java/eu/midnightdust/motschen/rocks/block/NetherGeyser.java

@@ -0,0 +1,66 @@
+package eu.midnightdust.motschen.rocks.block;
+
+import eu.midnightdust.motschen.rocks.block.blockentity.BlockEntityInit;
+import eu.midnightdust.motschen.rocks.block.blockentity.NetherGeyserBlockEntity;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.*;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.BlockEntityTicker;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldView;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+public class NetherGeyser extends BlockWithEntity implements BlockEntityProvider {
+
+    private static final VoxelShape SHAPE;
+    public static final BooleanProperty ACTIVE = BooleanProperty.of("active");
+
+    public NetherGeyser() {
+        super(FabricBlockSettings.copy(Blocks.STONE).strength(10).noCollision().nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(ACTIVE, false));
+    }
+    @Override
+    public BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new NetherGeyserBlockEntity(pos, state);
+    }
+    @Nullable
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+        return checkType(type, BlockEntityInit.NETHER_GEYSER_BE, NetherGeyserBlockEntity::tick);
+    }
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+                .with(ACTIVE, false);
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(ACTIVE);
+    }
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        return SHAPE;
+    }
+    static {
+        SHAPE = createCuboidShape(5, 0, 5, 11, 1, 11);
+    }
+
+    public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
+        return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP);
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/block/OverworldGeyser.java

@@ -0,0 +1,77 @@
+package eu.midnightdust.motschen.rocks.block;
+
+import eu.midnightdust.motschen.rocks.block.blockentity.BlockEntityInit;
+import eu.midnightdust.motschen.rocks.block.blockentity.OverworldGeyserBlockEntity;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.*;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.BlockEntityTicker;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldView;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+public class OverworldGeyser extends BlockWithEntity implements BlockEntityProvider {
+
+    private static final VoxelShape SHAPE;
+    private static final VoxelShape SNOWY_SHAPE;
+    public static final BooleanProperty ACTIVE = BooleanProperty.of("active");
+    public static final BooleanProperty SNOWY = Properties.SNOWY;
+
+    public OverworldGeyser() {
+        super(FabricBlockSettings.copy(Blocks.STONE).strength(10).noCollision().nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(ACTIVE, false).with(SNOWY, false));
+    }
+    @Override
+    public BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new OverworldGeyserBlockEntity(pos, state);
+    }
+    @Nullable
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+        return checkType(type, BlockEntityInit.OVERWORLD_GEYSER_BE, OverworldGeyserBlockEntity::tick);
+    }
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+                .with(ACTIVE, false).with(SNOWY, false);
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(ACTIVE,SNOWY);
+    }
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        if (state.get(SNOWY)) {return SNOWY_SHAPE;}
+        else return SHAPE;
+    }
+    static {
+        VoxelShape shape = createCuboidShape(5, 0, 5, 11, 1, 11);
+        VoxelShape snow_layer = createCuboidShape(0, 0, 0, 16, 2, 16);
+        VoxelShape shape_snow = createCuboidShape(5, 2, 5, 11, 3, 11);
+        VoxelShape snowy = VoxelShapes.union(snow_layer, shape_snow);
+
+        SHAPE = shape;
+        SNOWY_SHAPE = snowy;
+    }
+
+    public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
+        return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP);
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/block/Pinecone.java

@@ -7,6 +7,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
 
 public class Pinecone extends Block {
@@ -14,7 +15,7 @@ public class Pinecone extends Block {
     private static final VoxelShape SHAPE;
 
     public Pinecone() {
-        super(FabricBlockSettings.copy(Blocks.POPPY).nonOpaque().sounds(BlockSoundGroup.STONE));
+        super(FabricBlockSettings.copy(Blocks.POPPY).nonOpaque().sounds(BlockSoundGroup.WOOD));
         this.setDefaultState(this.stateManager.getDefaultState());
     }
 
@@ -23,12 +24,13 @@ public class Pinecone extends Block {
         return SHAPE;
     }
     static {
-        VoxelShape shape = createCuboidShape(0, 0, 0, 16, 3, 16);
+        SHAPE = createCuboidShape(0, 0, 0, 16, 3, 16);
-
-        SHAPE = shape;
     }
 
     public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
         return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP);
     }
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) {
+        return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom);
+    }
 }

src/main/java/eu/midnightdust/motschen/rocks/block/Rock.java

@@ -2,7 +2,6 @@ package eu.midnightdust.motschen.rocks.block;
 
 import eu.midnightdust.motschen.rocks.RocksMain;
 import eu.midnightdust.motschen.rocks.blockstates.RockVariation;
-import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.entity.player.PlayerEntity;
@@ -18,8 +17,11 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
 
+import java.util.Objects;
+
 public class Rock extends Block {
 
     private static final VoxelShape SHAPE;
@@ -32,7 +34,7 @@ public class Rock extends Block {
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return super.getPlacementState(itemPlacementContext)
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
                 .with(ROCK_VARIATION, RockVariation.TINY);
     }
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
@@ -63,12 +65,13 @@ public class Rock extends Block {
         return SHAPE;
     }
     static {
-        VoxelShape shape = createCuboidShape(0, 0, 0, 16, 3, 16);
+        SHAPE = createCuboidShape(0, 0, 0, 16, 3, 16);
-
-        SHAPE = shape;
     }
 
     public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
         return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP);
     }
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) {
+        return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom);
+    }
 }

src/main/java/eu/midnightdust/motschen/rocks/block/Seashell.java

@@ -2,19 +2,17 @@ package eu.midnightdust.motschen.rocks.block;
 
 import eu.midnightdust.motschen.rocks.RocksMain;
 import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
-import eu.midnightdust.motschen.rocks.blockstates.StickVariation;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.minecraft.block.Block;
+import net.minecraft.block.*;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.ShapeContext;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.sound.BlockSoundGroup;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
+import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.EnumProperty;
+import net.minecraft.state.property.Properties;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -23,22 +21,32 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
 
-public class Seashell extends Block {
+import java.util.Objects;
+
+public class Seashell extends Block implements Waterloggable {
 
     private static final VoxelShape SHAPE;
     private static final EnumProperty<SeashellVariation> SEASHELL_VARIATION = RocksMain.SEASHELL_VARIATION;
+    public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED;
 
     public Seashell() {
         super(FabricBlockSettings.copy(Blocks.POPPY).nonOpaque().sounds(BlockSoundGroup.STONE));
-        this.setDefaultState(this.stateManager.getDefaultState().with(SEASHELL_VARIATION, SeashellVariation.PINK));
+        this.setDefaultState(this.stateManager.getDefaultState().with(SEASHELL_VARIATION, SeashellVariation.PINK).with(WATERLOGGED, false));
+    }
+
+    @Override
+    public FluidState getFluidState(BlockState blockState_1) {
+        return blockState_1.get(WATERLOGGED) ? Fluids.WATER.getStill(true) : super.getFluidState(blockState_1);
     }
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return super.getPlacementState(itemPlacementContext)
+        FluidState fluidState = itemPlacementContext.getWorld().getFluidState(itemPlacementContext.getBlockPos());
-                .with(SEASHELL_VARIATION, SeashellVariation.PINK);
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+                .with(SEASHELL_VARIATION, SeashellVariation.PINK).with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
     }
 
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
@@ -59,19 +67,20 @@ public class Seashell extends Block {
 
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(SEASHELL_VARIATION);
+        builder.add(SEASHELL_VARIATION, WATERLOGGED);
     }
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
         return SHAPE;
     }
     static {
-        VoxelShape shape = createCuboidShape(0, 0, 0, 16, 3, 16);
+        SHAPE = createCuboidShape(0, 0, 0, 16, 3, 16);
-
-        SHAPE = shape;
     }
 
     public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
         return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP);
     }
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) {
+        return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom);
+    }
 }

src/main/java/eu/midnightdust/motschen/rocks/block/Starfish.java

@@ -0,0 +1,103 @@
+package eu.midnightdust.motschen.rocks.block;
+
+import eu.midnightdust.motschen.rocks.RocksMain;
+import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.*;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.Fluids;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtElement;
+import net.minecraft.nbt.NbtString;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.state.property.EnumProperty;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
+import net.minecraft.world.WorldView;
+
+import java.util.Objects;
+
+public class Starfish extends Block implements Waterloggable {
+
+    private static final VoxelShape SHAPE;
+    private static final EnumProperty<StarfishVariation> STARFISH_VARIATION = RocksMain.STARFISH_VARIATION;
+    public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED;
+
+    public Starfish() {
+        super(FabricBlockSettings.copy(Blocks.POPPY).nonOpaque().sounds(BlockSoundGroup.CORAL));
+        this.setDefaultState(this.stateManager.getDefaultState().with(STARFISH_VARIATION, StarfishVariation.RED).with(WATERLOGGED, false));
+    }
+
+    @Override
+    public FluidState getFluidState(BlockState blockState_1) {
+        return blockState_1.get(WATERLOGGED) ? Fluids.WATER.getStill(true) : super.getFluidState(blockState_1);
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        ItemStack stack = itemPlacementContext.getStack();
+        StarfishVariation variation = StarfishVariation.RED;
+        if (stack.getTag() != null) {
+            var optionalVariation = STARFISH_VARIATION.parse(stack.getTag().getString("variation"));
+            if (optionalVariation.isPresent()) variation = optionalVariation.get();
+        }
+        FluidState fluidState = itemPlacementContext.getWorld().getFluidState(itemPlacementContext.getBlockPos());
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+                .with(STARFISH_VARIATION, variation).with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
+    }
+    @Override
+    public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
+        ItemStack stack = new ItemStack(this);
+        stack.getOrCreateTag().putString("variation", state.get(STARFISH_VARIATION).asString());
+        LOGGER.info(state.get(STARFISH_VARIATION).asString());
+        return stack;
+    }
+
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        if (player.isCreative()) {
+            if (state.get(STARFISH_VARIATION) == StarfishVariation.RED) {
+                world.setBlockState(pos, state.with(STARFISH_VARIATION, StarfishVariation.PINK));
+            }
+            if (state.get(STARFISH_VARIATION) == StarfishVariation.PINK) {
+                world.setBlockState(pos, state.with(STARFISH_VARIATION, StarfishVariation.ORANGE));
+            }
+            if (state.get(STARFISH_VARIATION) == StarfishVariation.ORANGE) {
+                world.setBlockState(pos, state.with(STARFISH_VARIATION, StarfishVariation.RED));
+            }
+            return ActionResult.SUCCESS;
+        }
+        else return ActionResult.FAIL;
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(STARFISH_VARIATION,WATERLOGGED);
+    }
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        return SHAPE;
+    }
+    static {
+        SHAPE = createCuboidShape(0, 0, 0, 16, 1, 16);
+    }
+
+    public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
+        return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP);
+    }
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) {
+        return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom);
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/block/Stick.java

@@ -1,7 +1,6 @@
 package eu.midnightdust.motschen.rocks.block;
 
 import eu.midnightdust.motschen.rocks.RocksMain;
-import eu.midnightdust.motschen.rocks.blockstates.RockVariation;
 import eu.midnightdust.motschen.rocks.blockstates.StickVariation;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
@@ -18,21 +17,24 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
 
+import java.util.Objects;
+
 public class Stick extends Block {
 
     private static final VoxelShape SHAPE;
     private static final EnumProperty<StickVariation> STICK_VARIATION = RocksMain.STICK_VARIATION;
 
     public Stick() {
-        super(FabricBlockSettings.copy(Blocks.POPPY).nonOpaque().sounds(BlockSoundGroup.STONE));
+        super(FabricBlockSettings.copy(Blocks.POPPY).nonOpaque().sounds(BlockSoundGroup.WOOD));
         this.setDefaultState(this.stateManager.getDefaultState().with(STICK_VARIATION, StickVariation.SMALL));
     }
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return super.getPlacementState(itemPlacementContext)
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
                 .with(STICK_VARIATION, StickVariation.SMALL);
     }
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
@@ -60,12 +62,13 @@ public class Stick extends Block {
         return SHAPE;
     }
     static {
-        VoxelShape shape = createCuboidShape(0, 0, 0, 16, 3, 16);
+        SHAPE = createCuboidShape(0, 0, 0, 16, 1, 16);
-
-        SHAPE = shape;
     }
 
     public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
         return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP);
     }
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) {
+        return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom);
+    }
 }

src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/BlockEntityInit.java

@@ -0,0 +1,17 @@
+package eu.midnightdust.motschen.rocks.block.blockentity;
+
+import eu.midnightdust.motschen.rocks.RocksMain;
+import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class BlockEntityInit {
+    public static BlockEntityType<OverworldGeyserBlockEntity> OVERWORLD_GEYSER_BE;
+    public static BlockEntityType<NetherGeyserBlockEntity> NETHER_GEYSER_BE;
+
+    public static void init() {
+        OVERWORLD_GEYSER_BE = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(RocksMain.MOD_ID,"overworld_geyser_blockentity"), FabricBlockEntityTypeBuilder.create(OverworldGeyserBlockEntity::new, RocksMain.Geyser).build(null));
+        NETHER_GEYSER_BE = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(RocksMain.MOD_ID,"nether_geyser_blockentity"), FabricBlockEntityTypeBuilder.create(NetherGeyserBlockEntity::new, RocksMain.NetherGeyser).build(null));
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/NetherGeyserBlockEntity.java

@@ -0,0 +1,51 @@
+package eu.midnightdust.motschen.rocks.block.blockentity;
+
+import eu.midnightdust.motschen.rocks.RocksMain;
+import eu.midnightdust.motschen.rocks.block.NetherGeyser;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public class NetherGeyserBlockEntity extends BlockEntity {
+    private int countdown = 0;
+
+    public NetherGeyserBlockEntity(BlockPos pos, BlockState state) {
+        super(BlockEntityInit.NETHER_GEYSER_BE, pos, state);
+    }
+
+    public static void tick(World world, BlockPos pos, BlockState state, NetherGeyserBlockEntity blockEntity) {
+        assert world != null;
+        if (world.getBlockState(pos).getBlock() == RocksMain.NetherGeyser) {
+            PlayerEntity player = world.getClosestPlayer(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 3, true);
+            PlayerEntity player2 = world.getClosestPlayer(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 1, true);
+
+
+            if (player != null) {
+                world.setBlockState(pos, state.with(NetherGeyser.ACTIVE, true));
+
+                player.damage(DamageSource.ON_FIRE, 1);
+                if (player2 != null) {
+                    player2.damage(DamageSource.ON_FIRE, 4);
+                }
+                blockEntity.countdown = 1000;
+            } else {
+                if (blockEntity.countdown > 0) {
+                    blockEntity.countdown = blockEntity.countdown - 1;
+                }
+                if (blockEntity.countdown == 0) {
+                    world.setBlockState(pos, state.with(NetherGeyser.ACTIVE, false));
+                }
+            }
+
+            if (state.get(NetherGeyser.ACTIVE)) {
+                world.addParticle(ParticleTypes.LAVA, pos.getX() + 0.5, pos.getY() + 0.1, pos.getZ() + 0.5, 1, 1.5, 1);
+                world.addParticle(ParticleTypes.LAVA, pos.getX() + 0.5, pos.getY() + 1.0, pos.getZ() + 0.5, 1, 1.5, 1);
+                world.addParticle(ParticleTypes.SMOKE, pos.getX() + 0.5, pos.getY() + 0.1, pos.getZ() + 0.5, 0, 0.3, 0);
+            }
+        }
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/block/blockentity/OverworldGeyserBlockEntity.java

@@ -0,0 +1,50 @@
+package eu.midnightdust.motschen.rocks.block.blockentity;
+
+import eu.midnightdust.motschen.rocks.RocksMain;
+import eu.midnightdust.motschen.rocks.block.OverworldGeyser;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public class OverworldGeyserBlockEntity extends BlockEntity {
+    public int countdown = 0;
+
+    public OverworldGeyserBlockEntity(BlockPos pos, BlockState state) {
+        super(BlockEntityInit.OVERWORLD_GEYSER_BE, pos, state);
+    }
+
+    public static void tick(World world, BlockPos pos, BlockState state, OverworldGeyserBlockEntity blockEntity) {
+        assert world != null;
+        if (world.getBlockState(pos).getBlock() == RocksMain.Geyser) {
+            PlayerEntity player = world.getClosestPlayer(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 3, true);
+            PlayerEntity player2 = world.getClosestPlayer(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 8, true);
+
+            if (player2 != null && player2.getY() >= pos.getY() && (pos.getX() <= player2.getX() && pos.getX() + 1 >= player2.getX()) && (pos.getZ() <= player2.getZ() && pos.getZ() + 1 >= player2.getZ())) {
+                player2.addStatusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 2, 10, true, false, false));
+            }
+
+            if (player != null) {
+                world.setBlockState(pos, state.with(OverworldGeyser.ACTIVE, true));
+                blockEntity.countdown = 1000;
+            } else {
+                if (blockEntity.countdown > 0) {
+                    blockEntity.countdown = blockEntity.countdown - 1;
+                }
+                if (blockEntity.countdown == 0) {
+                    world.setBlockState(pos, state.with(OverworldGeyser.ACTIVE, false));
+                }
+            }
+
+            if (state.get(OverworldGeyser.ACTIVE)) {
+                world.addParticle(ParticleTypes.SPIT, pos.getX() + 0.5, pos.getY() + 0.1, pos.getZ() + 0.5, 0, 1.0, 0);
+                world.addParticle(ParticleTypes.SPIT, pos.getX() + 0.5, pos.getY() + 0.3, pos.getZ() + 0.5, 0, 1.0, 0);
+                world.addParticle(ParticleTypes.SPLASH, pos.getX() + 0.5, pos.getY() + 1.0, pos.getZ() + 0.5, -0.01, 1.5, -0.01);
+            }
+        }
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/blockstates/StarfishVariation.java

@@ -0,0 +1,23 @@
+package eu.midnightdust.motschen.rocks.blockstates;
+
+import net.minecraft.util.StringIdentifiable;
+
+public enum StarfishVariation implements StringIdentifiable {
+    RED("red"),
+    PINK("pink"),
+    ORANGE("orange");
+
+    private final String name;
+
+    StarfishVariation(String name) {
+        this.name = name;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+
+    public String asString() {
+        return this.name;
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/item/StarfishItem.java

@@ -0,0 +1,13 @@
+package eu.midnightdust.motschen.rocks.item;
+
+import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
+import net.minecraft.item.Item;
+
+public class StarfishItem extends Item {
+    public final StarfishVariation variation;
+
+    public StarfishItem(Settings settings, StarfishVariation variation) {
+        super(settings);
+        this.variation = variation;
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/mixin/MixinModelElementDeserializer.java

@@ -0,0 +1,22 @@
+package eu.midnightdust.motschen.rocks.mixin;
+
+import com.google.gson.JsonObject;
+import net.minecraft.client.render.model.json.ModelElement;
+import net.minecraft.util.JsonHelper;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+@Mixin(value = ModelElement.Deserializer.class, priority = 2000)
+public class MixinModelElementDeserializer {
+
+    /**
+     * @author Motschen
+     * @reason Not cancellable
+     * Unlimited rotation angles for starfish
+     * Inspired by https://github.com/CottonMC/ModelsUnlocked/blob/master/src/main/java/io/github/cottonmc/modelsunlocked/mixin/ModelElementDeserializerMixin.java
+     */
+    @Overwrite
+    private float deserializeRotationAngle(JsonObject json) {
+        return (JsonHelper.getFloat(json, "angle"));
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/world/FeatureInjector.java

@@ -2,6 +2,10 @@ package eu.midnightdust.motschen.rocks.world;
 
 import com.google.common.collect.Lists;
 import eu.midnightdust.motschen.rocks.mixin.GenerationSettingsAccessorMixin;
+import eu.midnightdust.motschen.rocks.world.configured_feature.MiscFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.NetherFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.RockFeatures;
+import eu.midnightdust.motschen.rocks.world.configured_feature.StickFeatures;
 import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.world.biome.Biome;
@@ -22,55 +26,68 @@ public class FeatureInjector {
     private static void addRockToBiome(Biome biome) {
         // Rocks
         if (biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THEEND && biome.getCategory() != Biome.Category.BEACH && biome.getCategory() != Biome.Category.DESERT && biome.getCategory() != Biome.Category.MESA && biome.getCategory() != Biome.Category.ICY && biome.getCategory() != Biome.Category.OCEAN) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRANITE_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.DIORITE_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.ANDESITE_ROCK_FEATURE);
         }
-        if ((biome.getCategory() == Biome.Category.BEACH) || (biome.getCategory() == Biome.Category.DESERT)) {
+        if (biome.getCategory() == Biome.Category.BEACH || biome.getCategory() == Biome.Category.DESERT || biome.getCategory() == Biome.Category.MESA || biome.toString().contains("terrestria:lush_desert")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.SAND_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.SAND_ROCK_FEATURE);
         }
-        if (biome.getCategory() == Biome.Category.MESA) {
+        if (biome.getCategory() == Biome.Category.MESA || biome.getCategory() == Biome.Category.DESERT || biome.toString().contains("terrestria:lush_desert")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.RED_SAND_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.RED_SAND_ROCK_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.THEEND) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.END_STONE_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.END_STONE_ROCK_FEATURE);
         }
         // Sticks
         if (biome.toString().contains("minecraft:forest") || biome.toString().contains("minecraft:wooded_hills") ||
                 biome.toString().contains("minecraft:wooded_mountains") || biome.toString().contains("minecraft:plains") ||
-                biome.toString().contains("minecraft:flower_forest") || biome.toString().contains("minecraft:swamp") ||
+                biome.toString().contains("minecraft:flower_forest") || biome.toString().contains("minecraft:wooded_badlands_plateau") ||
-                biome.toString().contains("minecraft:swamp_hills") || biome.toString().contains("minecraft:wooded_badlands_plateau") ||
+                biome.toString().contains("minecraft:modified_wooded_badlands_plateau") || biome.getCategory() == Biome.Category.SWAMP) {
-                biome.toString().contains("minecraft:modified_wooded_badlands_plateau")) {
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.OAK_STICK_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.OAK_STICK_FEATURE);
         }
         if (biome.toString().contains("minecraft:forest") || biome.toString().contains("minecraft:birch_forest") ||
                 biome.toString().contains("minecraft:birch_forest_hills") || biome.toString().contains("minecraft:flower_forest")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.BIRCH_STICK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.BIRCH_STICK_FEATURE);
         }
-        if (biome.toString().contains("minecraft:taiga") || biome.toString().contains("minecraft:taiga_mountains") ||
+        if (biome.toString().contains("minecraft:wooded_mountains") || biome.getCategory() == Biome.Category.TAIGA) {
-                biome.toString().contains("minecraft:giant_spruce_taiga") || biome.toString().contains("minecraft:taiga_hills")||
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.SPRUCE_STICK_FEATURE);
-                biome.toString().contains("minecraft:giant_spruce_taiga_hills") || biome.toString().contains("minecraft:snowy_taiga_mountain") ||
-                biome.toString().contains("minecraft:snowy_taiga") || biome.toString().contains("minecraft:snowy_taiga_hills") ||
-                biome.toString().contains("minecraft:giant_tree_taiga") || biome.toString().contains("minecraft:giant_tree_taiga_hills") ||
-                biome.toString().contains("minecraft:wooded_mountains")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.SPRUCE_STICK_FEATURE);
         }
-        if (biome.toString().contains("minecraft:savanna") || biome.toString().contains("minecraft:savanna_plateau") ||
+        if (biome.getCategory() == Biome.Category.SAVANNA) {
-                biome.toString().contains("minecraft:shattered_savanna") || biome.toString().contains("minecraft:shattered_savanna_plateau")) {
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.ACACIA_STICK_FEATURE);
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.ACACIA_STICK_FEATURE);
         }
         if (biome.getCategory() == Biome.Category.JUNGLE) {
-            addFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, StickFeatures.JUNGLE_STICK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, StickFeatures.JUNGLE_STICK_FEATURE);
         }
         if (biome.toString().contains("minecraft:dark_forest") || biome.toString().contains("minecraft:dark_forest_hills") ||
-                biome.toString().contains("minecraft:birch_forest_hills") || biome.toString().contains("minecraft:flower_forest")) {
+                biome.toString().contains("minecraft:dark_forest_mountains")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.DARK_OAK_STICK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, StickFeatures.DARK_OAK_STICK_FEATURE);
         }
         // Misc
-        if (biome.getCategory() == Biome.Category.BEACH) {
+        if (biome.getCategory() == Biome.Category.BEACH && !biome.toString().contains("minecraft:snowy_beach")) {
-            addFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SEASHELL_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SEASHELL_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.STARFISH_FEATURE);
+        }
+        if (biome.getCategory() == Biome.Category.OCEAN) {
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_STARFISH_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.UNDERWATER_SEASHELL_FEATURE);
+        }
+        if (biome.getCategory() == Biome.Category.NETHER) {
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHERRACK_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.SOUL_SOIL_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GRAVEL_ROCK_FEATURE);
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, NetherFeatures.NETHER_GEYSER_FEATURE);
+        }
+        if (biome.getCategory() != Biome.Category.NETHER) {
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, RockFeatures.GRAVEL_ROCK_FEATURE);
+        }
+        if (biome.getCategory() == Biome.Category.ICY) {
+            addRockFeature(biome, GenerationStep.Feature.TOP_LAYER_MODIFICATION, MiscFeatures.SNOWY_GEYSER_FEATURE);
         }
     }
 
-    public static void addFeature(Biome biome, GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) {
+    public static void addRockFeature(Biome biome, GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) {
         GenerationSettingsAccessorMixin generationSettingsAccessor  = (GenerationSettingsAccessorMixin) biome.getGenerationSettings();
         int stepIndex = step.ordinal();
         List<List<Supplier<ConfiguredFeature<?, ?>>>> featuresByStep = new ArrayList<>( generationSettingsAccessor.getFeatures());

src/main/java/eu/midnightdust/motschen/rocks/world/FeatureRegistry.java

@@ -0,0 +1,45 @@
+package eu.midnightdust.motschen.rocks.world;
+
+import eu.midnightdust.motschen.rocks.RocksMain;
+import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
+import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
+import eu.midnightdust.motschen.rocks.world.feature.SnowFeature;
+import eu.midnightdust.motschen.rocks.world.feature.UnderwaterFeature;
+import net.minecraft.block.BlockState;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.gen.ProbabilityConfig;
+import net.minecraft.world.gen.feature.Feature;
+import net.minecraft.world.gen.feature.FeatureConfig;
+import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
+
+public class FeatureRegistry<FC extends FeatureConfig> {
+
+    public static final UnderwaterFeature UNDERWATER_STARFISH_FEATURE;
+    public static final UnderwaterFeature UNDERWATER_SEASHELL_FEATURE;
+    public static final SnowFeature SNOWY_GEYSER_FEATURE;
+
+    private static <C extends FeatureConfig, F extends Feature<C>> F register(String name, F feature) {
+        return Registry.register(Registry.FEATURE, name, feature);
+    }
+
+    private static final WeightedBlockStateProvider StarfishStates = new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+            .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION, StarfishVariation.RED).with(Properties.WATERLOGGED, true), 6)
+            .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.PINK).with(Properties.WATERLOGGED, true), 7)
+            .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.ORANGE).with(Properties.WATERLOGGED, true), 2).build());
+
+    private static final WeightedBlockStateProvider SeashellStates = new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+            .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION, SeashellVariation.YELLOW).with(Properties.WATERLOGGED, true), 7)
+            .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.PINK).with(Properties.WATERLOGGED, true), 2)
+            .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.WHITE).with(Properties.WATERLOGGED, true), 6).build());
+
+    private static final WeightedBlockStateProvider GeyserStates = new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+            .add(RocksMain.Geyser.getDefaultState().with(Properties.SNOWY, true), 1).build());
+
+    static {
+        UNDERWATER_STARFISH_FEATURE = register("underwater_starfish", new UnderwaterFeature(ProbabilityConfig.CODEC, StarfishStates));
+        UNDERWATER_SEASHELL_FEATURE = register("underwater_seashell", new UnderwaterFeature(ProbabilityConfig.CODEC, SeashellStates));
+        SNOWY_GEYSER_FEATURE = register("snowy_geyser", new SnowFeature(ProbabilityConfig.CODEC, GeyserStates));
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/world/MiscFeatures.java

@@ -1,32 +0,0 @@
-package eu.midnightdust.motschen.rocks.world;
-
-import eu.midnightdust.motschen.rocks.RocksMain;
-import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
-import eu.midnightdust.motschen.rocks.blockstates.StickVariation;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.BuiltinRegistries;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-import net.minecraft.world.gen.feature.ConfiguredFeatures;
-import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.RandomPatchFeatureConfig;
-import net.minecraft.world.gen.placer.SimpleBlockPlacer;
-import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider;
-import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
-
-public class MiscFeatures {
-    public static ConfiguredFeature<?, ?> SEASHELL_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.YELLOW), 7)
-                            .addState(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.PINK), 2)
-                            .addState(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.WHITE), 6),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-    public static void init() {
-        Registry<ConfiguredFeature<?, ?>> registry = BuiltinRegistries.CONFIGURED_FEATURE;
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "seashell"), SEASHELL_FEATURE);
-    }
-
-}

src/main/java/eu/midnightdust/motschen/rocks/world/RockFeatures.java

@@ -1,62 +0,0 @@
-package eu.midnightdust.motschen.rocks.world;
-
-import eu.midnightdust.motschen.rocks.RocksMain;
-import eu.midnightdust.motschen.rocks.blockstates.RockVariation;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.BuiltinRegistries;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.gen.feature.*;
-import net.minecraft.world.gen.placer.SimpleBlockPlacer;
-import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
-
-public class RockFeatures {
-    public static ConfiguredFeature<?, ?> ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.Rock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
-                            .addState(RocksMain.Rock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
-                            .addState(RocksMain.Rock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
-                            .addState(RocksMain.Rock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-    public static ConfiguredFeature<?, ?> SAND_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.SandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
-                            .addState(RocksMain.SandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
-                            .addState(RocksMain.SandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
-                            .addState(RocksMain.SandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-    public static ConfiguredFeature<?, ?> RED_SAND_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.RedSandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
-                            .addState(RocksMain.RedSandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
-                            .addState(RocksMain.RedSandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
-                            .addState(RocksMain.RedSandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-    public static ConfiguredFeature<?, ?> END_STONE_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.EndstoneRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
-                            .addState(RocksMain.EndstoneRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
-                            .addState(RocksMain.EndstoneRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
-                            .addState(RocksMain.EndstoneRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-
-    public static void init() {
-        Registry<ConfiguredFeature<?, ?>> registry = BuiltinRegistries.CONFIGURED_FEATURE;
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "rock"), ROCK_FEATURE);
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "sand_rock"), SAND_ROCK_FEATURE);
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "red_sand_rock"), RED_SAND_ROCK_FEATURE);
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "endstone_rock"), END_STONE_ROCK_FEATURE);
-    }
-
-}

src/main/java/eu/midnightdust/motschen/rocks/world/RocksDecorators.java

@@ -0,0 +1,12 @@
+package eu.midnightdust.motschen.rocks.world;
+
+import net.minecraft.world.gen.YOffset;
+import net.minecraft.world.gen.decorator.ConfiguredDecorator;
+import net.minecraft.world.gen.decorator.Decorator;
+import net.minecraft.world.gen.decorator.RangeDecoratorConfig;
+import net.minecraft.world.gen.heightprovider.UniformHeightProvider;
+
+public class RocksDecorators {
+    public static final RangeDecoratorConfig BOTTOM_TO_TOP_OFFSET_4 = new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(4), YOffset.belowTop(4)));
+    public static final ConfiguredDecorator<?> ROCK = (ConfiguredDecorator)((ConfiguredDecorator)Decorator.RANGE.configure(BOTTOM_TO_TOP_OFFSET_4).spreadHorizontally()).repeatRandomly(5);
+}

src/main/java/eu/midnightdust/motschen/rocks/world/StickFeatures.java

@@ -1,83 +0,0 @@
-package eu.midnightdust.motschen.rocks.world;
-
-import eu.midnightdust.motschen.rocks.RocksMain;
-import eu.midnightdust.motschen.rocks.blockstates.RockVariation;
-import eu.midnightdust.motschen.rocks.blockstates.StickVariation;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.BuiltinRegistries;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-import net.minecraft.world.gen.feature.ConfiguredFeatures;
-import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.RandomPatchFeatureConfig;
-import net.minecraft.world.gen.placer.SimpleBlockPlacer;
-import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
-
-public class StickFeatures {
-    public static ConfiguredFeature<?, ?> OAK_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.OakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
-                            .addState(RocksMain.OakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
-                            .addState(RocksMain.OakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-    public static ConfiguredFeature<?, ?> SPRUCE_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.SpruceStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
-                            .addState(RocksMain.SpruceStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
-                            .addState(RocksMain.SpruceStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1)
-                            .addState(RocksMain.Pinecone.getDefaultState(), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-    public static ConfiguredFeature<?, ?> BIRCH_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.BirchStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
-                            .addState(RocksMain.BirchStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
-                            .addState(RocksMain.BirchStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-    public static ConfiguredFeature<?, ?> ACACIA_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.AcaciaStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
-                            .addState(RocksMain.AcaciaStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
-                            .addState(RocksMain.AcaciaStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-    public static ConfiguredFeature<?, ?> JUNGLE_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.JungleStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
-                            .addState(RocksMain.JungleStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
-                            .addState(RocksMain.JungleStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-    public static ConfiguredFeature<?, ?> DARK_OAK_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
-            (new RandomPatchFeatureConfig.Builder(
-                    new WeightedBlockStateProvider()
-                            .addState(RocksMain.DarkOakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
-                            .addState(RocksMain.DarkOakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
-                            .addState(RocksMain.DarkOakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1),
-                    SimpleBlockPlacer.INSTANCE))
-                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
-                    .build()).decorate(ConfiguredFeatures.Decorators.FIRE).applyChance(1);
-
-    public static void init() {
-        Registry<ConfiguredFeature<?, ?>> registry = BuiltinRegistries.CONFIGURED_FEATURE;
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "oak_stick"), OAK_STICK_FEATURE);
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "spruce_stick"), SPRUCE_STICK_FEATURE);
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "birch_stick"), BIRCH_STICK_FEATURE);
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "acacia_stick"), ACACIA_STICK_FEATURE);
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "jungle_stick"), JUNGLE_STICK_FEATURE);
-        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "dark_oak_stick"), DARK_OAK_STICK_FEATURE);
-    }
-
-}

src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/MiscFeatures.java

@@ -0,0 +1,53 @@
+package eu.midnightdust.motschen.rocks.world.configured_feature;
+
+import com.google.common.collect.ImmutableSet;
+import eu.midnightdust.motschen.rocks.RocksMain;
+import eu.midnightdust.motschen.rocks.blockstates.SeashellVariation;
+import eu.midnightdust.motschen.rocks.blockstates.StarfishVariation;
+import eu.midnightdust.motschen.rocks.world.FeatureRegistry;
+import eu.midnightdust.motschen.rocks.world.RocksDecorators;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.gen.ProbabilityConfig;
+import net.minecraft.world.gen.feature.*;
+import net.minecraft.world.gen.placer.SimpleBlockPlacer;
+import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
+
+public class MiscFeatures {
+    public static ConfiguredFeature<?, ?> SEASHELL_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.YELLOW), 7)
+                            .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.PINK), 2)
+                            .add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.WHITE), 6).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).whitelist(ImmutableSet.of(Blocks.SAND, Blocks.SANDSTONE, Blocks.RED_SAND, Blocks.RED_SANDSTONE))
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> STARFISH_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.RED), 2)
+                            .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.PINK), 6)
+                            .add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.ORANGE), 7).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).whitelist(ImmutableSet.of(Blocks.SAND, Blocks.SANDSTONE, Blocks.RED_SAND, Blocks.RED_SANDSTONE))
+                    .build()).decorate(RocksDecorators.ROCK);
+
+    public static ConfiguredFeature<?, ?> UNDERWATER_STARFISH_FEATURE = FeatureRegistry.UNDERWATER_STARFISH_FEATURE.configure(new ProbabilityConfig(1));
+    public static ConfiguredFeature<?, ?> UNDERWATER_SEASHELL_FEATURE = FeatureRegistry.UNDERWATER_SEASHELL_FEATURE.configure(new ProbabilityConfig(1));
+    public static ConfiguredFeature<?, ?> SNOWY_GEYSER_FEATURE = FeatureRegistry.SNOWY_GEYSER_FEATURE.configure(new ProbabilityConfig(1)).decorate(RocksDecorators.ROCK);
+
+    public static void init() {
+        Registry<ConfiguredFeature<?, ?>> registry = BuiltinRegistries.CONFIGURED_FEATURE;
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "seashell"), SEASHELL_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "starfish"), STARFISH_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "underwater_starfish"), UNDERWATER_STARFISH_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "underwater_seashell"), UNDERWATER_SEASHELL_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "snowy_geyser"), SNOWY_GEYSER_FEATURE);
+    }
+
+}

src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/NetherFeatures.java

@@ -0,0 +1,68 @@
+package eu.midnightdust.motschen.rocks.world.configured_feature;
+
+import com.google.common.collect.ImmutableSet;
+import eu.midnightdust.motschen.rocks.RocksMain;
+import eu.midnightdust.motschen.rocks.blockstates.RockVariation;
+import eu.midnightdust.motschen.rocks.world.RocksDecorators;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.ConfiguredFeatures;
+import net.minecraft.world.gen.feature.Feature;
+import net.minecraft.world.gen.feature.RandomPatchFeatureConfig;
+import net.minecraft.world.gen.placer.SimpleBlockPlacer;
+import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider;
+import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
+
+public class NetherFeatures {
+
+    public static ConfiguredFeature<?, ?> NETHERRACK_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.NetherrackRock.getDefaultState().with(RocksMain.ROCK_VARIATION, RockVariation.TINY), 10)
+                            .add(RocksMain.NetherrackRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.NetherrackRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.NetherrackRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .whitelist(ImmutableSet.of(Blocks.NETHERRACK,Blocks.WARPED_NYLIUM,Blocks.CRIMSON_NYLIUM)).cannotProject().build()).decorate(RocksDecorators.ROCK).repeat(128);
+    public static ConfiguredFeature<?, ?> SOUL_SOIL_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.SoulSoilRock.getDefaultState().with(RocksMain.ROCK_VARIATION, RockVariation.TINY), 10)
+                            .add(RocksMain.SoulSoilRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.SoulSoilRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.SoulSoilRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .whitelist(ImmutableSet.of(Blocks.SOUL_SOIL,Blocks.SOUL_SAND)).cannotProject().build()).decorate(RocksDecorators.ROCK).repeat(128);
+    public static ConfiguredFeature<?, ?> NETHER_GRAVEL_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.GravelRock.getDefaultState().with(RocksMain.ROCK_VARIATION, RockVariation.TINY), 10)
+                            .add(RocksMain.GravelRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.GravelRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.GravelRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .whitelist(ImmutableSet.of(Blocks.GRAVEL)).cannotProject().build()).decorate(RocksDecorators.ROCK).repeat(128);
+    public static ConfiguredFeature<?, ?> NETHER_GEYSER_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new SimpleBlockStateProvider(RocksMain.NetherGeyser.getDefaultState()),SimpleBlockPlacer.INSTANCE)
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .whitelist(ImmutableSet.of(Blocks.NETHERRACK)).cannotProject().build())).decorate(RocksDecorators.ROCK).repeat(16);
+
+    public static void init() {
+        Registry<ConfiguredFeature<?, ?>> registry = BuiltinRegistries.CONFIGURED_FEATURE;
+
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "netherrack_rock"), NETHERRACK_ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "soul_soil_rock"), SOUL_SOIL_ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "nether_gravel_rock"), NETHER_GRAVEL_ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "nether_geyser"), NETHER_GEYSER_FEATURE);
+    }
+
+}

src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/RockFeatures.java

@@ -0,0 +1,111 @@
+package eu.midnightdust.motschen.rocks.world.configured_feature;
+
+import com.google.common.collect.ImmutableSet;
+import eu.midnightdust.motschen.rocks.RocksMain;
+import eu.midnightdust.motschen.rocks.blockstates.RockVariation;
+import eu.midnightdust.motschen.rocks.world.RocksDecorators;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.gen.feature.*;
+import net.minecraft.world.gen.placer.SimpleBlockPlacer;
+import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
+
+public class RockFeatures {
+    public static ConfiguredFeature<?, ?> ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.Rock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
+                            .add(RocksMain.Rock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.Rock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.Rock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).blacklist(ImmutableSet.of(Blocks.ICE.getDefaultState(),Blocks.SAND.getDefaultState(),Blocks.RED_SAND.getDefaultState()))
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> GRANITE_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.GraniteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
+                            .add(RocksMain.GraniteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.GraniteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.GraniteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).whitelist(ImmutableSet.of(Blocks.GRANITE))
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> DIORITE_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.DioriteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
+                            .add(RocksMain.DioriteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.DioriteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.DioriteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).whitelist(ImmutableSet.of(Blocks.DIORITE))
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> ANDESITE_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.AndesiteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
+                            .add(RocksMain.AndesiteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.AndesiteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.AndesiteRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).whitelist(ImmutableSet.of(Blocks.ANDESITE))
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> SAND_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.SandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
+                            .add(RocksMain.SandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.SandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.SandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).whitelist(ImmutableSet.of(Blocks.SAND, Blocks.SANDSTONE))
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> RED_SAND_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.RedSandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
+                            .add(RocksMain.RedSandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.RedSandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.RedSandRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).whitelist(ImmutableSet.of(Blocks.RED_SAND, Blocks.RED_SANDSTONE))
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> END_STONE_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.EndstoneRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
+                            .add(RocksMain.EndstoneRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.EndstoneRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.EndstoneRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> GRAVEL_ROCK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.GravelRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.TINY), 10)
+                            .add(RocksMain.GravelRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
+                            .add(RocksMain.GravelRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
+                            .add(RocksMain.GravelRock.getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).whitelist(ImmutableSet.of(Blocks.GRAVEL))
+                    .build()).decorate(RocksDecorators.ROCK);
+
+    public static void init() {
+        Registry<ConfiguredFeature<?, ?>> registry = BuiltinRegistries.CONFIGURED_FEATURE;
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "rock"), ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "granite_rock"), GRANITE_ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "diorite_rock"), DIORITE_ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "andesite_rock"), ANDESITE_ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "sand_rock"), SAND_ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "red_sand_rock"), RED_SAND_ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "endstone_rock"), END_STONE_ROCK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "gravel_rock"), GRAVEL_ROCK_FEATURE);
+    }
+
+}

src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/StickFeatures.java

@@ -0,0 +1,87 @@
+package eu.midnightdust.motschen.rocks.world.configured_feature;
+
+import com.google.common.collect.ImmutableSet;
+import eu.midnightdust.motschen.rocks.RocksMain;
+import eu.midnightdust.motschen.rocks.blockstates.StickVariation;
+import eu.midnightdust.motschen.rocks.world.RocksDecorators;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.collection.DataPool;
+import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.ConfiguredFeatures;
+import net.minecraft.world.gen.feature.Feature;
+import net.minecraft.world.gen.feature.RandomPatchFeatureConfig;
+import net.minecraft.world.gen.placer.SimpleBlockPlacer;
+import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
+
+public class StickFeatures {
+    public static ConfiguredFeature<?, ?> OAK_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.OakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
+                            .add(RocksMain.OakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
+                            .add(RocksMain.OakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0).whitelist(ImmutableSet.of(Blocks.GRASS_BLOCK))
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> SPRUCE_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.SpruceStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
+                            .add(RocksMain.SpruceStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
+                            .add(RocksMain.SpruceStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1)
+                            .add(RocksMain.Pinecone.getDefaultState(), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> BIRCH_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.BirchStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
+                            .add(RocksMain.BirchStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
+                            .add(RocksMain.BirchStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> ACACIA_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.AcaciaStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
+                            .add(RocksMain.AcaciaStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
+                            .add(RocksMain.AcaciaStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> JUNGLE_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.JungleStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
+                            .add(RocksMain.JungleStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
+                            .add(RocksMain.JungleStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .build()).decorate(RocksDecorators.ROCK);
+    public static ConfiguredFeature<?, ?> DARK_OAK_STICK_FEATURE = Feature.RANDOM_PATCH.configure(
+            (new RandomPatchFeatureConfig.Builder(
+                    new WeightedBlockStateProvider(DataPool.<BlockState>builder()
+                            .add(RocksMain.DarkOakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.SMALL), 7)
+                            .add(RocksMain.DarkOakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.MEDIUM), 5)
+                            .add(RocksMain.DarkOakStick.getDefaultState().with(RocksMain.STICK_VARIATION,StickVariation.LARGE), 1).build()),
+                    SimpleBlockPlacer.INSTANCE))
+                    .tries(1).spreadX(0).spreadY(0).spreadZ(0)
+                    .build()).decorate(RocksDecorators.ROCK);
+
+    public static void init() {
+        Registry<ConfiguredFeature<?, ?>> registry = BuiltinRegistries.CONFIGURED_FEATURE;
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "oak_stick"), OAK_STICK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "spruce_stick"), SPRUCE_STICK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "birch_stick"), BIRCH_STICK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "acacia_stick"), ACACIA_STICK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "jungle_stick"), JUNGLE_STICK_FEATURE);
+        Registry.register(registry, new Identifier(RocksMain.MOD_ID, "dark_oak_stick"), DARK_OAK_STICK_FEATURE);
+    }
+
+}

src/main/java/eu/midnightdust/motschen/rocks/world/feature/SnowFeature.java

@@ -0,0 +1,54 @@
+package eu.midnightdust.motschen.rocks.world.feature;
+
+import com.mojang.serialization.Codec;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.Heightmap;
+import net.minecraft.world.StructureWorldAccess;
+import net.minecraft.world.gen.ProbabilityConfig;
+import net.minecraft.world.gen.chunk.ChunkGenerator;
+import net.minecraft.world.gen.feature.Feature;
+import net.minecraft.world.gen.feature.util.FeatureContext;
+import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
+
+import java.util.Random;
+
+public class SnowFeature extends Feature<ProbabilityConfig> {
+    WeightedBlockStateProvider weightedBlockStateProvider1;
+
+    public SnowFeature(Codec<ProbabilityConfig> codec, WeightedBlockStateProvider weightedBlockStateProvider) {
+        super(codec);
+        weightedBlockStateProvider1 = weightedBlockStateProvider;
+    }
+
+    @Override
+    public boolean generate(FeatureContext<ProbabilityConfig> context) {
+        Random random = context.getRandom();
+        StructureWorldAccess structureWorldAccess = context.getWorld();
+        BlockPos blockPos = context.getOrigin();
+        boolean bl = false;
+        int i = random.nextInt(8) - random.nextInt(8);
+        int j = random.nextInt(8) - random.nextInt(8);
+        int k = structureWorldAccess.getTopY(Heightmap.Type.OCEAN_FLOOR, blockPos.getX() + i, blockPos.getZ() + j);
+        BlockPos blockPos2 = new BlockPos(blockPos.getX() + i, k, blockPos.getZ() + j);
+        int chance = random.nextInt(8);
+
+        if (structureWorldAccess.getBlockState(blockPos2).isOf(Blocks.SNOW) && chance == 1) {
+
+            BlockState blockState = weightedBlockStateProvider1.getBlockState(random,blockPos);
+
+            if (blockState.canPlaceAt(structureWorldAccess, blockPos2)) {
+                structureWorldAccess.setBlockState(blockPos2, blockState, 1);
+                if (structureWorldAccess.getBlockState(blockPos2.down()) == Blocks.GRASS_BLOCK.getDefaultState()) {
+                    structureWorldAccess.setBlockState(blockPos2.down(), Blocks.GRASS_BLOCK.getDefaultState().with(Properties.SNOWY, true), 1);
+                }
+
+                bl = true;
+            }
+        }
+
+        return bl;
+    }
+}

src/main/java/eu/midnightdust/motschen/rocks/world/feature/UnderwaterFeature.java

@@ -0,0 +1,48 @@
+package eu.midnightdust.motschen.rocks.world.feature;
+
+import com.mojang.serialization.Codec;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.Heightmap;
+import net.minecraft.world.StructureWorldAccess;
+import net.minecraft.world.gen.ProbabilityConfig;
+import net.minecraft.world.gen.chunk.ChunkGenerator;
+import net.minecraft.world.gen.feature.Feature;
+import net.minecraft.world.gen.feature.util.FeatureContext;
+import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider;
+
+import java.util.Random;
+
+public class UnderwaterFeature extends Feature<ProbabilityConfig> {
+    WeightedBlockStateProvider weightedBlockStateProvider1;
+    public UnderwaterFeature(Codec<ProbabilityConfig> codec, WeightedBlockStateProvider weightedBlockStateProvider) {
+        super(codec);
+        weightedBlockStateProvider1 = weightedBlockStateProvider;
+    }
+
+    @Override
+    public boolean generate(FeatureContext<ProbabilityConfig> context) {
+        Random random = context.getRandom();
+        StructureWorldAccess structureWorldAccess = context.getWorld();
+        BlockPos blockPos = context.getOrigin();
+        boolean bl = false;
+        int i = random.nextInt(8) - random.nextInt(8);
+        int j = random.nextInt(8) - random.nextInt(8);
+        int k = structureWorldAccess.getTopY(Heightmap.Type.OCEAN_FLOOR, blockPos.getX() + i, blockPos.getZ() + j);
+        BlockPos blockPos2 = new BlockPos(blockPos.getX() + i, k, blockPos.getZ() + j);
+
+        if (structureWorldAccess.getBlockState(blockPos2).isOf(Blocks.WATER)) {
+
+            BlockState blockState = weightedBlockStateProvider1.getBlockState(random,blockPos);
+
+            if (blockState.canPlaceAt(structureWorldAccess, blockPos2)) {
+                structureWorldAccess.setBlockState(blockPos2, blockState, 2);
+
+                bl = true;
+            }
+        }
+
+        return bl;
+    }
+}

src/main/resources/assets/rocks/blockstates/acacia_stick.json

@@ -1,7 +1,22 @@
 {
     "variants": {
-        "variation=small": { "model": "rocks:block/small_acacia_stick" },
+		"variation=small": [
-        "variation=medium": { "model": "rocks:block/medium_acacia_stick" },
+			{"model": "rocks:block/small_acacia_stick"},
-        "variation=large": { "model": "rocks:block/large_acacia_stick" }
+			{"model": "rocks:block/small_acacia_stick", "y": 90},
+			{"model": "rocks:block/small_acacia_stick", "y": 180},
+			{"model": "rocks:block/small_acacia_stick", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_acacia_stick"},
+			{"model": "rocks:block/medium_acacia_stick", "y": 90},
+			{"model": "rocks:block/medium_acacia_stick", "y": 180},
+			{"model": "rocks:block/medium_acacia_stick", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_acacia_stick"},
+			{"model": "rocks:block/large_acacia_stick", "y": 90},
+			{"model": "rocks:block/large_acacia_stick", "y": 180},
+			{"model": "rocks:block/large_acacia_stick", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/andesite_rock.json

@@ -0,0 +1,28 @@
+{
+    "variants": {
+		"variation=tiny": [
+			{"model": "rocks:block/tiny_andesite_rock"},
+			{"model": "rocks:block/tiny_andesite_rock", "y": 90},
+			{"model": "rocks:block/tiny_andesite_rock", "y": 180},
+			{"model": "rocks:block/tiny_andesite_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_andesite_rock"},
+			{"model": "rocks:block/small_andesite_rock", "y": 90},
+			{"model": "rocks:block/small_andesite_rock", "y": 180},
+			{"model": "rocks:block/small_andesite_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_andesite_rock"},
+			{"model": "rocks:block/medium_andesite_rock", "y": 90},
+			{"model": "rocks:block/medium_andesite_rock", "y": 180},
+			{"model": "rocks:block/medium_andesite_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_andesite_rock"},
+			{"model": "rocks:block/large_andesite_rock", "y": 90},
+			{"model": "rocks:block/large_andesite_rock", "y": 180},
+			{"model": "rocks:block/large_andesite_rock", "y": 270}
+		]
+    }
+}

src/main/resources/assets/rocks/blockstates/birch_stick.json

@@ -1,7 +1,22 @@
 {
     "variants": {
-        "variation=small": { "model": "rocks:block/small_birch_stick" },
+		"variation=small": [
-        "variation=medium": { "model": "rocks:block/medium_birch_stick" },
+			{"model": "rocks:block/small_birch_stick"},
-        "variation=large": { "model": "rocks:block/large_birch_stick" }
+			{"model": "rocks:block/small_birch_stick", "y": 90},
+			{"model": "rocks:block/small_birch_stick", "y": 180},
+			{"model": "rocks:block/small_birch_stick", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_birch_stick"},
+			{"model": "rocks:block/medium_birch_stick", "y": 90},
+			{"model": "rocks:block/medium_birch_stick", "y": 180},
+			{"model": "rocks:block/medium_birch_stick", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_birch_stick"},
+			{"model": "rocks:block/large_birch_stick", "y": 90},
+			{"model": "rocks:block/large_birch_stick", "y": 180},
+			{"model": "rocks:block/large_birch_stick", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/dark_oak_stick.json

@@ -1,7 +1,22 @@
 {
     "variants": {
-        "variation=small": { "model": "rocks:block/small_dark_oak_stick" },
+		"variation=small": [
-        "variation=medium": { "model": "rocks:block/medium_dark_oak_stick" },
+			{"model": "rocks:block/small_dark_oak_stick"},
-        "variation=large": { "model": "rocks:block/large_dark_oak_stick" }
+			{"model": "rocks:block/small_dark_oak_stick", "y": 90},
+			{"model": "rocks:block/small_dark_oak_stick", "y": 180},
+			{"model": "rocks:block/small_dark_oak_stick", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_dark_oak_stick"},
+			{"model": "rocks:block/medium_dark_oak_stick", "y": 90},
+			{"model": "rocks:block/medium_dark_oak_stick", "y": 180},
+			{"model": "rocks:block/medium_dark_oak_stick", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_dark_oak_stick"},
+			{"model": "rocks:block/large_dark_oak_stick", "y": 90},
+			{"model": "rocks:block/large_dark_oak_stick", "y": 180},
+			{"model": "rocks:block/large_dark_oak_stick", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/diorite_rock.json

@@ -0,0 +1,28 @@
+{
+    "variants": {
+		"variation=tiny": [
+			{"model": "rocks:block/tiny_diorite_rock"},
+			{"model": "rocks:block/tiny_diorite_rock", "y": 90},
+			{"model": "rocks:block/tiny_diorite_rock", "y": 180},
+			{"model": "rocks:block/tiny_diorite_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_diorite_rock"},
+			{"model": "rocks:block/small_diorite_rock", "y": 90},
+			{"model": "rocks:block/small_diorite_rock", "y": 180},
+			{"model": "rocks:block/small_diorite_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_diorite_rock"},
+			{"model": "rocks:block/medium_diorite_rock", "y": 90},
+			{"model": "rocks:block/medium_diorite_rock", "y": 180},
+			{"model": "rocks:block/medium_diorite_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_diorite_rock"},
+			{"model": "rocks:block/large_diorite_rock", "y": 90},
+			{"model": "rocks:block/large_diorite_rock", "y": 180},
+			{"model": "rocks:block/large_diorite_rock", "y": 270}
+		]
+    }
+}

src/main/resources/assets/rocks/blockstates/end_stone_rock.json

@@ -1,8 +1,28 @@
 {
     "variants": {
-        "variation=tiny": { "model": "rocks:block/tiny_end_stone_rock" },
+		"variation=tiny": [
-        "variation=small": { "model": "rocks:block/small_end_stone_rock" },
+			{"model": "rocks:block/tiny_end_stone_rock"},
-        "variation=medium": { "model": "rocks:block/medium_end_stone_rock" },
+			{"model": "rocks:block/tiny_end_stone_rock", "y": 90},
-        "variation=large": { "model": "rocks:block/large_end_stone_rock" }
+			{"model": "rocks:block/tiny_end_stone_rock", "y": 180},
+			{"model": "rocks:block/tiny_end_stone_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_end_stone_rock"},
+			{"model": "rocks:block/small_end_stone_rock", "y": 90},
+			{"model": "rocks:block/small_end_stone_rock", "y": 180},
+			{"model": "rocks:block/small_end_stone_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_end_stone_rock"},
+			{"model": "rocks:block/medium_end_stone_rock", "y": 90},
+			{"model": "rocks:block/medium_end_stone_rock", "y": 180},
+			{"model": "rocks:block/medium_end_stone_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_end_stone_rock"},
+			{"model": "rocks:block/large_end_stone_rock", "y": 90},
+			{"model": "rocks:block/large_end_stone_rock", "y": 180},
+			{"model": "rocks:block/large_end_stone_rock", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/geyser.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "active=true,snowy=false": { "model": "rocks:block/geyser_on" },
+        "active=false,snowy=false": { "model": "rocks:block/geyser_off" },
+		"active=true,snowy=true": { "model": "rocks:block/snowy_geyser_on" },
+        "active=false,snowy=true": { "model": "rocks:block/snowy_geyser_off" }
+    }
+}

src/main/resources/assets/rocks/blockstates/granite_rock.json

@@ -0,0 +1,28 @@
+{
+    "variants": {
+		"variation=tiny": [
+			{"model": "rocks:block/tiny_granite_rock"},
+			{"model": "rocks:block/tiny_granite_rock", "y": 90},
+			{"model": "rocks:block/tiny_granite_rock", "y": 180},
+			{"model": "rocks:block/tiny_granite_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_granite_rock"},
+			{"model": "rocks:block/small_granite_rock", "y": 90},
+			{"model": "rocks:block/small_granite_rock", "y": 180},
+			{"model": "rocks:block/small_granite_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_granite_rock"},
+			{"model": "rocks:block/medium_granite_rock", "y": 90},
+			{"model": "rocks:block/medium_granite_rock", "y": 180},
+			{"model": "rocks:block/medium_granite_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_granite_rock"},
+			{"model": "rocks:block/large_granite_rock", "y": 90},
+			{"model": "rocks:block/large_granite_rock", "y": 180},
+			{"model": "rocks:block/large_granite_rock", "y": 270}
+		]
+    }
+}

src/main/resources/assets/rocks/blockstates/gravel_rock.json

@@ -0,0 +1,28 @@
+{
+    "variants": {
+		"variation=tiny": [
+			{"model": "rocks:block/tiny_gravel_rock"},
+			{"model": "rocks:block/tiny_gravel_rock", "y": 90},
+			{"model": "rocks:block/tiny_gravel_rock", "y": 180},
+			{"model": "rocks:block/tiny_gravel_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_gravel_rock"},
+			{"model": "rocks:block/small_gravel_rock", "y": 90},
+			{"model": "rocks:block/small_gravel_rock", "y": 180},
+			{"model": "rocks:block/small_gravel_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_gravel_rock"},
+			{"model": "rocks:block/medium_gravel_rock", "y": 90},
+			{"model": "rocks:block/medium_gravel_rock", "y": 180},
+			{"model": "rocks:block/medium_gravel_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_gravel_rock"},
+			{"model": "rocks:block/large_gravel_rock", "y": 90},
+			{"model": "rocks:block/large_gravel_rock", "y": 180},
+			{"model": "rocks:block/large_gravel_rock", "y": 270}
+		]
+    }
+}

src/main/resources/assets/rocks/blockstates/jungle_stick.json

@@ -1,7 +1,22 @@
 {
     "variants": {
-        "variation=small": { "model": "rocks:block/small_jungle_stick" },
+		"variation=small": [
-        "variation=medium": { "model": "rocks:block/medium_jungle_stick" },
+			{"model": "rocks:block/small_jungle_stick"},
-        "variation=large": { "model": "rocks:block/large_jungle_stick" }
+			{"model": "rocks:block/small_jungle_stick", "y": 90},
+			{"model": "rocks:block/small_jungle_stick", "y": 180},
+			{"model": "rocks:block/small_jungle_stick", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_jungle_stick"},
+			{"model": "rocks:block/medium_jungle_stick", "y": 90},
+			{"model": "rocks:block/medium_jungle_stick", "y": 180},
+			{"model": "rocks:block/medium_jungle_stick", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_jungle_stick"},
+			{"model": "rocks:block/large_jungle_stick", "y": 90},
+			{"model": "rocks:block/large_jungle_stick", "y": 180},
+			{"model": "rocks:block/large_jungle_stick", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/nether_geyser.json

@@ -0,0 +1,6 @@
+{
+    "variants": {
+        "active=true": { "model": "rocks:block/nether_geyser_on" },
+        "active=false": { "model": "rocks:block/nether_geyser_off" }
+    }
+}

src/main/resources/assets/rocks/blockstates/netherrack_rock.json

@@ -0,0 +1,28 @@
+{
+    "variants": {
+		"variation=tiny": [
+			{"model": "rocks:block/tiny_netherrack_rock"},
+			{"model": "rocks:block/tiny_netherrack_rock", "y": 90},
+			{"model": "rocks:block/tiny_netherrack_rock", "y": 180},
+			{"model": "rocks:block/tiny_netherrack_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_netherrack_rock"},
+			{"model": "rocks:block/small_netherrack_rock", "y": 90},
+			{"model": "rocks:block/small_netherrack_rock", "y": 180},
+			{"model": "rocks:block/small_netherrack_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_netherrack_rock"},
+			{"model": "rocks:block/medium_netherrack_rock", "y": 90},
+			{"model": "rocks:block/medium_netherrack_rock", "y": 180},
+			{"model": "rocks:block/medium_netherrack_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_netherrack_rock"},
+			{"model": "rocks:block/large_netherrack_rock", "y": 90},
+			{"model": "rocks:block/large_netherrack_rock", "y": 180},
+			{"model": "rocks:block/large_netherrack_rock", "y": 270}
+		]
+    }
+}

src/main/resources/assets/rocks/blockstates/oak_stick.json

@@ -1,7 +1,22 @@
 {
     "variants": {
-        "variation=small": { "model": "rocks:block/small_oak_stick" },
+		"variation=small": [
-        "variation=medium": { "model": "rocks:block/medium_oak_stick" },
+			{"model": "rocks:block/small_oak_stick"},
-        "variation=large": { "model": "rocks:block/large_oak_stick" }
+			{"model": "rocks:block/small_oak_stick", "y": 90},
+			{"model": "rocks:block/small_oak_stick", "y": 180},
+			{"model": "rocks:block/small_oak_stick", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_oak_stick"},
+			{"model": "rocks:block/medium_oak_stick", "y": 90},
+			{"model": "rocks:block/medium_oak_stick", "y": 180},
+			{"model": "rocks:block/medium_oak_stick", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_oak_stick"},
+			{"model": "rocks:block/large_oak_stick", "y": 90},
+			{"model": "rocks:block/large_oak_stick", "y": 180},
+			{"model": "rocks:block/large_oak_stick", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/pinecone.json

@@ -1,5 +1,10 @@
 {
     "variants": {
-        "": { "model": "rocks:block/pinecone" }
+		"": [
+			{"model": "rocks:block/pinecone"},
+			{"model": "rocks:block/pinecone", "y": 90},
+			{"model": "rocks:block/pinecone", "y": 180},
+			{"model": "rocks:block/pinecone", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/red_sand_rock.json

@@ -1,8 +1,28 @@
 {
     "variants": {
-        "variation=tiny": { "model": "rocks:block/tiny_red_sand_rock" },
+		"variation=tiny": [
-        "variation=small": { "model": "rocks:block/small_red_sand_rock" },
+			{"model": "rocks:block/tiny_red_sand_rock"},
-        "variation=medium": { "model": "rocks:block/medium_red_sand_rock" },
+			{"model": "rocks:block/tiny_red_sand_rock", "y": 90},
-        "variation=large": { "model": "rocks:block/large_red_sand_rock" }
+			{"model": "rocks:block/tiny_red_sand_rock", "y": 180},
+			{"model": "rocks:block/tiny_red_sand_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_red_sand_rock"},
+			{"model": "rocks:block/small_red_sand_rock", "y": 90},
+			{"model": "rocks:block/small_red_sand_rock", "y": 180},
+			{"model": "rocks:block/small_red_sand_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_red_sand_rock"},
+			{"model": "rocks:block/medium_red_sand_rock", "y": 90},
+			{"model": "rocks:block/medium_red_sand_rock", "y": 180},
+			{"model": "rocks:block/medium_red_sand_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_red_sand_rock"},
+			{"model": "rocks:block/large_red_sand_rock", "y": 90},
+			{"model": "rocks:block/large_red_sand_rock", "y": 180},
+			{"model": "rocks:block/large_red_sand_rock", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/rock.json

@@ -1,8 +1,28 @@
 {
     "variants": {
-        "variation=tiny": { "model": "rocks:block/tiny_rock" },
+		"variation=tiny": [
-        "variation=small": { "model": "rocks:block/small_rock" },
+			{"model": "rocks:block/tiny_rock"},
-        "variation=medium": { "model": "rocks:block/medium_rock" },
+			{"model": "rocks:block/tiny_rock", "y": 90},
-        "variation=large": { "model": "rocks:block/large_rock" }
+			{"model": "rocks:block/tiny_rock", "y": 180},
+			{"model": "rocks:block/tiny_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_rock"},
+			{"model": "rocks:block/small_rock", "y": 90},
+			{"model": "rocks:block/small_rock", "y": 180},
+			{"model": "rocks:block/small_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_rock"},
+			{"model": "rocks:block/medium_rock", "y": 90},
+			{"model": "rocks:block/medium_rock", "y": 180},
+			{"model": "rocks:block/medium_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_rock"},
+			{"model": "rocks:block/large_rock", "y": 90},
+			{"model": "rocks:block/large_rock", "y": 180},
+			{"model": "rocks:block/large_rock", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/sand_rock.json

@@ -1,8 +1,28 @@
 {
     "variants": {
-        "variation=tiny": { "model": "rocks:block/tiny_sand_rock" },
+		"variation=tiny": [
-        "variation=small": { "model": "rocks:block/small_sand_rock" },
+			{"model": "rocks:block/tiny_sand_rock"},
-        "variation=medium": { "model": "rocks:block/medium_sand_rock" },
+			{"model": "rocks:block/tiny_sand_rock", "y": 90},
-        "variation=large": { "model": "rocks:block/large_sand_rock" }
+			{"model": "rocks:block/tiny_sand_rock", "y": 180},
+			{"model": "rocks:block/tiny_sand_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_sand_rock"},
+			{"model": "rocks:block/small_sand_rock", "y": 90},
+			{"model": "rocks:block/small_sand_rock", "y": 180},
+			{"model": "rocks:block/small_sand_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_sand_rock"},
+			{"model": "rocks:block/medium_sand_rock", "y": 90},
+			{"model": "rocks:block/medium_sand_rock", "y": 180},
+			{"model": "rocks:block/medium_sand_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_sand_rock"},
+			{"model": "rocks:block/large_sand_rock", "y": 90},
+			{"model": "rocks:block/large_sand_rock", "y": 180},
+			{"model": "rocks:block/large_sand_rock", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/seashell.json

@@ -1,7 +1,22 @@
 {
     "variants": {
-        "variation=yellow": { "model": "rocks:block/seashell_yellow" },
+		"variation=yellow": [
-        "variation=pink": { "model": "rocks:block/seashell_pink" },
+			{"model": "rocks:block/seashell_yellow"},
-        "variation=white": { "model": "rocks:block/seashell_white" }
+			{"model": "rocks:block/seashell_yellow", "y": 90},
+			{"model": "rocks:block/seashell_yellow", "y": 180},
+			{"model": "rocks:block/seashell_yellow", "y": 270}
+		],
+		"variation=pink": [
+			{"model": "rocks:block/seashell_pink"},
+			{"model": "rocks:block/seashell_pink", "y": 90},
+			{"model": "rocks:block/seashell_pink", "y": 180},
+			{"model": "rocks:block/seashell_pink", "y": 270}
+		],
+		"variation=white": [
+			{"model": "rocks:block/seashell_white"},
+			{"model": "rocks:block/seashell_white", "y": 90},
+			{"model": "rocks:block/seashell_white", "y": 180},
+			{"model": "rocks:block/seashell_white", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/soul_soil_rock.json

@@ -0,0 +1,28 @@
+{
+    "variants": {
+		"variation=tiny": [
+			{"model": "rocks:block/tiny_soul_soil_rock"},
+			{"model": "rocks:block/tiny_soul_soil_rock", "y": 90},
+			{"model": "rocks:block/tiny_soul_soil_rock", "y": 180},
+			{"model": "rocks:block/tiny_soul_soil_rock", "y": 270}
+		],
+		"variation=small": [
+			{"model": "rocks:block/small_soul_soil_rock"},
+			{"model": "rocks:block/small_soul_soil_rock", "y": 90},
+			{"model": "rocks:block/small_soul_soil_rock", "y": 180},
+			{"model": "rocks:block/small_soul_soil_rock", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_soul_soil_rock"},
+			{"model": "rocks:block/medium_soul_soil_rock", "y": 90},
+			{"model": "rocks:block/medium_soul_soil_rock", "y": 180},
+			{"model": "rocks:block/medium_soul_soil_rock", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_soul_soil_rock"},
+			{"model": "rocks:block/large_soul_soil_rock", "y": 90},
+			{"model": "rocks:block/large_soul_soil_rock", "y": 180},
+			{"model": "rocks:block/large_soul_soil_rock", "y": 270}
+		]
+    }
+}

src/main/resources/assets/rocks/blockstates/spruce_stick.json

@@ -1,7 +1,22 @@
 {
     "variants": {
-        "variation=small": { "model": "rocks:block/small_spruce_stick" },
+		"variation=small": [
-        "variation=medium": { "model": "rocks:block/medium_spruce_stick" },
+			{"model": "rocks:block/small_spruce_stick"},
-        "variation=large": { "model": "rocks:block/large_spruce_stick" }
+			{"model": "rocks:block/small_spruce_stick", "y": 90},
+			{"model": "rocks:block/small_spruce_stick", "y": 180},
+			{"model": "rocks:block/small_spruce_stick", "y": 270}
+		],
+		"variation=medium": [
+			{"model": "rocks:block/medium_spruce_stick"},
+			{"model": "rocks:block/medium_spruce_stick", "y": 90},
+			{"model": "rocks:block/medium_spruce_stick", "y": 180},
+			{"model": "rocks:block/medium_spruce_stick", "y": 270}
+		],
+		"variation=large": [
+			{"model": "rocks:block/large_spruce_stick"},
+			{"model": "rocks:block/large_spruce_stick", "y": 90},
+			{"model": "rocks:block/large_spruce_stick", "y": 180},
+			{"model": "rocks:block/large_spruce_stick", "y": 270}
+		]
     }
 }

src/main/resources/assets/rocks/blockstates/starfish.json

@@ -0,0 +1,23 @@
+{
+    "variants": {
+		"variation=red": [
+			{"model": "rocks:block/starfish_red", "y": 180},
+			{"model": "rocks:block/starfish_red", "y": 270},
+			{"model": "rocks:block/starfish_red", "y": 0},
+			{"model": "rocks:block/starfish_red", "y": 90}
+		],
+		"variation=pink": [
+			{"model": "rocks:block/starfish_pink"},
+			{"model": "rocks:block/starfish_pink", "y": 90},
+			{"model": "rocks:block/starfish_pink", "y": 180},
+			{"model": "rocks:block/starfish_pink", "y": 270}
+		],
+		"variation=orange": [
+			{"model": "rocks:block/starfish_orange", "y": 90},
+			{"model": "rocks:block/starfish_orange", "y": 180},
+			{"model": "rocks:block/starfish_orange", "y": 270},
+			{"model": "rocks:block/starfish_orange"}
+		]
+    }
+}
+

src/main/resources/assets/rocks/lang/de_de.json

@@ -0,0 +1,38 @@
+{
+	"itemGroup.rocks.rocks":"This Rocks!",
+	
+	"block.rocks.rock":"Steinbrocken",
+	"block.rocks.granite_rock":"Granitbrocken",
+	"block.rocks.diorite_rock":"Dioritbrocken",
+	"block.rocks.andesite_rock":"Andesitbrocken",
+	"block.rocks.sand_rock":"Sandsteinbrocken",
+	"block.rocks.red_sand_rock":"Roter Sandsteinbrocken",
+	"block.rocks.gravel_rock":"Kiesbrocken",
+	"block.rocks.end_stone_rock":"Endsteinbrocken",
+	"block.rocks.netherrack_rock":"Netherrackbrocken",
+	"block.rocks.soul_soil_rock":"Seelenerdebrocken",
+	
+	"block.rocks.oak_stick":"Eichenholzstock",
+	"block.rocks.birch_stick":"Birkenholzstock",
+	"block.rocks.spruce_stick":"Fichtenholzstock",
+	"block.rocks.jungle_stick":"Tropenholzstock",
+	"block.rocks.acacia_stick":"Akazienholzstock",
+	"block.rocks.dark_oak_stick":"Schwarzeichenholzstock",
+	
+	"block.rocks.geyser":"Geyser",
+	"block.rocks.nether_geyser":"Magma Geyser",
+	
+	"block.rocks.pinecone":"Tannenzapfen",
+	"block.rocks.seashell":"Muschel",
+	"block.rocks.starfish":"Seestern",
+	
+	"item.rocks.cobblestone_splitter":"Bruchsteinsplitter",
+	"item.rocks.granite_splitter":"Granitsplitter",
+	"item.rocks.diorite_splitter":"Dioritsplitter",
+	"item.rocks.andesite_splitter":"Andesitsplitter",
+	"item.rocks.sandstone_splitter":"Sandsteinsplitter",
+	"item.rocks.red_sandstone_splitter":"Roter Sandsteinsplitter",
+	"item.rocks.end_stone_splitter":"Endsteinsplitter",
+	"item.rocks.netherrack_splitter":"Netherracksplitter",
+	"item.rocks.soul_soil_splitter":"Seelenerdesplitter"
+}

src/main/resources/assets/rocks/lang/en_us.json

@@ -2,9 +2,15 @@
 	"itemGroup.rocks.rocks":"This Rocks!",
 	
 	"block.rocks.rock":"Rock",
+	"block.rocks.granite_rock":"Granite Rock",
+	"block.rocks.diorite_rock":"Diorite Rock",
+	"block.rocks.andesite_rock":"Andesite Rock",
 	"block.rocks.sand_rock":"Sand Rock",
 	"block.rocks.red_sand_rock":"Red Sand Rock",
+	"block.rocks.gravel_rock":"Gravel Rock",
 	"block.rocks.end_stone_rock":"End Stone Rock",
+	"block.rocks.netherrack_rock":"Netherrack Rock",
+	"block.rocks.soul_soil_rock":"Soul Soil Rock",
 	
 	"block.rocks.oak_stick":"Oak Stick",
 	"block.rocks.birch_stick":"Birch Stick",
@@ -13,11 +19,20 @@
 	"block.rocks.acacia_stick":"Acacia Stick",
 	"block.rocks.dark_oak_stick":"Dark Oak Stick",
 	
+	"block.rocks.geyser":"Geyser",
+	"block.rocks.nether_geyser":"Magma Geyser",
+	
 	"block.rocks.pinecone":"Pinecone",
 	"block.rocks.seashell":"Seashell",
+	"block.rocks.starfish":"Starfish",
 	
 	"item.rocks.cobblestone_splitter":"Cobblestone Splitter",
+	"item.rocks.granite_splitter":"Granite Splitter",
+	"item.rocks.diorite_splitter":"Diorite Splitter",
+	"item.rocks.andesite_splitter":"Andesite Splitter",
 	"item.rocks.sandstone_splitter":"Sandstone Splitter",
 	"item.rocks.red_sandstone_splitter":"Red Sandstone Splitter",
-	"item.rocks.end_stone_splitter":"End Stone Splitter"
+	"item.rocks.end_stone_splitter":"End Stone Splitter",
+	"item.rocks.netherrack_splitter":"Netherrack Splitter",
+	"item.rocks.soul_soil_splitter":"Soul Soil Splitter"
 }

src/main/resources/assets/rocks/lang/pl_pl.json

@@ -0,0 +1,38 @@
+{
+	"itemGroup.rocks.rocks":"This Rocks!",
+	
+	"block.rocks.rock":"Fragment kamienia",
+	"block.rocks.granite_rock":"Fragment granitu",
+	"block.rocks.diorite_rock":"Fragment diorytu",
+	"block.rocks.andesite_rock":"Fragment andezytu",
+	"block.rocks.sand_rock":"Fragment piaskowca",
+	"block.rocks.red_sand_rock":"Fragment czerwonego piaskowca",
+	"block.rocks.gravel_rock":"Fragment żwiru",
+	"block.rocks.end_stone_rock":"Fragment kamienia endu",
+	"block.rocks.netherrack_rock":"Fragment skały netheru",
+	"block.rocks.soul_soil_rock":"Fragment gleby dusz",
+	
+	"block.rocks.oak_stick":"Dębowy patyk",
+	"block.rocks.birch_stick":"Brzozowy patyk",
+	"block.rocks.spruce_stick":"Świerkowy patyk",
+	"block.rocks.jungle_stick":"Tropikalny patyk",
+	"block.rocks.acacia_stick":"Akacjowy patyk",
+	"block.rocks.dark_oak_stick":"Ciemnodębowy patyk",
+	
+	"block.rocks.geyser":"Gejzer",
+	"block.rocks.nether_geyser":"Gejzer Magmowy",
+	
+	"block.rocks.pinecone":"Szyszka",
+	"block.rocks.seashell":"Muszla",
+	"block.rocks.starfish":"Rozgwiazda",
+	
+	"item.rocks.cobblestone_splitter":"Fragment bruku",
+	"item.rocks.granite_splitter":"Fragment granitu",
+	"item.rocks.diorite_splitter":"Fragment diorytu",
+	"item.rocks.andesite_splitter":"Fragment andezytu",
+	"item.rocks.sandstone_splitter":"Fragment piaskowca",
+	"item.rocks.red_sandstone_splitter":"Fragment czerwonego piaskowca",
+	"item.rocks.end_stone_splitter":"Fragment kamienia endu",
+	"item.rocks.netherrack_splitter":"Fragment skały netheru",
+	"item.rocks.soul_soil_splitter":"Fragment gleby dusz"
+}

src/main/resources/assets/rocks/lang/ru_ru.json

@@ -0,0 +1,38 @@
+{
+	"itemGroup.rocks.rocks":"This Rocks!",
+	
+	"block.rocks.rock":"Камушек из булыжника",
+	"block.rocks.granite_rock":"Камушек из гранита",
+	"block.rocks.diorite_rock":"Камушек из диорита",
+	"block.rocks.andesite_rock":"Камушек из андезита",
+	"block.rocks.sand_rock":"Камушек из песчаника",
+	"block.rocks.red_sand_rock":"Камушек из красного песчаника",
+	"block.rocks.gravel_rock":"Камушек из гравия",
+	"block.rocks.end_stone_rock":"Камушек из эндерняка",
+	"block.rocks.netherrack_rock":"Камушек из адского камня",
+	"block.rocks.soul_soil_rock":"Камушек из почвы душ",
+	
+	"block.rocks.oak_stick":"Дубовая палка",
+	"block.rocks.birch_stick":"Берёзовая палка",
+	"block.rocks.spruce_stick":"Еловая палочка",
+	"block.rocks.jungle_stick":"Палка из тропического дерева",
+	"block.rocks.acacia_stick":"Палка из акации",
+	"block.rocks.dark_oak_stick":"Палка из тёмного дуба",
+	
+	"block.rocks.geyser":"Гейзер",
+	"block.rocks.nether_geyser":"Магмовый гейзер",
+	
+	"block.rocks.pinecone":"Шишка",
+	"block.rocks.seashell":"Морская ракушка",
+	"block.rocks.starfish":"Морская звезда",
+	
+	"item.rocks.cobblestone_splitter":"Кусочек булыжника",
+	"item.rocks.granite_splitter":"Кусочек гранита",
+	"item.rocks.diorite_splitter":"Кусочек диорита",
+	"item.rocks.andesite_splitter":"Кусочек андезита",
+	"item.rocks.sandstone_splitter":"Кусочек песчаника",
+	"item.rocks.red_sandstone_splitter":"Кусочек красного песчаника",
+	"item.rocks.end_stone_splitter":"Кусочек эндерняка",
+	"item.rocks.netherrack_splitter":"Кусочек адского камня",
+	"item.rocks.soul_soil_splitter":"Кусочек почвы душ"
+}

src/main/resources/assets/rocks/lang/zh_cn.json

@@ -0,0 +1,24 @@
+{
+	"itemGroup.rocks.rocks":"这就是石粒！ §7（This Rocks!）",
+	
+	"block.rocks.rock":"石粒",
+	"block.rocks.sand_rock":"砂岩粒",
+	"block.rocks.red_sand_rock":"红砂岩粒",
+	"block.rocks.end_stone_rock":"末地石粒",
+	
+	"block.rocks.oak_stick":"橡木棍",
+	"block.rocks.birch_stick":"白桦木棍",
+	"block.rocks.spruce_stick":"云杉木棍",
+	"block.rocks.jungle_stick":"丛林木棍",
+	"block.rocks.acacia_stick":"金合欢木棍",
+	"block.rocks.dark_oak_stick":"深色橡木棍",
+	
+	"block.rocks.pinecone":"松果",
+	"block.rocks.seashell":"海贝",
+	"block.rocks.starfish":"海星",
+	
+	"item.rocks.cobblestone_splitter":"圆石碎块",
+	"item.rocks.sandstone_splitter":"砂石碎块",
+	"item.rocks.red_sandstone_splitter":"红砂石碎块",
+	"item.rocks.end_stone_splitter":"末地石碎块"
+}

src/main/resources/assets/rocks/materialmaps/block/geyser.json

@@ -0,0 +1,10 @@
+{
+  "defaultMap": {
+	"spriteMap": [
+	  {
+		"sprite": "minecraft:block/magma",
+		"material": "canvas:warm_glow"
+	  }
+	]
+  }
+}

src/main/resources/assets/rocks/materialmaps/block/nether_geyser.json

@@ -0,0 +1,10 @@
+{
+  "defaultMap": {
+	"spriteMap": [
+	  {
+		"sprite": "minecraft:block/magma",
+		"material": "canvas:warm_glow"
+	  }
+	]
+  }
+}

src/main/resources/assets/rocks/models/block/geyser_off.json

@@ -0,0 +1,108 @@
+{
+	"credit": "made by Motschen",
+	"parent": "block/block",
+	"textures": {
+		"0": "block/snow",
+		"2": "block/black_concrete",
+		"particle": "block/snow"
+	},
+	"elements": [
+		{
+			"from": [5, 0, 5],
+			"to": [11, 1, 6],
+			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 13]},
+			"faces": {
+				"north": {"uv": [0, 0, 6, 1], "texture": "#0"},
+				"east": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"south": {"uv": [0, 0, 6, 1], "texture": "#0"},
+				"west": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"up": {"uv": [0, 0, 6, 1], "texture": "#0"},
+				"down": {"uv": [0, 0, 6, 1], "texture": "#0"}
+			}
+		},
+		{
+			"from": [10, 0, 6],
+			"to": [11, 1, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 14]},
+			"faces": {
+				"north": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"east": {"uv": [0, 0, 4, 1], "texture": "#0"},
+				"south": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"west": {"uv": [0, 0, 4, 1], "texture": "#0"},
+				"up": {"uv": [0, 2, 1, 6], "texture": "#0"},
+				"down": {"uv": [0, 0, 1, 4], "texture": "#0"}
+			}
+		},
+		{
+			"from": [5, 0, 6],
+			"to": [6, 1, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 14]},
+			"faces": {
+				"north": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"east": {"uv": [0, 0, 4, 1], "texture": "#0"},
+				"south": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"west": {"uv": [0, 0, 4, 1], "texture": "#0"},
+				"up": {"uv": [15, 1, 16, 5], "texture": "#0"},
+				"down": {"uv": [0, 0, 1, 4], "texture": "#0"}
+			}
+		},
+		{
+			"from": [5, 0, 10],
+			"to": [11, 1, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 18]},
+			"faces": {
+				"north": {"uv": [0, 0, 6, 1], "texture": "#0"},
+				"east": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"south": {"uv": [0, 0, 6, 1], "texture": "#0"},
+				"west": {"uv": [0, 0, 1, 1], "texture": "#0"},
+				"up": {"uv": [0, 5, 6, 6], "texture": "#0"},
+				"down": {"uv": [0, 0, 6, 1], "texture": "#0"}
+			}
+		},
+		{
+			"from": [6, 0, 6],
+			"to": [10, 0.1, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [13, 8, 13]},
+			"faces": {
+				"north": {"uv": [0, 0, 4, 0.1], "texture": "#0"},
+				"east": {"uv": [0, 0, 4, 0.1], "texture": "#0"},
+				"south": {"uv": [0, 0, 4, 0.1], "texture": "#0"},
+				"west": {"uv": [0, 0, 4, 0.1], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 4], "texture": "#2"},
+				"down": {"uv": [0, 0, 4, 4], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 2.25, -1.5],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 2.25, -1.5],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"translation": [2.5, 8.25, -0.25]
+		},
+		"firstperson_lefthand": {
+			"translation": [2.5, 8.25, -0.25]
+		},
+		"ground": {
+			"translation": [0, 5.75, 0]
+		},
+		"gui": {
+			"rotation": [45, 45, 0],
+			"translation": [0, 7.25, 0],
+			"scale": [1.5, 1.5, 1.5]
+		},
+		"head": {
+			"translation": [0, 14.5, 0]
+		},
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -12],
+			"scale": [1.5, 1.5, 1.5]
+		}
+	}
+}

src/main/resources/assets/rocks/models/block/geyser_on.json

@@ -0,0 +1,7 @@
+{
+	"credit": "made by Motschen",
+	"parent": "rocks:block/geyser_off",
+	"textures": {
+		"2": "block/magma"
+	}
+}

src/main/resources/assets/rocks/models/block/large_andesite_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/large_rock",
+	"textures": {
+		"0": "block/andesite",
+		"particle": "block/andesite"
+	}
+}

src/main/resources/assets/rocks/models/block/large_diorite_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/large_rock",
+	"textures": {
+		"0": "block/diorite",
+		"particle": "block/diorite"
+	}
+}

src/main/resources/assets/rocks/models/block/large_granite_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/large_rock",
+	"textures": {
+		"0": "block/granite",
+		"particle": "block/granite"
+	}
+}

src/main/resources/assets/rocks/models/block/large_gravel_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/large_rock",
+	"textures": {
+		"0": "block/gravel",
+		"particle": "block/gravel"
+	}
+}

src/main/resources/assets/rocks/models/block/large_netherrack_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/large_rock",
+	"textures": {
+		"0": "block/netherrack",
+		"particle": "block/netherrack"
+	}
+}

src/main/resources/assets/rocks/models/block/large_soul_soil_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/large_rock",
+	"textures": {
+		"0": "block/soul_soil",
+		"particle": "block/soul_soil"
+	}
+}

src/main/resources/assets/rocks/models/block/medium_andesite_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/medium_rock",
+	"textures": {
+		"0": "block/andesite",
+		"particle": "block/andesite"
+	}
+}

src/main/resources/assets/rocks/models/block/medium_diorite_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/medium_rock",
+	"textures": {
+		"0": "block/diorite",
+		"particle": "block/diorite"
+	}
+}

src/main/resources/assets/rocks/models/block/medium_granite_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/medium_rock",
+	"textures": {
+		"0": "block/granite",
+		"particle": "block/granite"
+	}
+}

src/main/resources/assets/rocks/models/block/medium_gravel_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/medium_rock",
+	"textures": {
+		"0": "block/gravel",
+		"particle": "block/gravel"
+	}
+}

src/main/resources/assets/rocks/models/block/medium_netherrack_rock.json

@@ -0,0 +1,7 @@
+{
+	"parent": "rocks:block/medium_rock",
+	"textures": {
+		"0": "block/netherrack",
+		"particle": "block/netherrack"
+	}
+}