Lamps, fans and AIR RAID SIRENS

src/main/resources/assets/new_soviet/blockstates/ceiling_fan.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "lit=true": {
+      "model": "new_soviet:block/ceiling_fan_on"
+    },
+    "lit=false": {
+      "model": "new_soviet:block/ceiling_fan_off"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/lamp.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "hanging=false": {
+      "model": "new_soviet:block/table_lamp"
+    },
+    "hanging=true": {
+      "model": "new_soviet:block/ceiling_lamp"
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/siren.json

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

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

@@ -120,5 +120,9 @@
   "block.new_soviet.tv": "TV",
   "block.new_soviet.red_tv": "Red TV",
   "block.new_soviet.brown_tv": "Brown TV",
-  "block.new_soviet.radio": "Radio"
+  "block.new_soviet.radio": "Radio",
+  "block.new_soviet.lamp": "Lamp",
+  "block.new_soviet.ceiling_fan": "Ceiling Fan",
+  "block.new_soviet.siren": "Siren"
+
 }

src/main/resources/assets/new_soviet/models/block/brown_tv.json

@@ -1,7 +1,7 @@
 {
 	"parent": "new_soviet:block/tv",
 	"textures": {
-		"0": "new_soviet:block/custom/brown_television",
-		"particle": "new_soviet:block/custom/brown_television"
+		"0": "new_soviet:block/custom/electronics/brown_television",
+		"particle": "new_soviet:block/custom/electronics/brown_television"
 	}
 }

src/main/resources/assets/new_soviet/models/block/ceiling_fan_off.json

@@ -2,9 +2,9 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"0": "C:/Users/Yura/Desktop/van_animated",
-		"1": "C:/Users/Yura/Desktop/fan_base",
-		"particle": "C:/Users/Yura/Desktop/van_animated"
+		"0": "new_soviet:block/custom/appliances/fan_static",
+		"1": "new_soviet:block/custom/appliances/fan_base",
+		"particle": "new_soviet:block/custom/appliances/fan_static"
 	},
 	"elements": [
 		{

src/main/resources/assets/new_soviet/models/block/ceiling_fan_on.json

@@ -0,0 +1,82 @@
+{
+	"credit": "Made with Blockbench",
+	"texture_size": [64, 64],
+	"textures": {
+		"0": "new_soviet:block/custom/appliances/fan_animated",
+		"1": "new_soviet:block/custom/appliances/fan_base",
+		"particle": "new_soviet:block/custom/appliances/fan_animated"
+	},
+	"elements": [
+		{
+			"name": "root",
+			"from": [6, 13, 6],
+			"to": [10, 16, 10],
+			"faces": {
+				"north": {"uv": [1, 4.25, 2, 5], "texture": "#1"},
+				"east": {"uv": [0, 4.25, 1, 5], "texture": "#1"},
+				"south": {"uv": [3, 4.25, 4, 5], "texture": "#1"},
+				"west": {"uv": [2, 4.25, 3, 5], "texture": "#1"},
+				"up": {"uv": [2, 4.25, 1, 3.25], "texture": "#1"},
+				"down": {"uv": [3, 3.25, 2, 4.25], "texture": "#1"}
+			}
+		},
+		{
+			"name": "root",
+			"from": [7, 7, 7],
+			"to": [9, 13, 9],
+			"faces": {
+				"north": {"uv": [0.5, 0.5, 1, 2], "texture": "#1"},
+				"east": {"uv": [0, 0.5, 0.5, 2], "texture": "#1"},
+				"south": {"uv": [1.5, 0.5, 2, 2], "texture": "#1"},
+				"west": {"uv": [1, 0.5, 1.5, 2], "texture": "#1"},
+				"up": {"uv": [1, 0.5, 0.5, 0], "texture": "#1"},
+				"down": {"uv": [1.5, 0, 1, 0.5], "texture": "#1"}
+			}
+		},
+		{
+			"name": "root",
+			"from": [4, 2, 4],
+			"to": [12, 7, 12],
+			"faces": {
+				"north": {"uv": [2, 2, 4, 3.25], "texture": "#1"},
+				"east": {"uv": [0, 2, 2, 3.25], "texture": "#1"},
+				"south": {"uv": [6, 2, 8, 3.25], "texture": "#1"},
+				"west": {"uv": [4, 2, 6, 3.25], "texture": "#1"},
+				"up": {"uv": [4, 2, 2, 0], "texture": "#1"},
+				"down": {"uv": [6, 0, 4, 2], "texture": "#1"}
+			}
+		},
+		{
+			"name": "root",
+			"from": [6, 0, 6],
+			"to": [10, 2, 10],
+			"faces": {
+				"north": {"uv": [4, 5, 5, 5.5], "texture": "#1"},
+				"east": {"uv": [3, 5, 4, 5.5], "texture": "#1"},
+				"south": {"uv": [6, 5, 7, 5.5], "texture": "#1"},
+				"west": {"uv": [5, 5, 6, 5.5], "texture": "#1"},
+				"up": {"uv": [5, 5, 4, 4], "texture": "#1"},
+				"down": {"uv": [6, 4, 5, 5], "texture": "#1"}
+			}
+		},
+		{
+			"name": "root",
+			"from": [-8, 1, -8],
+			"to": [24, 1, 24],
+			"faces": {
+				"up": {"uv": [16, 16, 0, 0], "texture": "#0"},
+				"down": {"uv": [16, 0, 0, 16], "texture": "#0"}
+			}
+		}
+	],
+	"groups": [
+		{
+			"name": "root",
+			"origin": [0, 0, 0],
+			"color": 0,
+			"nbt": "{}",
+			"armAnimationEnabled": false,
+			"children": [0, 1, 2, 3, 4]
+		}
+	]
+}

src/main/resources/assets/new_soviet/models/block/ceiling_lamp.json

@@ -1,8 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"0": "ceiling_lamp",
-		"particle": "ceiling_lamp"
+		"0": "new_soviet:block/custom/furniture/ceiling_lamp",
+		"particle": "new_soviet:block/custom/furniture/ceiling_lamp"
 	},
 	"elements": [
 		{

src/main/resources/assets/new_soviet/models/block/radio.json

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"0": "new_soviet:block/custom/radio",
-		"particle": "new_soviet:block/custom/radio"
+		"0": "new_soviet:block/custom/electronics/radio",
+		"particle": "new_soviet:block/custom/electronics/radio"
 	},
 	"elements": [
 		{

src/main/resources/assets/new_soviet/models/block/red_tv.json

@@ -1,7 +1,7 @@
 {
 	"parent": "new_soviet:block/tv",
 	"textures": {
-		"0": "new_soviet:block/custom/red_television",
-		"particle": "new_soviet:block/custom/red_television"
+		"0": "new_soviet:block/custom/electronics/red_television",
+		"particle": "new_soviet:block/custom/electronics/red_television"
 	}
 }

src/main/resources/assets/new_soviet/models/block/siren.json

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"0": "siren",
-		"particle": "siren"
+		"0": "new_soviet:block/custom/electronics/siren",
+		"particle": "new_soviet:block/custom/electronics/siren"
 	},
 	"elements": [
 		{

src/main/resources/assets/new_soviet/models/block/table_lamp.json

@@ -1,8 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"0": "custom/furniture/table_lamp",
-		"particle": "custom/furniture/table_lamp"
+		"0": "new_soviet:block/custom/furniture/table_lamp",
+		"particle": "new_soviet:block/custom/furniture/table_lamp"
 	},
 	"elements": [
 		{

src/main/resources/assets/new_soviet/models/block/tv.json

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"0": "new_soviet:block/custom/television",
-		"particle": "new_soviet:block/custom/television"
+		"0": "new_soviet:block/custom/electronics/television",
+		"particle": "new_soviet:block/custom/electronics/television"
 	},
 	"elements": [
 		{

src/main/resources/assets/new_soviet/models/item/ceiling_fan.json

@@ -0,0 +1,4 @@
+{
+  "parent": "new_soviet:block/ceiling_fan_off"
+}
+

src/main/resources/assets/new_soviet/models/item/lamp.json

@@ -0,0 +1,3 @@
+{
+  "parent": "new_soviet:block/table_lamp"
+}

src/main/resources/assets/new_soviet/models/item/siren.json

@@ -0,0 +1,4 @@
+{
+  "parent": "new_soviet:block/siren"
+}
+

src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_animated.png.mcmeta

@@ -0,0 +1,7 @@
+{
+	"animation": {
+		"frametime": 1,
+		"interpolate": false,
+		"frames": [0, 1, 2, 3]
+	}
+}

src/main/resources/assets/new_soviet/textures/block/custom/appliances/stove.json

@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [64, 64],
 	"textures": {
-		"1": "nuke",
-		"particle": "nuke"
+		"1": "stove",
+		"particle": "stove"
 	},
 	"elements": [
 		{

src/main/resources/assets/new_soviet/textures/block/custom/furniture/bedside_table.json

@@ -1,8 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"0": "bedside_tabl",
-		"particle": "bedside_tabl"
+		"0": "bedside_table",
+		"particle": "bedside_table"
 	},
 	"elements": [
 		{