4.0.0 - First commit to github

.gitignore

@@ -1,7 +1,11 @@
 # gradle
 
 .gradle/
-build/
+build/classes/
+build/generated/
+build/libs/
+build/resources/
+build/tmp/
 out/
 classes/
 

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.8-SNAPSHOT'
+	id 'fabric-loom' version '0.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -14,65 +14,60 @@ minecraft {
 }
 
 repositories {
+	maven {	url = 'https://raw.githubusercontent.com/Devan-Kerman/Devan-Repo/master/'}
 	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"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	
-// 	modImplementation("vazkii.patchouli:Patchouli:${project.patchouli_version}"){
-//         exclude module: "fabric-api"
-//     }
+	modCompile("vazkii.patchouli:Patchouli:${project.patchouli_version}")
 	
-	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}"){
-        exclude module: "fabric-api"
-    }
+	modImplementation ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}")
+	modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}")
+	modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}")
 	
-	modImplementation "com.github.TeamMidnightDust:midnightlib:${midnightlib_version}"
-    include "com.github.TeamMidnightDust:midnightlib:${midnightlib_version}"
+	modImplementation "eu.midnightdust:midnight-hats:${midnighthats_version}"
+    include "eu.midnightdust:midnight-hats:${midnighthats_version}"
 }
 
 processResources {
 	inputs.property "version", project.version
 
-	filesMatching("fabric.mod.json") {
+	from(sourceSets.main.resources.srcDirs) {
+		include "fabric.mod.json"
 		expand "version": project.version
 	}
+
+	from(sourceSets.main.resources.srcDirs) {
+		exclude "fabric.mod.json"
+	}
 }
 
-tasks.withType(JavaCompile).configureEach {
 // ensure that the encoding is set to UTF-8, no matter what the system default is
 // this fixes some edge cases with special characters not displaying correctly
 // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-	// 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
+tasks.withType(JavaCompile) {
+	options.encoding = "UTF-8"
 }
 
-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()
+// If you remove this task, sources will not be generated.
+task sourcesJar(type: Jar, dependsOn: classes) {
+	classifier = "sources"
+	from sourceSets.main.allSource
 }
 
 jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
-	}
+	from "LICENSE"
 }
 
 // configure the maven publication
@@ -89,11 +84,9 @@ publishing {
 		}
 	}
 
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	// select the repositories you want to publish to
 	repositories {
-		// 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.
+		// uncomment to publish to the local maven
+		// mavenLocal()
 	}
 }

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

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

gradle.properties

@@ -3,18 +3,21 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.17
-	yarn_mappings=1.17+build.5
-	loader_version=0.11.3
+	minecraft_version=1.16.4
+	yarn_mappings=1.16.4+build.6
+	loader_version=0.10.6+build.214
 
 # Mod Properties
-	mod_version = 4.1.1
+	mod_version = 4.0.0-dev
 	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.34.9+1.17
-	mod_menu_version = 2.0.0-beta.7
-	midnightlib_version=0.2.3
-	patchouli_version=1.16.4-50-FABRIC
+	fabric_version=0.25.1+build.416-1.16
+	patchouli_version=1.16-40-FABRIC
+	midnighthats_version=2.0.1
+	
+	auto_config_version = 3.2.0-unstable
+	cloth_config_version = 4.7.0-unstable
+	mod_menu_version = 1.14.6+build.31

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -82,7 +82,6 @@ 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
@@ -126,11 +125,10 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; 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
@@ -156,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        i=$((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
 
@@ -177,9 +175,14 @@ 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,9 +29,6 @@ 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"
 
@@ -40,7 +37,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +51,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +61,28 @@ 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 %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

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

@@ -1,11 +1,6 @@
 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;
@@ -13,48 +8,44 @@ 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.model.ModelLoadingRegistry;
 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.render.RenderLayer;
-import net.minecraft.util.DyeColor;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.command.argument.ItemEnchantmentArgumentType;
+
+import java.util.function.Supplier;
 
-@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, (dispatcher, context) -> new BeachBallRenderer(dispatcher));
 
-        EntityRendererRegistry.INSTANCE.register(Pool.BEACH_BALL, BeachBallRenderer::new);
+        EntityRendererRegistry.INSTANCE.register(BathTires.WHITE_BATH_TIRE, (dispatcher, context) -> new WhiteBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.ORANGE_BATH_TIRE, (dispatcher, context) -> new OrangeBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.MAGENTA_BATH_TIRE, (dispatcher, context) -> new MagentaBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.LIGHT_BLUE_BATH_TIRE, (dispatcher, context) -> new LightBlueBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.YELLOW_BATH_TIRE, (dispatcher, context) -> new YellowBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.LIME_BATH_TIRE, (dispatcher, context) -> new LimeBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.PINK_BATH_TIRE, (dispatcher, context) -> new PinkBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.GRAY_BATH_TIRE, (dispatcher, context) -> new GrayBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.LIGHT_GRAY_BATH_TIRE, (dispatcher, context) -> new LightGrayBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.CYAN_BATH_TIRE, (dispatcher, context) -> new CyanBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.PURPLE_BATH_TIRE, (dispatcher, context) -> new PurpleBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.BLUE_BATH_TIRE, (dispatcher, context) -> new BlueBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.BROWN_BATH_TIRE, (dispatcher, context) -> new BrownBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.GREEN_BATH_TIRE, (dispatcher, context) -> new GreenBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.RED_BATH_TIRE, (dispatcher, context) -> new RedBathTireRenderer(dispatcher));
+        EntityRendererRegistry.INSTANCE.register(BathTires.BLACK_BATH_TIRE, (dispatcher, context) -> new BlackBathTireRenderer(dispatcher));
 
-        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);
+        EntityRendererRegistry.INSTANCE.register(BathTires.DUCK_BATH_TIRE, (dispatcher, context) -> new DuckBathTireRenderer(dispatcher));
 
 
         registerBlockColor(DecorativeMain.BirdBath, Blocks.WATER);

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

@@ -1,6 +1,5 @@
 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;
@@ -11,6 +10,8 @@ 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 me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -21,9 +22,9 @@ import net.minecraft.state.property.EnumProperty;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-
 public class DecorativeMain implements ModInitializer {
     public static final String MOD_ID = "decorative";
+    public static DecorativeConfig DECORATIVE_CONFIG;
 
     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));
@@ -52,14 +53,14 @@ public class DecorativeMain implements ModInitializer {
     public static Block ChristmasLights = new ChristmasLights();
     public static Block ShowerHead = new ShowerHead();
     public static Block WallClock = new WallClock();
-    public static Block StonePath = new StonePath();
+    public static Block SmokeDetector = new SmokeDetector();
 
     @Override
     public void onInitialize() {
-        MidnightConfig.init("decorative", DecorativeConfig.class);
+        AutoConfig.register(DecorativeConfig.class, JanksonConfigSerializer::new);
+        DECORATIVE_CONFIG = AutoConfig.getConfigHolder(DecorativeConfig.class).getConfig();
 
         BlockEntities.init();
-
         // Traffic //
         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)));
@@ -80,8 +81,6 @@ public class DecorativeMain implements ModInitializer {
         Signs.init();
 
         //Garden//
-        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);
@@ -108,6 +107,8 @@ public class DecorativeMain implements ModInitializer {
         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)));
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"smoke_detector"), SmokeDetector);
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"smoke_detector"), new BlockItem(SmokeDetector, new Item.Settings().group(DecorativeMain.IndoorGroup)));
 
         Lamps.init();
         DoubleLamps.init();

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

@@ -2,72 +2,34 @@ 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;
 
-import java.util.Objects;
-
-public class BirdBath extends AbstractCauldronBlock {
+public class BirdBath extends CauldronBlock {
     private static final VoxelShape SHAPE;
-    public static final IntProperty LEVEL = IntProperty.of("level",0,3);
 
     public BirdBath() {
-        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
-    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);
-        }
+        super(FabricBlockSettings.copy(Blocks.CAULDRON).nonOpaque().sounds(BlockSoundGroup.STONE));
     }
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+        return super.getPlacementState(itemPlacementContext)
                 .with(LEVEL, 0);
     }
 
-
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
             return SHAPE;
     }
     static {
-        SHAPE = createCuboidShape(4, 0, 4, 12, 9, 12);
+        VoxelShape shape = createCuboidShape(4, 0, 4, 12, 9, 12);
+        SHAPE = shape;
     }
 
     public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {

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

@@ -3,13 +3,9 @@ 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;
@@ -25,9 +21,8 @@ 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 BlockWithEntity implements BlockEntityProvider {
+public class CeilingFan extends Block implements BlockEntityProvider {
     private static final VoxelShape SHAPE;
     private static final EnumProperty<CeilingFanStage> STAGE = DecorativeMain.STAGE;
 
@@ -37,17 +32,8 @@ public class CeilingFan extends BlockWithEntity implements BlockEntityProvider {
     }
 
     @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;
+    public BlockEntity createBlockEntity(BlockView view) {
+        return new CeilingFanBlockEntity();
     }
 
     @Override

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

@@ -1,26 +1,18 @@
 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.BlockView;
 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 class ChoppingLog extends HorizontalFacingBlock implements BlockEntityProvider {
 
     public ChoppingLog() {
         super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD));
@@ -29,7 +21,7 @@ public class ChoppingLog extends BlockWithEntity implements BlockEntityProvider
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+        return super.getPlacementState(itemPlacementContext)
                 .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite());
     }
 
@@ -43,17 +35,8 @@ public class ChoppingLog extends BlockWithEntity implements BlockEntityProvider
     }
 
     @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;
+    public BlockEntity createBlockEntity(BlockView view) {
+        return new ChoppingLogBlockEntity();
     }
 
 }

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

@@ -1,26 +1,20 @@
 package eu.midnightdust.motschen.decorative.block;
 
 import eu.midnightdust.motschen.decorative.block.blockentity.DigitalClockBlockEntity;
-import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity;
 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;
+public class DigitalClock extends HorizontalFacingBlock implements BlockEntityProvider {
     private static final VoxelShape NORTH_SHAPE;
     private static final VoxelShape EAST_SHAPE;
     private static final VoxelShape SOUTH_SHAPE;
@@ -32,17 +26,8 @@ public class DigitalClock extends BlockWithEntity implements BlockEntityProvider
     }
 
     @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;
+    public BlockEntity createBlockEntity(BlockView view) {
+        return new DigitalClockBlockEntity();
     }
 
     @Override

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

@@ -5,7 +5,6 @@ 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;
@@ -37,7 +36,14 @@ public class FireHydrant extends HorizontalFacingBlock {
         if (!itemStack.isEmpty() && hand==Hand.MAIN_HAND) {
             if (itemStack.getItem() == Items.BUCKET) {
                 if (!world.isClient) {
-                    ItemUsage.exchangeStack(itemStack, player, new ItemStack(Items.BUCKET));
+                    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;

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

@@ -45,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.CRABRAVE));
+                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 CRABRAVE: world.setBlockState(pos, state.with(PROGRAM, Program.TATER));
+                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));

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

@@ -1,12 +1,9 @@
 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;
@@ -14,7 +11,6 @@ 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;
@@ -25,18 +21,14 @@ 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 HorizontalFacingBlock implements BlockEntityProvider {
 
-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 static final BooleanProperty POWERED = DoorBlock.POWERED;
 
     public PoolSprinkler() {
         super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE));
@@ -44,14 +36,14 @@ public class PoolSprinkler extends BlockWithEntity implements BlockEntityProvide
     }
 
     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.setBlockState(pos, state.with(POWERED, Boolean.valueOf(!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))
+        return super.getPlacementState(itemPlacementContext)
                 .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite())
                 .with(POWERED, Boolean.FALSE);
     }
@@ -97,17 +89,8 @@ public class PoolSprinkler extends BlockWithEntity implements BlockEntityProvide
         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;
+    public BlockEntity createBlockEntity(BlockView world) {
+        return new PoolSprinklerBlockEntity();
     }
 
 }

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

@@ -1,12 +1,9 @@
 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;
@@ -14,7 +11,6 @@ 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;
@@ -25,16 +21,14 @@ 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;
+public class ShowerHead extends HorizontalFacingBlock implements BlockEntityProvider {
+
     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 static final BooleanProperty POWERED = DoorBlock.POWERED;
 
     public ShowerHead() {
         super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE));
@@ -42,7 +36,7 @@ public class ShowerHead extends BlockWithEntity implements BlockEntityProvider {
     }
 
     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.setBlockState(pos, state.with(POWERED, Boolean.valueOf(!state.get(POWERED))));
         world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f);
         return ActionResult.SUCCESS;
     }
@@ -97,17 +91,8 @@ public class ShowerHead extends BlockWithEntity implements BlockEntityProvider {
         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;
+    public BlockEntity createBlockEntity(BlockView world) {
+        return new ShowerHeadBlockEntity();
     }
 
 }

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

@@ -35,13 +35,13 @@ public class Sign extends HorizontalFacingBlock {
     }
     @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);
-        };
+        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(0, 0, 6.9, 16, 16, 9);

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

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

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

@@ -43,12 +43,16 @@ public class SlidingDoor extends DoorBlock {
         state.get(FACING);
         boolean bl = !state.get(OPEN);
         boolean bl2 = state.get(HINGE) == DoorHinge.RIGHT;
-        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);
-        };
+        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);
+        }
     }
     static {
         VoxelShape shape = createCuboidShape(0, 0, 7, 16, 16, 9);

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

@@ -0,0 +1,47 @@
+package eu.midnightdust.motschen.decorative.block;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.SmokeDetectorBlockEntity;
+import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.*;
+import net.minecraft.block.entity.BlockEntity;
+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.Property;
+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 SmokeDetector extends HorizontalFacingBlock implements BlockEntityProvider {
+    private static final VoxelShape SHAPE;
+    public static final BooleanProperty ACTIVE = BooleanProperty.of("active");
+
+    public SmokeDetector() {
+        super(FabricBlockSettings.copy(Blocks.SMOOTH_QUARTZ).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(ACTIVE, false));
+    }
+
+    @Override
+    public BlockEntity createBlockEntity(BlockView view) {
+        return new SmokeDetectorBlockEntity();
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(ACTIVE);
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        return SHAPE;
+    }
+    static {
+        VoxelShape shape = createCuboidShape(4, 14, 4, 12, 16, 12);
+
+        SHAPE = shape;
+    }
+}

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

@@ -24,8 +24,6 @@ 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;
@@ -45,56 +43,68 @@ public class Springboard extends HorizontalFacingBlock {
         ItemStack itemStack = player.getStackInHand(hand);
         if (!world.isClient) {
             if (itemStack.isEmpty() && hand==Hand.MAIN_HAND) {
-                if (state.get(PART) == Part.FRONT) {
+                switch (state.get(PART)) {
+                    case 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;
                         }
-                }
-            }
-        }
+                        else return ActionResult.FAIL;
+                    default:
                         return ActionResult.FAIL;
                 }
+            }
+            else return ActionResult.FAIL;
+        }
+        else return ActionResult.FAIL;
+    }
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+        return 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)) {
+        switch (state.get(PART)) {
+            case BACK: switch (state.get(FACING)) {
                 case NORTH:
                     if (!arg.getBlockState(pos.north()).isAir()) {
                         arg.breakBlock(pos, true);
-                    } else {
+                    }
+                    else {
                     arg.setBlockState(pos.north(), state.with(PART, Part.FRONT).with(FACING, Direction.NORTH));
                     }
-                    break;
+                    return;
                 case EAST:
                     if (!arg.getBlockState(pos.east()).isAir()) {
                         arg.breakBlock(pos, true);
-                    } else {
+                    }
+                    else {
                     arg.setBlockState(pos.east(), state.with(PART, Part.FRONT).with(FACING, Direction.EAST));
                     }
-                    break;
+                    return;
                 case SOUTH:
                     if (!arg.getBlockState(pos.south()).isAir()) {
                         arg.breakBlock(pos, true);
-                    } else {
+                    }
+                    else {
                     arg.setBlockState(pos.south(), state.with(PART, Part.FRONT).with(FACING, Direction.SOUTH));
                     }
-                    break;
+                    return;
                 case WEST:
                     if (!arg.getBlockState(pos.west()).isAir()) {
                         arg.breakBlock(pos, true);
-                    } else {
+                    }
+                    else {
                     arg.setBlockState(pos.west(), state.with(PART, Part.FRONT).with(FACING, Direction.WEST));
                     }
-                    break;
+                    return;
+                default:
+                    return;
             }
+            default: return;
         }
     }
     @Override
@@ -102,48 +112,38 @@ public class Springboard extends HorizontalFacingBlock {
         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;
-                    }
+                    if (world.getBlockState(pos.north()).contains(PART)) { world.breakBlock(pos.north(), true);}
+                    return;
                 case EAST:
-                    if (world.getBlockState(pos.east()).contains(PART)) {
-                        world.breakBlock(pos.east(), true);
-                        break;
-                    }
+                    if (world.getBlockState(pos.east()).contains(PART)) { world.breakBlock(pos.east(), true);}
+                    return;
                 case SOUTH:
-                    if (world.getBlockState(pos.south()).contains(PART)) {
-                        world.breakBlock(pos.south(), true);
-                        break;
-                    }
+                    if (world.getBlockState(pos.south()).contains(PART)) { world.breakBlock(pos.south(), true);}
+
+                    return;
                 case WEST:
-                    if (world.getBlockState(pos.west()).contains(PART)) {
-                        world.breakBlock(pos.west(), true);
-                        break;
-                    }
+                    if (world.getBlockState(pos.west()).contains(PART)) { world.breakBlock(pos.west(), true);}
+                    return;
+                default:
+                    return;
             }
             case FRONT: switch (state.get(FACING)) {
                 case NORTH:
-                    if (world.getBlockState(pos.south()).contains(PART)) {
-                        world.breakBlock(pos.south(), true);
-                        break;
-                    }
+                    if (world.getBlockState(pos.south()).contains(PART)) { world.breakBlock(pos.south(), true); }
+                    return;
                 case EAST:
-                    if (world.getBlockState(pos.west()).contains(PART)) {
-                        world.breakBlock(pos.west(), true);
-                        break;
-                    }
+                    if (world.getBlockState(pos.west()).contains(PART)) { world.breakBlock(pos.south(), true); }
+                    return;
                 case SOUTH:
-                    if (world.getBlockState(pos.north()).contains(PART)) {
-                        world.breakBlock(pos.north(), true);
-                        break;
-                    }
+                    if (world.getBlockState(pos.north()).contains(PART)) { world.breakBlock(pos.south(), true); }
+                    return;
                 case WEST:
-                    if (world.getBlockState(pos.east()).contains(PART)) {
-                        world.breakBlock(pos.east(), true);
-                        break;
-                    }
+                    if (world.getBlockState(pos.east()).contains(PART)) { world.breakBlock(pos.south(), true); }
+                    return;
+                default:
+                    return;
             }
+            default: return;
         }
     }
 
@@ -154,25 +154,13 @@ public class Springboard extends HorizontalFacingBlock {
     }
     @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);
-        };
+        switch (state.get(FACING)) {
+            case NORTH: switch (state.get(PART)) { case FRONT: return NORTH_SHAPE_FRONT; case BACK: return NORTH_SHAPE_BACK;}
+            case EAST: switch (state.get(PART)) { case FRONT: return EAST_SHAPE_FRONT; case BACK: return EAST_SHAPE_BACK;}
+            case SOUTH: switch (state.get(PART)) { case FRONT: return SOUTH_SHAPE_FRONT; case BACK: return SOUTH_SHAPE_BACK;}
+            case WEST: switch (state.get(PART)) { case FRONT: return WEST_SHAPE_FRONT; case BACK: return WEST_SHAPE_BACK;}
+            default: return super.getOutlineShape(state, view, pos, context);
+        }
     }
     static {
         //long_plank
@@ -241,7 +229,7 @@ public class Springboard extends HorizontalFacingBlock {
     }
 
     public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {
-        return !worldView.isAir(pos.down()) && worldView.getBlockState(pos.offset(state.get(FACING))) == Blocks.AIR.getDefaultState();
+        return !worldView.isAir(pos.down());
     }
 
 }

src/main/java/eu/midnightdust/motschen/decorative/block/StonePath.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.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

@@ -23,7 +23,6 @@ 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 {
@@ -41,38 +40,28 @@ public class Television extends HorizontalFacingBlock {
 
     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));
+                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));
+                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));
+                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 CRABRAVE -> {
-                world.setBlockState(pos, state.with(PROGRAM, Program.TATER));
+                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));
+                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 Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+        return super.getPlacementState(itemPlacementContext)
                 .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite())
                 .with(PROGRAM, Program.OFF);
     }
@@ -84,13 +73,13 @@ public class Television extends HorizontalFacingBlock {
     }
     @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);
-        };
+        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(-7, 4, 7, 22, 22, 9);

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

@@ -20,7 +20,9 @@ public class TrafficCone extends Block {
         return SHAPE;
     }
     static {
-        SHAPE = createCuboidShape(4, 0, 4, 12, 11.5, 12);
+        VoxelShape shape = createCuboidShape(4, 0, 4, 12, 11.5, 12);
+
+        SHAPE = shape;
     }
 
     public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {

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

@@ -1,28 +1,19 @@
 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;
+public class WallClock extends HorizontalFacingBlock implements BlockEntityProvider {
     private static final VoxelShape NORTH_SHAPE;
     private static final VoxelShape EAST_SHAPE;
     private static final VoxelShape SOUTH_SHAPE;
@@ -34,17 +25,8 @@ public class WallClock extends BlockWithEntity implements BlockEntityProvider {
     }
 
     @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;
+    public BlockEntity createBlockEntity(BlockView view) {
+        return new WallClockBlockEntity();
     }
 
     @Override
@@ -54,27 +36,27 @@ public class WallClock extends BlockWithEntity implements BlockEntityProvider {
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
-        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+        return 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);
-        };
+        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(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);
+        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() };

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

@@ -19,8 +19,6 @@ 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;
@@ -36,19 +34,30 @@ public class WaterPump extends HorizontalFacingBlock {
         if (!itemStack.isEmpty() && hand==Hand.MAIN_HAND) {
             if (itemStack.getItem() == Items.BUCKET) {
                 if (!world.isClient) {
-                    ItemUsage.exchangeStack(itemStack, player, new ItemStack(Items.BUCKET));
+                    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) {
-        return Objects.requireNonNull(super.getPlacementState(itemPlacementContext))
+        return super.getPlacementState(itemPlacementContext)
                 .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite());
     }
 
@@ -58,13 +67,13 @@ public class WaterPump extends HorizontalFacingBlock {
     }
     @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);
-        };
+        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(4.25, 0, 0, 11.75, 24, 14);

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

@@ -5,45 +5,43 @@ 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.Tickable;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 
-import java.time.LocalTime;
-
-public class CeilingFanBlockEntity extends BlockEntity {
+public class CeilingFanBlockEntity extends BlockEntity implements Tickable {
     private int rot;
-    private int second;
 
-    public CeilingFanBlockEntity(BlockPos pos, BlockState state) {
-        super(BlockEntities.CeilingFanBlockEntity, pos, state);
+    public CeilingFanBlockEntity() {
+        super(BlockEntities.CeilingFanBlockEntity);
     }
 
-    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();
+
+
+    @Override
+    public void tick() {
+
+        BlockPos pos = this.pos;
+        BlockState state = this.world.getBlockState(pos);
+        if (world != null && state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_1) {
             world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.1f, 1.0f);
+            rot = rot + 6;
+            return;
         }
-            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();
+        if (world != null && state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_2) {
             world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.2f, 1.0f);
+            rot = rot + 10;
+            return;
         }
-            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();
+        if (world != null && state.get(DecorativeMain.STAGE) == CeilingFanStage.LEVEL_3) {
             world.playSound(null,pos, DecorativeSoundEvents.CEILINGFAN_AMBIENT, SoundCategory.BLOCKS, 0.3f, 1.0f);
+            rot = rot + 14;
+            return;
         }
-
-            blockEntity.rot = blockEntity.rot + 14;
+        else {
+            rot = rot;
+            return;
         }
     }
     public int getRot() {

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

@@ -4,40 +4,48 @@ 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.Tickable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-import net.minecraft.world.World;
 
-public class ChoppingLogBlockEntity extends BlockEntity {
+public class ChoppingLogBlockEntity extends BlockEntity implements Tickable {
     private int facing;
     private double axe_x;
     private double axe_z;
 
-    public ChoppingLogBlockEntity(BlockPos pos, BlockState state) {
-        super(BlockEntities.ChoppingLogBlockEntity, pos, state);
+    public ChoppingLogBlockEntity() {
+        super(BlockEntities.ChoppingLogBlockEntity);
     }
 
-    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;
+    @Override
+    public void tick() {
+
+        BlockPos pos = this.pos;
+        BlockState state = this.world.getBlockState(pos);
+
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) {
+            facing = 180;
+            axe_x = 0.2D;
+            axe_z = 0.5D;
+            return;
         }
-        else if (state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) {
-            blockEntity.facing = 90;
-            blockEntity.axe_x = 0.5D;
-            blockEntity.axe_z = 0.2D;
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) {
+            facing = 90;
+            axe_x = 0.5D;
+            axe_z = 0.2D;
+            return;
         }
-        else if (state.get(HorizontalFacingBlock.FACING) == Direction.WEST) {
-            blockEntity.facing = 0;
-            blockEntity.axe_x = 0.8D;
-            blockEntity.axe_z = 0.5D;
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) {
+            facing = 0;
+            axe_x = 0.8D;
+            axe_z = 0.5D;
+            return;
         }
         else {
-            blockEntity.facing = 270;
-            blockEntity.axe_x = 0.5D;
-            blockEntity.axe_z = 0.8D;
+            facing = 270;
+            axe_x = 0.5D;
+            axe_z = 0.8D;
+            return;
         }
     }
 

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

@@ -4,52 +4,59 @@ 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.Tickable;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
+import net.minecraft.util.math.Direction;
 
 import java.time.LocalTime;
 
-public class DigitalClockBlockEntity extends BlockEntity {
+public class DigitalClockBlockEntity extends BlockEntity implements Tickable {
     private int facing;
     private double x;
     private double z;
     private int second;
 
-    public DigitalClockBlockEntity(BlockPos pos, BlockState state) {
-        super(BlockEntities.DigitalClockBlockEntity, pos, state);
+    public DigitalClockBlockEntity() {
+        super(BlockEntities.DigitalClockBlockEntity);
     }
 
-    public static void tick(World world, BlockPos pos, BlockState state, DigitalClockBlockEntity blockEntity) {
-        if (LocalTime.now().getSecond() != blockEntity.second) {
-            blockEntity.second = LocalTime.now().getSecond();
+    @Override
+    public void tick() {
+        if (LocalTime.now().getSecond() != second) {
+            second = LocalTime.now().getSecond();
         }
-        switch (state.get(HorizontalFacingBlock.FACING)) {
-            case NORTH: {
-                blockEntity.facing = 0;
-                blockEntity.x = 0.825;
-                blockEntity.z = 0.374;
-                break;
+
+        BlockPos pos = this.pos;
+        BlockState state = this.world.getBlockState(pos);
+
+
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) {
+            facing = 270;
+            x = 0.626;
+            z = 0.825;
+            return;
         }
-            case EAST:{
-                blockEntity.facing = 270;
-                blockEntity.x = 0.626;
-                blockEntity.z = 0.825;
-                break;
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) {
+            facing = 180;
+            x = 0.175;
+            z = 0.626;
+            return;
         }
-            case SOUTH:{
-                blockEntity.facing = 180;
-                blockEntity.x = 0.175;
-                blockEntity.z = 0.626;
-                break;
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) {
+            facing = 90;
+            x = 0.374;
+            z = 0.175;
+            return;
         }
-            case WEST:{
-                blockEntity.facing = 90;
-                blockEntity.x = 0.374;
-                blockEntity.z = 0.175;
-                break;
-            }
-            default: break;
+        else {
+            facing = 0;
+            x = 0.825;
+            z = 0.374;
+            return;
         }
+
     }
     public int getFacing() {
         return facing;

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

@@ -2,26 +2,41 @@ package eu.midnightdust.motschen.decorative.block.blockentity;
 
 import eu.midnightdust.motschen.decorative.block.PoolSprinkler;
 import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import eu.midnightdust.motschen.decorative.init.Pool;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.util.Tickable;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 
-public class PoolSprinklerBlockEntity extends BlockEntity {
+public class PoolSprinklerBlockEntity extends BlockEntity implements Tickable {
 
-    public PoolSprinklerBlockEntity(BlockPos pos, BlockState state) {
-        super(BlockEntities.PoolSprinklerBlockEntity, pos, state);
+    public PoolSprinklerBlockEntity() {
+        super(BlockEntities.PoolSprinklerBlockEntity);
     }
 
-    public static void tick(World world, BlockPos pos, BlockState state, PoolSprinklerBlockEntity blockEntity) {
+    @Override
+    public void tick() {
+        BlockPos pos = this.pos;
+        if (world != null) {
+            BlockState state = this.world.getBlockState(pos);
             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;
+                    case NORTH:
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() - 0.34, 1, 1, 1);
+                        return;
+                    case EAST:
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 1.34, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1);
+                        return;
+                    case SOUTH:
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 1.34, 1, 1, 1);
+                        return;
+                    case WEST:
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() - 0.34, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1);
+                        return;
+                    default:
+                        return;
+                }
             }
         }
     }

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

@@ -2,28 +2,42 @@ package eu.midnightdust.motschen.decorative.block.blockentity;
 
 import eu.midnightdust.motschen.decorative.block.PoolSprinkler;
 import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import eu.midnightdust.motschen.decorative.init.Pool;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.util.Tickable;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 
-public class ShowerHeadBlockEntity extends BlockEntity {
+public class ShowerHeadBlockEntity extends BlockEntity implements Tickable {
 
-    public ShowerHeadBlockEntity(BlockPos pos, BlockState state) {
-        super(BlockEntities.ShowerHeadBlockEntity, pos, state);
+    public ShowerHeadBlockEntity() {
+        super(BlockEntities.ShowerHeadBlockEntity);
     }
 
-    public static void tick(World world, BlockPos pos, BlockState state, ShowerHeadBlockEntity blockEntity) {
-        if (state.get(PoolSprinkler.POWERED)) {
+    @Override
+    public void tick() {
+        BlockPos pos = this.pos;
+        if (world != null) {
+            BlockState state = this.world.getBlockState(pos);
+            if (state.get(PoolSprinkler.POWERED) == true) {
                 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;
+                    case NORTH:
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.625, 1, 1, 1);
+                        return;
+                    case EAST:
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.375, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1);
+                        return;
+                    case SOUTH:
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.375, 1, 1, 1);
+                        return;
+                    case WEST:
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.625, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 1, 1);
+                        return;
+                    default:
+                        return;
+                }
             }
         }
-
     }
 }

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

@@ -0,0 +1,47 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.block.SmokeDetector;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.tag.BlockTags;
+import net.minecraft.util.Tickable;
+import net.minecraft.util.math.BlockPos;
+
+import java.time.LocalTime;
+
+public class SmokeDetectorBlockEntity extends BlockEntity implements Tickable {
+    private int second;
+    private int sound = 0;
+
+    public SmokeDetectorBlockEntity() {
+        super(BlockEntities.SmokeDetectorBlockEntity);
+    }
+
+    public boolean isInFireRange() {
+        return this.world.getBlockState(this.pos.down()).isIn(BlockTags.FIRE);
+    }
+
+    @Override
+    public void tick() {
+        if (LocalTime.now().getSecond() != second) {
+            second = LocalTime.now().getSecond();
+
+            if (this.isInFireRange()) {
+                world.setBlockState(pos, DecorativeMain.SmokeDetector.getDefaultState().with(SmokeDetector.ACTIVE, true));
+
+                sound = sound + 1;
+                if (sound > 3) {sound = 0;}
+                if (sound == 0) {
+                    world.playSound(null, pos, DecorativeSoundEvents.SMOKE_DETECTOR_BEEP, SoundCategory.BLOCKS, 1f, 1f);
+                }
+            }
+            else if (this.world.getBlockState(pos).get(SmokeDetector.ACTIVE).equals(true)) {
+                world.setBlockState(pos, DecorativeMain.SmokeDetector.getDefaultState().with(SmokeDetector.ACTIVE, false));
+            }
+        }
+    }
+}

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

@@ -1,59 +1,73 @@
 package eu.midnightdust.motschen.decorative.block.blockentity;
 
 import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents;
 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.state.property.Properties;
+import net.minecraft.util.Tickable;
 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 class WallClockBlockEntity extends BlockEntity implements Tickable {
+    private int facing;
+    private double x;
+    private double z;
+    private int second;
 
-    public WallClockBlockEntity(BlockPos pos, BlockState state) {
-        super(BlockEntities.WallClockBlockEntity, pos, state);
+    public WallClockBlockEntity() {
+        super(BlockEntities.WallClockBlockEntity);
     }
 
-    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);
+    @Override
+    public void tick() {
+        if (LocalTime.now().getSecond() != second) {
+            second = LocalTime.now().getSecond();
+            world.playSound(null, pos, SoundEvents.BLOCK_WOODEN_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.004f, 1f);
         }
 
-        switch (state.get(HorizontalFacingBlock.FACING)) {
-            case NORTH: {
-                blockEntity.facing = 0;
-                blockEntity.x = 0.5;
-                blockEntity.z = 0.95;
-                break;
+        BlockPos pos = this.pos;
+        BlockState state = this.world.getBlockState(pos);
+
+
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.EAST) {
+            facing = 270;
+            x = 0.05;
+            z = 0.5;
+            return;
         }
-            case EAST: {
-                blockEntity.facing = 270;
-                blockEntity.x = 0.05;
-                blockEntity.z = 0.5;
-                break;
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) {
+            facing = 180;
+            x = 0.5;
+            z = 0.05;
+            return;
         }
-            case SOUTH: {
-                blockEntity.facing = 180;
-                blockEntity.x = 0.5;
-                blockEntity.z = 0.05;
-                break;
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) {
+            facing = 90;
+            x = 0.95;
+            z = 0.5;
+            return;
         }
-            case WEST: {
-                blockEntity.facing = 90;
-                blockEntity.x = 0.95;
-                blockEntity.z = 0.5;
-                break;
-            }
-            default: break;
+        else {
+            facing = 0;
+            x = 0.5;
+            z = 0.95;
+            return;
         }
+
+    }
+    public int getFacing() {
+        return facing;
+    }
+    public double getX() {
+        return x;
+    }
+    public double getZ() {
+        return z;
     }
 }

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

@@ -1,25 +1,38 @@
 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.block.DoorBlock;
+import net.minecraft.client.model.ModelPart;
 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.WorldRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 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.client.util.math.Vector3f;
 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 class CeilingFanRenderer extends BlockEntityRenderer<CeilingFanBlockEntity> {
+    private static int rot;
+    private final ModelPart blades;
+    private final ModelPart point;
 
-    public CeilingFanRenderer(BlockEntityRendererFactory.Context ctx) {
-        blades = new CeilingFanBladesModel(ctx.getLayerModelPart(CeilingFanBladesModel.CEILING_FAN_MODEL_LAYER));
+    public CeilingFanRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
+        super(blockEntityRenderDispatcher);
+        blades = new ModelPart(64, 64, 0, 0);
+        blades.setPivot(0.0F, 0.0F, 0.0F);
+        blades.addCuboid(-1.0F, 0.0F, 1.0F, 2.0F, 1.0F, 10.0F, 0.0F);
+        blades.addCuboid(-1.0F, 0.0F, -11.0F, 2.0F, 1.0F, 10.0F, 0.0F);
+        blades.addCuboid(1.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F, 0.0F);
+        blades.addCuboid(-11.0F, 0.0F, -1.0F, 10.0F, 1.0F, 2.0F, 0.0F);
+        point = new ModelPart(32, 32, 16, 0);
+        point.addCuboid(-1.0F, -1.0F, -1.0F, 2.0F, 2.0F, 2.0F, 0.0F);
+        blades.addChild(point);
     }
 
     @Override
@@ -30,11 +43,16 @@ public class CeilingFanRenderer implements BlockEntityRenderer<CeilingFanBlockEn
 
     @Override
     public void render(CeilingFanBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+
         matrices.push();
+        int lightAtBlock = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos());
         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.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getRot()));
+
+
+        blades.render(matrices, vertexConsumer, lightAtBlock, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
         matrices.pop();
     }
 }

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

@@ -3,22 +3,23 @@ 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.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.*;
+import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 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.client.util.math.Vector3f;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.util.math.Vec3f;
-
-import java.util.Objects;
+import net.minecraft.util.math.BlockPos;
 
 @Environment(EnvType.CLIENT)
-public class ChoppingLogBlockEntityRenderer implements BlockEntityRenderer<ChoppingLogBlockEntity> {
+public class ChoppingLogBlockEntityRenderer extends BlockEntityRenderer<ChoppingLogBlockEntity> {
 
-    public ChoppingLogBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
+    public ChoppingLogBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
+        super(blockEntityRenderDispatcher);
     }
 
     @Override
@@ -26,15 +27,25 @@ public class ChoppingLogBlockEntityRenderer implements BlockEntityRenderer<Chopp
         return true;
     }
 
+
     @Override
     public void render(ChoppingLogBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+        BlockPos pos = blockEntity.getPos();
+        BlockState state = blockEntity.getWorld().getBlockState(pos);
+
         matrices.push();
-        int lightAbove = WorldRenderer.getLightmapCoordinates(Objects.requireNonNull(blockEntity.getWorld()), blockEntity.getPos().up());
+        int lightAbove = WorldRenderer.getLightmapCoordinates(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.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing()));
+
+        matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(160));
+        MinecraftClient.getInstance().getItemRenderer().renderItem(new ItemStack(Items.IRON_AXE),
+                ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers);
+
+
         matrices.pop();
     }
 }

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

@@ -2,24 +2,29 @@ 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 eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.*;
+import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
-import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
+import net.minecraft.client.render.block.entity.SignBlockEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.Vec3f;
+import net.minecraft.client.util.math.Vector3f;
+import net.minecraft.util.Identifier;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalTime;
+import java.util.SimpleTimeZone;
+import java.util.TimeZone;
 
 @Environment(EnvType.CLIENT)
-public class DigitalClockRenderer implements BlockEntityRenderer<DigitalClockBlockEntity> {
-    private final TextRenderer textRenderer;
+public class DigitalClockRenderer extends BlockEntityRenderer<DigitalClockBlockEntity> {
 
-    public DigitalClockRenderer(BlockEntityRendererFactory.Context ctx) {
-        textRenderer = ctx.getTextRenderer();
+    public DigitalClockRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
+        super(blockEntityRenderDispatcher);
     }
 
     private int getHour12hFormat() {
@@ -35,7 +40,7 @@ public class DigitalClockRenderer implements BlockEntityRenderer<DigitalClockBlo
         String minute;
 
         // Hour
-        if (DecorativeConfig.timeFormat.equals(DecorativeConfig.TimeFormat.h12)) {
+        if (DecorativeMain.DECORATIVE_CONFIG.use12hTime) {
             if (getHour12hFormat() <= 9) {
                 hour = "0" + getHour12hFormat();
             } else {
@@ -58,20 +63,24 @@ public class DigitalClockRenderer implements BlockEntityRenderer<DigitalClockBlo
             minute = "" + LocalTime.now().getMinute();
         }
 
-        return hour +":"+ minute;
+        String time = hour +":"+ minute;
+        return time;
     }
 
 
     @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());
+        int lightAtBlock1 = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos());
 
+        TextRenderer textRenderer = dispatcher.getTextRenderer();
+
+        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.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing()));
+        matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
+        textRenderer.draw(getTime(), 0, 0, 16382457, false, matrices.peek().getModel(), vertexConsumers, false, 0, lightAtBlock1);
+
         matrices.pop();
     }
 }

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

@@ -1,24 +1,41 @@
 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.model.ModelPart;
 import net.minecraft.client.render.*;
+import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 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.client.util.math.Vector3f;
 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 class WallClockRenderer extends BlockEntityRenderer<WallClockBlockEntity> {
+    private final ModelPart blades;
+    private final ModelPart seconds;
+    private final ModelPart minutes;
+    private final ModelPart hours;
 
-    public WallClockRenderer(BlockEntityRendererFactory.Context ctx) {
-        handsModel = new WallClockHandsModel(ctx.getLayerModelPart(WallClockHandsModel.CLOCK_HANDS_MODEL_LAYER));
+    public WallClockRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
+        super(blockEntityRenderDispatcher);
+        blades = new ModelPart(16, 16, 0, 0);
+        blades.setPivot(0.0F, 0.0F, 0.0F);
+
+        seconds = new ModelPart(16, 16, 8, 0);
+        seconds.addCuboid(-0.175F, 0.0F, 0.0F, 0.25F, 7.0F, 0.2F, 0.0F);
+        blades.addChild(seconds);
+
+        minutes = new ModelPart(16, 16, 0, 0);
+        minutes.addCuboid(-0.25F, 0.0F, 0.0F, 0.5F, 6.0F, 0.2F, 0.0F);
+        blades.addChild(minutes);
+
+        hours = new ModelPart(16, 16, 0, 0);
+        hours.addCuboid(-0.25F, 0.0F, 0.0F, 0.5F, 4.0F, 0.2F, 0.0F);
+        blades.addChild(hours);
     }
 
     private int getHour12hFormat() {
@@ -30,29 +47,37 @@ public class WallClockRenderer implements BlockEntityRenderer<WallClockBlockEnti
         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")));
+
+        int lightAtBlock = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos());
 
         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);
+        VertexConsumer redVertex = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("textures/block/red_concrete.png")));
+        int lightAtBlock1 = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos());
+        matrices.translate(blockEntity.getX(),0.5,blockEntity.getZ());
+        matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing()));
+        matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(LocalTime.now().getSecond() * 6));
+        seconds.render(matrices, redVertex, lightAtBlock1, 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);
+        VertexConsumer blackVertex = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("textures/block/black_concrete.png")));
+        int lightAtBlock2 = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos());
+        matrices.translate(blockEntity.getX(),0.5,blockEntity.getZ());
+        matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing()));
+        matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(LocalTime.now().getMinute() * 6));
+        minutes.render(matrices, blackVertex, lightAtBlock2, 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(getHour12hFormat() * 30));
-        handsModel.hours.render(matrices, vertex, light, OverlayTexture.DEFAULT_UV, 0.0F, 0.0F, 0.0F, 1.0F);
+        VertexConsumer blackVertex2 = vertexConsumers.getBuffer(RenderLayer.getEntityCutoutNoCull(new Identifier("textures/block/black_concrete.png")));
+        int lightAtBlock3 = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos());
+        matrices.translate(blockEntity.getX(),0.5,blockEntity.getZ());
+        matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(blockEntity.getFacing()));
+        matrices.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(getHour12hFormat() * 30));
+        hours.render(matrices, blackVertex2, lightAtBlock3, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
         matrices.pop();
     }
 }

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

@@ -1,42 +0,0 @@
-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

@@ -1,47 +0,0 @@
-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/Program.java

@@ -6,7 +6,7 @@ public enum Program implements StringIdentifiable {
     OFF("off"),
     NYANCAT("nyancat"),
     CREEPER("creeper"),
-    CRABRAVE("crabrave"),
+    WOODYS("woodys"),
     TATER("tater");
 
     private final String name;

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

@@ -1,13 +1,11 @@
 package eu.midnightdust.motschen.decorative.config;
 
-import eu.midnightdust.lib.config.MidnightConfig;
+import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
+import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
+import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
 
-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
-    }
+@Config(name = "decorative")
+public class DecorativeConfig implements ConfigData {
+    @Comment(value = "Use 12h Time")
+    public boolean use12hTime = true;
 }

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

@@ -1,8 +1,8 @@
 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 io.github.prospector.modmenu.api.ConfigScreenFactory;
+import io.github.prospector.modmenu.api.ModMenuApi;
+import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
@@ -11,6 +11,6 @@ public class ModMenuIntegration implements ModMenuApi {
 
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> MidnightConfig.getScreen(parent,"decorative");
+        return parent -> AutoConfig.getConfigScreen(DecorativeConfig.class, parent).get();
     }
 }

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

@@ -21,6 +21,11 @@ public class BathTireEntity extends PigEntity {
         super(entityType, world);
     }
 
+    @Override
+    protected int getCurrentExperience(PlayerEntity player) {
+        return 0;
+    }
+
     @Override
     protected SoundEvent getAmbientSound() {
         return null;

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

@@ -22,6 +22,11 @@ public class BeachBallEntity extends PigEntity {
         super(entityType, world);
     }
 
+    @Override
+    protected int getCurrentExperience(PlayerEntity player) {
+        return 0;
+    }
+
     @Override
     protected SoundEvent getAmbientSound() {
         return null;
@@ -102,7 +107,7 @@ public class BeachBallEntity extends PigEntity {
     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);
+            remove();
             player.setStackInHand(hand, new ItemStack(Pool.BEACH_BALL_ITEM));
             return ActionResult.SUCCESS;
         }

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

@@ -1,44 +1,39 @@
 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.model.ModelPart;
 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;
+	public BathTireModel() {
+		textureWidth = 16;
+		textureHeight = 16;
+
+		body = new ModelPart(this);
 		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;
+		body.setTextureOffset(0, 0).addCuboid(6.0F, -9.0F, -11.0F, 4.0F, 4.0F, 16.0F, 0.0F, false);
+		body.setTextureOffset(0, 0).addCuboid(-10.0F, -9.0F, -11.0F, 4.0F, 4.0F, 16.0F, 0.0F, false);
+		body.setTextureOffset(0, 0).addCuboid(-8.0F, -8.99F, -13.0F, 16.0F, 4.0F, 4.0F, 0.0F, false);
+		body.setTextureOffset(0, 0).addCuboid(-8.0F, -8.99F, 3.0F, 16.0F, 4.0F, 4.0F, 0.0F, false);
 	}
 
 	@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);
 	}
+
+	public void setRotationAngle(ModelPart modelRenderer, float x, float y, float z) {
+		modelRenderer.pivotX = x;
+		modelRenderer.pivotY = y;
+		modelRenderer.pivotZ = z;
+	}
 }

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

@@ -1,39 +1,27 @@
 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.model.ModelPart;
 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 BeachBallModel() {
+		textureWidth = 64;
+		textureHeight = 64;
 
-	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;
+		body = new ModelPart(this);
+		body.setPivot(0.0F, 24.0F, 0.0F);
+		body.setTextureOffset(0, 22).addCuboid(-4.0F, -1.0F, -4.0F, 8.0F, 1.0F, 8.0F, 0.0F, false);
+		body.setTextureOffset(0, 22).addCuboid(-4.0F, -12.0F, -4.0F, 8.0F, 1.0F, 8.0F, 0.0F, false);
+		body.setTextureOffset(0, 48).addCuboid(-6.0F, -10.0F, -4.0F, 1.0F, 8.0F, 8.0F, 0.0F, false);
+		body.setTextureOffset(20, 48).addCuboid(5.0F, -10.0F, -4.0F, 1.0F, 8.0F, 8.0F, 0.0F, false);
+		body.setTextureOffset(0, 33).addCuboid(-4.0F, -10.0F, -6.0F, 8.0F, 8.0F, 1.0F, 0.0F, false);
+		body.setTextureOffset(20, 33).addCuboid(-4.0F, -10.0F, 5.0F, 8.0F, 8.0F, 1.0F, 0.0F, false);
+		body.setTextureOffset(0, 0).addCuboid(-5.0F, -11.0F, -5.0F, 10.0F, 10.0F, 10.0F, 0.0F, false);
 	}
 
 	@Override
@@ -45,4 +33,10 @@ public class BeachBallModel extends EntityModel<BeachBallEntity> {
 	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);
 	}
+
+	public void setRotationAngle(ModelPart modelRenderer, float x, float y, float z) {
+		modelRenderer.pivotX = x;
+		modelRenderer.pivotY = y;
+		modelRenderer.pivotZ = z;
+	}
 }

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

@@ -1,44 +1,32 @@
 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.model.ModelPart;
 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 DuckBathTireModel() {
+		textureWidth = 64;
+		textureHeight = 64;
 
-	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;
+		body = new ModelPart(this);
+		body.setPivot(0.0F, 19.0F, 0.0F);
+		body.setTextureOffset(0, 9).addCuboid(6.0F, -3.0F, -8.0F, 4.0F, 3.0F, 16.0F, 0.0F, false);
+		body.setTextureOffset(0, 37).addCuboid(-10.0F, -3.0F, -8.0F, 4.0F, 3.0F, 16.0F, 0.0F, false);
+		body.setTextureOffset(0, 57).addCuboid(-8.0F, -2.99F, -10.0F, 16.0F, 3.0F, 4.0F, 0.0F, false);
+		body.setTextureOffset(0, 29).addCuboid(-8.0F, -2.99F, 6.0F, 16.0F, 3.0F, 4.0F, 0.0F, false);
+		body.setTextureOffset(50, 0).addCuboid(-2.0F, -8.0F, -10.0F, 4.0F, 5.0F, 3.0F, 0.0F, false);
+		body.setTextureOffset(46, 11).addCuboid(-2.999F, -10.0F, -12.0F, 6.0F, 5.0F, 3.0F, 0.0F, false);
+		body.setTextureOffset(15, 31).addCuboid(-2.499F, -10.5F, -12.001F, 5.0F, 1.0F, 3.0F, 0.0F, false);
+		body.setTextureOffset(58, 20).addCuboid(-0.999F, -8.0F, -13.0F, 2.0F, 2.0F, 1.0F, 0.0F, false);
+		body.setTextureOffset(58, 20).addCuboid(-1.999F, -7.0F, -13.0F, 1.0F, 1.0F, 1.0F, 0.0F, false);
+		body.setTextureOffset(53, 21).addCuboid(-1.999F, -10.0F, -12.5F, 1.0F, 1.0F, 1.0F, 0.0F, false);
+		body.setTextureOffset(53, 21).addCuboid(1.001F, -10.0F, -12.5F, 1.0F, 1.0F, 1.0F, 0.0F, false);
+		body.setTextureOffset(58, 20).addCuboid(1.001F, -7.0F, -13.0F, 1.0F, 1.0F, 1.0F, 0.0F, false);
 	}
 
 	@Override
@@ -50,4 +38,10 @@ public class DuckBathTireModel extends EntityModel<BathTireEntity> {
 	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);
 	}
+
+	public void setRotationAngle(ModelPart modelRenderer, float x, float y, float z) {
+		modelRenderer.pivotX = x;
+		modelRenderer.pivotY = y;
+		modelRenderer.pivotZ = z;
+	}
 }

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

@@ -1,24 +0,0 @@
-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

@@ -5,17 +5,15 @@ 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.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
 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);
+    public BeachBallRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BeachBallModel(), 0.5F);
     }
 
     @Override

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class BlackBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public BlackBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/black_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class BlueBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public BlueBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/blue_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class BrownBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public BrownBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/brown_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class CyanBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public CyanBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/cyan_concrete.png");
+    }
+}

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

@@ -8,15 +8,13 @@ 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);
-    }
+
+    public DuckBathTireRenderer(EntityRenderDispatcher dispatcher) { super(dispatcher, new DuckBathTireModel(), 0.5F); }
 
     @Override
     public Identifier getTexture(BathTireEntity entity) {

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class GrayBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public GrayBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/gray_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class GreenBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public GreenBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/green_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class LightBlueBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public LightBlueBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/light_blue_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class LightGrayBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public LightGrayBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/light_gray_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class LimeBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public LimeBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/lime_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class MagentaBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public MagentaBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/magenta_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class OrangeBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public OrangeBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/orange_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class PinkBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public PinkBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/pink_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class PurpleBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public PurpleBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/purple_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class RedBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public RedBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/red_concrete.png");
+    }
+}

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

@@ -0,0 +1,23 @@
+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.client.model.BathTireModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class WhiteBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public WhiteBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/white_concrete.png");
+    }
+}

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

@@ -0,0 +1,22 @@
+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.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class YellowBathTireRenderer extends MobEntityRenderer<BathTireEntity, BathTireModel> {
+
+    public YellowBathTireRenderer(EntityRenderDispatcher dispatcher) {
+        super(dispatcher, new BathTireModel(), 0.5F);
+    }
+
+    @Override
+    public Identifier getTexture(BathTireEntity entity) {
+        return new Identifier("minecraft", "textures/block/yellow_concrete.png");
+    }
+}

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

@@ -2,7 +2,6 @@ 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;
@@ -16,13 +15,15 @@ public class BlockEntities {
     public static BlockEntityType<ChoppingLogBlockEntity> ChoppingLogBlockEntity;
     public static BlockEntityType<WallClockBlockEntity> WallClockBlockEntity;
     public static BlockEntityType<DigitalClockBlockEntity> DigitalClockBlockEntity;
+    public static BlockEntityType<SmokeDetectorBlockEntity> SmokeDetectorBlockEntity;
 
     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));
+        PoolSprinklerBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler_blockentity"), BlockEntityType.Builder.create(PoolSprinklerBlockEntity::new, Pool.PoolSprinkler).build(null));
+        ShowerHeadBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"shower_head_blockentity"), BlockEntityType.Builder.create(ShowerHeadBlockEntity::new, DecorativeMain.ShowerHead).build(null));
+        CeilingFanBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"ceiling_fan_blockentity"), BlockEntityType.Builder.create(CeilingFanBlockEntity::new, DecorativeMain.CeilingFan).build(null));
+        ChoppingLogBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"chopping_log_blockentity"), BlockEntityType.Builder.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"), BlockEntityType.Builder.create(WallClockBlockEntity::new, DecorativeMain.WallClock).build(null));
+        DigitalClockBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"digital_clock_blockentity"), BlockEntityType.Builder.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));
+        SmokeDetectorBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(DecorativeMain.MOD_ID,"smoke_detector_blockentity"), BlockEntityType.Builder.create(SmokeDetectorBlockEntity::new, DecorativeMain.SmokeDetector).build(null));
     }
 }

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

@@ -1,13 +1,14 @@
 package eu.midnightdust.motschen.decorative.item;
 
+import com.google.common.collect.Maps;
+import java.util.Map;
 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.nbt.CompoundTag;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.stat.Stats;
 import net.minecraft.util.Hand;
@@ -19,11 +20,13 @@ import net.minecraft.world.RaycastContext;
 import net.minecraft.world.World;
 
 public class BathTireItem extends Item {
+    private static final Map<EntityType<?>, BathTireItem> SPAWN_EGGS = Maps.newIdentityHashMap();
     private final EntityType<?> type;
 
     public BathTireItem(EntityType<?> type, Item.Settings settings) {
         super(settings);
         this.type = type;
+        SPAWN_EGGS.put(type, this);
     }
 
     public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand hand) {
@@ -43,7 +46,7 @@ public class BathTireItem extends Item {
                 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) {
+                    if (!user.abilities.creativeMode) {
                         itemStack.decrement(1);
                     }
 
@@ -56,9 +59,9 @@ public class BathTireItem extends Item {
         }
     }
 
-    public EntityType<?> getEntityType(NbtCompound tag) {
+    public EntityType<?> getEntityType(CompoundTag tag) {
         if (tag != null && tag.contains("EntityTag", 10)) {
-            NbtCompound compoundTag = tag.getCompound("EntityTag");
+            CompoundTag compoundTag = tag.getCompound("EntityTag");
             if (compoundTag.contains("id", 8)) {
                 return EntityType.get(compoundTag.getString("id")).orElse(this.type);
             }

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

@@ -6,6 +6,7 @@ import net.minecraft.util.registry.Registry;
 
 public class DecorativeSoundEvents {
     public static final SoundEvent CEILINGFAN_AMBIENT = register("decorative:ceiling_fan.ambient");
+    public static final SoundEvent SMOKE_DETECTOR_BEEP = register("decorative:smoke_detector.beep");
 
     private static SoundEvent register(String id) {
         return Registry.register(Registry.SOUND_EVENT, id, new SoundEvent(new Identifier(id)));