4.0.0 - First commit to github

Update ru_ru.json

.gitignore

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

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.4-SNAPSHOT'
+	id 'fabric-loom' version '0.5-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -14,6 +14,7 @@ minecraft {
 }
 
 repositories {
+	maven {	url = 'https://raw.githubusercontent.com/Devan-Kerman/Devan-Repo/master/'}
 	maven { url "https://jitpack.io" }
 	maven { url "https://maven.blamejared.com" }
 }
@@ -28,8 +29,13 @@ dependencies {
 	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	
 	modCompile("vazkii.patchouli:Patchouli:${project.patchouli_version}")
-	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
+	
-	// You may need to force-disable transitiveness on them.
+	modImplementation ("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 "eu.midnightdust:midnight-hats:${midnighthats_version}"
+    include "eu.midnightdust:midnight-hats:${midnighthats_version}"
 }
 
 processResources {

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

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

gradle.properties

@@ -1,18 +1,23 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.2
+	minecraft_version=1.16.4
-	yarn_mappings=1.16.2+build.6
+	yarn_mappings=1.16.4+build.6
-	loader_version=0.9.1+build.205
+	loader_version=0.10.6+build.214
 
 # Mod Properties
-	mod_version = 2.0.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.17.2+build.396-1.16
+	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

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

@@ -1,22 +1,31 @@
 package eu.midnightdust.motschen.decorative;
 
+import eu.midnightdust.motschen.decorative.block.render.*;
 import eu.midnightdust.motschen.decorative.entity.client.renderer.*;
 import eu.midnightdust.motschen.decorative.init.BathTires;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
 import eu.midnightdust.motschen.decorative.init.Pool;
 import eu.midnightdust.motschen.decorative.init.Signs;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
+import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
 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.client.render.model.UnbakedModel;
+import net.minecraft.command.argument.ItemEnchantmentArgumentType;
+
+import java.util.function.Supplier;
 
 public class DecorativeClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
+
         EntityRendererRegistry.INSTANCE.register(Pool.BEACH_BALL, (dispatcher, context) -> new BeachBallRenderer(dispatcher));
 
         EntityRendererRegistry.INSTANCE.register(BathTires.WHITE_BATH_TIRE, (dispatcher, context) -> new WhiteBathTireRenderer(dispatcher));
@@ -60,8 +69,15 @@ public class DecorativeClient implements ClientModInitializer {
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.ChristmasTree);
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.CeilingFan);
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.SlidingDoor);
+        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DecorativeMain.WallClock);
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getTranslucent(),DecorativeMain.BirdBath);
 
+        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.CeilingFanBlockEntity, CeilingFanRenderer::new);
+
+        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.ChoppingLogBlockEntity, ChoppingLogBlockEntityRenderer::new);
+
+        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.WallClockBlockEntity, WallClockRenderer::new);
+        BlockEntityRendererRegistry.INSTANCE.register(BlockEntities.DigitalClockBlockEntity, DigitalClockRenderer::new);
     }
     public void registerBlockColor(Block block, Block templateBlock) {
         ColorProviderRegistry.BLOCK.register((type, pos, world, layer) -> {

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

@@ -1,7 +1,17 @@
 package eu.midnightdust.motschen.decorative;
 
 import eu.midnightdust.motschen.decorative.block.*;
+import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage;
+import eu.midnightdust.motschen.decorative.blockstates.Part;
+import eu.midnightdust.motschen.decorative.blockstates.PoolShape;
+import eu.midnightdust.motschen.decorative.blockstates.Program;
+import eu.midnightdust.motschen.decorative.config.DecorativeConfig;
 import eu.midnightdust.motschen.decorative.init.*;
+import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents;
+import eu.midnightdust.motschen.decorative.world.OreFeatureInjector;
+import eu.midnightdust.motschen.decorative.world.OreFeatures;
+import 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;
@@ -12,18 +22,18 @@ import net.minecraft.state.property.EnumProperty;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
-import java.util.Locale;
-
 public class DecorativeMain implements ModInitializer {
     public static final String MOD_ID = "decorative";
+    public static 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));
-    public static final ItemGroup GardenGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "garden"), () -> new ItemStack(LogsWithAxes.OakLogWithAxe));
+    public static final ItemGroup GardenGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "garden"), () -> new ItemStack(LogsWithAxes.OakChoppingLog));
     public static final ItemGroup PoolGroup = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "pool"), () -> new ItemStack(Pool.BEACH_BALL_ITEM));
     public static final EnumProperty<Program> PROGRAM = EnumProperty.of("program", Program.class);
     public static final EnumProperty<PoolShape> POOL_SHAPE = EnumProperty.of("shape", PoolShape.class);
     public static final EnumProperty<Part> PART = EnumProperty.of("part", Part.class);
+    public static final EnumProperty<CeilingFanStage> STAGE = EnumProperty.of("stage", CeilingFanStage.class);
     public static Block RockyAsphalt = new Block(FabricBlockSettings.copyOf(Blocks.COAL_ORE));
     public static Block Road = new Block(FabricBlockSettings.copyOf(Blocks.STONE));
     public static Block RoadWhiteShort = new RotatableBlock();
@@ -42,57 +52,69 @@ public class DecorativeMain implements ModInitializer {
     public static Block ChristmasTree = new ChristmasTree();
     public static Block ChristmasLights = new ChristmasLights();
     public static Block ShowerHead = new ShowerHead();
+    public static Block WallClock = new WallClock();
+    public static Block SmokeDetector = new SmokeDetector();
 
     @Override
     public void onInitialize() {
+        AutoConfig.register(DecorativeConfig.class, JanksonConfigSerializer::new);
+        DECORATIVE_CONFIG = AutoConfig.getConfigHolder(DecorativeConfig.class).getConfig();
+
         BlockEntities.init();
         // Traffic //
-        Registry.register(Registry.BLOCK, new Identifier("decorative","rocky_asphalt"), RockyAsphalt);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"rocky_asphalt"), RockyAsphalt);
-        Registry.register(Registry.ITEM, new Identifier("decorative","rocky_asphalt"), new BlockItem(RockyAsphalt, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"rocky_asphalt"), new BlockItem(RockyAsphalt, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","road"), Road);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"road"), Road);
-        Registry.register(Registry.ITEM, new Identifier("decorative","road"), new BlockItem(Road, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"road"), new BlockItem(Road, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","road_white_short"), RoadWhiteShort);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"road_white_short"), RoadWhiteShort);
-        Registry.register(Registry.ITEM, new Identifier("decorative","road_white_short"), new BlockItem(RoadWhiteShort, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"road_white_short"), new BlockItem(RoadWhiteShort, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","road_white_long"), RoadWhiteLong);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"road_white_long"), RoadWhiteLong);
-        Registry.register(Registry.ITEM, new Identifier("decorative","road_white_long"), new BlockItem(RoadWhiteLong, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"road_white_long"), new BlockItem(RoadWhiteLong, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","traffic_cone"), TrafficCone);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"traffic_cone"), TrafficCone);
-        Registry.register(Registry.ITEM, new Identifier("decorative","traffic_cone"), new BlockItem(TrafficCone, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"traffic_cone"), new BlockItem(TrafficCone, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","fire_hydrant"), FireHydrant);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"fire_hydrant"), FireHydrant);
-        Registry.register(Registry.ITEM, new Identifier("decorative","fire_hydrant"), new BlockItem(FireHydrant, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"fire_hydrant"), new BlockItem(FireHydrant, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","guardrail"), Guardrail);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"guardrail"), Guardrail);
-        Registry.register(Registry.ITEM, new Identifier("decorative","guardrail"), new BlockItem(Guardrail, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"guardrail"), new BlockItem(Guardrail, new Item.Settings().group(DecorativeMain.TrafficGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","sign_post"), SignPost);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"sign_post"), SignPost);
-        Registry.register(Registry.ITEM, new Identifier("decorative","sign_post"), new BlockItem(SignPost, new Item.Settings().group(DecorativeMain.TrafficGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"sign_post"), new BlockItem(SignPost, new Item.Settings().group(DecorativeMain.TrafficGroup)));
         Signs.init();
 
         //Garden//
-        Registry.register(Registry.BLOCK, new Identifier("decorative","bird_bath"), BirdBath);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"bird_bath"), BirdBath);
-        Registry.register(Registry.ITEM, new Identifier("decorative","bird_bath"), new BlockItem(BirdBath, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        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("decorative","water_pump"), WaterPump);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"water_pump"), WaterPump);
-        Registry.register(Registry.ITEM, new Identifier("decorative","water_pump"), new BlockItem(WaterPump, new Item.Settings().group(DecorativeMain.GardenGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"water_pump"), new BlockItem(WaterPump, new Item.Settings().group(DecorativeMain.GardenGroup)));
         LogsWithAxes.init();
         Pool.init();
-        
+
         //Furniture//
-        Registry.register(Registry.BLOCK, new Identifier("decorative","kitchen_tiles"), KitchenTiles);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"kitchen_tiles"), KitchenTiles);
-        Registry.register(Registry.ITEM, new Identifier("decorative","kitchen_tiles"), new BlockItem(KitchenTiles, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"kitchen_tiles"), new BlockItem(KitchenTiles, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","television"), Television);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"wall_clock"), WallClock);
-        Registry.register(Registry.ITEM, new Identifier("decorative","television"), new BlockItem(Television, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"wall_clock"), new BlockItem(WallClock, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","old_television"), OldTelevision);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"television"), Television);
-        Registry.register(Registry.ITEM, new Identifier("decorative","old_television"), new BlockItem(OldTelevision, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"television"), new BlockItem(Television, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","ceilingfan"), CeilingFan);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"old_television"), OldTelevision);
-        Registry.register(Registry.ITEM, new Identifier("decorative","ceilingfan"), new BlockItem(CeilingFan, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"old_television"), new BlockItem(OldTelevision, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","shower_head"), ShowerHead);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"ceilingfan"), CeilingFan);
-        Registry.register(Registry.ITEM, new Identifier("decorative","shower_head"), new BlockItem(ShowerHead, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"ceilingfan"), new BlockItem(CeilingFan, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","sliding_door"), SlidingDoor);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"shower_head"), ShowerHead);
-        Registry.register(Registry.ITEM, new Identifier("decorative","sliding_door"), new BlockItem(SlidingDoor, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"shower_head"), new BlockItem(ShowerHead, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","christmas_tree"), ChristmasTree);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"sliding_door"), SlidingDoor);
-        Registry.register(Registry.ITEM, new Identifier("decorative","christmas_tree"), new BlockItem(ChristmasTree, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        Registry.register(Registry.ITEM, new Identifier(MOD_ID,"sliding_door"), new BlockItem(SlidingDoor, new Item.Settings().group(DecorativeMain.IndoorGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","christmas_lights"), ChristmasLights);
+        Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"christmas_tree"), ChristmasTree);
-        Registry.register(Registry.ITEM, new Identifier("decorative","christmas_lights"), new BlockItem(ChristmasLights, new Item.Settings().group(DecorativeMain.IndoorGroup)));
+        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();
+        Clocks.init();
         OreFeatures.init();
+        OreFeatureInjector.init();
+        new DecorativeSoundEvents();
     }
 }

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

@@ -15,7 +15,6 @@ public class BirdBath extends CauldronBlock {
 
     public BirdBath() {
         super(FabricBlockSettings.copy(Blocks.CAULDRON).nonOpaque().sounds(BlockSoundGroup.STONE));
-        this.setDefaultState(this.stateManager.getDefaultState().with(LEVEL, 0));
     }
 
     @Override
@@ -24,11 +23,6 @@ public class BirdBath extends CauldronBlock {
                 .with(LEVEL, 0);
     }
 
-    @Override
-    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(LEVEL);
-    }
-
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
             return SHAPE;

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

@@ -1,13 +1,18 @@
 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 net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
+import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
+import net.minecraft.state.property.EnumProperty;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -17,28 +22,38 @@ import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
-public class CeilingFan extends RedstoneLampBlock {
+public class CeilingFan extends Block implements BlockEntityProvider {
     private static final VoxelShape SHAPE;
+    private static final EnumProperty<CeilingFanStage> STAGE = DecorativeMain.STAGE;
 
     public CeilingFan() {
         super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE));
-        this.setDefaultState(this.stateManager.getDefaultState().with(LIT, true));
+        this.setDefaultState(this.stateManager.getDefaultState().with(STAGE, CeilingFanStage.OFF));
+    }
+
+    @Override
+    public BlockEntity createBlockEntity(BlockView view) {
+        return new CeilingFanBlockEntity();
     }
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
         return super.getPlacementState(itemPlacementContext)
-                .with(LIT, false);
+                .with(STAGE, CeilingFanStage.OFF);
     }
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-            world.setBlockState(pos, state.with(LIT, Boolean.valueOf(!state.get(LIT))));
+        if (state.get(STAGE) == CeilingFanStage.OFF) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.LEVEL_1));}
-            world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f);
+        if (state.get(STAGE) == CeilingFanStage.LEVEL_1) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.LEVEL_2));}
-            return ActionResult.SUCCESS;
+        if (state.get(STAGE) == CeilingFanStage.LEVEL_2) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.LEVEL_3));}
+        if (state.get(STAGE) == CeilingFanStage.LEVEL_3) {world.setBlockState(pos, state.with(STAGE, CeilingFanStage.OFF));}
+
+        world.playSound(player, pos, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.BLOCKS, 0.2f, 0.5f);
+        return ActionResult.SUCCESS;
     }
 
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(LIT);
+        builder.add(STAGE);
     }
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {

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

@@ -1,18 +1,21 @@
 package eu.midnightdust.motschen.decorative.block;
 
+import eu.midnightdust.motschen.decorative.block.blockentity.ChoppingLogBlockEntity;
 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.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.WorldView;
 
-public class LogWithAxe extends HorizontalFacingBlock {
+public class ChoppingLog extends HorizontalFacingBlock implements BlockEntityProvider {
 
-    public LogWithAxe() {
+    public ChoppingLog() {
-        super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.STONE));
+        super(FabricBlockSettings.copy(Blocks.OAK_PLANKS).nonOpaque().sounds(BlockSoundGroup.WOOD));
         this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH));
     }
 
@@ -31,4 +34,9 @@ public class LogWithAxe extends HorizontalFacingBlock {
         return !worldView.isAir(pos.down());
     }
 
+    @Override
+    public BlockEntity createBlockEntity(BlockView view) {
+        return new ChoppingLogBlockEntity();
+    }
+
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 package eu.midnightdust.motschen.decorative.block;
 
 import eu.midnightdust.motschen.decorative.DecorativeMain;
-import eu.midnightdust.motschen.decorative.PoolShape;
+import eu.midnightdust.motschen.decorative.blockstates.PoolShape;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.fluid.FluidState;

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

@@ -1,7 +1,7 @@
 package eu.midnightdust.motschen.decorative.block;
 
 import eu.midnightdust.motschen.decorative.DecorativeMain;
-import eu.midnightdust.motschen.decorative.Part;
+import eu.midnightdust.motschen.decorative.blockstates.Part;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.entity.LivingEntity;

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

@@ -1,7 +1,7 @@
 package eu.midnightdust.motschen.decorative.block;
 
 import eu.midnightdust.motschen.decorative.DecorativeMain;
-import eu.midnightdust.motschen.decorative.Program;
+import eu.midnightdust.motschen.decorative.blockstates.Program;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.entity.player.PlayerEntity;
@@ -11,6 +11,7 @@ import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.EnumProperty;
+import net.minecraft.state.property.Properties;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -22,6 +23,8 @@ import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
+import java.util.function.ToIntFunction;
+
 public class Television extends HorizontalFacingBlock {
 
     private static final VoxelShape NORTH_SHAPE;
@@ -31,7 +34,7 @@ public class Television extends HorizontalFacingBlock {
     private static final EnumProperty<Program> PROGRAM = DecorativeMain.PROGRAM;
 
     public Television() {
-        super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE));
+        super(FabricBlockSettings.copy(Blocks.BLACK_CONCRETE).nonOpaque().sounds(BlockSoundGroup.STONE).luminance(createLightLevelFromBlockState()));
         this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(PROGRAM, Program.OFF));
     }
 
@@ -102,4 +105,16 @@ public class Television extends HorizontalFacingBlock {
         return !worldView.isAir(pos.down());
     }
 
+    private static ToIntFunction<BlockState> createLightLevelFromBlockState() {
+        return (blockState) -> {
+            if (blockState.get(PROGRAM) == Program.OFF) {
+                return 0;
+            }
+            else {
+                return 11;
+            }
+        };
+    }
+
+
 }

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

@@ -0,0 +1,73 @@
+package eu.midnightdust.motschen.decorative.block;
+
+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.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 WallClock 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 WallClock() {
+        super(FabricBlockSettings.copy(Blocks.SMOOTH_QUARTZ).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH));
+    }
+
+    @Override
+    public BlockEntity createBlockEntity(BlockView view) {
+        return new WallClockBlockEntity();
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(FACING);
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return super.getPlacementState(itemPlacementContext)
+                .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite());
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
+        switch (state.get(FACING)) {
+            case NORTH: return NORTH_SHAPE;
+            case EAST: return EAST_SHAPE;
+            case SOUTH: return SOUTH_SHAPE;
+            case WEST: return WEST_SHAPE;
+            default: return super.getOutlineShape(state, view, pos, context);
+        }
+    }
+    static {
+        VoxelShape shape = createCuboidShape(0, 0, 15, 16, 16, 16);
+
+        NORTH_SHAPE = shape;
+        WEST_SHAPE = rotate(Direction.EAST, Direction.NORTH, shape);
+        EAST_SHAPE = rotate(Direction.EAST, Direction.SOUTH, shape);
+        SOUTH_SHAPE = rotate(Direction.EAST, Direction.WEST, shape);
+    }
+    private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) {
+        VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() };
+
+        int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4;
+        for (int i = 0; i < times; i++) {
+            buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX)));
+            buffer[0] = buffer[1];
+            buffer[1] = VoxelShapes.empty();
+        }
+
+        return buffer[0];
+    }
+}

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

@@ -0,0 +1,50 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.blockstates.CeilingFanStage;
+import eu.midnightdust.motschen.decorative.DecorativeMain;
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import eu.midnightdust.motschen.decorative.sound.DecorativeSoundEvents;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.util.Tickable;
+import net.minecraft.util.math.BlockPos;
+
+public class CeilingFanBlockEntity extends BlockEntity implements Tickable {
+    private int rot;
+
+    public CeilingFanBlockEntity() {
+        super(BlockEntities.CeilingFanBlockEntity);
+    }
+
+
+
+    @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;
+        }
+        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;
+        }
+        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;
+        }
+        else {
+            rot = rot;
+            return;
+        }
+    }
+    public int getRot() {
+        return rot;
+    }
+}

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

@@ -0,0 +1,61 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.HorizontalFacingBlock;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.util.Tickable;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+
+public class ChoppingLogBlockEntity extends BlockEntity implements Tickable {
+    private int facing;
+    private double axe_x;
+    private double axe_z;
+
+    public ChoppingLogBlockEntity() {
+        super(BlockEntities.ChoppingLogBlockEntity);
+    }
+
+    @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;
+        }
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) {
+            facing = 90;
+            axe_x = 0.5D;
+            axe_z = 0.2D;
+            return;
+        }
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) {
+            facing = 0;
+            axe_x = 0.8D;
+            axe_z = 0.5D;
+            return;
+        }
+        else {
+            facing = 270;
+            axe_x = 0.5D;
+            axe_z = 0.8D;
+            return;
+        }
+    }
+
+    public int getFacing() {
+        return facing;
+    }
+    public double getAxeX() {
+        return axe_x;
+    }
+    public double getAxeZ() {
+        return axe_z;
+    }
+}

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

@@ -0,0 +1,70 @@
+package eu.midnightdust.motschen.decorative.block.blockentity;
+
+import eu.midnightdust.motschen.decorative.init.BlockEntities;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.HorizontalFacingBlock;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.Tickable;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+
+import java.time.LocalTime;
+
+public class DigitalClockBlockEntity extends BlockEntity implements Tickable {
+    private int facing;
+    private double x;
+    private double z;
+    private int second;
+
+    public DigitalClockBlockEntity() {
+        super(BlockEntities.DigitalClockBlockEntity);
+    }
+
+    @Override
+    public void tick() {
+        if (LocalTime.now().getSecond() != second) {
+            second = LocalTime.now().getSecond();
+        }
+
+        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;
+        }
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) {
+            facing = 180;
+            x = 0.175;
+            z = 0.626;
+            return;
+        }
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) {
+            facing = 90;
+            x = 0.374;
+            z = 0.175;
+            return;
+        }
+        else {
+            facing = 0;
+            x = 0.825;
+            z = 0.374;
+            return;
+        }
+
+    }
+    public int getFacing() {
+        return facing;
+    }
+    public double getX() {
+        return x;
+    }
+    public double getZ() {
+        return z;
+    }
+}

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

@@ -18,14 +18,25 @@ public class PoolSprinklerBlockEntity extends BlockEntity implements Tickable {
     @Override
     public void tick() {
         BlockPos pos = this.pos;
-        BlockState state = this.world.getBlockState(pos);
+        if (world != null) {
-        if (world != null && state.get(PoolSprinkler.POWERED) == true) {
+            BlockState state = this.world.getBlockState(pos);
-            switch (state.get(PoolSprinkler.FACING)) {
+            if (state.get(PoolSprinkler.POWERED)) {
-                case NORTH: world.addParticle(ParticleTypes.DRIPPING_WATER,pos.getX()+0.5,pos.getY()+0.5,pos.getZ()-0.34,1,1,1); return;
+                switch (state.get(PoolSprinkler.FACING)) {
-                case EAST: world.addParticle(ParticleTypes.DRIPPING_WATER,pos.getX()+1.34,pos.getY()+0.5,pos.getZ()+0.5,1,1,1); return;
+                    case NORTH:
-                case SOUTH: world.addParticle(ParticleTypes.DRIPPING_WATER,pos.getX()+0.5,pos.getY()+0.5,pos.getZ()+1.34,1,1,1); return;
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() - 0.34, 1, 1, 1);
-                case WEST: world.addParticle(ParticleTypes.DRIPPING_WATER,pos.getX()-0.34,pos.getY()+0.5,pos.getZ()+0.5,1,1,1); return;
+                        return;
-                default: 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

@@ -18,14 +18,25 @@ public class ShowerHeadBlockEntity extends BlockEntity implements Tickable {
     @Override
     public void tick() {
         BlockPos pos = this.pos;
-        BlockState state = this.world.getBlockState(pos);
+        if (world != null) {
-        if (world != null && state.get(PoolSprinkler.POWERED) == true) {
+            BlockState state = this.world.getBlockState(pos);
-            switch (state.get(PoolSprinkler.FACING)) {
+            if (state.get(PoolSprinkler.POWERED) == true) {
-                case NORTH: world.addParticle(ParticleTypes.DRIPPING_WATER,pos.getX()+0.5,pos.getY()+0.5,pos.getZ()+0.625,1,1,1); return;
+                switch (state.get(PoolSprinkler.FACING)) {
-                case EAST: world.addParticle(ParticleTypes.DRIPPING_WATER,pos.getX()+0.375,pos.getY()+0.5,pos.getZ()+0.5,1,1,1); return;
+                    case NORTH:
-                case SOUTH: world.addParticle(ParticleTypes.DRIPPING_WATER,pos.getX()+0.5,pos.getY()+0.5,pos.getZ()+0.375,1,1,1); return;
+                        world.addParticle(ParticleTypes.DRIPPING_WATER, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.625, 1, 1, 1);
-                case WEST: world.addParticle(ParticleTypes.DRIPPING_WATER,pos.getX()+0.625,pos.getY()+0.5,pos.getZ()+0.5,1,1,1); return;
+                        return;
-                default: 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

@@ -0,0 +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 java.time.LocalTime;
+
+public class WallClockBlockEntity extends BlockEntity implements Tickable {
+    private int facing;
+    private double x;
+    private double z;
+    private int second;
+
+    public WallClockBlockEntity() {
+        super(BlockEntities.WallClockBlockEntity);
+    }
+
+    @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);
+        }
+
+        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;
+        }
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.SOUTH) {
+            facing = 180;
+            x = 0.5;
+            z = 0.05;
+            return;
+        }
+        if (world != null && state.get(HorizontalFacingBlock.FACING) == Direction.WEST) {
+            facing = 90;
+            x = 0.95;
+            z = 0.5;
+            return;
+        }
+        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

@@ -0,0 +1,58 @@
+package eu.midnightdust.motschen.decorative.block.render;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.CeilingFanBlockEntity;
+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.util.math.MatrixStack;
+import net.minecraft.client.util.math.Vector3f;
+import net.minecraft.util.Identifier;
+
+@Environment(EnvType.CLIENT)
+public class CeilingFanRenderer extends BlockEntityRenderer<CeilingFanBlockEntity> {
+    private static int rot;
+    private final ModelPart blades;
+    private final ModelPart point;
+
+    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
+    public boolean rendersOutsideBoundingBox(CeilingFanBlockEntity blockEntity) {
+        return true;
+    }
+
+
+    @Override
+    public void render(CeilingFanBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+
+        matrices.push();
+        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(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

@@ -0,0 +1,51 @@
+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.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.BlockPos;
+
+@Environment(EnvType.CLIENT)
+public class ChoppingLogBlockEntityRenderer extends BlockEntityRenderer<ChoppingLogBlockEntity> {
+
+    public ChoppingLogBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
+        super(blockEntityRenderDispatcher);
+    }
+
+    @Override
+    public boolean rendersOutsideBoundingBox(ChoppingLogBlockEntity blockEntity) {
+        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(blockEntity.getWorld(), blockEntity.getPos().up());
+
+        matrices.translate(blockEntity.getAxeX(), 1.5D, blockEntity.getAxeZ());
+        matrices.scale(2.5f,2.5f,2.5f);
+
+        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

@@ -0,0 +1,86 @@
+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.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.SignBlockEntityRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+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 extends BlockEntityRenderer<DigitalClockBlockEntity> {
+
+    public DigitalClockRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
+        super(blockEntityRenderDispatcher);
+    }
+
+    private int getHour12hFormat() {
+        int hour;
+        hour = LocalTime.now().getHour();
+        if (hour > 12) {
+            hour = hour - 12;
+        }
+        return hour;
+    }
+    private String getTime() {
+        String hour;
+        String minute;
+
+        // Hour
+        if (DecorativeMain.DECORATIVE_CONFIG.use12hTime) {
+            if (getHour12hFormat() <= 9) {
+                hour = "0" + getHour12hFormat();
+            } else {
+                hour = "" + getHour12hFormat();
+            }
+        }
+        else {
+            if (LocalTime.now().getHour() <= 9) {
+                hour = "0" + LocalTime.now().getHour();
+            } else {
+                hour = "" + LocalTime.now().getHour();
+            }
+        }
+
+        // Minute
+        if (LocalTime.now().getMinute() <= 9) {
+            minute = "0" + LocalTime.now().getMinute();
+        }
+        else {
+            minute = "" + LocalTime.now().getMinute();
+        }
+
+        String time = hour +":"+ minute;
+        return time;
+    }
+
+
+    @Override
+    public void render(DigitalClockBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+        matrices.push();
+        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(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

@@ -0,0 +1,83 @@
+package eu.midnightdust.motschen.decorative.block.render;
+
+import eu.midnightdust.motschen.decorative.block.blockentity.WallClockBlockEntity;
+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.util.math.MatrixStack;
+import net.minecraft.client.util.math.Vector3f;
+import net.minecraft.util.Identifier;
+
+import java.time.LocalTime;
+
+@Environment(EnvType.CLIENT)
+public class WallClockRenderer extends BlockEntityRenderer<WallClockBlockEntity> {
+    private final ModelPart blades;
+    private final ModelPart seconds;
+    private final ModelPart minutes;
+    private final ModelPart hours;
+
+    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() {
+        int hour;
+        hour = LocalTime.now().getHour();
+        if (hour >= 12) {
+            hour = hour - 12;
+        }
+        return hour;
+    }
+
+
+    @Override
+    public void render(WallClockBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
+
+        int lightAtBlock = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos());
+
+        matrices.push();
+        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();
+        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();
+        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/blockstates/CeilingFanStage.java

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

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

@@ -1,4 +1,4 @@
-package eu.midnightdust.motschen.decorative;
+package eu.midnightdust.motschen.decorative.blockstates;
 
 import net.minecraft.util.StringIdentifiable;
 

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

@@ -1,4 +1,4 @@
-package eu.midnightdust.motschen.decorative;
+package eu.midnightdust.motschen.decorative.blockstates;
 
 import net.minecraft.util.StringIdentifiable;
 

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

@@ -1,4 +1,4 @@
-package eu.midnightdust.motschen.decorative;
+package eu.midnightdust.motschen.decorative.blockstates;
 
 import net.minecraft.util.StringIdentifiable;
 

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

@@ -0,0 +1,11 @@
+package eu.midnightdust.motschen.decorative.config;
+
+import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
+import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
+import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
+
+@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

@@ -0,0 +1,16 @@
+package eu.midnightdust.motschen.decorative.config;
+
+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;
+
+@Environment(EnvType.CLIENT)
+public class ModMenuIntegration implements ModMenuApi {
+
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return parent -> AutoConfig.getConfigScreen(DecorativeConfig.class, parent).get();
+    }
+}

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

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

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

@@ -1,8 +1,8 @@
 package eu.midnightdust.motschen.decorative.init;
 
 import eu.midnightdust.motschen.decorative.DecorativeMain;
-import eu.midnightdust.motschen.decorative.block.blockentity.PoolSprinklerBlockEntity;
+import eu.midnightdust.motschen.decorative.block.blockentity.*;
-import eu.midnightdust.motschen.decorative.block.blockentity.ShowerHeadBlockEntity;
+import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
@@ -11,10 +11,19 @@ public class BlockEntities {
 
     public static BlockEntityType<PoolSprinklerBlockEntity> PoolSprinklerBlockEntity;
     public static BlockEntityType<ShowerHeadBlockEntity> ShowerHeadBlockEntity;
+    public static BlockEntityType<CeilingFanBlockEntity> CeilingFanBlockEntity;
+    public static BlockEntityType<ChoppingLogBlockEntity> ChoppingLogBlockEntity;
+    public static BlockEntityType<WallClockBlockEntity> WallClockBlockEntity;
+    public static BlockEntityType<DigitalClockBlockEntity> DigitalClockBlockEntity;
+    public static BlockEntityType<SmokeDetectorBlockEntity> SmokeDetectorBlockEntity;
 
     public static void init() {
-        PoolSprinklerBlockEntity = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier("decorative","pool_sprinkler_blockentity"), BlockEntityType.Builder.create(PoolSprinklerBlockEntity::new, Pool.PoolSprinkler).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("decorative","shower_head_blockentity"), BlockEntityType.Builder.create(ShowerHeadBlockEntity::new, DecorativeMain.ShowerHead).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/init/Clocks.java

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

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

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

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

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

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

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

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

@@ -22,20 +22,20 @@ import net.minecraft.util.registry.Registry;
 public class Pool {
 
     public static final EntityType<BeachBallEntity> BEACH_BALL =
-            Registry.register(Registry.ENTITY_TYPE,new Identifier("decorative","beach_ball"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT, BeachBallEntity::new).dimensions(EntityDimensions.fixed(0.9f,0.9f)).trackable(100,4).build());
+            Registry.register(Registry.ENTITY_TYPE,new Identifier(DecorativeMain.MOD_ID,"beach_ball"), FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT, BeachBallEntity::new).dimensions(EntityDimensions.fixed(0.9f,0.9f)).trackable(100,4).build());
     public static Item BEACH_BALL_ITEM = new BathTireItem(BEACH_BALL, new Item.Settings().group(DecorativeMain.PoolGroup));
     public static Block PoolWall = new PoolWall();
     public static Block Springboard = new Springboard();
     public static Block PoolSprinkler = new PoolSprinkler();
 
     public static void init() {
-        Registry.register(Registry.BLOCK, new Identifier("decorative","pool_wall"), PoolWall);
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pool_wall"), PoolWall);
-        Registry.register(Registry.ITEM, new Identifier("decorative","pool_wall"), new BlockItem(PoolWall, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pool_wall"), new BlockItem(PoolWall, new Item.Settings().group(DecorativeMain.PoolGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","springboard"), Springboard);
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"springboard"), Springboard);
-        Registry.register(Registry.ITEM, new Identifier("decorative","springboard"), new BlockItem(Springboard, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"springboard"), new BlockItem(Springboard, new Item.Settings().group(DecorativeMain.PoolGroup)));
-        Registry.register(Registry.BLOCK, new Identifier("decorative","pool_sprinkler"), PoolSprinkler);
+        Registry.register(Registry.BLOCK, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler"), PoolSprinkler);
-        Registry.register(Registry.ITEM, new Identifier("decorative","pool_sprinkler"), new BlockItem(PoolSprinkler, new Item.Settings().group(DecorativeMain.PoolGroup)));
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"pool_sprinkler"), new BlockItem(PoolSprinkler, new Item.Settings().group(DecorativeMain.PoolGroup)));
-        Registry.register(Registry.ITEM, new Identifier("decorative","beach_ball"), BEACH_BALL_ITEM);
+        Registry.register(Registry.ITEM, new Identifier(DecorativeMain.MOD_ID,"beach_ball"), BEACH_BALL_ITEM);
         FabricDefaultAttributeRegistry.register(BEACH_BALL, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 100000.0D).add(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, -10D));
         BathTires.init();
     }

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

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

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

@@ -16,7 +16,7 @@ import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.RayTraceContext;
+import net.minecraft.world.RaycastContext;
 import net.minecraft.world.World;
 
 public class BathTireItem extends Item {
@@ -31,7 +31,7 @@ public class BathTireItem extends Item {
 
     public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand hand) {
         ItemStack itemStack = user.getStackInHand(hand);
-        HitResult hitResult = rayTrace(world, user, RayTraceContext.FluidHandling.SOURCE_ONLY);
+        HitResult hitResult = raycast(world, user, RaycastContext.FluidHandling.SOURCE_ONLY);
         if (hitResult.getType() != HitResult.Type.BLOCK) {
             return TypedActionResult.pass(itemStack);
         } else if (world.isClient) {

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

@@ -1,18 +0,0 @@
-package eu.midnightdust.motschen.decorative.mixin;
-
-import eu.midnightdust.motschen.decorative.OreFeatures;
-import net.minecraft.world.biome.GenerationSettings.Builder;
-import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(DefaultBiomeFeatures.class)
-public class DefaultBiomeFeaturesMixin {
-    @Inject(at = @At("RETURN"), method = "addDefaultOres")
-    private static void addDefaultOres(Builder builder, CallbackInfo info) {
-        builder.feature(GenerationStep.Feature.UNDERGROUND_ORES, OreFeatures.ROCKY_ASPHALT_FEATURE);
-    }
-}

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

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

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

@@ -0,0 +1,14 @@
+package eu.midnightdust.motschen.decorative.sound;
+
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class DecorativeSoundEvents {
+    public static final SoundEvent CEILINGFAN_AMBIENT = register("decorative:ceiling_fan.ambient");
+    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)));
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+{
+    "variants": {
+        "active=true": { "model": "decorative:block/smoke_detector_on" },
+        "active=false":  { "model": "decorative:block/smoke_detector_off" }
+    }
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,111 @@
+{
+    // ItemGroups //
+	"itemGroup.decorative.indoor":"Decorative - В помещении",
+	"itemGroup.decorative.traffic":"Decorative - Дорога",
+	"itemGroup.decorative.garden":"Decorative - Сад",
+	
+	"text.decorative.landing_text":"Это руководство о том, как создавать декоративные элементы, добавляемые декоративными. У нас есть лампы, телевизоры, потолочные вентиляторы и многое другое",
+	"book.decorative.decoration_guide":"Руководство по Оформлению",
+	
+	// Indoor //
+	"block.decorative.kitchen_tiles":"Кухонная Плитка",
+	"block.decorative.television":"Телевизор",
+	"block.decorative.old_television":"Старый Телевизор",
+	"block.decorative.ceilingfan":"Потолочный Вентилятор",
+	"block.decorative.sliding_door":"Раздвижная дверь",
+	"block.decorative.christmas_tree":"Рождественская елка",
+	"block.decorative.christmas_lights":"Рождественские огни",
+	"block.decorative.white_lamp":"Белая Лампа",
+	"block.decorative.orange_lamp":"Оранжевая Лампа",
+	"block.decorative.magenta_lamp":"Пурпурная Лампа",
+	"block.decorative.light_blue_lamp":"Светло Синяя Лампа",
+	"block.decorative.yellow_lamp":"Жёлтая Лампа",
+	"block.decorative.lime_lamp":"Лаймовая Лампа",
+	"block.decorative.pink_lamp":"Розовая Лампа",
+	"block.decorative.gray_lamp":"Серая Лампа",
+	"block.decorative.light_gray_lamp":"Светлосерая Лампа",
+	"block.decorative.cyan_lamp":"Голубая Лампа",
+	"block.decorative.purple_lamp":"Фиолетовая Лампа",
+	"block.decorative.blue_lamp":"Синяя Лампа",
+	"block.decorative.brown_lamp":"Коричневая Лампа",
+	"block.decorative.green_lamp":"Зеленая Лампа",
+	"block.decorative.red_lamp":"Красная Лампа",
+	"block.decorative.black_lamp":"Чёрная Лампа",
+	"block.decorative.white_double_lamp":"Белая Двойная Лампа",
+	"block.decorative.orange_double_lamp":"Оранжевая Двойная Лампа",
+	"block.decorative.magenta_double_lamp":"Пурпурная Двойная Лампа",
+	"block.decorative.light_blue_double_lamp":"Светло Синяя Двойная Лампа",
+	"block.decorative.yellow_double_lamp":"Жёлтая Двойная Лампа",
+	"block.decorative.lime_double_lamp":"Лаймовая Двойная Лампа",
+	"block.decorative.pink_double_lamp":"Розовая Двойная Лампа",
+	"block.decorative.gray_double_lamp":"Зелёная Двойная Лампа",
+	"block.decorative.light_gray_double_lamp":"Светлосерая Двойная Лампа",
+	"block.decorative.cyan_double_lamp":"Голубая Двойная Лампа",
+	"block.decorative.purple_double_lamp":"Фиолетовая Двойная Лампа",
+	"block.decorative.blue_double_lamp":"Синяя Двойная Лампа",
+	"block.decorative.brown_double_lamp":"Коричневая Двойная Лампа",
+	"block.decorative.green_double_lamp":"Зеленая Двойная Лампа",
+	"block.decorative.red_double_lamp":"Красная Двойная Лампа",
+	"block.decorative.black_double_lamp":"Чёрная Двойная Лампа",
+	
+	
+	// Garden //
+	"block.decorative.oak_log_with_axe":"Дубовое Бревно с Топором",
+	"block.decorative.spruce_log_with_axe":"Еловое Бревно с Топором",
+	"block.decorative.birch_log_with_axe":"Берёзовое Бревно с Топором",
+	"block.decorative.acacia_log_with_axe":"Акациевое Бревно с Топором",
+	"block.decorative.jungle_log_with_axe":"Тропичекое Бревно с Топором",
+	"block.decorative.dark_oak_log_with_axe":"Чёмный Дуб с Топором",
+	"block.decorative.bird_bath":"Птичья Ванна",
+	"block.decorative.water_pump":"Водяной Насос",
+	
+	// Traffic //
+	"block.decorative.fire_hydrant":"Пожарный Гидрант",
+	"block.decorative.rocky_asphalt":"Каменый Асфальт",
+	"block.decorative.road":"Дорога",
+	"block.decorative.road_white_short":"Дорога с короткой белой полосой",
+	"block.decorative.road_white_long":"Дорога с длинной белой полосой",
+	"block.decorative.guardrail":"Перила",
+	"block.decorative.traffic_cone":"Дорожный Конус",
+	"block.decorative.sign_post":"Дорожный Знак",
+	"block.decorative.empty_sign":"Пустой Знак",
+	"block.decorative.stop_sign":"Знак Остановки",
+	"block.decorative.five_sign":"Ограничение Скорости: 5 км/ч",
+	"block.decorative.ten_sign":"Ограничение Скорости: 10 км/ч",
+	"block.decorative.twenty_sign":"Ограничение Скорости: 20 км/ч",
+	"block.decorative.thirty_sign":"Ограничение Скорости: 30 км/ч",
+	"block.decorative.forty_sign":"Ограничение Скорости: 40 км/ч",
+	"block.decorative.fifty_sign":"Ограничение Скорости: 50 км/ч",
+	"block.decorative.sixty_sign":"Ограничение Скорости: 60 км/ч",
+	"block.decorative.seventy_sign":"Ограничение Скорости: 70 км/ч",
+	"block.decorative.eighty_sign":"Ограничение Скорости: 80 км/ч",
+	"block.decorative.ninety_sign":"Ограничение Скорости: 90 км/ч",
+	"block.decorative.onehundred_sign":"Ограничение Скорости: 100 км/ч",
+	"block.decorative.onehundredten_sign":"Ограничение Скорости: 110 км/ч",
+	
+	//* 2.0 - Summer 2020 Update *//
+	"itemGroup.decorative.pool":"Decorative - Пляж",
+	"item.decorative.white_bath_tire":"Белый Надувной Круг",
+	"item.decorative.orange_bath_tire":"Оранжевый Надувной Круг",
+	"item.decorative.magenta_bath_tire":"Пурпурный Надувной Круг",
+	"item.decorative.light_blue_bath_tire":"Светло Синый Надувной Круг",
+	"item.decorative.yellow_bath_tire":"Жёлтый Надувной Круг",
+	"item.decorative.lime_bath_tire":"Лаймовый Надувной Круг",
+	"item.decorative.pink_bath_tire":"Розовый Надувной Круг",
+	"item.decorative.gray_bath_tire":"Серый Надувной Круг",
+	"item.decorative.light_gray_bath_tire":"Светлосерый Надувной Круг",
+	"item.decorative.cyan_bath_tire":"Голубый Надувной Круг",
+	"item.decorative.purple_bath_tire":"Розовый Надувной Круг",
+	"item.decorative.blue_bath_tire":"Синий Надувной Круг",
+	"item.decorative.brown_bath_tire":"Коричневый Надувной Круг",
+	"item.decorative.green_bath_tire":"Зеленый Надувной Круг",
+	"item.decorative.red_bath_tire":"Красный Надувной Круг",
+	"item.decorative.black_bath_tire":"Чёрный Надувной Круг",
+	"item.decorative.duck_bath_tire":"Надувной Круг Утка",
+	
+	"item.decorative.beach_ball":"Пляжный Мяч",
+	"block.decorative.pool_wall":"Стена Бассейна",
+	"block.decorative.springboard":"Трамплин",
+	"block.decorative.pool_sprinkler":"Кран",
+	"block.decorative.shower_head":"Душевая Головка"
+}

src/main/resources/assets/decorative/materialmaps/block/black_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/black_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/blue_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/blue_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/brown_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/brown_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/christmas_lights.json

@@ -0,0 +1,14 @@
+{
+  "defaultMap": {
+	"spriteMap": [
+	  {
+		"sprite": "decorative:block/red_lamp",
+		"material": "canvas:emissive_no_diffuse"
+	  },
+	  {
+		"sprite": "decorative:block/green_lamp",
+		"material": "canvas:emissive_no_diffuse"
+	  }
+	]
+  }
+}

src/main/resources/assets/decorative/materialmaps/block/cyan_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/cyan_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/gray_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/gray_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/green_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/green_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/light_blue_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/light_blue_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/light_gray_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/light_gray_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/lime_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/lime_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/magenta_double_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/magenta_lamp.json

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

src/main/resources/assets/decorative/materialmaps/block/old_television.json

@@ -0,0 +1,26 @@
+{
+  "defaultMap": {
+	"spriteMap": [
+	  {
+		"sprite": "decorative:tv/nyancat",
+		"material": "canvas:emissive_no_diffuse"
+	  },
+	  {
+		"sprite": "decorative:tv/creeper",
+		"material": "canvas:emissive_no_diffuse"
+	  },
+	  {
+		"sprite": "decorative:tv/woodys",
+		"material": "canvas:emissive_no_diffuse"
+	  },
+	  {
+		"sprite": "decorative:tv/tater",
+		"material": "canvas:emissive_no_diffuse"
+	  },
+	  {
+		"sprite": "minecraft:block/lime_terracotta",
+		"material": "canvas:emissive_no_diffuse"
+	  }
+	]
+  }
+}