diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
index 5c0048427..9fb455bb9 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
@@ -19,6 +19,7 @@ import ru.dbotthepony.mc.otm.datagen.modLocation
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
 import ru.dbotthepony.mc.otm.registry.MRegistry
+import java.util.ArrayList
 
 fun addBlockStates(provider: MatteryBlockStateProvider) {
 	provider.block(MBlocks.BLACK_HOLE)
@@ -114,6 +115,8 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
 	provider.block(MBlocks.ENERGY_SERVO.values)
 	provider.block(MBlocks.COBBLESTONE_GENERATOR.values)
 
+	provider.block(MBlocks.DRIVE_RACK)
+
 	provider.block(MBlocks.PAINTER)
 	provider.block(MBlocks.INFINITE_WATER_SOURCE)
 
@@ -254,5 +257,30 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
 					.addModel().end()
 			}
 		}
+
+		provider.getVariantBuilder(MBlocks.METAL_JUNK).forAllStates {
+			val generated = ArrayList<ConfiguredModel>()
+
+			for (suffix in arrayOf("", "_b", "_c", "_d")) {
+				val model = provider.models().getExistingFile(modLocation("block/metal_junk$suffix"))
+
+				generated.add(with(ConfiguredModel.builder()) {
+					modelFile(model)
+					weight(2)
+
+					return@with buildLast()
+				})
+
+				generated.add(with(ConfiguredModel.builder()) {
+					modelFile(model)
+					rotationY(180)
+					weight(2)
+
+					return@with buildLast()
+				})
+			}
+
+			return@forAllStates generated.toTypedArray()
+		}
 	}
 }
diff --git a/src/main/resources/assets/overdrive_that_matters/blockstates/drive_rack.json b/src/main/resources/assets/overdrive_that_matters/blockstates/drive_rack.json
deleted file mode 100644
index 9e8995d38..000000000
--- a/src/main/resources/assets/overdrive_that_matters/blockstates/drive_rack.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"variants": {
-		"facing=south": {
-			"model": "overdrive_that_matters:block/drive_rack",
-			"y": 180
-		},
-		"facing=west": {
-			"model": "overdrive_that_matters:block/drive_rack",
-			"y": 270
-		},
-		"facing=north": {
-			"model": "overdrive_that_matters:block/drive_rack"
-		},
-		"facing=east": {
-			"model": "overdrive_that_matters:block/drive_rack",
-			"y": 90
-		}
-	}
-}
diff --git a/src/main/resources/assets/overdrive_that_matters/blockstates/metal_junk.json b/src/main/resources/assets/overdrive_that_matters/blockstates/metal_junk.json
deleted file mode 100644
index 0452e9c4c..000000000
--- a/src/main/resources/assets/overdrive_that_matters/blockstates/metal_junk.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"variants": {
-	"":[
-	{
-	"model": "overdrive_that_matters:block/metal_junk", "weight": 2
-	},
-	{
-	"model": "overdrive_that_matters:block/metal_junk", "y": 180, "weight": 2
-	},
-	{
-	"model": "overdrive_that_matters:block/metal_junk_b", "weight": 4
-	},
-	{
-	"model": "overdrive_that_matters:block/metal_junk_b", "y": 180, "weight": 4
-	},
-	{
-	"model": "overdrive_that_matters:block/metal_junk_c", "weight": 2
-	},
-	{
-	"model": "overdrive_that_matters:block/metal_junk_c", "y": 180, "weight": 2
-	},
-	{
-	"model": "overdrive_that_matters:block/metal_junk_d", "weight": 2
-	},
-	{
-	"model": "overdrive_that_matters:block/metal_junk_d", "y": 180, "weight": 2
-	}
-	]
-	}
-}
\ No newline at end of file