diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..4604fe5
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,34 @@
+# Changelog
+
+## [1.0.0-1.21.1] - 2025-08-22
+
+### Added
+
+- Full compatibility with Minecraft 1.21.1
+- Updated to Fabric Loader 0.16.5
+
+### Changed
+
+- Updated datapack format from 10 to 48 (1.21.1 requirement)
+- Migrated tags directory structure: `tags/blocks/` → `tags/block/`, `tags/items/` → `tags/item/`
+- Updated ResourceLocation API calls to use new 1.21.1 syntax
+- Updated mixin targeting for 1.21.1 BlockBehaviour changes
+- Fixed block ID references: `minecraft:grass` → `minecraft:short_grass`
+
+### Technical Notes
+
+- Maintains data-driven approach using tags for block sound assignments
+- All original sound functionality preserved
+- Clean codebase following original mod structure
+- Compatible with ModMenu for configuration
+
+### Dependencies
+
+- Minecraft 1.21.1
+- Fabric Loader 0.16.5+
+- Fabric API 0.104.0+1.21.1
+
+### Optional Dependencies
+
+- ModMenu (for in-game configuration)
+- Cloth Config API (for configuration GUI)
diff --git a/gradle.properties b/gradle.properties
index 77f461c..c5532a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ minecraft_version=1.21.1
 loader_version=0.16.5
 
 # Mod Properties
-mod_version = 0.0.7-1.21.1
+mod_version = 1.0.0-1.21.1
 maven_group = com.sydokiddo
 archives_base_name = auditory
 
diff --git a/src/main/java/net/sydokiddo/auditory/mixin/blocks/BlockSoundsMixin.java b/src/main/java/net/sydokiddo/auditory/mixin/blocks/BlockSoundsMixin.java
index 5619087..df963c6 100644
--- a/src/main/java/net/sydokiddo/auditory/mixin/blocks/BlockSoundsMixin.java
+++ b/src/main/java/net/sydokiddo/auditory/mixin/blocks/BlockSoundsMixin.java
@@ -16,11 +16,12 @@
 // Any blocks in the respective tags will use the respective sound group.
 // This is entirely data-driven and can be controlled by adding the block's ID to the respective tag through a datapack or mod.
 
-@Mixin(BlockBehaviour.class)
+@Mixin(BlockBehaviour.BlockStateBase.class)
 abstract class BlockSoundsMixin {
 
     @Inject(at = @At("HEAD"), method = "getSoundType", cancellable = true)
-    private void auditory_alterSoundType(BlockState state, CallbackInfoReturnable<SoundType> info) {
+    private void auditory_alterSoundType(CallbackInfoReturnable<SoundType> info) {
+        BlockState state = (BlockState) (Object) this;
 
         if (state.is(AuditoryTags.BASALT_SOUNDS) && (Auditory.getConfig().block_sounds.blockSoundsConfig.overworldStoneVariantSounds)) {
             info.setReturnValue(SoundType.BASALT);
diff --git a/src/main/resources/auditory.mixins.json b/src/main/resources/auditory.mixins.json
index b38bffc..a3c04d6 100644
--- a/src/main/resources/auditory.mixins.json
+++ b/src/main/resources/auditory.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.sydokiddo.auditory.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
     "blocks.BlockSoundsMixin",
     "blocks.CakeEatingSoundMixin",
@@ -27,4 +27,4 @@
   "injectors": {
     "defaultRequire": 1
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/data/auditory/tags/blocks/basalt_sounds.json b/src/main/resources/data/auditory/tags/block/basalt_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/basalt_sounds.json
rename to src/main/resources/data/auditory/tags/block/basalt_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/bookshelf_sounds.json b/src/main/resources/data/auditory/tags/block/bookshelf_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/bookshelf_sounds.json
rename to src/main/resources/data/auditory/tags/block/bookshelf_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/chorus_plant_sounds.json b/src/main/resources/data/auditory/tags/block/chorus_plant_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/chorus_plant_sounds.json
rename to src/main/resources/data/auditory/tags/block/chorus_plant_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/clay_brick_sounds.json b/src/main/resources/data/auditory/tags/block/clay_brick_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/clay_brick_sounds.json
rename to src/main/resources/data/auditory/tags/block/clay_brick_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/dirt_sounds.json b/src/main/resources/data/auditory/tags/block/dirt_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/dirt_sounds.json
rename to src/main/resources/data/auditory/tags/block/dirt_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/gold_sounds.json b/src/main/resources/data/auditory/tags/block/gold_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/gold_sounds.json
rename to src/main/resources/data/auditory/tags/block/gold_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/gourd_sounds.json b/src/main/resources/data/auditory/tags/block/gourd_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/gourd_sounds.json
rename to src/main/resources/data/auditory/tags/block/gourd_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/ice_sounds.json b/src/main/resources/data/auditory/tags/block/ice_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/ice_sounds.json
rename to src/main/resources/data/auditory/tags/block/ice_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/leaf_sounds.json b/src/main/resources/data/auditory/tags/block/leaf_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/leaf_sounds.json
rename to src/main/resources/data/auditory/tags/block/leaf_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/lily_pad_sounds.json b/src/main/resources/data/auditory/tags/block/lily_pad_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/lily_pad_sounds.json
rename to src/main/resources/data/auditory/tags/block/lily_pad_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/metal_sounds.json b/src/main/resources/data/auditory/tags/block/metal_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/metal_sounds.json
rename to src/main/resources/data/auditory/tags/block/metal_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/mushroom_sounds.json b/src/main/resources/data/auditory/tags/block/mushroom_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/mushroom_sounds.json
rename to src/main/resources/data/auditory/tags/block/mushroom_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/mushroom_stem_sounds.json b/src/main/resources/data/auditory/tags/block/mushroom_stem_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/mushroom_stem_sounds.json
rename to src/main/resources/data/auditory/tags/block/mushroom_stem_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/netherrack_sounds.json b/src/main/resources/data/auditory/tags/block/netherrack_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/netherrack_sounds.json
rename to src/main/resources/data/auditory/tags/block/netherrack_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/obsidian_sounds.json b/src/main/resources/data/auditory/tags/block/obsidian_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/obsidian_sounds.json
rename to src/main/resources/data/auditory/tags/block/obsidian_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/plant_sounds.json b/src/main/resources/data/auditory/tags/block/plant_sounds.json
similarity index 94%
rename from src/main/resources/data/auditory/tags/blocks/plant_sounds.json
rename to src/main/resources/data/auditory/tags/block/plant_sounds.json
index 5281169..2237994 100644
--- a/src/main/resources/data/auditory/tags/blocks/plant_sounds.json
+++ b/src/main/resources/data/auditory/tags/block/plant_sounds.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "minecraft:grass",
+    "minecraft:short_grass",
     "minecraft:dead_bush",
     "minecraft:tall_grass",
     "minecraft:fern",
@@ -21,4 +21,4 @@
     "minecraft:red_mushroom",
     "minecraft:sugar_cane"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/data/auditory/tags/blocks/pot_sounds.json b/src/main/resources/data/auditory/tags/block/pot_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/pot_sounds.json
rename to src/main/resources/data/auditory/tags/block/pot_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/purpur_sounds.json b/src/main/resources/data/auditory/tags/block/purpur_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/purpur_sounds.json
rename to src/main/resources/data/auditory/tags/block/purpur_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/raw_ore_block_sounds.json b/src/main/resources/data/auditory/tags/block/raw_ore_block_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/raw_ore_block_sounds.json
rename to src/main/resources/data/auditory/tags/block/raw_ore_block_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/sand_sounds.json b/src/main/resources/data/auditory/tags/block/sand_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/sand_sounds.json
rename to src/main/resources/data/auditory/tags/block/sand_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/shulker_box_sounds.json b/src/main/resources/data/auditory/tags/block/shulker_box_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/shulker_box_sounds.json
rename to src/main/resources/data/auditory/tags/block/shulker_box_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/small_object_sounds.json b/src/main/resources/data/auditory/tags/block/small_object_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/small_object_sounds.json
rename to src/main/resources/data/auditory/tags/block/small_object_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/spawner_sounds.json b/src/main/resources/data/auditory/tags/block/spawner_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/spawner_sounds.json
rename to src/main/resources/data/auditory/tags/block/spawner_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/stone_brick_sounds.json b/src/main/resources/data/auditory/tags/block/stone_brick_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/stone_brick_sounds.json
rename to src/main/resources/data/auditory/tags/block/stone_brick_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/stone_ore_sounds.json b/src/main/resources/data/auditory/tags/block/stone_ore_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/stone_ore_sounds.json
rename to src/main/resources/data/auditory/tags/block/stone_ore_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/string_sounds.json b/src/main/resources/data/auditory/tags/block/string_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/string_sounds.json
rename to src/main/resources/data/auditory/tags/block/string_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/terracotta_sounds.json b/src/main/resources/data/auditory/tags/block/terracotta_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/terracotta_sounds.json
rename to src/main/resources/data/auditory/tags/block/terracotta_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/wood_sounds.json b/src/main/resources/data/auditory/tags/block/wood_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/blocks/wood_sounds.json
rename to src/main/resources/data/auditory/tags/block/wood_sounds.json
diff --git a/src/main/resources/data/auditory/tags/blocks/blackstone_sounds.json b/src/main/resources/data/auditory/tags/blocks/blackstone_sounds.json
deleted file mode 100644
index 2fea220..0000000
--- a/src/main/resources/data/auditory/tags/blocks/blackstone_sounds.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "values": [
-    "minecraft:blackstone",
-    "minecraft:blackstone_stairs",
-    "minecraft:blackstone_slab",
-    "minecraft:blackstone_wall",
-    "minecraft:polished_blackstone",
-    "minecraft:polished_blackstone_stairs",
-    "minecraft:polished_blackstone_slab",
-    "minecraft:polished_blackstone_wall",
-    "minecraft:polished_blackstone_button",
-    "minecraft:polished_blackstone_pressure_plate",
-    "minecraft:chiseled_polished_blackstone",
-    "minecraft:polished_blackstone_bricks",
-    "minecraft:polished_blackstone_brick_stairs",
-    "minecraft:polished_blackstone_brick_slab",
-    "minecraft:polished_blackstone_brick_wall",
-    "minecraft:cracked_polished_blackstone_bricks"
-  ]
-}
\ No newline at end of file
diff --git a/src/main/resources/data/auditory/tags/blocks/portal_sounds.json b/src/main/resources/data/auditory/tags/blocks/portal_sounds.json
deleted file mode 100644
index f1e3edf..0000000
--- a/src/main/resources/data/auditory/tags/blocks/portal_sounds.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "#minecraft:portals"
-  ]
-}
\ No newline at end of file
diff --git a/src/main/resources/data/auditory/tags/blocks/prismarine_sounds.json b/src/main/resources/data/auditory/tags/blocks/prismarine_sounds.json
deleted file mode 100644
index 8e313e4..0000000
--- a/src/main/resources/data/auditory/tags/blocks/prismarine_sounds.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "values": [
-    "minecraft:prismarine",
-    "minecraft:prismarine_stairs",
-    "minecraft:prismarine_slab",
-    "minecraft:prismarine_wall",
-    "minecraft:prismarine_bricks",
-    "minecraft:prismarine_brick_stairs",
-    "minecraft:prismarine_brick_slab",
-    "minecraft:dark_prismarine",
-    "minecraft:dark_prismarine_stairs",
-    "minecraft:dark_prismarine_slab"
-  ]
-}
\ No newline at end of file
diff --git a/src/main/resources/data/auditory/tags/blocks/sandstone_sounds.json b/src/main/resources/data/auditory/tags/blocks/sandstone_sounds.json
deleted file mode 100644
index 07c72fa..0000000
--- a/src/main/resources/data/auditory/tags/blocks/sandstone_sounds.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "values": [
-    "minecraft:sandstone",
-    "minecraft:chiseled_sandstone",
-    "minecraft:cut_sandstone",
-    "minecraft:smooth_sandstone",
-    "minecraft:red_sandstone",
-    "minecraft:chiseled_red_sandstone",
-    "minecraft:cut_red_sandstone",
-    "minecraft:smooth_red_sandstone",
-    "minecraft:sandstone_slab",
-    "minecraft:red_sandstone_slab",
-    "minecraft:cut_sandstone_slab",
-    "minecraft:cut_red_sandstone_slab",
-    "minecraft:sandstone_stairs",
-    "minecraft:red_sandstone_stairs",
-    "minecraft:smooth_sandstone_stairs",
-    "minecraft:smooth_sandstone_slab",
-    "minecraft:smooth_red_sandstone_stairs",
-    "minecraft:smooth_red_sandstone_slab"
-  ]
-}
\ No newline at end of file
diff --git a/src/main/resources/data/auditory/tags/items/crunchy_fruit_sounds.json b/src/main/resources/data/auditory/tags/item/crunchy_fruit_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/items/crunchy_fruit_sounds.json
rename to src/main/resources/data/auditory/tags/item/crunchy_fruit_sounds.json
diff --git a/src/main/resources/data/auditory/tags/items/dried_kelp_sounds.json b/src/main/resources/data/auditory/tags/item/dried_kelp_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/items/dried_kelp_sounds.json
rename to src/main/resources/data/auditory/tags/item/dried_kelp_sounds.json
diff --git a/src/main/resources/data/auditory/tags/items/soft_fruit_sounds.json b/src/main/resources/data/auditory/tags/item/soft_fruit_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/items/soft_fruit_sounds.json
rename to src/main/resources/data/auditory/tags/item/soft_fruit_sounds.json
diff --git a/src/main/resources/data/auditory/tags/items/stew_sounds.json b/src/main/resources/data/auditory/tags/item/stew_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/items/stew_sounds.json
rename to src/main/resources/data/auditory/tags/item/stew_sounds.json
diff --git a/src/main/resources/data/auditory/tags/items/vegetable_sounds.json b/src/main/resources/data/auditory/tags/item/vegetable_sounds.json
similarity index 100%
rename from src/main/resources/data/auditory/tags/items/vegetable_sounds.json
rename to src/main/resources/data/auditory/tags/item/vegetable_sounds.json
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index b11a1d0..f168628 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -5,10 +5,7 @@
 
   "name": "Auditory",
   "description": "A mod that expands and improves upon the sound and audio aspects of Minecraft!",
-  "authors": [
-    "Sydokiddo (Developer)",
-    "AmberSand (Additional Sounds)"
-  ],
+  "authors": ["Sydokiddo (Developer)", "AmberSand (Additional Sounds)"],
   "contact": {
     "homepage": "https://www.curseforge.com/minecraft/mc-mods/auditory",
     "issues": "https://github.com/Sydokiddo/auditory/issues",
@@ -20,19 +17,11 @@
   "environment": "*",
 
   "entrypoints": {
-    "main": [
-      "net.sydokiddo.auditory.Auditory"
-    ],
-    "client": [
-      "net.sydokiddo.auditory.AuditoryClient"
-    ],
-    "modmenu": [
-      "net.sydokiddo.auditory.misc.config.ModMenuCompatibility"
-    ]
+    "main": ["net.sydokiddo.auditory.Auditory"],
+    "client": ["net.sydokiddo.auditory.AuditoryClient"],
+    "modmenu": ["net.sydokiddo.auditory.misc.config.ModMenuCompatibility"]
   },
-  "mixins": [
-    "auditory.mixins.json"
-  ],
+  "mixins": ["auditory.mixins.json"],
 
   "depends": {
     "fabricloader": ">=0.16.5",
@@ -41,8 +30,7 @@
     "java": ">=21"
   },
   "suggests": {
-    "another-mod": "*",
-    "modmenu" : "*",
-    "cloth config" : "*"
+    "modmenu": "*",
+    "cloth-config": "*"
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/template_datapack/pack.mcmeta b/src/main/resources/template_datapack/pack.mcmeta
index 64a5fa7..e5b169c 100644
--- a/src/main/resources/template_datapack/pack.mcmeta
+++ b/src/main/resources/template_datapack/pack.mcmeta
@@ -1,8 +1,6 @@
 {
-   "pack":{
-      "pack_format": 10,
-      "description": [
-		{"text":"Auditory Template Datapack","color":"gold"}
-	  ]
-   }
-}
\ No newline at end of file
+  "pack": {
+    "pack_format": 48,
+    "description": [{ "text": "Auditory Template Datapack", "color": "gold" }]
+  }
+}