Decorative 4.1.1 - Bugfixes

Fixed #9
Fixed bath tires having wrong colors
Update MidnightLib

.gitignore

@@ -22,4 +22,4 @@ bin/
 
 # fabric
 
-run/
+run/

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.4-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -16,52 +16,63 @@ minecraft {
 repositories {
 	maven { url "https://jitpack.io" }
 	maven { url "https://maven.blamejared.com" }
+	maven { url "https://maven.terraformersmc.com/releases" }
+	flatDir {
+		dirs 'local_maven'
+	}
 }
 
 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}"
 	
-	modCompile("vazkii.patchouli:Patchouli_1.16-fabric:${project.patchouli_version}")
-	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-	// You may need to force-disable transitiveness on them.
+// 	modImplementation("vazkii.patchouli:Patchouli:${project.patchouli_version}"){
+//         exclude module: "fabric-api"
+//     }
+	
+	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}"){
+        exclude module: "fabric-api"
+    }
+	
+	modImplementation "com.github.TeamMidnightDust:midnightlib:${midnightlib_version}"
+    include "com.github.TeamMidnightDust:midnightlib:${midnightlib_version}"
 }
 
 processResources {
 	inputs.property "version", project.version
 
-	from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
+	filesMatching("fabric.mod.json") {
 		expand "version": project.version
 	}
-
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
-	}
 }
 
-// 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) {
-	options.encoding = "UTF-8"
+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
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
+	it.options.release = 16
 }
 
-// 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.
-task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
-	from sourceSets.main.allSource
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
 }
 
 jar {
-	from "LICENSE"
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
 }
 
 // configure the maven publication
@@ -78,9 +89,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
-		// mavenLocal()
+		// Add repositories to publish to here.
+		// 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.
 	}
 }

build/loom-cache/mixin-map-1.16.4-1.16.4+build.6-v2.0.tiny

@@ -0,0 +1 @@
+v1	named	intermediary

build/loom-cache/mixin-map-1.16.4-1.16.4+build.9-v2.0.tiny

@@ -0,0 +1 @@
+v1	named	intermediary

gradle.properties

@@ -1,18 +1,20 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.1
-	yarn_mappings=1.16.1+build.7
-	loader_version=0.8.8+build.202
+	minecraft_version=1.17
+	yarn_mappings=1.17+build.5
+	loader_version=0.11.3
 
 # Mod Properties
-	mod_version = 1.0.0
+	mod_version = 4.1.1
 	maven_group = eu.midnightdust.motschen
 	archives_base_name = decorative
 
 # 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.14.0+build.371-1.16
-	patchouli_version=1.16-37.21-FABRIC
+	fabric_version=0.34.9+1.17
+	mod_menu_version = 2.0.0-beta.7
+	midnightlib_version=0.2.3
+	patchouli_version=1.16.4-50-FABRIC

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
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+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 -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        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/decorative/DecorativeClient.java

@@ -1,19 +1,62 @@
 package eu.midnightdust.motschen.decorative;
 
+import eu.midnightdust.motschen.decorative.block.render.*;
+import eu.midnightdust.motschen.decorative.block.render.model.CeilingFanBladesModel;
+import eu.midnightdust.motschen.decorative.block.render.model.WallClockHandsModel;
+import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel;
+import eu.midnightdust.motschen.decorative.entity.client.model.BeachBallModel;
+import eu.midnightdust.motschen.decorative.entity.client.model.DuckBathTireModel;
+import eu.midnightdust.motschen.decorative.entity.client.renderer.*;
+import eu.midnightdust.motschen.decorative.init.BathTires;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import eu.midnightdust.motschen.decorative.init.Pool;
 import eu.midnightdust.motschen.decorative.init.Signs;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
+import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityModelLayerRegistry;
+import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.client.color.block.BlockColorProvider;
-import net.minecraft.client.color.item.ItemColorProvider;
 import net.minecraft.client.render.RenderLayer;
+import net.minecraft.util.DyeColor;
 
+@SuppressWarnings({"deprecation", "UnstableApiUsage"})
 public class DecorativeClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
+        EntityModelLayerRegistry.registerModelLayer(BathTireModel.BATH_TIRE_MODEL_LAYER, BathTireModel::getTexturedModelData);
+        EntityModelLayerRegistry.registerModelLayer(DuckBathTireModel.DUCK_BATH_TIRE_MODEL_LAYER, DuckBathTireModel::getTexturedModelData);
+        EntityModelLayerRegistry.registerModelLayer(BeachBallModel.BEACH_BALL_MODEL_LAYER, BeachBallModel::getTexturedModelData);
+
+        EntityModelLayerRegistry.registerModelLayer(CeilingFanBladesModel.CEILING_FAN_MODEL_LAYER, CeilingFanBladesModel::getTexturedModelData);
+        EntityModelLayerRegistry.registerModelLayer(WallClockHandsModel.CLOCK_HANDS_MODEL_LAYER, WallClockHandsModel::getTexturedModelData);
+
+        EntityRendererRegistry.INSTANCE.register(Pool.BEACH_BALL, BeachBallRenderer::new);
+
+        EntityRendererRegistry.INSTANCE.register(BathTires.WHITE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.WHITE));
+        EntityRendererRegistry.INSTANCE.register(BathTires.ORANGE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.ORANGE));
+        EntityRendererRegistry.INSTANCE.register(BathTires.MAGENTA_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.MAGENTA));
+        EntityRendererRegistry.INSTANCE.register(BathTires.LIGHT_BLUE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.LIGHT_BLUE));
+        EntityRendererRegistry.INSTANCE.register(BathTires.YELLOW_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.YELLOW));
+        EntityRendererRegistry.INSTANCE.register(BathTires.LIME_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.LIME));
+        EntityRendererRegistry.INSTANCE.register(BathTires.PINK_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.PINK));
+        EntityRendererRegistry.INSTANCE.register(BathTires.GRAY_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.GRAY));
+        EntityRendererRegistry.INSTANCE.register(BathTires.LIGHT_GRAY_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.LIGHT_GRAY));
+        EntityRendererRegistry.INSTANCE.register(BathTires.CYAN_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.CYAN));
+        EntityRendererRegistry.INSTANCE.register(BathTires.PURPLE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.PURPLE));
+        EntityRendererRegistry.INSTANCE.register(BathTires.BLUE_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.BLUE));
+        EntityRendererRegistry.INSTANCE.register(BathTires.BROWN_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.BROWN));
+        EntityRendererRegistry.INSTANCE.register(BathTires.GREEN_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.GREEN));
+        EntityRendererRegistry.INSTANCE.register(BathTires.RED_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.RED));
+        EntityRendererRegistry.INSTANCE.register(BathTires.BLACK_BATH_TIRE, (context) -> new BathTireRenderer(context, DyeColor.BLACK));
+
+        EntityRendererRegistry.INSTANCE.register(BathTires.DUCK_BATH_TIRE, DuckBathTireRenderer::new);
+
+
         registerBlockColor(DecorativeMain.BirdBath, Blocks.WATER);
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.RoadWhiteShort);
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.RoadWhiteLong);
@@ -35,8 +78,15 @@ public class DecorativeClient implements ClientModInitializer {
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.ChristmasTree);
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.CeilingFan);
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.SlidingDoor);
+        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.WallClock);
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getTranslucent(),DecorativeMain.BirdBath);
 
+        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.CeilingFanBlockEntity, CeilingFanRenderer::new);
+
+        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.ChoppingLogBlockEntity, ChoppingLogBlockEntityRenderer::new);
+
+        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.WallClockBlockEntity, WallClockRenderer::new);
+        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.DigitalClockBlockEntity, DigitalClockRenderer::new);
     }
     public void registerBlockColor(Block block, Block templateBlock) {
         ColorProviderRegistry.BLOCK.register((type, pos, world, layer) -> {

src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java

@@ -1,7 +1,16 @@
 package eu.midnightdust.motschen.decorative;
 
+import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.motschen.decorative.block.*;
+import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage;
+import eu.midnightdust.motschen.decorative.blockstates.Part;
+import eu.midnightdust.motschen.decorative.blockstates.PoolShape;
+import eu.midnightdust.motschen.decorative.blockstates.Program;
+import eu.midnightdust.motschen.decorative.config.DecorativeConfig;
 import eu.midnightdust.motschen.decorative.init.*;
+import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents;
+import eu.midnightdust.motschen.decorative.world.OreFeatureInjector;
+import eu.midnightdust.motschen.decorative.world.OreFeatures;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -12,15 +21,18 @@ import net.minecraft.state.property.EnumProperty;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-import java.util.Locale;
 
 public class DecorativeMain implements ModInitializer {
     public static final String MOD_ID = "decorative";
 
     public static final ItemGroup IndoorGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "indoor"), () -> new ItemStack(DecorativeMain.Television));
     public static final ItemGroup TrafficGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "traffic"), () -> new ItemStack(DecorativeMain.TrafficCone));
-    public static final ItemGroup GardenGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "garden"), () -> new ItemStack(LogsWithAxes.OakLogWithAxe));
+    public static final ItemGroup GardenGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "garden"), () -> new ItemStack(LogsWithAxes.OakChoppingLog));
+    public static final ItemGroup PoolGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "pool"), () -> new ItemStack(Pool.BEACH_BALL_ITEM));
     public static final EnumProperty<Program> PROGRAM = EnumProperty.of("program", Program.class);
+    public static final EnumProperty<PoolShape> POOL_SHAPE = EnumProperty.of("shape", PoolShape.class);
+    public static final EnumProperty<Part> PART = EnumProperty.of("part", Part.class);
+    public static final EnumProperty<CeilingFanStage> STAGE = EnumProperty.of("stage", CeilingFanStage.class);
     public static Block RockyAsphalt = new Block(FabricBlockSettings.copyOf(Blocks.COAL_ORE));
     public static Block Road = new Block(FabricBlockSettings.copyOf(Blocks.STONE));
     public static Block RoadWhiteShort = new RotatableBlock();
@@ -38,74 +50,70 @@ public class DecorativeMain implements ModInitializer {
     public static Block BirdBath = new BirdBath();
     public static Block ChristmasTree = new ChristmasTree();
     public static Block ChristmasLights = new ChristmasLights();
+    public static Block ShowerHead = new ShowerHead();
+    public static Block WallClock = new WallClock();
+    public static Block StonePath = new StonePath();
 
     @Override
     public void onInitialize() {
+        MidnightConfig.init("decorative", DecorativeConfig.class);
+
+        BlockEntities.init();
+
         // Traffic //
-        Registry.register(Registry.BLOCK, new Identifier("decorative","rocky_asphalt"), RockyAsphalt);
-        Registry.register(Registry.ITEM, new Identifier("decorative","rocky_asphalt"), new BlockItem(RockyAsphalt, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","road"), Road);
-        Registry.register(Registry.ITEM, new Identifier("decorative","road"), new BlockItem(Road, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","road_white_short"), RoadWhiteShort);
-        Registry.register(Registry.ITEM, new Identifier("decorative","road_white_short"), new BlockItem(RoadWhiteShort, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","road_white_long"), RoadWhiteLong);
-        Registry.register(Registry.ITEM, new Identifier("decorative","road_white_long"), new BlockItem(RoadWhiteLong, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","traffic_cone"), TrafficCone);
-        Registry.register(Registry.ITEM, new Identifier("decorative","traffic_cone"), new BlockItem(TrafficCone, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","fire_hydrant"), FireHydrant);
-        Registry.register(Registry.ITEM, new Identifier("decorative","fire_hydrant"), new BlockItem(FireHydrant, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","guardrail"), Guardrail);
-        Registry.register(Registry.ITEM, new Identifier("decorative","guardrail"), new BlockItem(Guardrail, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","sign_post"), SignPost);
-        Registry.register(Registry.ITEM, new Identifier("decorative","sign_post"), new BlockItem(SignPost, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"rocky_asphalt"), RockyAsphalt);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"rocky_asphalt"), new BlockItem(RockyAsphalt, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"road"), Road);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"road"), new BlockItem(Road, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"road_white_short"), RoadWhiteShort);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"road_white_short"), new BlockItem(RoadWhiteShort, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"road_white_long"), RoadWhiteLong);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"road_white_long"), new BlockItem(RoadWhiteLong, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"traffic_cone"), TrafficCone);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"traffic_cone"), new BlockItem(TrafficCone, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"fire_hydrant"), FireHydrant);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"fire_hydrant"), new BlockItem(FireHydrant, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"guardrail"), Guardrail);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"guardrail"), new BlockItem(Guardrail, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"sign_post"), SignPost);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"sign_post"), new BlockItem(SignPost, new Item.Settings().group(DecorativeMain.TrafficGroup)));
         Signs.init();
 
         //Garden//
-        Registry.register(Registry.BLOCK, new Identifier("decorative","bird_bath"), BirdBath);
-        Registry.register(Registry.ITEM, new Identifier("decorative","bird_bath"), new BlockItem(BirdBath, new Item.Settings().group(DecorativeMain.GardenGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","water_pump"), WaterPump);
-        Registry.register(Registry.ITEM, new Identifier("decorative","water_pump"), new BlockItem(WaterPump, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"stone_path"), StonePath);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"stone_path"), new BlockItem(StonePath, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"bird_bath"), BirdBath);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"bird_bath"), new BlockItem(BirdBath, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"water_pump"), WaterPump);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"water_pump"), new BlockItem(WaterPump, new Item.Settings().group(DecorativeMain.GardenGroup)));
         LogsWithAxes.init();
-        
+        Pool.init();
+
         //Furniture//
-        Registry.register(Registry.BLOCK, new Identifier("decorative","kitchen_tiles"), KitchenTiles);
-        Registry.register(Registry.ITEM, new Identifier("decorative","kitchen_tiles"), new BlockItem(KitchenTiles, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","television"), Television);
-        Registry.register(Registry.ITEM, new Identifier("decorative","television"), new BlockItem(Television, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","old_television"), OldTelevision);
-        Registry.register(Registry.ITEM, new Identifier("decorative","old_television"), new BlockItem(OldTelevision, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","ceilingfan"), CeilingFan);
-        Registry.register(Registry.ITEM, new Identifier("decorative","ceilingfan"), new BlockItem(CeilingFan, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","sliding_door"), SlidingDoor);
-        Registry.register(Registry.ITEM, new Identifier("decorative","sliding_door"), new BlockItem(SlidingDoor, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","christmas_tree"), ChristmasTree);
-        Registry.register(Registry.ITEM, new Identifier("decorative","christmas_tree"), new BlockItem(ChristmasTree, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","christmas_lights"), ChristmasLights);
-        Registry.register(Registry.ITEM, new Identifier("decorative","christmas_lights"), new BlockItem(ChristmasLights, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"kitchen_tiles"), KitchenTiles);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"kitchen_tiles"), new BlockItem(KitchenTiles, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"wall_clock"), WallClock);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"wall_clock"), new BlockItem(WallClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"television"), Television);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"television"), new BlockItem(Television, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"old_television"), OldTelevision);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"old_television"), new BlockItem(OldTelevision, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"ceilingfan"), CeilingFan);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"ceilingfan"), new BlockItem(CeilingFan, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"shower_head"), ShowerHead);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"shower_head"), new BlockItem(ShowerHead, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"sliding_door"), SlidingDoor);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"sliding_door"), new BlockItem(SlidingDoor, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"christmas_tree"), ChristmasTree);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"christmas_tree"), new BlockItem(ChristmasTree, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"christmas_lights"), ChristmasLights);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"christmas_lights"), new BlockItem(ChristmasLights, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+
         Lamps.init();
         DoubleLamps.init();
-        eu.midnightdust.motschen.decorative.world.RockyAsphalt.initBiomeFeatures();
-    }
-    public enum Ores implements ItemConvertible {
-        RockyAsphalt(7, 20, 14, 200);
-
-        public final String name;
-        public final int veinSize;
-        public final int veinsPerChunk;
-        public final int minY;
-        public final int maxY;
-
-        Ores(int veinSize, int veinsPerChunk, int minY, int maxY) {
-            name = this.toString().toLowerCase(Locale.ROOT);
-            this.veinSize = veinSize;
-            this.veinsPerChunk = veinsPerChunk;
-            this.minY = minY;
-            this.maxY = maxY;
-        }
-
-        @Override
-        public Item asItem() {
-            return RockyAsphalt.asItem();
-        }
+        Clocks.init();
+        OreFeatures.init();
+        OreFeatureInjector.init();
+        new DecorativeSoundEvents();
     }
 }

src/main/java/eu/midnightdust/motschen/decorative/block/BirdBath.java

@@ -2,40 +2,72 @@ package eu.midnightdust.motschen.decorative.block;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
+import net.minecraft.block.cauldron.CauldronBehavior;
+import net.minecraft.fluid.Fluid;
+import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.StateManager;
+import net.minecraft.state.property.IntProperty;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
-public class BirdBath extends CauldronBlock {
+import java.util.Objects;
+
+public class BirdBath extends AbstractCauldronBlock {
     private static final VoxelShape SHAPE;
+    public static final IntProperty LEVEL = IntProperty.of("level",0,3);
 
     public BirdBath() {
-        super(FabricBlockSettings.copy(Blocks.CAULDRON).nonOpaque().sounds(BlockSoundGroup.STONE));
-        this.setDefaultState(this.stateManager.getDefaultState().with(LEVEL, 0));
+        super(FabricBlockSettings.copy(Blocks.WATER_CAULDRON).nonOpaque().sounds(BlockSoundGroup.STONE), CauldronBehavior.WATER_CAULDRON_BEHAVIOR);
+    }
+    @Override
+    public boolean isFull(BlockState state) {
+        return state.get(LEVEL) == 3;
     }
 
     @Override
-    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return super.getPlacementState(itemPlacementContext)
-                .with(LEVEL, 0);
+    protected boolean canBeFilledByDripstone(Fluid fluid) {
+        return fluid == Fluids.WATER;
+    }
+    @Override
+    protected double getFluidHeight(BlockState state) {
+        return (6.0D + (double)state.get(LEVEL) * 3.0D) / 16.0D;
+    }
+
+    @Override
+    public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
+        return state.get(LEVEL);
     }
 
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
         builder.add(LEVEL);
     }
+    @Override
+    protected void fillFromDripstone(BlockState state, World world, BlockPos pos, Fluid fluid) {
+        if (!this.isFull(state)) {
+            world.setBlockState(pos, state.with(LEVEL, state.get(LEVEL) + 1));
+            world.syncWorldEvent(1047, pos, 0);
+        }
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+                .with(LEVEL, 0);
+    }
+
 
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
             return SHAPE;
     }
     static {
-        VoxelShape shape = createCuboidShape(4, 0, 4, 12, 9, 12);
-        SHAPE = shape;
+        SHAPE = createCuboidShape(4, 0, 4, 12, 9, 12);
     }
 
     public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {

src/main/java/eu/midnightdust/motschen/decorative/block/CeilingFan.java

@@ -1,13 +1,22 @@
 package eu.midnightdust.motschen.decorative.block;
 
+import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage;
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.block.blockentity.CeilingFanBlockEntity;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
 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.block.entity.BrewingStandBlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
 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.EnumProperty;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -16,29 +25,49 @@ 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;
 
-public class CeilingFan extends RedstoneLampBlock {
+public class CeilingFan extends BlockWithEntity implements BlockEntityProvider {
     private static final VoxelShape SHAPE;
+    private static final EnumProperty<CeilingFanStage> STAGE = DecorativeMain.STAGE;
 
     public CeilingFan() {
         super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE));
-        this.setDefaultState(this.stateManager.getDefaultState().with(LIT, true));
+        this.setDefaultState(this.stateManager.getDefaultState().with(STAGE, CeilingFanStage.OFF));
+    }
+
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new CeilingFanBlockEntity(pos, state);
+    }
+    @Nullable
+    @Override
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+        return checkType(type, BlockEntities.CeilingFanBlockEntity, CeilingFanBlockEntity::tick);
+    }
+    @Override
+    public BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
     }
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
         return super.getPlacementState(itemPlacementContext)
-                .with(LIT, false);
+                .with(STAGE, CeilingFanStage.OFF);
     }
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-            world.setBlockState(pos, state.with(LIT, Boolean.valueOf(!state.get(LIT))));
-            world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f);
-            return ActionResult.SUCCESS;
+        if (state.get(STAGE) == CeilingFanStage.OFF) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.LEVEL_1));}
+        if (state.get(STAGE) == CeilingFanStage.LEVEL_1) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.LEVEL_2));}
+        if (state.get(STAGE) == CeilingFanStage.LEVEL_2) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.LEVEL_3));}
+        if (state.get(STAGE) == CeilingFanStage.LEVEL_3) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.OFF));}
+
+        world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f);
+        return ActionResult.SUCCESS;
     }
 
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(LIT);
+        builder.add(STAGE);
     }
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {

src/main/java/eu/midnightdust/motschen/decorative/block/ChoppingLog.java

@@ -0,0 +1,59 @@
+package eu.midnightdust.motschen.decorative.block;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.ChoppingLogBlockEntity;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+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.DirectionProperty;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldView;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+public class ChoppingLog extends BlockWithEntity implements BlockEntityProvider {
+    private static final DirectionProperty FACING = HorizontalFacingBlock.FACING;
+
+    public ChoppingLog() {
+        super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD));
+        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH));
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+                .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite());
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(FACING);
+    }
+
+    public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {
+        return !worldView.isAir(pos.down());
+    }
+
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new ChoppingLogBlockEntity(pos, state);
+    }
+    @Nullable
+    @Override
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+        return checkType(type, BlockEntities.ChoppingLogBlockEntity, ChoppingLogBlockEntity::tick);
+    }
+    @Override
+    public BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+
+}

src/main/java/eu/midnightdust/motschen/decorative/block/ChristmasLights.java

@@ -26,7 +26,7 @@ public class ChristmasLights extends HorizontalFacingBlock {
     private static final VoxelShape EAST_SHAPE;
     private static final VoxelShape SOUTH_SHAPE;
     private static final VoxelShape WEST_SHAPE;
-    public static final BooleanProperty LIT = RedstoneTorchBlock.LIT;
+    public static final BooleanProperty LIT = RedstoneLampBlock.LIT;
 
     public ChristmasLights() {
         super(FabricBlockSettings.copy(Blocks.REDSTONE_LAMP).nonOpaque().sounds(BlockSoundGroup.STONE));

src/main/java/eu/midnightdust/motschen/decorative/block/DigitalClock.java

@@ -0,0 +1,89 @@
+package eu.midnightdust.motschen.decorative.block;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.DigitalClockBlockEntity;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+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.DirectionProperty;
+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 org.jetbrains.annotations.Nullable;
+
+public class DigitalClock extends BlockWithEntity implements BlockEntityProvider {
+    private static final DirectionProperty FACING = HorizontalFacingBlock.FACING;
+    private static final VoxelShape NORTH_SHAPE;
+    private static final VoxelShape EAST_SHAPE;
+    private static final VoxelShape SOUTH_SHAPE;
+    private static final VoxelShape WEST_SHAPE;
+
+    public DigitalClock() {
+        super(FabricBlockSettings.copy(Blocks.SMOOTH_QUARTZ).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH));
+    }
+
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new DigitalClockBlockEntity(pos, state);
+    }
+    @Nullable
+    @Override
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+        return checkType(type, BlockEntities.DigitalClockBlockEntity, DigitalClockBlockEntity::tick);
+    }
+    @Override
+    public BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(FACING);
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return super.getPlacementState(itemPlacementContext)
+                .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite());
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        switch (state.get(FACING)) {
+            case NORTH: return NORTH_SHAPE;
+            case EAST: return EAST_SHAPE;
+            case SOUTH: return SOUTH_SHAPE;
+            case WEST: return WEST_SHAPE;
+            default: return super.getOutlineShape(state, view, pos, context);
+        }
+    }
+    static {
+        VoxelShape shape = createCuboidShape(1, 0, 5, 15, 8, 13);
+
+        NORTH_SHAPE = shape;
+        WEST_SHAPE = rotate(Direction.EAST, Direction.NORTH, shape);
+        EAST_SHAPE = rotate(Direction.EAST, Direction.SOUTH, shape);
+        SOUTH_SHAPE = rotate(Direction.EAST, Direction.WEST, shape);
+    }
+    private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) {
+        VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() };
+
+        int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4;
+        for (int i = 0; i < times; i++) {
+            buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX)));
+            buffer[0] = buffer[1];
+            buffer[1] = VoxelShapes.empty();
+        }
+
+        return buffer[0];
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/DoubleLamp.java

@@ -1,6 +1,5 @@
 package eu.midnightdust.motschen.decorative.block;
 
-import blue.endless.jankson.annotation.Nullable;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.block.enums.DoubleBlockHalf;
@@ -8,6 +7,7 @@ import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
@@ -26,11 +26,13 @@ import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.WorldView;
 
-public class DoubleLamp extends RedstoneLampBlock {
+import java.util.Random;
+
+public class DoubleLamp extends Block {
     private static final VoxelShape SHAPE_TOP;
     private static final VoxelShape SHAPE_BOTTOM;
 
-    public static final BooleanProperty LIT = RedstoneTorchBlock.LIT;
+    public static final BooleanProperty LIT = RedstoneLampBlock.LIT;
     public static final EnumProperty<DoubleBlockHalf> HALF = Properties.DOUBLE_BLOCK_HALF;
 
     public DoubleLamp() {
@@ -45,7 +47,6 @@ public class DoubleLamp extends RedstoneLampBlock {
     }
 
     @Override
-    @Nullable
     public BlockState getPlacementState(ItemPlacementContext arg) {
         return this.getDefaultState().with(LIT, arg.getWorld().isReceivingRedstonePower(arg.getBlockPos()));
     }

src/main/java/eu/midnightdust/motschen/decorative/block/FireHydrant.java

@@ -5,6 +5,7 @@ import net.minecraft.block.*;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemUsage;
 import net.minecraft.item.Items;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundCategory;
@@ -33,17 +34,10 @@ public class FireHydrant extends HorizontalFacingBlock {
     }
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
         ItemStack itemStack = player.getStackInHand(hand);
-        if (!itemStack.isEmpty()) {
+        if (!itemStack.isEmpty() && hand==Hand.MAIN_HAND) {
             if (itemStack.getItem() == Items.BUCKET) {
                 if (!world.isClient) {
-                    if (!player.abilities.creativeMode) {
-                        itemStack.decrement(1);
-                        if (itemStack.isEmpty()) {
-                            player.setStackInHand(hand, new ItemStack(Items.WATER_BUCKET));
-                        } else if (!player.inventory.insertStack(new ItemStack(Items.WATER_BUCKET))) {
-                            player.dropItem(new ItemStack(Items.WATER_BUCKET), false);
-                        }
-                    }
+                    ItemUsage.exchangeStack(itemStack, player, new ItemStack(Items.BUCKET));
                     world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
                 }
                 return ActionResult.SUCCESS;

src/main/java/eu/midnightdust/motschen/decorative/block/Guardrail.java

@@ -2,23 +2,14 @@ package eu.midnightdust.motschen.decorative.block;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.sound.BlockSoundGroup;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
-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.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
-import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
 public class Guardrail extends HorizontalFacingBlock {
@@ -31,31 +22,6 @@ public class Guardrail extends HorizontalFacingBlock {
         super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE));
         this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH));
     }
-    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-        ItemStack itemStack = player.getStackInHand(hand);
-        if (!itemStack.isEmpty()) {
-            if (itemStack.getItem() == Items.BUCKET) {
-                if (!world.isClient) {
-                    if (!player.abilities.creativeMode) {
-                        itemStack.decrement(1);
-                        if (itemStack.isEmpty()) {
-                            player.setStackInHand(hand, new ItemStack(Items.WATER_BUCKET));
-                        } else if (!player.inventory.insertStack(new ItemStack(Items.WATER_BUCKET))) {
-                            player.dropItem(new ItemStack(Items.WATER_BUCKET), false);
-                        }
-                    }
-                    world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                }
-                return ActionResult.SUCCESS;
-            }
-            else {
-                return ActionResult.PASS;
-            }
-        }
-        if (itemStack.isEmpty()) {
-            return ActionResult.PASS;
-        } return ActionResult.PASS;
-    }
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {

src/main/java/eu/midnightdust/motschen/decorative/block/Lamp.java

@@ -2,10 +2,14 @@ package eu.midnightdust.motschen.decorative.block;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
+import net.minecraft.block.enums.DoubleBlockHalf;
 import net.minecraft.entity.player.PlayerEntity;
+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.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -14,12 +18,23 @@ import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
-public class Lamp extends RedstoneLampBlock {
+public class Lamp extends Block {
     private static final VoxelShape SHAPE;
+    public static final BooleanProperty LIT = RedstoneLampBlock.LIT;
 
     public Lamp() {
         super(FabricBlockSettings.copy(Blocks.REDSTONE_LAMP).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(LIT, false));
     }
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> arg) {
+        arg.add(LIT);
+    }
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext arg) {
+        return this.getDefaultState().with(LIT, arg.getWorld().isReceivingRedstonePower(arg.getBlockPos()));
+    }
+
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
         world.setBlockState(pos, state.with(LIT, Boolean.valueOf(!state.get(LIT))));
         world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f);

src/main/java/eu/midnightdust/motschen/decorative/block/LogWithAxe.java

@@ -1,34 +0,0 @@
-package eu.midnightdust.motschen.decorative.block;
-
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.minecraft.block.*;
-import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.sound.BlockSoundGroup;
-import net.minecraft.state.StateManager;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.world.WorldView;
-
-public class LogWithAxe extends HorizontalFacingBlock {
-
-    public LogWithAxe() {
-        super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.STONE));
-        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH));
-    }
-
-    @Override
-    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return super.getPlacementState(itemPlacementContext)
-                .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite());
-    }
-
-    @Override
-    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(FACING);
-    }
-
-    public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {
-        return !worldView.isAir(pos.down());
-    }
-
-}

src/main/java/eu/midnightdust/motschen/decorative/block/OldTelevision.java

@@ -1,7 +1,7 @@
 package eu.midnightdust.motschen.decorative.block;
 
 import eu.midnightdust.motschen.decorative.DecorativeMain;
-import eu.midnightdust.motschen.decorative.Program;
+import eu.midnightdust.motschen.decorative.blockstates.Program;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.entity.player.PlayerEntity;
@@ -22,6 +22,8 @@ import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
+import java.util.function.ToIntFunction;
+
 public class OldTelevision extends HorizontalFacingBlock {
 
     private static final VoxelShape NORTH_SHAPE;
@@ -31,7 +33,7 @@ public class OldTelevision extends HorizontalFacingBlock {
     private static final EnumProperty<Program> PROGRAM = DecorativeMain.PROGRAM;
 
     public OldTelevision() {
-        super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE));
+        super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE).luminance(createLightLevelFromBlockState()));
         this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(PROGRAM, Program.OFF));
     }
 
@@ -43,10 +45,10 @@ public class OldTelevision extends HorizontalFacingBlock {
                 case NYANCAT: world.setBlockState(pos, state.with(PROGRAM, Program.CREEPER));
                     world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
                     return ActionResult.SUCCESS;
-                case CREEPER: world.setBlockState(pos, state.with(PROGRAM, Program.WOODYS));
+                case CREEPER: world.setBlockState(pos, state.with(PROGRAM, Program.CRABRAVE));
                     world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
                     return ActionResult.SUCCESS;
-                case WOODYS: world.setBlockState(pos, state.with(PROGRAM, Program.TATER));
+                case CRABRAVE: world.setBlockState(pos, state.with(PROGRAM, Program.TATER));
                     world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
                     return ActionResult.SUCCESS;
                 case TATER: world.setBlockState(pos, state.with(PROGRAM, Program.OFF));
@@ -102,4 +104,15 @@ public class OldTelevision extends HorizontalFacingBlock {
         return !worldView.isAir(pos.down());
     }
 
+    private static ToIntFunction<BlockState> createLightLevelFromBlockState() {
+        return (blockState) -> {
+            if (blockState.get(PROGRAM) == Program.OFF) {
+                return 0;
+            }
+            else {
+                return 11;
+            }
+        };
+    }
+
 }

src/main/java/eu/midnightdust/motschen/decorative/block/PoolSprinkler.java

@@ -0,0 +1,113 @@
+package eu.midnightdust.motschen.decorative.block;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.PoolSprinklerBlockEntity;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+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.entity.player.PlayerEntity;
+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.DirectionProperty;
+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.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 PoolSprinkler extends BlockWithEntity implements BlockEntityProvider {
+    public static final DirectionProperty FACING = HorizontalFacingBlock.FACING;
+    public static final BooleanProperty POWERED = DoorBlock.POWERED;
+    private static final VoxelShape NORTH_SHAPE;
+    private static final VoxelShape EAST_SHAPE;
+    private static final VoxelShape SOUTH_SHAPE;
+    private static final VoxelShape WEST_SHAPE;
+
+
+    public PoolSprinkler() {
+        super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(POWERED, Boolean.FALSE));
+    }
+
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        world.setBlockState(pos, state.with(POWERED, !state.get(POWERED)));
+        world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f);
+        return ActionResult.SUCCESS;
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+                .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite())
+                .with(POWERED, Boolean.FALSE);
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(FACING);
+        builder.add(POWERED);
+    }
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        switch (state.get(FACING)) {
+            case NORTH: return NORTH_SHAPE;
+            case EAST: return EAST_SHAPE;
+            case SOUTH: return SOUTH_SHAPE;
+            case WEST: return WEST_SHAPE;
+            default: return super.getOutlineShape(state, view, pos, context);
+        }
+    }
+    static {
+        VoxelShape post = createCuboidShape(7, 0, 0, 9, 13, 2);
+        VoxelShape upper = createCuboidShape(7, 9.65, -6.2, 9, 13, 1);
+        VoxelShape shape = VoxelShapes.union(post, upper);
+
+        NORTH_SHAPE = shape;
+        WEST_SHAPE = rotate(Direction.EAST, Direction.NORTH, shape);
+        EAST_SHAPE = rotate(Direction.EAST, Direction.SOUTH, shape);
+        SOUTH_SHAPE = rotate(Direction.EAST, Direction.WEST, shape);
+    }
+    private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) {
+        VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() };
+
+        int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4;
+        for (int i = 0; i < times; i++) {
+            buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX)));
+            buffer[0] = buffer[1];
+            buffer[1] = VoxelShapes.empty();
+        }
+
+        return buffer[0];
+    }
+    public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {
+        return !worldView.isAir(pos.down());
+    }
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new PoolSprinklerBlockEntity(pos, state);
+    }
+    @Nullable
+    @Override
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+        return checkType(type, BlockEntities.PoolSprinklerBlockEntity, PoolSprinklerBlockEntity::tick);
+    }
+    @Override
+    public BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+
+}

src/main/java/eu/midnightdust/motschen/decorative/block/PoolWall.java

@@ -0,0 +1,120 @@
+package eu.midnightdust.motschen.decorative.block;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.blockstates.PoolShape;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.*;
+import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.Fluids;
+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.DirectionProperty;
+import net.minecraft.state.property.EnumProperty;
+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;
+
+public class PoolWall extends HorizontalFacingBlock implements Waterloggable {
+    public static final DirectionProperty FACING = DoorBlock.FACING;
+    public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED;
+    public static final EnumProperty<PoolShape> SHAPE = DecorativeMain.POOL_SHAPE;
+    private static final VoxelShape NORTH_SHAPE;
+    private static final VoxelShape EAST_SHAPE;
+    private static final VoxelShape SOUTH_SHAPE;
+    private static final VoxelShape WEST_SHAPE;
+    private static final VoxelShape NORTH_WEST_CORNER_SHAPE;
+    private static final VoxelShape SOUTH_WEST_CORNER_SHAPE;
+    private static final VoxelShape NORTH_EAST_CORNER_SHAPE;
+    private static final VoxelShape SOUTH_EAST_CORNER_SHAPE;
+
+
+    public PoolWall() {
+        super(FabricBlockSettings.copy(Blocks.STONE_STAIRS).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(SHAPE, PoolShape.STRAIGHT).with(WATERLOGGED, false));
+    }
+
+    @Override
+    public FluidState getFluidState(BlockState blockState_1) {
+        return blockState_1.get(WATERLOGGED) ? Fluids.WATER.getStill(true) : super.getFluidState(blockState_1);
+    }
+
+    public BlockState getPlacementState(ItemPlacementContext ctx) {
+        BlockPos blockPos = ctx.getBlockPos();
+        FluidState fluidState = ctx.getWorld().getFluidState(blockPos);
+        BlockState blockState = this.getDefaultState().with(FACING, ctx.getPlayerFacing().getOpposite()).with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
+        return blockState.with(SHAPE, getPoolShape(blockState, ctx.getWorld(), blockPos));
+    }
+
+    private static PoolShape getPoolShape(BlockState state, BlockView view, BlockPos pos) {
+        Direction direction = state.get(FACING).getOpposite();
+        BlockState blockState2 = view.getBlockState(pos.offset(direction.getOpposite()));
+        if (isPoolWall(blockState2)) {
+            Direction direction3 = blockState2.get(FACING).getOpposite();
+            if (direction3.getAxis() != (state.get(FACING).getOpposite()).getAxis() && getSide(state, view, pos, direction3)) {
+                if (direction3 == direction.rotateYCounterclockwise()) {
+                    return PoolShape.INNER_LEFT;
+                }
+
+                return PoolShape.INNER_RIGHT;
+            }
+        }
+
+        return PoolShape.STRAIGHT;
+    }
+
+    private static boolean getSide(BlockState state, BlockView view, BlockPos pos, Direction dir) {
+        BlockState blockState = view.getBlockState(pos.offset(dir));
+        return !isPoolWall(blockState) || blockState.get(FACING) != state.get(FACING);
+    }
+
+    public static boolean isPoolWall(BlockState state) {
+        return state.getBlock() instanceof PoolWall;
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(FACING,SHAPE,WATERLOGGED);
+    }
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        switch (state.get(FACING)) {
+            case NORTH: switch (state.get(SHAPE)) { case STRAIGHT: return NORTH_SHAPE; case INNER_LEFT: return NORTH_WEST_CORNER_SHAPE; case INNER_RIGHT: return NORTH_EAST_CORNER_SHAPE;}
+            case EAST: switch (state.get(SHAPE)) { case STRAIGHT: return EAST_SHAPE; case INNER_LEFT: return NORTH_EAST_CORNER_SHAPE; case INNER_RIGHT: return SOUTH_EAST_CORNER_SHAPE;}
+            case SOUTH: switch (state.get(SHAPE)) { case STRAIGHT: return SOUTH_SHAPE; case INNER_LEFT: return SOUTH_EAST_CORNER_SHAPE; case INNER_RIGHT: return SOUTH_WEST_CORNER_SHAPE;}
+            case WEST: switch (state.get(SHAPE)) { case STRAIGHT: return WEST_SHAPE; case INNER_LEFT: return SOUTH_WEST_CORNER_SHAPE; case INNER_RIGHT: return NORTH_WEST_CORNER_SHAPE;}
+            default: return super.getOutlineShape(state, view, pos, context);
+        }
+    }
+    static {
+        VoxelShape base = createCuboidShape(0, 0, 15, 16, 16, 16);
+        VoxelShape corner = createCuboidShape(15, 0, 0, 16, 16, 16);
+        VoxelShape corner_shapes = VoxelShapes.union(base, corner);
+
+        NORTH_SHAPE = base;
+        WEST_SHAPE = rotate(Direction.EAST, Direction.NORTH, base);
+        EAST_SHAPE = rotate(Direction.EAST, Direction.SOUTH, base);
+        SOUTH_SHAPE = rotate(Direction.EAST, Direction.WEST, base);
+        NORTH_WEST_CORNER_SHAPE = corner_shapes;
+        SOUTH_WEST_CORNER_SHAPE = rotate(Direction.EAST, Direction.NORTH, corner_shapes);
+        NORTH_EAST_CORNER_SHAPE = rotate(Direction.EAST, Direction.SOUTH, corner_shapes);
+        SOUTH_EAST_CORNER_SHAPE = rotate(Direction.EAST, Direction.WEST, corner_shapes);
+    }
+    private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) {
+        VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() };
+
+        int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4;
+        for (int i = 0; i < times; i++) {
+            buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX)));
+            buffer[0] = buffer[1];
+            buffer[1] = VoxelShapes.empty();
+        }
+
+        return buffer[0];
+    }
+
+}

src/main/java/eu/midnightdust/motschen/decorative/block/RotatableBlock.java

@@ -8,9 +8,7 @@ import net.minecraft.block.HorizontalFacingBlock;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.StateManager;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-import net.minecraft.world.WorldView;
 
 public class RotatableBlock extends HorizontalFacingBlock {
 

src/main/java/eu/midnightdust/motschen/decorative/block/ShowerHead.java

@@ -0,0 +1,113 @@
+package eu.midnightdust.motschen.decorative.block;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.ShowerHeadBlockEntity;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+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.entity.player.PlayerEntity;
+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.DirectionProperty;
+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.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldView;
+import org.jetbrains.annotations.Nullable;
+
+public class ShowerHead extends BlockWithEntity implements BlockEntityProvider {
+    private static final DirectionProperty FACING = HorizontalFacingBlock.FACING;
+    public static final BooleanProperty POWERED = DoorBlock.POWERED;
+    private static final VoxelShape NORTH_SHAPE;
+    private static final VoxelShape EAST_SHAPE;
+    private static final VoxelShape SOUTH_SHAPE;
+    private static final VoxelShape WEST_SHAPE;
+
+
+    public ShowerHead() {
+        super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(POWERED, Boolean.FALSE));
+    }
+
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        world.setBlockState(pos, state.with(POWERED, !state.get(POWERED)));
+        world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f);
+        return ActionResult.SUCCESS;
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return super.getPlacementState(itemPlacementContext)
+                .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite())
+                .with(POWERED, Boolean.FALSE);
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(FACING);
+        builder.add(POWERED);
+    }
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        switch (state.get(FACING)) {
+            case NORTH: return NORTH_SHAPE;
+            case EAST: return EAST_SHAPE;
+            case SOUTH: return SOUTH_SHAPE;
+            case WEST: return WEST_SHAPE;
+            default: return super.getOutlineShape(state, view, pos, context);
+        }
+    }
+    static {
+        VoxelShape pipe = createCuboidShape(7, 12, 8.75, 9, 14, 16);
+        VoxelShape pivot_pipe = createCuboidShape(7, 12, 8.25, 9, 13, 11);
+        VoxelShape pivot_pipe2 = createCuboidShape(7, 10.5, 7.25, 9, 12, 11);
+        VoxelShape head = createCuboidShape(4, 9.75, 5, 12, 11.25, 13);
+        VoxelShape shape = VoxelShapes.union(pipe, head, pivot_pipe, pivot_pipe2);
+
+        NORTH_SHAPE = shape;
+        WEST_SHAPE = rotate(Direction.EAST, Direction.NORTH, shape);
+        EAST_SHAPE = rotate(Direction.EAST, Direction.SOUTH, shape);
+        SOUTH_SHAPE = rotate(Direction.EAST, Direction.WEST, shape);
+    }
+    private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) {
+        VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() };
+
+        int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4;
+        for (int i = 0; i < times; i++) {
+            buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX)));
+            buffer[0] = buffer[1];
+            buffer[1] = VoxelShapes.empty();
+        }
+
+        return buffer[0];
+    }
+    public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {
+        return !worldView.isAir(pos.north()) | !worldView.isAir(pos.east()) | !worldView.isAir(pos.south()) | !worldView.isAir(pos.west());
+    }
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new ShowerHeadBlockEntity(pos, state);
+    }
+    @Nullable
+    @Override
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+        return checkType(type, BlockEntities.ShowerHeadBlockEntity, ShowerHeadBlockEntity::tick);
+    }
+    @Override
+    public BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+
+}

src/main/java/eu/midnightdust/motschen/decorative/block/Sign.java

@@ -2,23 +2,14 @@ package eu.midnightdust.motschen.decorative.block;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.sound.BlockSoundGroup;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
-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.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
-import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
 public class Sign extends HorizontalFacingBlock {
@@ -44,13 +35,13 @@ public class Sign extends HorizontalFacingBlock {
     }
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
-        switch (state.get(FACING)) {
-            case NORTH: return NORTH_SHAPE;
-            case EAST: return EAST_SHAPE;
-            case SOUTH: return SOUTH_SHAPE;
-            case WEST: return WEST_SHAPE;
-            default: return super.getOutlineShape(state, view, pos, context);
-        }
+        return switch (state.get(FACING)) {
+            case NORTH -> NORTH_SHAPE;
+            case EAST -> EAST_SHAPE;
+            case SOUTH -> SOUTH_SHAPE;
+            case WEST -> WEST_SHAPE;
+            default -> super.getOutlineShape(state, view, pos, context);
+        };
     }
     static {
         VoxelShape shape = createCuboidShape(0, 0, 6.9, 16, 16, 9);

src/main/java/eu/midnightdust/motschen/decorative/block/SignPost.java

@@ -23,9 +23,7 @@ public class SignPost extends Block {
         return SHAPE;
     }
     static {
-        VoxelShape shape = createCuboidShape(7, 0, 7, 9, 16, 9);
-
-        SHAPE = shape;
+        SHAPE = createCuboidShape(7, 0, 7, 9, 16, 9);
     }
 
     public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {

src/main/java/eu/midnightdust/motschen/decorative/block/SlidingDoor.java

@@ -4,7 +4,6 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.block.enums.DoorHinge;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
@@ -17,7 +16,6 @@ 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;
 
 public class SlidingDoor extends DoorBlock {
 
@@ -45,16 +43,12 @@ public class SlidingDoor extends DoorBlock {
         state.get(FACING);
         boolean bl = !state.get(OPEN);
         boolean bl2 = state.get(HINGE) == DoorHinge.RIGHT;
-        switch(state.get(FACING)) {
-            default:
-                return bl ? WEST_SHAPE : (bl2 ? EAST_SHAPE_OPEN : WEST_SHAPE_OPEN);
-            case NORTH:
-                return bl ? NORTH_SHAPE : (bl2 ? SOUTH_SHAPE_OPEN : NORTH_SHAPE_OPEN);
-            case EAST:
-                return bl ? EAST_SHAPE : (bl2 ? WEST_SHAPE_OPEN : EAST_SHAPE_OPEN);
-            case SOUTH:
-                return bl ? SOUTH_SHAPE : (bl2 ? NORTH_SHAPE_OPEN : SOUTH_SHAPE_OPEN);
-        }
+        return switch (state.get(FACING)) {
+            default -> bl ? WEST_SHAPE : (bl2 ? EAST_SHAPE_OPEN : WEST_SHAPE_OPEN);
+            case NORTH -> bl ? NORTH_SHAPE : (bl2 ? SOUTH_SHAPE_OPEN : NORTH_SHAPE_OPEN);
+            case EAST -> bl ? EAST_SHAPE : (bl2 ? WEST_SHAPE_OPEN : EAST_SHAPE_OPEN);
+            case SOUTH -> bl ? SOUTH_SHAPE : (bl2 ? NORTH_SHAPE_OPEN : SOUTH_SHAPE_OPEN);
+        };
     }
     static {
         VoxelShape shape = createCuboidShape(0, 0, 7, 16, 16, 9);

src/main/java/eu/midnightdust/motschen/decorative/block/Springboard.java

@@ -0,0 +1,247 @@
+package eu.midnightdust.motschen.decorative.block;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.blockstates.Part;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.*;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.item.ItemStack;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.EnumProperty;
+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.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldView;
+
+import java.util.Objects;
+
+public class Springboard extends HorizontalFacingBlock {
+    private static final VoxelShape NORTH_SHAPE_FRONT;
+    private static final VoxelShape EAST_SHAPE_FRONT;
+    private static final VoxelShape SOUTH_SHAPE_FRONT;
+    private static final VoxelShape WEST_SHAPE_FRONT;
+    private static final VoxelShape NORTH_SHAPE_BACK;
+    private static final VoxelShape EAST_SHAPE_BACK;
+    private static final VoxelShape SOUTH_SHAPE_BACK;
+    private static final VoxelShape WEST_SHAPE_BACK;
+    private static final EnumProperty<Part> PART = DecorativeMain.PART;
+
+    public Springboard() {
+        super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(PART, Part.BACK));
+    }
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        ItemStack itemStack = player.getStackInHand(hand);
+        if (!world.isClient) {
+            if (itemStack.isEmpty() && hand==Hand.MAIN_HAND) {
+                if (state.get(PART) == Part.FRONT) {
+                    if (player.getY() >= pos.getY() + 0.1 && player.squaredDistanceTo(pos.getX(), pos.getY(), pos.getZ()) <= 1.0) {
+                        player.addStatusEffect(new StatusEffectInstance(StatusEffects.LEVITATION, 10, 10));
+                        return ActionResult.SUCCESS;
+                    }
+                }
+            }
+        }
+        return ActionResult.FAIL;
+    }
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+                .with(FACING, itemPlacementContext.getPlayerFacing())
+                .with(PART, Part.BACK);
+    }
+
+    @Override
+    public void onPlaced(World arg, BlockPos pos, BlockState state, LivingEntity arg4, ItemStack arg5) {
+        if (state.get(PART) == Part.BACK) {
+            switch (state.get(FACING)) {
+                case NORTH:
+                    if (!arg.getBlockState(pos.north()).isAir()) {
+                        arg.breakBlock(pos, true);
+                    } else {
+                        arg.setBlockState(pos.north(), state.with(PART, Part.FRONT).with(FACING, Direction.NORTH));
+                    }
+                    break;
+                case EAST:
+                    if (!arg.getBlockState(pos.east()).isAir()) {
+                        arg.breakBlock(pos, true);
+                    } else {
+                        arg.setBlockState(pos.east(), state.with(PART, Part.FRONT).with(FACING, Direction.EAST));
+                    }
+                    break;
+                case SOUTH:
+                    if (!arg.getBlockState(pos.south()).isAir()) {
+                        arg.breakBlock(pos, true);
+                    } else {
+                        arg.setBlockState(pos.south(), state.with(PART, Part.FRONT).with(FACING, Direction.SOUTH));
+                    }
+                    break;
+                case WEST:
+                    if (!arg.getBlockState(pos.west()).isAir()) {
+                        arg.breakBlock(pos, true);
+                    } else {
+                        arg.setBlockState(pos.west(), state.with(PART, Part.FRONT).with(FACING, Direction.WEST));
+                    }
+                    break;
+            }
+        }
+    }
+    @Override
+    public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
+        switch (state.get(PART)) {
+            case BACK: switch (state.get(FACING)) {
+                case NORTH:
+                    if (world.getBlockState(pos.north()).contains(PART)) {
+                        world.breakBlock(pos.north(), true);
+                        break;
+                    }
+                case EAST:
+                    if (world.getBlockState(pos.east()).contains(PART)) {
+                        world.breakBlock(pos.east(), true);
+                        break;
+                    }
+                case SOUTH:
+                    if (world.getBlockState(pos.south()).contains(PART)) {
+                        world.breakBlock(pos.south(), true);
+                        break;
+                    }
+                case WEST:
+                    if (world.getBlockState(pos.west()).contains(PART)) {
+                        world.breakBlock(pos.west(), true);
+                        break;
+                    }
+            }
+            case FRONT: switch (state.get(FACING)) {
+                case NORTH:
+                    if (world.getBlockState(pos.south()).contains(PART)) {
+                        world.breakBlock(pos.south(), true);
+                        break;
+                    }
+                case EAST:
+                    if (world.getBlockState(pos.west()).contains(PART)) {
+                        world.breakBlock(pos.west(), true);
+                        break;
+                    }
+                case SOUTH:
+                    if (world.getBlockState(pos.north()).contains(PART)) {
+                        world.breakBlock(pos.north(), true);
+                        break;
+                    }
+                case WEST:
+                    if (world.getBlockState(pos.east()).contains(PART)) {
+                        world.breakBlock(pos.east(), true);
+                        break;
+                    }
+            }
+        }
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(FACING);
+        builder.add(PART);
+    }
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        return switch (state.get(FACING)) {
+            case NORTH -> switch (state.get(PART)) {
+                case FRONT -> NORTH_SHAPE_FRONT;
+                case BACK -> NORTH_SHAPE_BACK;
+            };
+            case EAST -> switch (state.get(PART)) {
+                case FRONT -> EAST_SHAPE_FRONT;
+                case BACK -> EAST_SHAPE_BACK;
+            };
+            case SOUTH -> switch (state.get(PART)) {
+                case FRONT -> SOUTH_SHAPE_FRONT;
+                case BACK -> SOUTH_SHAPE_BACK;
+            };
+            case WEST -> switch (state.get(PART)) {
+                case FRONT -> WEST_SHAPE_FRONT;
+                case BACK -> WEST_SHAPE_BACK;
+            };
+            default -> super.getOutlineShape(state, view, pos, context);
+        };
+    }
+    static {
+        //long_plank
+        VoxelShape front1 = createCuboidShape(1, 2, 0, 15, 3, 28);
+        VoxelShape back1 = createCuboidShape(1, 2, -16, 15, 3, 12);
+        //plank-y
+        VoxelShape front2 = createCuboidShape(1, 1, 21, 15, 2, 30);
+        VoxelShape back2 = createCuboidShape(1, 1, 5, 15, 2, 14);
+        //plank--y
+        VoxelShape front3 = createCuboidShape(1, 0, 23, 15, 1, 32);
+        VoxelShape back3 = createCuboidShape(1, 0, 7, 15, 1, 16);
+        //lower_siding
+        VoxelShape front4left = createCuboidShape(0, 0, 8, 1, 1, 32);
+        VoxelShape back4left = createCuboidShape(0, 0, -8, 1, 1, 16);
+        VoxelShape front4right = createCuboidShape(15, 0, 8, 16, 1, 32);
+        VoxelShape back4right = createCuboidShape(15, 0, -8, 16, 1, 16);
+        //upper_siding
+        VoxelShape front5left = createCuboidShape(0, 6, 9, 1, 7, 31);
+        VoxelShape back5left = createCuboidShape(0, 6, -7, 1, 7, 15);
+        VoxelShape front5right = createCuboidShape(15, 6, 9, 16, 7, 31);
+        VoxelShape back5right = createCuboidShape(15, 6, -7, 16, 7, 15);
+        //siding_front
+        VoxelShape front6left = createCuboidShape(0, 1, 31, 1, 6, 32);
+        VoxelShape back6left = createCuboidShape(0, 1, 15, 1, 6, 16);
+        VoxelShape front6right = createCuboidShape(15, 1, 31, 16, 6, 32);
+        VoxelShape back6right = createCuboidShape(15, 1, 15, 16, 6, 16);
+        //siding_back
+        VoxelShape front7left = createCuboidShape(0, 1, 8, 1, 6, 9);
+        VoxelShape back7left = createCuboidShape(0, 1, -8, 1, 6, -7);
+        VoxelShape front7right = createCuboidShape(15, 1, 8, 16, 6, 9);
+        VoxelShape back7right = createCuboidShape(15, 1, -8, 16, 6, -7);
+        //dot_front
+        VoxelShape front8left = createCuboidShape(0, 5, 30, 1, 6, 31);
+        VoxelShape back8left = createCuboidShape(0, 5, 14, 1, 6, 15);
+        VoxelShape front8right = createCuboidShape(15, 5, 30, 16, 6, 31);
+        VoxelShape back8right = createCuboidShape(15, 5, 14, 16, 6, 15);
+        //dot_back
+        VoxelShape front9left = createCuboidShape(0, 5, 9, 1, 6, 10);
+        VoxelShape back9left = createCuboidShape(0, 5, -7, 1, 6, -6);
+        VoxelShape front9right = createCuboidShape(15, 5, 9, 16, 6, 10);
+        VoxelShape back9right = createCuboidShape(15, 5, -7, 16, 6, -6);
+        //union
+        VoxelShape front = VoxelShapes.union(front1, front2, front3, front4left, front4right, front5left, front5right, front6left, front6right, front7left, front7right, front8left, front8right, front9left, front9right);
+        VoxelShape back = VoxelShapes.union(back1, back2, back3, back4left, back4right, back5left, back5right, back6left, back6right, back7left, back7right, back8left, back8right, back9left, back9right);
+
+        NORTH_SHAPE_FRONT = front;
+        WEST_SHAPE_FRONT = rotate(Direction.EAST, Direction.NORTH, front);
+        EAST_SHAPE_FRONT = rotate(Direction.EAST, Direction.SOUTH, front);
+        SOUTH_SHAPE_FRONT = rotate(Direction.EAST, Direction.WEST, front);
+        NORTH_SHAPE_BACK = back;
+        WEST_SHAPE_BACK = rotate(Direction.EAST, Direction.NORTH, back);
+        EAST_SHAPE_BACK = rotate(Direction.EAST, Direction.SOUTH, back);
+        SOUTH_SHAPE_BACK = rotate(Direction.EAST, Direction.WEST, back);
+    }
+    private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) {
+        VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() };
+
+        int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4;
+        for (int i = 0; i < times; i++) {
+            buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX)));
+            buffer[0] = buffer[1];
+            buffer[1] = VoxelShapes.empty();
+        }
+
+        return buffer[0];
+    }
+
+    public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {
+        return !worldView.isAir(pos.down()) && worldView.getBlockState(pos.offset(state.get(FACING))) == Blocks.AIR.getDefaultState();
+    }
+
+}

src/main/java/eu/midnightdust/motschen/decorative/block/StonePath.java

@@ -0,0 +1,34 @@
+package eu.midnightdust.motschen.decorative.block;
+
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.*;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.state.StateManager;
+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.WorldView;
+
+public class StonePath extends Block {
+    private static final VoxelShape SHAPE;
+
+    public StonePath() {
+        super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE));
+    }
+
+    @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 worldView, BlockPos pos) {
+        return worldView.getBlockState(pos.down()).isSideSolidFullSquare(worldView,pos,Direction.UP);
+    }
+
+}

src/main/java/eu/midnightdust/motschen/decorative/block/Television.java

@@ -1,7 +1,7 @@
 package eu.midnightdust.motschen.decorative.block;
 
 import eu.midnightdust.motschen.decorative.DecorativeMain;
-import eu.midnightdust.motschen.decorative.Program;
+import eu.midnightdust.motschen.decorative.blockstates.Program;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.entity.player.PlayerEntity;
@@ -11,6 +11,7 @@ import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
 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;
@@ -22,6 +23,9 @@ import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
+import java.util.Objects;
+import java.util.function.ToIntFunction;
+
 public class Television extends HorizontalFacingBlock {
 
     private static final VoxelShape NORTH_SHAPE;
@@ -31,34 +35,44 @@ public class Television extends HorizontalFacingBlock {
     private static final EnumProperty<Program> PROGRAM = DecorativeMain.PROGRAM;
 
     public Television() {
-        super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE));
+        super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE).luminance(createLightLevelFromBlockState()));
         this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(PROGRAM, Program.OFF));
     }
 
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-            switch (state.get(PROGRAM)) {
-                case OFF: world.setBlockState(pos, state.with(PROGRAM, Program.NYANCAT));
-                    world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
-                    return ActionResult.SUCCESS;
-                case NYANCAT: world.setBlockState(pos, state.with(PROGRAM, Program.CREEPER));
-                    world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
-                    return ActionResult.SUCCESS;
-                case CREEPER: world.setBlockState(pos, state.with(PROGRAM, Program.WOODYS));
-                    world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
-                    return ActionResult.SUCCESS;
-                case WOODYS: world.setBlockState(pos, state.with(PROGRAM, Program.TATER));
-                    world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
-                    return ActionResult.SUCCESS;
-                case TATER: world.setBlockState(pos, state.with(PROGRAM, Program.OFF));
-                    world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
-                    return ActionResult.SUCCESS;
+        switch (state.get(PROGRAM)) {
+            case OFF -> {
+                world.setBlockState(pos, state.with(PROGRAM, Program.NYANCAT));
+                world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
+                return ActionResult.SUCCESS;
             }
+            case NYANCAT -> {
+                world.setBlockState(pos, state.with(PROGRAM, Program.CREEPER));
+                world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
+                return ActionResult.SUCCESS;
+            }
+            case CREEPER -> {
+                world.setBlockState(pos, state.with(PROGRAM, Program.CRABRAVE));
+                world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
+                return ActionResult.SUCCESS;
+            }
+            case CRABRAVE -> {
+                world.setBlockState(pos, state.with(PROGRAM, Program.TATER));
+                world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
+                return ActionResult.SUCCESS;
+            }
+            case TATER -> {
+                world.setBlockState(pos, state.with(PROGRAM, Program.OFF));
+                world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 1.5f);
+                return ActionResult.SUCCESS;
+            }
+        }
             return ActionResult.SUCCESS;
     }
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return super.getPlacementState(itemPlacementContext)
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
                 .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite())
                 .with(PROGRAM, Program.OFF);
     }
@@ -70,13 +84,13 @@ public class Television extends HorizontalFacingBlock {
     }
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
-        switch (state.get(FACING)) {
-            case NORTH: return NORTH_SHAPE;
-            case EAST: return EAST_SHAPE;
-            case SOUTH: return SOUTH_SHAPE;
-            case WEST: return WEST_SHAPE;
-            default: return super.getOutlineShape(state, view, pos, context);
-        }
+        return switch (state.get(FACING)) {
+            case NORTH -> NORTH_SHAPE;
+            case EAST -> EAST_SHAPE;
+            case SOUTH -> SOUTH_SHAPE;
+            case WEST -> WEST_SHAPE;
+            default -> super.getOutlineShape(state, view, pos, context);
+        };
     }
     static {
         VoxelShape shape = createCuboidShape(-7, 4, 7, 22, 22, 9);
@@ -102,4 +116,16 @@ public class Television extends HorizontalFacingBlock {
         return !worldView.isAir(pos.down());
     }
 
+    private static ToIntFunction<BlockState> createLightLevelFromBlockState() {
+        return (blockState) -> {
+            if (blockState.get(PROGRAM) == Program.OFF) {
+                return 0;
+            }
+            else {
+                return 11;
+            }
+        };
+    }
+
+
 }

src/main/java/eu/midnightdust/motschen/decorative/block/TrafficCone.java

@@ -2,23 +2,10 @@ package eu.midnightdust.motschen.decorative.block;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemPlacementContext;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.sound.BlockSoundGroup;
-import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
-import net.minecraft.state.StateManager;
-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.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
-import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
 public class TrafficCone extends Block {
@@ -33,9 +20,7 @@ public class TrafficCone extends Block {
         return SHAPE;
     }
     static {
-        VoxelShape shape = createCuboidShape(4, 0, 4, 12, 11.5, 12);
-
-        SHAPE = shape;
+        SHAPE = createCuboidShape(4, 0, 4, 12, 11.5, 12);
     }
 
     public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {

src/main/java/eu/midnightdust/motschen/decorative/block/WallClock.java

@@ -0,0 +1,91 @@
+package eu.midnightdust.motschen.decorative.block;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+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.DirectionProperty;
+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 org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+public class WallClock extends BlockWithEntity implements BlockEntityProvider {
+    private static final DirectionProperty FACING = HorizontalFacingBlock.FACING;
+    private static final VoxelShape NORTH_SHAPE;
+    private static final VoxelShape EAST_SHAPE;
+    private static final VoxelShape SOUTH_SHAPE;
+    private static final VoxelShape WEST_SHAPE;
+
+    public WallClock() {
+        super(FabricBlockSettings.copy(Blocks.SMOOTH_QUARTZ).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH));
+    }
+
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new WallClockBlockEntity(pos, state);
+    }
+    @Nullable
+    @Override
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+        return checkType(type, BlockEntities.WallClockBlockEntity, WallClockBlockEntity::tick);
+    }
+    @Override
+    public BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(FACING);
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+                .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite());
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        return switch (state.get(FACING)) {
+            case NORTH -> NORTH_SHAPE;
+            case EAST -> EAST_SHAPE;
+            case SOUTH -> SOUTH_SHAPE;
+            case WEST -> WEST_SHAPE;
+            default -> super.getOutlineShape(state, view, pos, context);
+        };
+    }
+    static {
+        VoxelShape shape = createCuboidShape(0, 0, 15, 16, 16, 16);
+
+        NORTH_SHAPE = shape;
+        WEST_SHAPE = rotate(Direction.NORTH, Direction.WEST, shape);
+        EAST_SHAPE = rotate(Direction.NORTH, Direction.EAST, shape);
+        SOUTH_SHAPE = rotate(Direction.NORTH, Direction.SOUTH, shape);
+    }
+    private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) {
+        VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() };
+
+        int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4;
+        for (int i = 0; i < times; i++) {
+            buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX)));
+            buffer[0] = buffer[1];
+            buffer[1] = VoxelShapes.empty();
+        }
+
+        return buffer[0];
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/WaterPump.java

@@ -2,18 +2,11 @@ package eu.midnightdust.motschen.decorative.block;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
-import net.minecraft.block.entity.BannerBlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.fluid.WaterFluid;
 import net.minecraft.item.*;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.potion.PotionUtil;
-import net.minecraft.potion.Potions;
-import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.stat.Stats;
 import net.minecraft.state.StateManager;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -26,6 +19,8 @@ import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
+import java.util.Objects;
+
 public class WaterPump extends HorizontalFacingBlock {
     private static final VoxelShape NORTH_SHAPE;
     private static final VoxelShape EAST_SHAPE;
@@ -38,33 +33,22 @@ public class WaterPump extends HorizontalFacingBlock {
     }
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
         ItemStack itemStack = player.getStackInHand(hand);
-        if (!itemStack.isEmpty()) {
+        if (!itemStack.isEmpty() && hand==Hand.MAIN_HAND) {
             if (itemStack.getItem() == Items.BUCKET) {
                 if (!world.isClient) {
-                    if (!player.abilities.creativeMode) {
-                        itemStack.decrement(1);
-                        if (itemStack.isEmpty()) {
-                            player.setStackInHand(hand, new ItemStack(Items.WATER_BUCKET));
-                        } else if (!player.inventory.insertStack(new ItemStack(Items.WATER_BUCKET))) {
-                            player.dropItem(new ItemStack(Items.WATER_BUCKET), false);
-                        }
-                    }
+                    ItemUsage.exchangeStack(itemStack, player, new ItemStack(Items.BUCKET));
                     world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
                 }
                 return ActionResult.SUCCESS;
             }
-            else {
-                return ActionResult.PASS;
-            }
-        }
-        if (itemStack.isEmpty()) {
             return ActionResult.PASS;
-        } return ActionResult.PASS;
+        }
+        return ActionResult.PASS;
     }
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return super.getPlacementState(itemPlacementContext)
+        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
                 .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite());
     }
 
@@ -74,13 +58,13 @@ public class WaterPump extends HorizontalFacingBlock {
     }
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
-        switch (state.get(FACING)) {
-            case NORTH: return NORTH_SHAPE;
-            case EAST: return EAST_SHAPE;
-            case SOUTH: return SOUTH_SHAPE;
-            case WEST: return WEST_SHAPE;
-            default: return super.getOutlineShape(state, view, pos, context);
-        }
+        return switch (state.get(FACING)) {
+            case NORTH -> NORTH_SHAPE;
+            case EAST -> EAST_SHAPE;
+            case SOUTH -> SOUTH_SHAPE;
+            case WEST -> WEST_SHAPE;
+            default -> super.getOutlineShape(state, view, pos, context);
+        };
     }
     static {
         VoxelShape shape = createCuboidShape(4.25, 0, 0, 11.75, 24, 14);

src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/CeilingFanBlockEntity.java

@@ -0,0 +1,52 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage;
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.BrewingStandBlock;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.BrewingStandBlockEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import java.time.LocalTime;
+
+public class CeilingFanBlockEntity extends BlockEntity {
+    private int rot;
+    private int second;
+
+    public CeilingFanBlockEntity(BlockPos pos, BlockState state) {
+        super(BlockEntities.CeilingFanBlockEntity, pos, state);
+    }
+
+    public static void tick(World world, BlockPos pos, BlockState state, CeilingFanBlockEntity blockEntity) {
+        if (state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_1) {
+            if (LocalTime.now().getSecond() != blockEntity.second) {
+                blockEntity.second = LocalTime.now().getSecond();
+                world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.1f, 1.0f);
+            }
+            blockEntity.rot = blockEntity.rot + 6;
+        }
+        else if (state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_2) {
+            if (LocalTime.now().getSecond() != blockEntity.second) {
+                blockEntity.second = LocalTime.now().getSecond();
+                world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.2f, 1.0f);
+            }
+            blockEntity.rot = blockEntity.rot + 10;
+        }
+        else if (state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_3) {
+            if (LocalTime.now().getSecond() != blockEntity.second) {
+                blockEntity.second = LocalTime.now().getSecond();
+                world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.3f, 1.0f);
+            }
+
+            blockEntity.rot = blockEntity.rot + 14;
+        }
+    }
+    public int getRot() {
+        return rot;
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ChoppingLogBlockEntity.java

@@ -0,0 +1,53 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.HorizontalFacingBlock;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.JukeboxBlockEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+
+public class ChoppingLogBlockEntity extends BlockEntity {
+    private int facing;
+    private double axe_x;
+    private double axe_z;
+
+    public ChoppingLogBlockEntity(BlockPos pos, BlockState state) {
+        super(BlockEntities.ChoppingLogBlockEntity, pos, state);
+    }
+
+    public static void tick(World world, BlockPos pos, BlockState state, ChoppingLogBlockEntity blockEntity) {
+        if (state.get(HorizontalFacingBlock.FACING) == Direction.EAST) {
+            blockEntity.facing = 180;
+            blockEntity.axe_x = 0.2D;
+            blockEntity.axe_z = 0.5D;
+        }
+        else if (state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) {
+            blockEntity.facing = 90;
+            blockEntity.axe_x = 0.5D;
+            blockEntity.axe_z = 0.2D;
+        }
+        else if (state.get(HorizontalFacingBlock.FACING) == Direction.WEST) {
+            blockEntity.facing = 0;
+            blockEntity.axe_x = 0.8D;
+            blockEntity.axe_z = 0.5D;
+        }
+        else {
+            blockEntity.facing = 270;
+            blockEntity.axe_x = 0.5D;
+            blockEntity.axe_z = 0.8D;
+        }
+    }
+
+    public int getFacing() {
+        return facing;
+    }
+    public double getAxeX() {
+        return axe_x;
+    }
+    public double getAxeZ() {
+        return axe_z;
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/DigitalClockBlockEntity.java

@@ -0,0 +1,63 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.HorizontalFacingBlock;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import java.time.LocalTime;
+
+public class DigitalClockBlockEntity extends BlockEntity {
+    private int facing;
+    private double x;
+    private double z;
+    private int second;
+
+    public DigitalClockBlockEntity(BlockPos pos, BlockState state) {
+        super(BlockEntities.DigitalClockBlockEntity, pos, state);
+    }
+
+    public static void tick(World world, BlockPos pos, BlockState state, DigitalClockBlockEntity blockEntity) {
+        if (LocalTime.now().getSecond() != blockEntity.second) {
+            blockEntity.second = LocalTime.now().getSecond();
+        }
+        switch (state.get(HorizontalFacingBlock.FACING)) {
+            case NORTH: {
+                blockEntity.facing = 0;
+                blockEntity.x = 0.825;
+                blockEntity.z = 0.374;
+                break;
+            }
+            case EAST:{
+                blockEntity.facing = 270;
+                blockEntity.x = 0.626;
+                blockEntity.z = 0.825;
+                break;
+            }
+            case SOUTH:{
+                blockEntity.facing = 180;
+                blockEntity.x = 0.175;
+                blockEntity.z = 0.626;
+                break;
+            }
+            case WEST:{
+                blockEntity.facing = 90;
+                blockEntity.x = 0.374;
+                blockEntity.z = 0.175;
+                break;
+            }
+            default: break;
+        }
+    }
+    public int getFacing() {
+        return facing;
+    }
+    public double getX() {
+        return x;
+    }
+    public double getZ() {
+        return z;
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/PoolSprinklerBlockEntity.java

@@ -0,0 +1,28 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.block.PoolSprinkler;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public class PoolSprinklerBlockEntity extends BlockEntity {
+
+    public PoolSprinklerBlockEntity(BlockPos pos, BlockState state) {
+        super(BlockEntities.PoolSprinklerBlockEntity, pos, state);
+    }
+
+    public static void tick(World world, BlockPos pos, BlockState state, PoolSprinklerBlockEntity blockEntity) {
+        if (state.get(PoolSprinkler.POWERED)) {
+            switch (state.get(PoolSprinkler.FACING)) {
+                case NORTH: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() - 0.34, 1, 1, 1); break;
+                case EAST: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 1.34, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); break;
+                case SOUTH: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 1.34, 1, 1, 1); break;
+                case WEST: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() - 0.34, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); break;
+                default: break;
+            }
+        }
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/ShowerHeadBlockEntity.java

@@ -0,0 +1,29 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.block.PoolSprinkler;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public class ShowerHeadBlockEntity extends BlockEntity {
+
+    public ShowerHeadBlockEntity(BlockPos pos, BlockState state) {
+        super(BlockEntities.ShowerHeadBlockEntity, pos, state);
+    }
+
+    public static void tick(World world, BlockPos pos, BlockState state, ShowerHeadBlockEntity blockEntity) {
+        if (state.get(PoolSprinkler.POWERED)) {
+            switch (state.get(PoolSprinkler.FACING)) {
+                case NORTH: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.625, 1, 1, 1); break;
+                case EAST: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.375, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); break;
+                case SOUTH: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.375, 1, 1, 1); break;
+                case WEST: world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.625, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1); break;
+                default: break;
+            }
+        }
+
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/blockentity/WallClockBlockEntity.java

@@ -0,0 +1,59 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.HorizontalFacingBlock;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+
+import java.time.LocalTime;
+
+public class WallClockBlockEntity extends BlockEntity {
+    public int facing;
+    public double x;
+    public double z;
+    public int second;
+
+    public WallClockBlockEntity(BlockPos pos, BlockState state) {
+        super(BlockEntities.WallClockBlockEntity, pos, state);
+    }
+
+    public static void tick(World world, BlockPos pos, BlockState state, WallClockBlockEntity blockEntity) {
+        if (LocalTime.now().getSecond() != blockEntity.second) {
+            blockEntity.second = LocalTime.now().getSecond();
+            world.playSound(null, pos, SoundEvents.BLOCK_WOODEN_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.04f, 1f);
+        }
+
+        switch (state.get(HorizontalFacingBlock.FACING)) {
+            case NORTH: {
+                blockEntity.facing = 0;
+                blockEntity.x = 0.5;
+                blockEntity.z = 0.95;
+                break;
+            }
+            case EAST: {
+                blockEntity.facing = 270;
+                blockEntity.x = 0.05;
+                blockEntity.z = 0.5;
+                break;
+            }
+            case SOUTH: {
+                blockEntity.facing = 180;
+                blockEntity.x = 0.5;
+                blockEntity.z = 0.05;
+                break;
+            }
+            case WEST: {
+                blockEntity.facing = 90;
+                blockEntity.x = 0.95;
+                blockEntity.z = 0.5;
+                break;
+            }
+            default: break;
+        }
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/render/CeilingFanRenderer.java

@@ -0,0 +1,40 @@
+package eu.midnightdust.motschen.decorative.block.render;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.CeilingFanBlockEntity;
+import eu.midnightdust.motschen.decorative.block.render.model.CeilingFanBladesModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.render.OverlayTexture;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Vec3f;
+
+@Environment(EnvType.CLIENT)
+public class CeilingFanRenderer implements BlockEntityRenderer<CeilingFanBlockEntity> {
+    private final CeilingFanBladesModel blades;
+
+    public CeilingFanRenderer(BlockEntityRendererFactory.Context ctx) {
+        blades = new CeilingFanBladesModel(ctx.getLayerModelPart(CeilingFanBladesModel.CEILING_FAN_MODEL_LAYER));
+    }
+
+    @Override
+    public boolean rendersOutsideBoundingBox(CeilingFanBlockEntity blockEntity) {
+        return true;
+    }
+
+
+    @Override
+    public void render(CeilingFanBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+        matrices.push();
+        VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("decorative:textures/block/ceilingfan.png")));
+        matrices.translate(0.5,0.31,0.5);
+        matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getRot()));
+        blades.render(matrices, vertexConsumer, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
+        matrices.pop();
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/render/ChoppingLogBlockEntityRenderer.java

@@ -0,0 +1,40 @@
+package eu.midnightdust.motschen.decorative.block.render;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.ChoppingLogBlockEntity;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.*;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
+import net.minecraft.client.render.model.json.ModelTransformation;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.util.math.Vec3f;
+
+import java.util.Objects;
+
+@Environment(EnvType.CLIENT)
+public class ChoppingLogBlockEntityRenderer implements BlockEntityRenderer<ChoppingLogBlockEntity> {
+
+    public ChoppingLogBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
+    }
+
+    @Override
+    public boolean rendersOutsideBoundingBox(ChoppingLogBlockEntity blockEntity) {
+        return true;
+    }
+
+    @Override
+    public void render(ChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+        matrices.push();
+        int lightAbove = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(blockEntity.getWorld()), blockEntity.getPos().up());
+        matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ());
+        matrices.scale(2.5f,2.5f,2.5f);
+        matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing()));
+        matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(160));
+        MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE), ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers, 0);
+        matrices.pop();
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/render/DigitalClockRenderer.java

@@ -0,0 +1,77 @@
+package eu.midnightdust.motschen.decorative.block.render;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.block.blockentity.DigitalClockBlockEntity;
+import eu.midnightdust.motschen.decorative.config.DecorativeConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.render.*;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.Vec3f;
+
+import java.time.LocalTime;
+
+@Environment(EnvType.CLIENT)
+public class DigitalClockRenderer implements BlockEntityRenderer<DigitalClockBlockEntity> {
+    private final TextRenderer textRenderer;
+
+    public DigitalClockRenderer(BlockEntityRendererFactory.Context ctx) {
+        textRenderer = ctx.getTextRenderer();
+    }
+
+    private int getHour12hFormat() {
+        int hour;
+        hour = LocalTime.now().getHour();
+        if (hour > 12) {
+            hour = hour - 12;
+        }
+        return hour;
+    }
+    private String getTime() {
+        String hour;
+        String minute;
+
+        // Hour
+        if (DecorativeConfig.timeFormat.equals(DecorativeConfig.TimeFormat.h12)) {
+            if (getHour12hFormat() <= 9) {
+                hour = "0" + getHour12hFormat();
+            } else {
+                hour = "" + getHour12hFormat();
+            }
+        }
+        else {
+            if (LocalTime.now().getHour() <= 9) {
+                hour = "0" + LocalTime.now().getHour();
+            } else {
+                hour = "" + LocalTime.now().getHour();
+            }
+        }
+
+        // Minute
+        if (LocalTime.now().getMinute() <= 9) {
+            minute = "0" + LocalTime.now().getMinute();
+        }
+        else {
+            minute = "" + LocalTime.now().getMinute();
+        }
+
+        return hour +":"+ minute;
+    }
+
+
+    @Override
+    public void render(DigitalClockBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+        matrices.push();
+        matrices.translate(blockEntity.getX(),0.35,blockEntity.getZ());
+
+        matrices.scale(0.025f, 0.025f, 0.025f);
+        matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing()));
+        matrices.translate(0,0,-0.1);
+        matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(180));
+        textRenderer.draw(getTime(), 0, 0, 16382457, false, matrices.peek().getModel(), vertexConsumers, false, 0, light);
+        matrices.pop();
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/render/WallClockRenderer.java

@@ -0,0 +1,58 @@
+package eu.midnightdust.motschen.decorative.block.render;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity;
+import eu.midnightdust.motschen.decorative.block.render.model.WallClockHandsModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.render.*;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Vec3f;
+
+import java.time.LocalTime;
+
+@Environment(EnvType.CLIENT)
+public class WallClockRenderer implements BlockEntityRenderer<WallClockBlockEntity> {
+    private final WallClockHandsModel handsModel;
+
+    public WallClockRenderer(BlockEntityRendererFactory.Context ctx) {
+        handsModel = new WallClockHandsModel(ctx.getLayerModelPart(WallClockHandsModel.CLOCK_HANDS_MODEL_LAYER));
+    }
+
+    private int getHour12hFormat() {
+        int hour;
+        hour = LocalTime.now().getHour();
+        if (hour >= 12) {
+            hour = hour - 12;
+        }
+        return hour;
+    }
+
+    @Override
+    public void render(WallClockBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+        VertexConsumer vertex = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("textures/block/red_concrete.png")));
+
+        matrices.push();
+        matrices.translate(blockEntity.x,0.5,blockEntity.z);
+        matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.facing));
+        matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(LocalTime.now().getSecond() * 6));
+        handsModel.seconds.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
+        matrices.pop();
+
+        matrices.push();
+        matrices.translate(blockEntity.x,0.5,blockEntity.z);
+        matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.facing));
+        matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(LocalTime.now().getMinute() * 6));
+        handsModel.minutes.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, 0.0F, 0.0F, 0.0F, 1.0F);
+        matrices.pop();
+
+        matrices.push();
+        matrices.translate(blockEntity.x,0.5,blockEntity.z);
+        matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.facing));
+        matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(getHour12hFormat() * 30));
+        handsModel.hours.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, 0.0F, 0.0F, 0.0F, 1.0F);
+        matrices.pop();
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/render/model/CeilingFanBladesModel.java

@@ -0,0 +1,42 @@
+package eu.midnightdust.motschen.decorative.block.render.model;
+
+import net.minecraft.client.model.*;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.entity.model.EntityModelLayer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+
+public class CeilingFanBladesModel extends Model {
+    private final ModelPart blades;
+    public static final EntityModelLayer CEILING_FAN_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "ceiling_fan"), "main");
+
+    public CeilingFanBladesModel(ModelPart root) {
+        super(RenderLayer::getEntitySolid);
+        blades = root;
+        blades.setPivot(0.0F, 0.0F, 0.0F);
+    }
+    public ModelPart getPart() {
+        return blades;
+    }
+
+    public static TexturedModelData getTexturedModelData() {
+        return TexturedModelData.of(getModelData(), 64, 64);
+    }
+
+    public static ModelData getModelData() {
+        ModelData modelData = new ModelData();
+        ModelPartData modelPartData = modelData.getRoot();
+        modelPartData.addChild("blade1", ModelPartBuilder.create().cuboid(-1.0F, 0.0F, 1.0F, 2.0F, 1.0F, 10.0F), ModelTransform.NONE);
+        modelPartData.addChild("blade2", ModelPartBuilder.create().cuboid(-1.0F, 0.0F, -11.0F, 2.0F, 1.0F, 10.0F), ModelTransform.NONE);
+        modelPartData.addChild("blade3", ModelPartBuilder.create().cuboid(1.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F), ModelTransform.NONE);
+        modelPartData.addChild("blade4", ModelPartBuilder.create().cuboid(-11.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F), ModelTransform.NONE);
+        modelPartData.addChild("point", ModelPartBuilder.create().uv(32,0).cuboid(-1.0F, -1.0F, -1.0F, 2.0F, 2.0F, 2.0F), ModelTransform.NONE);
+        return modelData;
+    }
+
+    @Override
+    public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) {
+        blades.render(matrices, vertices, light, overlay, red, green, blue, alpha);
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/block/render/model/WallClockHandsModel.java

@@ -0,0 +1,47 @@
+package eu.midnightdust.motschen.decorative.block.render.model;
+
+import net.minecraft.client.model.*;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.entity.model.EntityModelLayer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+
+public class WallClockHandsModel extends Model {
+    private final ModelPart hands;
+    public final ModelPart seconds;
+    public final ModelPart minutes;
+    public final ModelPart hours;
+    public static final EntityModelLayer CLOCK_HANDS_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "clock_hands"), "main");
+
+    public WallClockHandsModel(ModelPart root) {
+        super(RenderLayer::getEntitySolid);
+        hands = root;
+        hands.setPivot(0.0F, 0.0F, 0.0F);
+
+        seconds = hands.getChild("seconds");//new ModelPart(16, 16, 8, 0);
+        minutes = hands.getChild("minutes");//new ModelPart(16, 16, 0, 0);
+        hours = hands.getChild("hours");//new ModelPart(16, 16, 0, 0);
+    }
+    public ModelPart getPart() {
+        return hands;
+    }
+
+    public static TexturedModelData getTexturedModelData() {
+        return TexturedModelData.of(getModelData(), 16, 16);
+    }
+
+    public static ModelData getModelData(){
+        ModelData modelData = new ModelData();
+        ModelPartData modelPartData = modelData.getRoot();
+        modelPartData.addChild("seconds", ModelPartBuilder.create().uv(0, 0).cuboid(-0.175F, 0.0F, 0.01F, 0.25F, 7.0F, 0.2F), ModelTransform.NONE);
+        modelPartData.addChild("minutes", ModelPartBuilder.create().uv(0, 0).cuboid(-0.25F, 0.0F, 0.0F, 0.5F, 6.0F, 0.2F), ModelTransform.NONE);
+        modelPartData.addChild("hours", ModelPartBuilder.create().uv(0, 0).cuboid(-0.25F, 0.0F, 0.0F, 0.5F, 4.0F, 0.2F), ModelTransform.NONE);
+        return modelData;
+    }
+
+    @Override
+    public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) {
+        hands.render(matrices, vertices, light, overlay, red, green, blue, alpha);
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/blockstates/CeilingFanStage.java

@@ -0,0 +1,24 @@
+package eu.midnightdust.motschen.decorative.blockstates;
+
+import net.minecraft.util.StringIdentifiable;
+
+public enum CeilingFanStage implements StringIdentifiable {
+    OFF("off"),
+    LEVEL_1("level1"),
+    LEVEL_2("level2"),
+    LEVEL_3("level3");
+
+    private final String name;
+
+    CeilingFanStage(String name) {
+        this.name = name;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+
+    public String asString() {
+        return this.name;
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/blockstates/Part.java

@@ -0,0 +1,22 @@
+package eu.midnightdust.motschen.decorative.blockstates;
+
+import net.minecraft.util.StringIdentifiable;
+
+public enum Part implements StringIdentifiable {
+    FRONT("front"),
+    BACK("back");
+
+    private final String name;
+
+    Part(String name) {
+        this.name = name;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+
+    public String asString() {
+        return this.name;
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/blockstates/PoolShape.java

@@ -0,0 +1,23 @@
+package eu.midnightdust.motschen.decorative.blockstates;
+
+import net.minecraft.util.StringIdentifiable;
+
+public enum PoolShape implements StringIdentifiable {
+    STRAIGHT("straight"),
+    INNER_LEFT("inner_left"),
+    INNER_RIGHT("inner_right");
+
+    private final String name;
+
+    PoolShape(String name) {
+        this.name = name;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+
+    public String asString() {
+        return this.name;
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/blockstates/Program.java

@@ -1,4 +1,4 @@
-package eu.midnightdust.motschen.decorative;
+package eu.midnightdust.motschen.decorative.blockstates;
 
 import net.minecraft.util.StringIdentifiable;
 
@@ -6,7 +6,7 @@ public enum Program implements StringIdentifiable {
     OFF("off"),
     NYANCAT("nyancat"),
     CREEPER("creeper"),
-    WOODYS("woodys"),
+    CRABRAVE("crabrave"),
     TATER("tater");
 
     private final String name;

src/main/java/eu/midnightdust/motschen/decorative/config/DecorativeConfig.java

@@ -0,0 +1,13 @@
+package eu.midnightdust.motschen.decorative.config;
+
+import eu.midnightdust.lib.config.MidnightConfig;
+
+import java.util.TimeZone;
+
+public class DecorativeConfig extends MidnightConfig {
+    @Entry public static TimeFormat timeFormat = TimeZone.getDefault().useDaylightTime() ? TimeFormat.h12 : TimeFormat.h24;
+
+    public enum TimeFormat {
+        h12, h24
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/config/ModMenuIntegration.java

@@ -0,0 +1,16 @@
+package eu.midnightdust.motschen.decorative.config;
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+
+@Environment(EnvType.CLIENT)
+public class ModMenuIntegration implements ModMenuApi {
+
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return parent -> MidnightConfig.getScreen(parent,"decorative");
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/entity/BathTireEntity.java

@@ -0,0 +1,124 @@
+package eu.midnightdust.motschen.decorative.entity;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.passive.PigEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.fluid.Fluid;
+import net.minecraft.item.ItemStack;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.tag.Tag;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+
+public class BathTireEntity extends PigEntity {
+    public BathTireEntity(EntityType<? extends PigEntity> entityType, World world) {
+        super(entityType, world);
+    }
+
+    @Override
+    protected SoundEvent getAmbientSound() {
+        return null;
+    }
+
+    @Override
+    protected SoundEvent getHurtSound(DamageSource source) {
+        return null;
+    }
+
+    @Override
+    protected SoundEvent getDeathSound() {
+        return null;
+    }
+
+    protected void playStepSound(BlockPos pos, BlockState state) {
+    }
+
+    @Override
+    public boolean canEat() {
+        return false;
+    }
+
+    @Override
+    protected void swimUpward(Tag<Fluid> fluid) {
+        if (this.getNavigation().canSwim()) {
+            super.swimUpward(fluid);
+        } else {
+            this.setVelocity(this.getVelocity().add(0.0D, 0.7D, 0.0D));
+        }
+
+    }
+
+    @Override
+    public double getHeightOffset() {
+        return 0.0D;
+    }
+
+    @Override
+    public boolean canWalkOnFluid(Fluid fluid) {
+        return true;
+    }
+
+    @Override
+    public float getSaddledSpeed() {
+        return 0;
+    }
+
+    @Override
+    protected void initGoals() { }
+
+    @Override
+    public boolean canBeRiddenInWater() {
+        return true;
+    }
+
+    @Override
+    protected int computeFallDamage(float fallDistance, float damageMultiplier) {
+        return 0;
+    }
+
+    @Override
+    public boolean cannotDespawn() {
+        return true;
+    }
+
+    @Override
+    protected boolean movesIndependently() {
+        return false;
+    }
+
+    @Override
+    public boolean canMoveVoluntarily() {
+        return false;
+    }
+
+    @Override
+    public boolean canBeControlledByRider() {
+        return true;
+    }
+
+    @Override
+    public ActionResult interactAt(PlayerEntity player, Vec3d hitPos, Hand hand) {
+        if(!player.getEntityWorld().isClient && player.getStackInHand(hand)== ItemStack.EMPTY && hand==Hand.MAIN_HAND)
+        {
+            player.startRiding(this,true);
+            return ActionResult.SUCCESS;
+        }
+        return ActionResult.FAIL;
+    }
+
+    @Override
+    public void updatePassengerPosition(Entity passenger) {
+        if(this.getPrimaryPassenger() instanceof PlayerEntity)
+        {
+            passenger.updatePosition(this.getX(),this.getY(),this.getZ());
+        }
+    }
+
+
+}

src/main/java/eu/midnightdust/motschen/decorative/entity/BeachBallEntity.java

@@ -0,0 +1,121 @@
+package eu.midnightdust.motschen.decorative.entity;
+
+import eu.midnightdust.motschen.decorative.init.Pool;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.passive.PigEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.fluid.Fluid;
+import net.minecraft.item.ItemStack;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.tag.Tag;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+
+public class BeachBallEntity extends PigEntity {
+    public BeachBallEntity(EntityType<? extends PigEntity> entityType, World world) {
+        super(entityType, world);
+    }
+
+    @Override
+    protected SoundEvent getAmbientSound() {
+        return null;
+    }
+
+    @Override
+    protected SoundEvent getHurtSound(DamageSource source) {
+        return null;
+    }
+
+    @Override
+    protected SoundEvent getDeathSound() {
+        return null;
+    }
+
+    protected void playStepSound(BlockPos pos, BlockState state) {
+    }
+
+    @Override
+    public boolean canEat() {
+        return false;
+    }
+
+    @Override
+    protected void swimUpward(Tag<Fluid> fluid) {
+            this.setVelocity(this.getVelocity().add(0.0D, 1.0D, 0.0D));
+    }
+
+    @Override
+    public double getHeightOffset() {
+        return 0.0D;
+    }
+
+    @Override
+    public boolean canWalkOnFluid(Fluid fluid) {
+        return true;
+    }
+
+    @Override
+    public float getSaddledSpeed() {
+        return 0;
+    }
+
+    @Override
+    protected void initGoals() { }
+
+    @Override
+    public boolean canBeRiddenInWater() {
+        return true;
+    }
+
+    @Override
+    protected int computeFallDamage(float fallDistance, float damageMultiplier) {
+        return 0;
+    }
+
+    @Override
+    public boolean cannotDespawn() {
+        return true;
+    }
+
+    @Override
+    protected boolean movesIndependently() {
+        return false;
+    }
+
+    @Override
+    public boolean canMoveVoluntarily() {
+        return false;
+    }
+
+    @Override
+    public boolean canBeControlledByRider() {
+        return true;
+    }
+
+    @Override
+    public ActionResult interactAt(PlayerEntity player, Vec3d hitPos, Hand hand) {
+        if(!player.getEntityWorld().isClient && player.getStackInHand(hand)== ItemStack.EMPTY && hand==Hand.MAIN_HAND && player.isSneaking())
+        {
+            this.remove(RemovalReason.DISCARDED);
+            player.setStackInHand(hand, new ItemStack(Pool.BEACH_BALL_ITEM));
+            return ActionResult.SUCCESS;
+        }
+        return ActionResult.FAIL;
+    }
+
+    @Override
+    public void updatePassengerPosition(Entity passenger) {
+        if(this.getPrimaryPassenger() instanceof PlayerEntity)
+        {
+            passenger.updatePosition(this.getX(),this.getY(),this.getZ());
+        }
+    }
+
+
+}

src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BathTireModel.java

@@ -0,0 +1,44 @@
+package eu.midnightdust.motschen.decorative.entity.client.model;
+
+import eu.midnightdust.motschen.decorative.entity.BathTireEntity;
+import net.minecraft.client.model.*;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.entity.model.EntityModel;
+import net.minecraft.client.render.entity.model.EntityModelLayer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+
+public class BathTireModel extends EntityModel<BathTireEntity> {
+	private final ModelPart body;
+	public static final EntityModelLayer BATH_TIRE_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "bath_tire"), "main");
+
+	public BathTireModel(ModelPart root) {
+		super(RenderLayer::getEntitySolid);
+		body = root;
+		body.setPivot(0.0F, 24.0F, 0.0F);
+	}
+
+	public static TexturedModelData getTexturedModelData() {
+		return TexturedModelData.of(getModelData(), 16, 16);
+	}
+
+	public static ModelData getModelData(){
+		ModelData modelData = new ModelData();
+		ModelPartData modelPartData = modelData.getRoot();
+		modelPartData.addChild("cube1", ModelPartBuilder.create().cuboid(6.0F, -9.0F, -11.0F, 4.0F, 4.0F, 16.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube2", ModelPartBuilder.create().cuboid(-10.0F, -9.0F, -11.0F, 4.0F, 4.0F, 16.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube3", ModelPartBuilder.create().cuboid(-8.0F, -8.99F, -13.0F, 16.0F, 4.0F, 4.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube4", ModelPartBuilder.create().cuboid(-8.0F, -8.99F, 3.0F, 16.0F, 4.0F, 4.0F), ModelTransform.NONE);
+		return modelData;
+	}
+
+	@Override
+	public void setAngles(BathTireEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch){
+	}
+
+	@Override
+	public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
+		body.render(matrixStack, buffer, packedLight, packedOverlay);
+	}
+}

src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/BeachBallModel.java

@@ -0,0 +1,48 @@
+package eu.midnightdust.motschen.decorative.entity.client.model;
+
+import eu.midnightdust.motschen.decorative.entity.BeachBallEntity;
+import net.minecraft.client.model.*;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.entity.model.EntityModel;
+import net.minecraft.client.render.entity.model.EntityModelLayer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+
+public class BeachBallModel extends EntityModel<BeachBallEntity> {
+	private final ModelPart body;
+	public static final EntityModelLayer BEACH_BALL_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "beach_ball"), "main");
+
+	public BeachBallModel(ModelPart root) {
+		super(RenderLayer::getEntitySolid);
+		body = root;
+		body.setPivot(0.0F, 20.0F, 0.0F);
+	}
+
+	public static TexturedModelData getTexturedModelData() {
+		return TexturedModelData.of(getModelData(), 64, 64);
+	}
+
+	public static ModelData getModelData(){
+		ModelData modelData = new ModelData();
+		ModelPartData modelPartData = modelData.getRoot();
+		modelPartData.addChild("cube1", ModelPartBuilder.create().uv(0, 22).cuboid(-4.0F, -1.0F, -4.0F, 8.0F, 1.0F, 8.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube2", ModelPartBuilder.create().uv(0, 22).cuboid(-4.0F, -12.0F, -4.0F, 8.0F, 1.0F, 8.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube3", ModelPartBuilder.create().uv(0, 48).cuboid(-6.0F, -10.0F, -4.0F, 1.0F, 8.0F, 8.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube4", ModelPartBuilder.create().uv(20, 48).cuboid(5.0F, -10.0F, -4.0F, 1.0F, 8.0F, 8.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube5", ModelPartBuilder.create().uv(0, 33).cuboid(-4.0F, -10.0F, -6.0F, 8.0F, 8.0F, 1.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube6", ModelPartBuilder.create().uv(20, 33).cuboid(-4.0F, -10.0F, 5.0F, 8.0F, 8.0F, 1.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube7", ModelPartBuilder.create().uv(0,0).cuboid(-5.0F, -11.0F, -5.0F, 10.0F, 10.0F, 10.0F), ModelTransform.NONE);
+		return modelData;
+	}
+
+	@Override
+	public void setAngles(BeachBallEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch){
+		//previously the render function, render code was moved to a method below
+	}
+
+	@Override
+	public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
+		body.render(matrixStack, buffer, packedLight, packedOverlay);
+	}
+}

src/main/java/eu/midnightdust/motschen/decorative/entity/client/model/DuckBathTireModel.java

@@ -0,0 +1,53 @@
+package eu.midnightdust.motschen.decorative.entity.client.model;
+
+import eu.midnightdust.motschen.decorative.entity.BathTireEntity;
+import net.minecraft.client.model.*;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.entity.model.EntityModel;
+import net.minecraft.client.render.entity.model.EntityModelLayer;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+
+public class DuckBathTireModel extends EntityModel<BathTireEntity> {
+	private final ModelPart body;
+	public static final EntityModelLayer DUCK_BATH_TIRE_MODEL_LAYER = new EntityModelLayer(new Identifier("decorative", "duck_bath_tire"), "main");
+
+	public DuckBathTireModel(ModelPart root) {
+		super(RenderLayer::getEntitySolid);
+		body = root;
+		body.setPivot(0.0F, 20.0F, 0.0F);
+	}
+
+	public static TexturedModelData getTexturedModelData() {
+		return TexturedModelData.of(getModelData(), 64, 64);
+	}
+
+	public static ModelData getModelData(){
+		ModelData modelData = new ModelData();
+		ModelPartData modelPartData = modelData.getRoot();
+		modelPartData.addChild("cube1", ModelPartBuilder.create().uv(0, 9).cuboid(6.0F, -3.0F, -8.0F, 4.0F, 3.0F, 16.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube2", ModelPartBuilder.create().uv(0, 37).cuboid(-10.0F, -3.0F, -8.0F, 4.0F, 3.0F, 16.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube3", ModelPartBuilder.create().uv(0, 57).cuboid(-8.0F, -2.99F, -10.0F, 16.0F, 3.0F, 4.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube4", ModelPartBuilder.create().uv(0, 29).cuboid(-8.0F, -2.99F, 6.0F, 16.0F, 3.0F, 4.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube5", ModelPartBuilder.create().uv(50, 0).cuboid(-2.0F, -8.0F, -10.0F, 4.0F, 5.0F, 3.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube6", ModelPartBuilder.create().uv(46, 11).cuboid(-2.999F, -10.0F, -12.0F, 6.0F, 5.0F, 3.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube7", ModelPartBuilder.create().uv(15, 31).cuboid(-2.499F, -10.5F, -12.001F, 5.0F, 1.0F, 3.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube8", ModelPartBuilder.create().uv(58, 20).cuboid(-0.999F, -8.0F, -13.0F, 2.0F, 2.0F, 1.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube9", ModelPartBuilder.create().uv(58, 20).cuboid(-1.999F, -7.0F, -13.0F, 1.0F, 1.0F, 1.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube10", ModelPartBuilder.create().uv(53, 21).cuboid(-1.999F, -10.0F, -12.5F, 1.0F, 1.0F, 1.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube11", ModelPartBuilder.create().uv(53, 21).cuboid(1.001F, -10.0F, -12.5F, 1.0F, 1.0F, 1.0F), ModelTransform.NONE);
+		modelPartData.addChild("cube12", ModelPartBuilder.create().uv(58, 20).cuboid(1.001F, -7.0F, -13.0F, 1.0F, 1.0F, 1.0F), ModelTransform.NONE);
+		return modelData;
+	}
+
+	@Override
+	public void setAngles(BathTireEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
+		//previously the render function, render code was moved to a method below
+	}
+
+	@Override
+	public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) {
+		body.render(matrixStack, buffer, packedLight, packedOverlay);
+	}
+}

src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BathTireRenderer.java

@@ -0,0 +1,24 @@
+package eu.midnightdust.motschen.decorative.entity.client.renderer;
+
+import eu.midnightdust.motschen.decorative.entity.BathTireEntity;
+import eu.midnightdust.motschen.decorative.entity.client.model.BathTireModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.render.entity.EntityRendererFactory;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.DyeColor;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class BathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+    private final Identifier TEXTURE;
+    public BathTireRenderer(EntityRendererFactory.Context context, DyeColor color) {
+        super(context, new BathTireModel(context.getPart(BathTireModel.BATH_TIRE_MODEL_LAYER)), 0.5F);
+        TEXTURE = Identifier.tryParse("textures/block/"+color.getName()+"_concrete.png");
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return TEXTURE;
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/BeachBallRenderer.java

@@ -0,0 +1,25 @@
+package eu.midnightdust.motschen.decorative.entity.client.renderer;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.entity.BeachBallEntity;
+import eu.midnightdust.motschen.decorative.entity.client.model.BeachBallModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.render.entity.*;
+import net.minecraft.client.render.entity.feature.ArmorFeatureRenderer;
+import net.minecraft.client.render.entity.feature.SlimeOverlayFeatureRenderer;
+import net.minecraft.client.render.entity.model.*;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class BeachBallRenderer extends MobEntityRenderer<BeachBallEntity, BeachBallModel> {
+
+    public BeachBallRenderer(EntityRendererFactory.Context context) {
+        super(context, new BeachBallModel(context.getPart(BeachBallModel.BEACH_BALL_MODEL_LAYER)), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BeachBallEntity entity) {
+        return new Identifier(DecorativeMain.MOD_ID, "textures/entity/beach_ball.png");
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/entity/client/renderer/DuckBathTireRenderer.java

@@ -0,0 +1,25 @@
+package eu.midnightdust.motschen.decorative.entity.client.renderer;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.entity.BathTireEntity;
+import eu.midnightdust.motschen.decorative.entity.BeachBallEntity;
+import eu.midnightdust.motschen.decorative.entity.client.model.BeachBallModel;
+import eu.midnightdust.motschen.decorative.entity.client.model.DuckBathTireModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.EntityRendererFactory;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class DuckBathTireRenderer extends MobEntityRenderer<BathTireEntity, DuckBathTireModel> {
+    public DuckBathTireRenderer(EntityRendererFactory.Context context) {
+        super(context, new DuckBathTireModel(context.getPart(DuckBathTireModel.DUCK_BATH_TIRE_MODEL_LAYER)), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier(DecorativeMain.MOD_ID, "textures/entity/duck_bath_tire.png");
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java

@@ -0,0 +1,91 @@
+package eu.midnightdust.motschen.decorative.init;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.entity.BathTireEntity;
+import eu.midnightdust.motschen.decorative.item.BathTireItem;
+import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
+import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
+import net.minecraft.entity.EntityDimensions;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnGroup;
+import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.item.Item;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class BathTires {
+    public static final EntityType<BathTireEntity> WHITE_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"white_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> ORANGE_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"orange_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> MAGENTA_BATH_TIRE=
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"magenta_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> LIGHT_BLUE_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"light_blue_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> YELLOW_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"yellow_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> LIME_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"lime_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> PINK_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"pink_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> GRAY_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"gray_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> LIGHT_GRAY_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"light_gray_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> CYAN_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"cyan_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> PURPLE_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"purple_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> BLUE_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"blue_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> BROWN_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"brown_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> GREEN_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"green_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> RED_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"red_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+    public static final EntityType<BathTireEntity> BLACK_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"black_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+
+    public static final EntityType<BathTireEntity> DUCK_BATH_TIRE =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"duck_bath_tire"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT,BathTireEntity::new).dimensions(EntityDimensions.fixed(1.5f,1)).trackable(100,4).build());
+
+    public static void init() {
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"white_bath_tire"), new BathTireItem(WHITE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(WHITE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"orange_bath_tire"), new BathTireItem(ORANGE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(ORANGE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"magenta_bath_tire"), new BathTireItem(MAGENTA_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(MAGENTA_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_blue_bath_tire"), new BathTireItem(LIGHT_BLUE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(LIGHT_BLUE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"yellow_bath_tire"), new BathTireItem(YELLOW_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(YELLOW_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"lime_bath_tire"), new BathTireItem(LIME_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(LIME_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pink_bath_tire"), new BathTireItem(PINK_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(PINK_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"gray_bath_tire"), new BathTireItem(GRAY_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(GRAY_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_gray_bath_tire"), new BathTireItem(LIGHT_GRAY_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(LIGHT_GRAY_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"cyan_bath_tire"), new BathTireItem(CYAN_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(CYAN_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"purple_bath_tire"), new BathTireItem(PURPLE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(PURPLE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"blue_bath_tire"), new BathTireItem(BLUE_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(BLUE_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"brown_bath_tire"), new BathTireItem(BROWN_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(BROWN_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"green_bath_tire"), new BathTireItem(GREEN_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(GREEN_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"red_bath_tire"), new BathTireItem(RED_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(RED_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"black_bath_tire"), new BathTireItem(BLACK_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(BLACK_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"duck_bath_tire"), new BathTireItem(DUCK_BATH_TIRE, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        FabricDefaultAttributeRegistry.register(DUCK_BATH_TIRE, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D));
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/init/BlockEntities.java

@@ -0,0 +1,28 @@
+package eu.midnightdust.motschen.decorative.init;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.block.blockentity.*;
+import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class BlockEntities {
+
+    public static BlockEntityType<PoolSprinklerBlockEntity> PoolSprinklerBlockEntity;
+    public static BlockEntityType<ShowerHeadBlockEntity> ShowerHeadBlockEntity;
+    public static BlockEntityType<CeilingFanBlockEntity> CeilingFanBlockEntity;
+    public static BlockEntityType<ChoppingLogBlockEntity> ChoppingLogBlockEntity;
+    public static BlockEntityType<WallClockBlockEntity> WallClockBlockEntity;
+    public static BlockEntityType<DigitalClockBlockEntity> DigitalClockBlockEntity;
+
+    public static void init() {
+        PoolSprinklerBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler_blockentity"), FabricBlockEntityTypeBuilder.create(PoolSprinklerBlockEntity::new, Pool.PoolSprinkler).build(null));
+        ShowerHeadBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"shower_head_blockentity"), FabricBlockEntityTypeBuilder.create(ShowerHeadBlockEntity::new, DecorativeMain.ShowerHead).build(null));
+        CeilingFanBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"ceiling_fan_blockentity"), FabricBlockEntityTypeBuilder.create(CeilingFanBlockEntity::new, DecorativeMain.CeilingFan).build(null));
+        ChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"chopping_log_blockentity"), FabricBlockEntityTypeBuilder.create(ChoppingLogBlockEntity::new, LogsWithAxes.OakChoppingLog, LogsWithAxes.BirchChoppingLog, LogsWithAxes.AcaciaChoppingLog, LogsWithAxes.DarkOakChoppingLog, LogsWithAxes.JungleChoppingLog, LogsWithAxes.SpruceChoppingLog).build(null));
+        WallClockBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"wall_clock_blockentity"), FabricBlockEntityTypeBuilder.create(WallClockBlockEntity::new, DecorativeMain.WallClock).build(null));
+        DigitalClockBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"digital_clock_blockentity"), FabricBlockEntityTypeBuilder.create(DigitalClockBlockEntity::new, Clocks.RedDigitalClock, Clocks.BlackDigitalClock, Clocks.BlueDigitalClock, Clocks.BrownDigitalClock, Clocks.CyanDigitalClock, Clocks.GrayDigitalClock, Clocks.GreenDigitalClock, Clocks.LightBlueDigitalClock, Clocks.LightGrayDigitalClock, Clocks.LimeDigitalClock, Clocks.MagentaDigitalClock, Clocks.OrangeDigitalClock, Clocks.PinkDigitalClock, Clocks.PurpleDigitalClock, Clocks.WhiteDigitalClock, Clocks.YellowDigitalClock).build(null));
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/init/Clocks.java

@@ -0,0 +1,63 @@
+package eu.midnightdust.motschen.decorative.init;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.block.DigitalClock;
+import net.minecraft.block.Block;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class Clocks {
+    public static Block WhiteDigitalClock = new DigitalClock();
+    public static Block OrangeDigitalClock = new DigitalClock();
+    public static Block MagentaDigitalClock = new DigitalClock();
+    public static Block LightBlueDigitalClock = new DigitalClock();
+    public static Block YellowDigitalClock = new DigitalClock();
+    public static Block LimeDigitalClock = new DigitalClock();
+    public static Block PinkDigitalClock = new DigitalClock();
+    public static Block GrayDigitalClock = new DigitalClock();
+    public static Block LightGrayDigitalClock = new DigitalClock();
+    public static Block CyanDigitalClock = new DigitalClock();
+    public static Block PurpleDigitalClock = new DigitalClock();
+    public static Block BlueDigitalClock = new DigitalClock();
+    public static Block BrownDigitalClock = new DigitalClock();
+    public static Block GreenDigitalClock = new DigitalClock();
+    public static Block RedDigitalClock = new DigitalClock();
+    public static Block BlackDigitalClock = new DigitalClock();
+
+    public static void init() {
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"white_digital_clock"), WhiteDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"white_digital_clock"), new BlockItem(WhiteDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"orange_digital_clock"), OrangeDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"orange_digital_clock"), new BlockItem(OrangeDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"magenta_digital_clock"), MagentaDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"magenta_digital_clock"), new BlockItem(MagentaDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_blue_digital_clock"), LightBlueDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_blue_digital_clock"), new BlockItem(LightBlueDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"yellow_digital_clock"), YellowDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"yellow_digital_clock"), new BlockItem(YellowDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"lime_digital_clock"), LimeDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"lime_digital_clock"), new BlockItem(LimeDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pink_digital_clock"), PinkDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pink_digital_clock"), new BlockItem(PinkDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"gray_digital_clock"), GrayDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"gray_digital_clock"), new BlockItem(GrayDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_gray_digital_clock"), LightGrayDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_gray_digital_clock"), new BlockItem(LightGrayDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"cyan_digital_clock"), CyanDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"cyan_digital_clock"), new BlockItem(CyanDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"purple_digital_clock"), PurpleDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"purple_digital_clock"), new BlockItem(PurpleDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"blue_digital_clock"), BlueDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"blue_digital_clock"), new BlockItem(BlueDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"brown_digital_clock"), BrownDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"brown_digital_clock"), new BlockItem(BrownDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"green_digital_clock"), GreenDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"green_digital_clock"), new BlockItem(GreenDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"red_digital_clock"), RedDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"red_digital_clock"), new BlockItem(RedDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"black_digital_clock"), BlackDigitalClock);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"black_digital_clock"), new BlockItem(BlackDigitalClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/init/DoubleLamps.java

@@ -27,37 +27,37 @@ public class DoubleLamps {
     public static Block BlackDoubleLamp = new DoubleLamp();
 
     public static void init() {
-        Registry.register(Registry.BLOCK, new Identifier("decorative","white_double_lamp"), WhiteDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","white_double_lamp"), new BlockItem(WhiteDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","orange_double_lamp"), OrangeDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","orange_double_lamp"), new BlockItem(OrangeDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","magenta_double_lamp"), MagentaDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","magenta_double_lamp"), new BlockItem(MagentaDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","light_blue_double_lamp"), LightBlueDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","light_blue_double_lamp"), new BlockItem(LightBlueDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","yellow_double_lamp"), YellowDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","yellow_double_lamp"), new BlockItem(YellowDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","lime_double_lamp"), LimeDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","lime_double_lamp"), new BlockItem(LimeDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","pink_double_lamp"), PinkDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","pink_double_lamp"), new BlockItem(PinkDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","gray_double_lamp"), GrayDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","gray_double_lamp"), new BlockItem(GrayDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","light_gray_double_lamp"), LightGrayDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","light_gray_double_lamp"), new BlockItem(LightGrayDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","cyan_double_lamp"), CyanDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","cyan_double_lamp"), new BlockItem(CyanDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","purple_double_lamp"), PurpleDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","purple_double_lamp"), new BlockItem(PurpleDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","blue_double_lamp"), BlueDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","blue_double_lamp"), new BlockItem(BlueDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","brown_double_lamp"), BrownDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","brown_double_lamp"), new BlockItem(BrownDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","green_double_lamp"), GreenDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","green_double_lamp"), new BlockItem(GreenDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","red_double_lamp"), RedDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","red_double_lamp"), new BlockItem(RedDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","black_double_lamp"), BlackDoubleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","black_double_lamp"), new BlockItem(BlackDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"white_double_lamp"), WhiteDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"white_double_lamp"), new BlockItem(WhiteDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"orange_double_lamp"), OrangeDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"orange_double_lamp"), new BlockItem(OrangeDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"magenta_double_lamp"), MagentaDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"magenta_double_lamp"), new BlockItem(MagentaDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_blue_double_lamp"), LightBlueDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_blue_double_lamp"), new BlockItem(LightBlueDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"yellow_double_lamp"), YellowDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"yellow_double_lamp"), new BlockItem(YellowDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"lime_double_lamp"), LimeDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"lime_double_lamp"), new BlockItem(LimeDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pink_double_lamp"), PinkDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pink_double_lamp"), new BlockItem(PinkDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"gray_double_lamp"), GrayDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"gray_double_lamp"), new BlockItem(GrayDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_gray_double_lamp"), LightGrayDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_gray_double_lamp"), new BlockItem(LightGrayDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"cyan_double_lamp"), CyanDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"cyan_double_lamp"), new BlockItem(CyanDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"purple_double_lamp"), PurpleDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"purple_double_lamp"), new BlockItem(PurpleDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"blue_double_lamp"), BlueDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"blue_double_lamp"), new BlockItem(BlueDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"brown_double_lamp"), BrownDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"brown_double_lamp"), new BlockItem(BrownDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"green_double_lamp"), GreenDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"green_double_lamp"), new BlockItem(GreenDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"red_double_lamp"), RedDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"red_double_lamp"), new BlockItem(RedDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"black_double_lamp"), BlackDoubleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"black_double_lamp"), new BlockItem(BlackDoubleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
     }
 }

src/main/java/eu/midnightdust/motschen/decorative/init/Lamps.java

@@ -27,37 +27,37 @@ public class Lamps {
     public static Block BlackLamp = new Lamp();
 
     public static void init() {
-        Registry.register(Registry.BLOCK, new Identifier("decorative","white_lamp"), WhiteLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","white_lamp"), new BlockItem(WhiteLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","orange_lamp"), OrangeLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","orange_lamp"), new BlockItem(OrangeLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","magenta_lamp"), MagentaLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","magenta_lamp"), new BlockItem(MagentaLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","light_blue_lamp"), LightBlueLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","light_blue_lamp"), new BlockItem(LightBlueLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","yellow_lamp"), YellowLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","yellow_lamp"), new BlockItem(YellowLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","lime_lamp"), LimeLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","lime_lamp"), new BlockItem(LimeLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","pink_lamp"), PinkLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","pink_lamp"), new BlockItem(PinkLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","gray_lamp"), GrayLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","gray_lamp"), new BlockItem(GrayLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","light_gray_lamp"), LightGrayLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","light_gray_lamp"), new BlockItem(LightGrayLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","cyan_lamp"), CyanLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","cyan_lamp"), new BlockItem(CyanLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","purple_lamp"), PurpleLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","purple_lamp"), new BlockItem(PurpleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","blue_lamp"), BlueLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","blue_lamp"), new BlockItem(BlueLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","brown_lamp"), BrownLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","brown_lamp"), new BlockItem(BrownLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","green_lamp"), GreenLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","green_lamp"), new BlockItem(GreenLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","red_lamp"), RedLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","red_lamp"), new BlockItem(RedLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","black_lamp"), BlackLamp);
-        Registry.register(Registry.ITEM, new Identifier("decorative","black_lamp"), new BlockItem(BlackLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"white_lamp"), WhiteLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"white_lamp"), new BlockItem(WhiteLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"orange_lamp"), OrangeLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"orange_lamp"), new BlockItem(OrangeLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"magenta_lamp"), MagentaLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"magenta_lamp"), new BlockItem(MagentaLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_blue_lamp"), LightBlueLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_blue_lamp"), new BlockItem(LightBlueLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"yellow_lamp"), YellowLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"yellow_lamp"), new BlockItem(YellowLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"lime_lamp"), LimeLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"lime_lamp"), new BlockItem(LimeLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pink_lamp"), PinkLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pink_lamp"), new BlockItem(PinkLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"gray_lamp"), GrayLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"gray_lamp"), new BlockItem(GrayLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"light_gray_lamp"), LightGrayLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"light_gray_lamp"), new BlockItem(LightGrayLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"cyan_lamp"), CyanLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"cyan_lamp"), new BlockItem(CyanLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"purple_lamp"), PurpleLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"purple_lamp"), new BlockItem(PurpleLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"blue_lamp"), BlueLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"blue_lamp"), new BlockItem(BlueLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"brown_lamp"), BrownLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"brown_lamp"), new BlockItem(BrownLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"green_lamp"), GreenLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"green_lamp"), new BlockItem(GreenLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"red_lamp"), RedLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"red_lamp"), new BlockItem(RedLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"black_lamp"), BlackLamp);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"black_lamp"), new BlockItem(BlackLamp, new Item.Settings().group(DecorativeMain.IndoorGroup)));
     }
 }

src/main/java/eu/midnightdust/motschen/decorative/init/LogsWithAxes.java

@@ -1,8 +1,7 @@
 package eu.midnightdust.motschen.decorative.init;
 
 import eu.midnightdust.motschen.decorative.DecorativeMain;
-import eu.midnightdust.motschen.decorative.block.Lamp;
-import eu.midnightdust.motschen.decorative.block.LogWithAxe;
+import eu.midnightdust.motschen.decorative.block.*;
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
@@ -10,25 +9,25 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
 public class LogsWithAxes {
-    public static Block OakLogWithAxe = new LogWithAxe();
-    public static Block SpruceLogWithAxe = new LogWithAxe();
-    public static Block BirchLogWithAxe = new LogWithAxe();
-    public static Block AcaciaLogWithAxe = new LogWithAxe();
-    public static Block JungleLogWithAxe = new LogWithAxe();
-    public static Block DarkOakLogWithAxe = new LogWithAxe();
+    public static Block OakChoppingLog = new ChoppingLog();
+    public static Block SpruceChoppingLog = new ChoppingLog();
+    public static Block BirchChoppingLog = new ChoppingLog();
+    public static Block AcaciaChoppingLog = new ChoppingLog();
+    public static Block JungleChoppingLog = new ChoppingLog();
+    public static Block DarkOakChoppingLog = new ChoppingLog();
 
     public static void init() {
-        Registry.register(Registry.BLOCK, new Identifier("decorative","oak_log_with_axe"), OakLogWithAxe);
-        Registry.register(Registry.ITEM, new Identifier("decorative","oak_log_with_axe"), new BlockItem(OakLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","spruce_log_with_axe"), SpruceLogWithAxe);
-        Registry.register(Registry.ITEM, new Identifier("decorative","spruce_log_with_axe"), new BlockItem(SpruceLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","birch_log_with_axe"), BirchLogWithAxe);
-        Registry.register(Registry.ITEM, new Identifier("decorative","birch_log_with_axe"), new BlockItem(BirchLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","acacia_log_with_axe"), AcaciaLogWithAxe);
-        Registry.register(Registry.ITEM, new Identifier("decorative","acacia_log_with_axe"), new BlockItem(AcaciaLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","jungle_log_with_axe"), JungleLogWithAxe);
-        Registry.register(Registry.ITEM, new Identifier("decorative","jungle_log_with_axe"), new BlockItem(JungleLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","dark_oak_log_with_axe"), DarkOakLogWithAxe);
-        Registry.register(Registry.ITEM, new Identifier("decorative","dark_oak_log_with_axe"), new BlockItem(DarkOakLogWithAxe, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"oak_log_with_axe"), OakChoppingLog);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"oak_log_with_axe"), new BlockItem(OakChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"spruce_log_with_axe"), SpruceChoppingLog);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"spruce_log_with_axe"), new BlockItem(SpruceChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"birch_log_with_axe"), BirchChoppingLog);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"birch_log_with_axe"), new BlockItem(BirchChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"acacia_log_with_axe"), AcaciaChoppingLog);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"acacia_log_with_axe"), new BlockItem(AcaciaChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"jungle_log_with_axe"), JungleChoppingLog);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"jungle_log_with_axe"), new BlockItem(JungleChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"dark_oak_log_with_axe"), DarkOakChoppingLog);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"dark_oak_log_with_axe"), new BlockItem(DarkOakChoppingLog, new Item.Settings().group(DecorativeMain.GardenGroup)));
     }
 }

src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java

@@ -0,0 +1,42 @@
+package eu.midnightdust.motschen.decorative.init;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.block.PoolSprinkler;
+import eu.midnightdust.motschen.decorative.block.PoolWall;
+import eu.midnightdust.motschen.decorative.block.Springboard;
+import eu.midnightdust.motschen.decorative.entity.BeachBallEntity;
+import eu.midnightdust.motschen.decorative.item.BathTireItem;
+import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
+import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityDimensions;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnGroup;
+import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class Pool {
+
+    public static final EntityType<BeachBallEntity> BEACH_BALL =
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"beach_ball"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT, BeachBallEntity::new).dimensions(EntityDimensions.fixed(0.9f,0.9f)).trackable(100,4).build());
+    public static Item BEACH_BALL_ITEM = new BathTireItem(BEACH_BALL, new Item.Settings().group(DecorativeMain.PoolGroup));
+    public static Block PoolWall = new PoolWall();
+    public static Block Springboard = new Springboard();
+    public static Block PoolSprinkler = new PoolSprinkler();
+
+    public static void init() {
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pool_wall"), PoolWall);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pool_wall"), new BlockItem(PoolWall, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"springboard"), Springboard);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"springboard"), new BlockItem(Springboard, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler"), PoolSprinkler);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler"), new BlockItem(PoolSprinkler, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"beach_ball"), BEACH_BALL_ITEM);
+        FabricDefaultAttributeRegistry.register(BEACH_BALL, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 100000.0D).add(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, -10D));
+        BathTires.init();
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/init/Signs.java

@@ -1,7 +1,6 @@
 package eu.midnightdust.motschen.decorative.init;
 
 import eu.midnightdust.motschen.decorative.DecorativeMain;
-import eu.midnightdust.motschen.decorative.block.LogWithAxe;
 import eu.midnightdust.motschen.decorative.block.Sign;
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;
@@ -26,34 +25,34 @@ public class Signs {
     public static Block OnehundredtenSign = new Sign();
 
     public static void init() {
-        Registry.register(Registry.BLOCK, new Identifier("decorative","empty_sign"), EmptySign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","empty_sign"), new BlockItem(EmptySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"empty_sign"), EmptySign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"empty_sign"), new BlockItem(EmptySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
 
-        Registry.register(Registry.BLOCK, new Identifier("decorative","stop_sign"), StopSign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","stop_sign"), new BlockItem(StopSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","five_sign"), FiveSign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","five_sign"), new BlockItem(FiveSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","ten_sign"), TenSign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","ten_sign"), new BlockItem(TenSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","twenty_sign"), TwentySign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","twenty_sign"), new BlockItem(TwentySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","thirty_sign"), ThirtySign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","thirty_sign"), new BlockItem(ThirtySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","forty_sign"), FortySign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","forty_sign"), new BlockItem(FortySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","fifty_sign"), FiftySign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","fifty_sign"), new BlockItem(FiftySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","sixty_sign"), SixtySign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","sixty_sign"), new BlockItem(SixtySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","seventy_sign"), SeventySign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","seventy_sign"), new BlockItem(SeventySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","eighty_sign"), EightySign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","eighty_sign"), new BlockItem(EightySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","ninety_sign"), NinetySign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","ninety_sign"), new BlockItem(NinetySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","onehundred_sign"), OnehundredSign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","onehundred_sign"), new BlockItem(OnehundredSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","onehundredten_sign"), OnehundredtenSign);
-        Registry.register(Registry.ITEM, new Identifier("decorative","onehundredten_sign"), new BlockItem(OnehundredtenSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"stop_sign"), StopSign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"stop_sign"), new BlockItem(StopSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"five_sign"), FiveSign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"five_sign"), new BlockItem(FiveSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"ten_sign"), TenSign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"ten_sign"), new BlockItem(TenSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"twenty_sign"), TwentySign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"twenty_sign"), new BlockItem(TwentySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"thirty_sign"), ThirtySign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"thirty_sign"), new BlockItem(ThirtySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"forty_sign"), FortySign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"forty_sign"), new BlockItem(FortySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"fifty_sign"), FiftySign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"fifty_sign"), new BlockItem(FiftySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"sixty_sign"), SixtySign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"sixty_sign"), new BlockItem(SixtySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"seventy_sign"), SeventySign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"seventy_sign"), new BlockItem(SeventySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"eighty_sign"), EightySign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"eighty_sign"), new BlockItem(EightySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"ninety_sign"), NinetySign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"ninety_sign"), new BlockItem(NinetySign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"onehundred_sign"), OnehundredSign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"onehundred_sign"), new BlockItem(OnehundredSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"onehundredten_sign"), OnehundredtenSign);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"onehundredten_sign"), new BlockItem(OnehundredtenSign, new Item.Settings().group(DecorativeMain.TrafficGroup)));
     }
 }

src/main/java/eu/midnightdust/motschen/decorative/item/BathTireItem.java

@@ -0,0 +1,69 @@
+package eu.midnightdust.motschen.decorative.item;
+
+import net.minecraft.block.FluidBlock;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnReason;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.SpawnEggItem;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.stat.Stats;
+import net.minecraft.util.Hand;
+import net.minecraft.util.TypedActionResult;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.RaycastContext;
+import net.minecraft.world.World;
+
+public class BathTireItem extends Item {
+    private final EntityType<?> type;
+
+    public BathTireItem(EntityType<?> type, Item.Settings settings) {
+        super(settings);
+        this.type = type;
+    }
+
+    public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand hand) {
+        ItemStack itemStack = user.getStackInHand(hand);
+        HitResult hitResult = raycast(world, user, RaycastContext.FluidHandling.SOURCE_ONLY);
+        if (hitResult.getType() != HitResult.Type.BLOCK) {
+            return TypedActionResult.pass(itemStack);
+        } else if (world.isClient) {
+            return TypedActionResult.success(itemStack);
+        } else {
+            BlockHitResult blockHitResult = (BlockHitResult)hitResult;
+            BlockPos blockPos = blockHitResult.getBlockPos();
+            if (!(world.getBlockState(blockPos).getBlock() instanceof FluidBlock)) {
+                return TypedActionResult.pass(itemStack);
+            } else if (world.canPlayerModifyAt(user, blockPos) && user.canPlaceOn(blockPos, blockHitResult.getSide(), itemStack)) {
+                EntityType<?> entityType = this.getEntityType(itemStack.getTag());
+                if (entityType.spawnFromItemStack((ServerWorld) world, itemStack, user, blockPos.up(1), SpawnReason.SPAWN_EGG, false, false) == null) {
+                    return TypedActionResult.pass(itemStack);
+                } else {
+                    if (!user.getAbilities().creativeMode) {
+                        itemStack.decrement(1);
+                    }
+
+                    user.incrementStat(Stats.USED.getOrCreateStat(this));
+                    return TypedActionResult.success(itemStack);
+                }
+            } else {
+                return TypedActionResult.fail(itemStack);
+            }
+        }
+    }
+
+    public EntityType<?> getEntityType(NbtCompound tag) {
+        if (tag != null && tag.contains("EntityTag", 10)) {
+            NbtCompound compoundTag = tag.getCompound("EntityTag");
+            if (compoundTag.contains("id", 8)) {
+                return EntityType.get(compoundTag.getString("id")).orElse(this.type);
+            }
+        }
+
+        return this.type;
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/mixin/GenerationSettingsAccessorMixin.java

@@ -0,0 +1,19 @@
+package eu.midnightdust.motschen.decorative.mixin;
+
+import net.minecraft.world.biome.GenerationSettings;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+@Mixin(GenerationSettings.class)
+public interface GenerationSettingsAccessorMixin {
+
+    @Accessor
+    List<List<Supplier<ConfiguredFeature<?, ?>>>> getFeatures();
+
+    @Accessor
+    void setFeatures(List<List<Supplier<ConfiguredFeature<?, ?>>>> features);
+}

src/main/java/eu/midnightdust/motschen/decorative/sound/DecorativeSoundEvents.java

@@ -0,0 +1,13 @@
+package eu.midnightdust.motschen.decorative.sound;
+
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class DecorativeSoundEvents {
+    public static final SoundEvent CEILINGFAN_AMBIENT = register("decorative:ceiling_fan.ambient");
+
+    private static SoundEvent register(String id) {
+        return Registry.register(Registry.SOUND_EVENT, id, new SoundEvent(new Identifier(id)));
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatureInjector.java

@@ -0,0 +1,44 @@
+package eu.midnightdust.motschen.decorative.world;
+
+import com.google.common.collect.Lists;
+import eu.midnightdust.motschen.decorative.mixin.GenerationSettingsAccessorMixin;
+import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
+import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.gen.GenerationStep;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+public class OreFeatureInjector {
+
+    public static void init() {
+        BuiltinRegistries.BIOME.forEach(OreFeatureInjector::addToBiome);
+        RegistryEntryAddedCallback.event(BuiltinRegistries.BIOME).register((i, identifier, biome) -> addToBiome(biome));
+    }
+
+    private static void addToBiome(Biome biome) {
+        addSaltOre(biome);
+    }
+
+    private static void addSaltOre(Biome biome) {
+            if (biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THEEND) {
+                addFeature(biome, GenerationStep.Feature.UNDERGROUND_DECORATION, OreFeatures.ROCKY_ASPHALT_FEATURE);
+        }
+    }
+
+    public static void addFeature(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());
+        while (featuresByStep.size() <= stepIndex) {
+            featuresByStep.add(Lists.newArrayList());
+        }
+        List<Supplier<ConfiguredFeature<?, ?>>> features = new ArrayList<>(featuresByStep.get(stepIndex));
+        features.add(() -> feature);
+        featuresByStep.set(stepIndex, features);
+        generationSettingsAccessor.setFeatures(featuresByStep);
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/world/OreFeatures.java

@@ -0,0 +1,17 @@
+package eu.midnightdust.motschen.decorative.world;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+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.Feature;
+import net.minecraft.world.gen.feature.OreFeatureConfig;
+
+public class OreFeatures {
+    public static final ConfiguredFeature<?, ?> ROCKY_ASPHALT_FEATURE = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, DecorativeMain.RockyAsphalt.getDefaultState(), 7)).applyChance(200).spreadHorizontally().repeat(20);
+
+    public static void init() {
+        Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new Identifier(DecorativeMain.MOD_ID, "rocky_asphalt"), ROCKY_ASPHALT_FEATURE);
+    }
+}

src/main/java/eu/midnightdust/motschen/decorative/world/RockyAsphalt.java

@@ -1,41 +0,0 @@
-package eu.midnightdust.motschen.decorative.world;
-
-import eu.midnightdust.motschen.decorative.DecorativeMain;
-import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.decorator.Decorator;
-import net.minecraft.world.gen.decorator.RangeDecoratorConfig;
-import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.OreFeatureConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RockyAsphalt {
-    private static List<Biome> checkedBiomes = new ArrayList<>();
-
-    public static void initBiomeFeatures() {
-        for (Biome biome : Registry.BIOME) {
-            addToBiome(biome);
-        }
-
-        //Handles modded biomes
-        RegistryEntryAddedCallback.event(Registry.BIOME).register((i, identifier, biome) -> addToBiome(biome));
-    }
-    private static void addToBiome(Biome biome){
-        if(checkedBiomes.contains(biome)){
-            //Just to be sure we dont add the stuff twice to the same biome
-            return;
-        }
-        checkedBiomes.add(biome);
-            addOre(biome, OreFeatureConfig.Target.NATURAL_STONE, DecorativeMain.Ores.RockyAsphalt);
-        }
-
-    private static void addOre(Biome biome, OreFeatureConfig.Target canReplaceIn, DecorativeMain.Ores ore) {
-        biome.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, Feature.ORE.configure(
-                new OreFeatureConfig(canReplaceIn, DecorativeMain.RockyAsphalt.getDefaultState(), ore.veinSize)).createDecoratedFeature(Decorator.COUNT_RANGE.configure(
-                new RangeDecoratorConfig(ore.veinsPerChunk, ore.minY, ore.minY, ore.maxY))));
-    }
-}

src/main/resources/assets/decorative/blockstates/acacia_log_with_axe.json

@@ -1,8 +1,5 @@
 {
     "variants": {
-        "facing=south": { "model": "decorative:block/acacia_log_with_axe" },
-        "facing=west":  { "model": "decorative:block/acacia_log_with_axe", "y": 90 },
-        "facing=north": { "model": "decorative:block/acacia_log_with_axe", "y": 180 },
-        "facing=east":  { "model": "decorative:block/acacia_log_with_axe", "y": 270 }
+        "": { "model": "block/acacia_log" }
     }
 }

src/main/resources/assets/decorative/blockstates/birch_log_with_axe.json

@@ -1,8 +1,5 @@
 {
     "variants": {
-        "facing=south": { "model": "decorative:block/birch_log_with_axe" },
-        "facing=west":  { "model": "decorative:block/birch_log_with_axe", "y": 90 },
-        "facing=north": { "model": "decorative:block/birch_log_with_axe", "y": 180 },
-        "facing=east":  { "model": "decorative:block/birch_log_with_axe", "y": 270 }
+        "": { "model": "block/birch_log" }
     }
 }

src/main/resources/assets/decorative/blockstates/black_digital_clock.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "decorative:block/black_digital_clock", "y": 180 },
+        "facing=west":  { "model": "decorative:block/black_digital_clock", "y": 270 },
+        "facing=north": { "model": "decorative:block/black_digital_clock" },
+        "facing=east":  { "model": "decorative:block/black_digital_clock", "y": 90 }
+    }
+}

src/main/resources/assets/decorative/blockstates/blue_digital_clock.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "decorative:block/blue_digital_clock", "y": 180 },
+        "facing=west":  { "model": "decorative:block/blue_digital_clock", "y": 270 },
+        "facing=north": { "model": "decorative:block/blue_digital_clock" },
+        "facing=east":  { "model": "decorative:block/blue_digital_clock", "y": 90 }
+    }
+}

src/main/resources/assets/decorative/blockstates/brown_digital_clock.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "decorative:block/brown_digital_clock", "y": 180 },
+        "facing=west":  { "model": "decorative:block/brown_digital_clock", "y": 270 },
+        "facing=north": { "model": "decorative:block/brown_digital_clock" },
+        "facing=east":  { "model": "decorative:block/brown_digital_clock", "y": 90 }
+    }
+}

src/main/resources/assets/decorative/blockstates/ceilingfan.json

@@ -1,6 +1,5 @@
 {
     "variants": {
-        "lit=true": { "model": "decorative:block/ceilingfan_activated" },
-        "lit=false":  { "model": "decorative:block/ceilingfan" }
+        "":  { "model": "decorative:block/ceilingfan" }
     }
 }

src/main/resources/assets/decorative/blockstates/cyan_digital_clock.json

@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=south": { "model": "decorative:block/cyan_digital_clock", "y": 180 },
+        "facing=west":  { "model": "decorative:block/cyan_digital_clock", "y": 270 },
+        "facing=north": { "model": "decorative:block/cyan_digital_clock" },
+        "facing=east":  { "model": "decorative:block/cyan_digital_clock", "y": 90 }
+    }
+}

src/main/resources/assets/decorative/blockstates/dark_oak_log_with_axe.json

@@ -1,8 +1,5 @@
 {
     "variants": {
-        "facing=south": { "model": "decorative:block/dark_oak_log_with_axe" },
-        "facing=west":  { "model": "decorative:block/dark_oak_log_with_axe", "y": 90 },
-        "facing=north": { "model": "decorative:block/dark_oak_log_with_axe", "y": 180 },
-        "facing=east":  { "model": "decorative:block/dark_oak_log_with_axe", "y": 270 }
+        "": { "model": "block/dark_oak_log" }
     }
 }