diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
index 5db30dbdd..da5c28793 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
@@ -221,7 +221,40 @@ object DataGen {
 			block(MBlocks.CHEMICAL_GENERATOR)
 			block(MBlocks.MATTER_SCANNER)
 			block(MBlocks.ITEM_MONITOR)
-			block(MBlocks.MATTER_BOTTLER)
+
+			lambda {
+				with(getMultipartBuilder(MBlocks.MATTER_BOTTLER)) {
+					for (dir in RotatableMatteryBlock.FACING.possibleValues) {
+						for (enum in WorkerState.SEMI_WORKER_STATE.possibleValues) {
+							part().modelFile(models().getExistingFile(ResourceLocation(OverdriveThatMatters.MOD_ID, "matter_bottler_${enum.name.lowercase()}")))
+								.rotationY(dir.toYRotBlockstate())
+								.addModel()
+								.condition(RotatableMatteryBlock.FACING, dir)
+								.condition(WorkerState.WORKER_STATE, enum)
+								.end()
+						}
+					}
+
+					for (dir in RotatableMatteryBlock.FACING.possibleValues) {
+						for (enum in MatterBottlerBlock.SLOT_PROPERTIES) {
+							part().modelFile(models().getExistingFile(ResourceLocation(OverdriveThatMatters.MOD_ID, "matter_bottler_${enum.name}_open")))
+								.rotationY(dir.toYRotBlockstate())
+								.addModel()
+								.condition(RotatableMatteryBlock.FACING, dir)
+								.condition(enum, false)
+								.end()
+
+							part().modelFile(models().getExistingFile(ResourceLocation(OverdriveThatMatters.MOD_ID, "matter_bottler_${enum.name}_closed")))
+								.rotationY(dir.toYRotBlockstate())
+								.addModel()
+								.condition(RotatableMatteryBlock.FACING, dir)
+								.condition(enum, true)
+								.end()
+						}
+					}
+				}
+			}
+
 			block(MBlocks.MATTER_DECOMPOSER)
 			block(MBlocks.MATTER_REPLICATOR)
 			block(MBlocks.PLATE_PRESS)
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery1_closed.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_0_closed.json
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery1_closed.json
rename to src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_0_closed.json
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery1_open.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_0_open.json
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery1_open.json
rename to src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_0_open.json
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery2_closed.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_1_closed.json
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery2_closed.json
rename to src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_1_closed.json
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery2_open.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_1_open.json
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery2_open.json
rename to src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_1_open.json
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery3_closed.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_2_closed.json
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery3_closed.json
rename to src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_2_closed.json
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery3_open.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_2_open.json
similarity index 100%
rename from src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_battery3_open.json
rename to src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_bottle_2_open.json