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 5eaa053a8..0002abb6a 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
@@ -38,6 +38,8 @@ import ru.dbotthepony.mc.otm.datagen.tags.addTags
 import ru.dbotthepony.mc.otm.registry.objects.ColoredDecorativeBlock
 import ru.dbotthepony.mc.otm.registry.objects.DecorativeBlock
 
+fun modLocation(string: String) = ResourceLocation(DataGen.MOD_ID, string)
+
 @Mod.EventBusSubscriber(modid = DataGen.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 object DataGen {
 	const val MOD_ID = OverdriveThatMatters.MOD_ID
@@ -215,6 +217,7 @@ object DataGen {
 		event.generator.addProvider(true, BatteryBankProvider(event))
 		event.generator.addProvider(true, lootTableProvider)
 		event.generator.addProvider(true, lootModifier)
+		event.generator.addProvider(true, SoundDataProvider(event))
 
 		blockModelProvider.resourceCubeAll(MBlocks.TRITANIUM_ORE)
 		blockModelProvider.resourceCubeAll(MBlocks.TRITANIUM_RAW_BLOCK)
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/SoundDataProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/SoundDataProvider.kt
new file mode 100644
index 000000000..15dfba907
--- /dev/null
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/SoundDataProvider.kt
@@ -0,0 +1,23 @@
+package ru.dbotthepony.mc.otm.datagen
+
+import net.minecraft.resources.ResourceLocation
+import net.minecraftforge.common.data.SoundDefinition
+import net.minecraftforge.common.data.SoundDefinitionsProvider
+import net.minecraftforge.data.event.GatherDataEvent
+import ru.dbotthepony.mc.otm.registry.MSoundEvents
+
+class SoundDataProvider(event: GatherDataEvent) : SoundDefinitionsProvider(event.generator, DataGen.MOD_ID, event.existingFileHelper) {
+	override fun registerSounds() {
+		add(MSoundEvents.PLASMA_WEAPON_OVERHEAT,
+			definition().subtitle("otm.sound.plasma_weapon_overheat")
+				.with(SoundDefinition.Sound.sound(modLocation("item/plasma_weapon_overheat"), SoundDefinition.SoundType.SOUND)))
+
+		add(MSoundEvents.PLAYER_BECOME_ANDROID,
+			definition().subtitle("otm.sound.player_become_android")
+				.with(SoundDefinition.Sound.sound(modLocation("player_become_android"), SoundDefinition.SoundType.SOUND)))
+
+		add(MSoundEvents.RIFLE_SHOT,
+			definition().subtitle("otm.sound.rifle_shot")
+				.with(SoundDefinition.Sound.sound(modLocation("item/rifle_shot"), SoundDefinition.SoundType.SOUND)))
+	}
+}
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
index 8c576312b..5fbeaf3c2 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
@@ -41,7 +41,7 @@ private fun decoratives(provider: MatteryLanguageProvider) {
 
 private fun sounds(provider: MatteryLanguageProvider) {
 	with(provider.english) {
-		sound("rifle_shoot", "Plasma rifle fires")
+		sound("rifle_shot", "Plasma rifle fires")
 		sound("plasma_weapon_overheat", "Plasma weapon overheats")
 		sound("player_become_android", "Player became android")
 	}
diff --git a/src/main/resources/assets/overdrive_that_matters/sounds.json b/src/main/resources/assets/overdrive_that_matters/sounds.json
deleted file mode 100644
index 0bbc87f23..000000000
--- a/src/main/resources/assets/overdrive_that_matters/sounds.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"item.rifle_shot": {
-		"subtitle": "otm.sound.rifle_shoot",
-		"sounds": [
-			{
-				"name": "overdrive_that_matters:item/rifle_shot",
-				"volume": 1.0,
-				"weight": 1
-			}
-		]
-	},
-
-	"player_become_android": {
-		"subtitle": "otm.sound.player_become_android",
-		"sounds": [
-			{
-				"name": "overdrive_that_matters:player_become_android",
-				"volume": 1.0,
-				"weight": 1
-			}
-		]
-	},
-
-	"item.plasma_weapon_overheat": {
-		"subtitle": "otm.sound.plasma_weapon_overheat",
-		"sounds": [
-			{
-				"name": "overdrive_that_matters:item/plasma_weapon_overheat",
-				"volume": 1.0,
-				"weight": 1
-			}
-		]
-	}
-}
\ No newline at end of file