diff --git a/package-lock.json b/package-lock.json
index 07263381..fb673987 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,8 +23,8 @@
         "@mcschema/java-1.20.2": "^0.0.9",
         "@mcschema/java-1.20.3": "^0.0.10",
         "@mcschema/java-1.20.5": "^0.0.32",
-        "@mcschema/java-1.21": "^0.0.15",
-        "@mcschema/locales": "^0.1.101",
+        "@mcschema/java-1.21": "^0.0.16",
+        "@mcschema/locales": "^0.1.102",
         "@zip.js/zip.js": "^2.4.5",
         "brace": "^0.11.1",
         "buffer": "^6.0.3",
@@ -677,17 +677,17 @@
       }
     },
     "node_modules/@mcschema/java-1.21": {
-      "version": "0.0.15",
-      "resolved": "https://registry.npmjs.org/@mcschema/java-1.21/-/java-1.21-0.0.15.tgz",
-      "integrity": "sha512-q2WFziQA2SCtlEuRUIc7FfpoCZJD3SVG+RwPnFoPG083I3pKF/gr3YzM9m9eYDoyK1RbKcqUqVqDQHB8pDDsUg==",
+      "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/@mcschema/java-1.21/-/java-1.21-0.0.16.tgz",
+      "integrity": "sha512-hPcN8ragrQbyo67mUhS7Qg3IyuREITbgHvzqMg3VItRhdfjWRIZtcyPjRhloL/yKCBeDpdQROUZ//JoReGmmrQ==",
       "dependencies": {
         "@mcschema/core": "^0.13.0"
       }
     },
     "node_modules/@mcschema/locales": {
-      "version": "0.1.101",
-      "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.101.tgz",
-      "integrity": "sha512-OwV4XtscNmVW9urrRX59iOOHwoJ4SoHmo0NVQvdBIJp43MRPSjiOMkhw/KlBC45X7qdHnPl/uKB4HemFHUuHoQ=="
+      "version": "0.1.102",
+      "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.102.tgz",
+      "integrity": "sha512-HVxpZyeNcKeX+sYA91x9wHgL2EhD1d9mj5RcxviI5t1D3DZOzu/Gpou0O+A1MoH9p6mM2h6GXUwLRjenRcyO+g=="
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -4794,17 +4794,17 @@
       }
     },
     "@mcschema/java-1.21": {
-      "version": "0.0.15",
-      "resolved": "https://registry.npmjs.org/@mcschema/java-1.21/-/java-1.21-0.0.15.tgz",
-      "integrity": "sha512-q2WFziQA2SCtlEuRUIc7FfpoCZJD3SVG+RwPnFoPG083I3pKF/gr3YzM9m9eYDoyK1RbKcqUqVqDQHB8pDDsUg==",
+      "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/@mcschema/java-1.21/-/java-1.21-0.0.16.tgz",
+      "integrity": "sha512-hPcN8ragrQbyo67mUhS7Qg3IyuREITbgHvzqMg3VItRhdfjWRIZtcyPjRhloL/yKCBeDpdQROUZ//JoReGmmrQ==",
       "requires": {
         "@mcschema/core": "^0.13.0"
       }
     },
     "@mcschema/locales": {
-      "version": "0.1.101",
-      "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.101.tgz",
-      "integrity": "sha512-OwV4XtscNmVW9urrRX59iOOHwoJ4SoHmo0NVQvdBIJp43MRPSjiOMkhw/KlBC45X7qdHnPl/uKB4HemFHUuHoQ=="
+      "version": "0.1.102",
+      "resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.102.tgz",
+      "integrity": "sha512-HVxpZyeNcKeX+sYA91x9wHgL2EhD1d9mj5RcxviI5t1D3DZOzu/Gpou0O+A1MoH9p6mM2h6GXUwLRjenRcyO+g=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
diff --git a/package.json b/package.json
index 9a474d6b..187351c3 100644
--- a/package.json
+++ b/package.json
@@ -29,8 +29,8 @@
     "@mcschema/java-1.20.2": "^0.0.9",
     "@mcschema/java-1.20.3": "^0.0.10",
     "@mcschema/java-1.20.5": "^0.0.32",
-    "@mcschema/java-1.21": "^0.0.15",
-    "@mcschema/locales": "^0.1.101",
+    "@mcschema/java-1.21": "^0.0.16",
+    "@mcschema/locales": "^0.1.102",
     "@zip.js/zip.js": "^2.4.5",
     "brace": "^0.11.1",
     "buffer": "^6.0.3",
diff --git a/src/app/schema/renderHtml.tsx b/src/app/schema/renderHtml.tsx
index 3957b358..a58f2b79 100644
--- a/src/app/schema/renderHtml.tsx
+++ b/src/app/schema/renderHtml.tsx
@@ -11,7 +11,7 @@ import config from '../Config.js'
 import { localize, useLocale, useStore } from '../contexts/index.js'
 import { useFocus } from '../hooks/index.js'
 import type { BlockStateRegistry, VersionId } from '../services/index.js'
-import { CachedDecorator, CachedFeature } from '../services/index.js'
+import { CachedDecorator, CachedFeature, checkVersion } from '../services/index.js'
 import { deepClone, deepEqual, generateColor, generateUUID, hexId, hexToRgb, isObject, newSeed, rgbToHex, stringToColor } from '../Utils.js'
 import { ModelWrapper } from './ModelWrapper.js'
 
@@ -488,7 +488,7 @@ function StringSuffix({ path, getValues, config, node, value, lang, version, sta
 				{values.map(v => <option value={v} />)}
 			</datalist>}
 			{['generator_biome.biome'].includes(context) && <input type="color" value={rgbToHex(biomeColors[fullId] ?? VanillaColors[fullId] ?? stringToColor(fullId))} onChange={v => setBiomeColor(fullId, hexToRgb(v.currentTarget.value))}></input>}
-			{['attribute_modifier.id', 'text_component_object.hoverEvent.show_entity.contents.id', 'enchantment.effects.entry.uuid'].includes(context) && <button onClick={() => path.set(generateUUID())} class="tooltipped tip-se" aria-label={localize(lang, 'generate_new_uuid')}>{Octicon.sync}</button>}
+			{(['text_component_object.hoverEvent.show_entity.contents.id', 'enchantment.effects.entry.uuid'].includes(context) || ('attribute_modifier.id' === context && !checkVersion(version, '1.21'))) && <button onClick={() => path.set(generateUUID())} class="tooltipped tip-se" aria-label={localize(lang, 'generate_new_uuid')}>{Octicon.sync}</button>}
 			{gen && values.includes(value) && value.startsWith('minecraft:') &&
 				<a href={`/${gen.url}/?version=${version}&preset=${value.replace(/^minecraft:/, '')}`} class="tooltipped tip-se" aria-label={localize(lang, 'follow_reference')}>{Octicon.link_external}</a>}
 		</>
diff --git a/src/config.json b/src/config.json
index e9db0f37..493e37f2 100644
--- a/src/config.json
+++ b/src/config.json
@@ -263,6 +263,13 @@
       "minVersion": "1.21",
       "wiki": "https://minecraft.wiki/w/Painting_variant"
     },
+    {
+      "id": "jukebox_song",
+      "url": "jukebox-song",
+      "schema": "jukebox_song",
+      "minVersion": "1.21",
+      "wiki": "https://minecraft.wiki/w/Jukebox_song_definition"
+    },
     {
       "id": "pack_mcmeta",
       "url": "pack-mcmeta",
diff --git a/src/locales/en.json b/src/locales/en.json
index d52f9e2f..1dfd7477 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -68,6 +68,7 @@
   "generator.font": "Font",
   "generator.immersive_weathering.block_growth": "Block Growth",
   "generator.item_modifier": "Item Modifier",
+  "generator.jukebox_song": "Jukebox Song",
   "generator.lithostitched.worldgen_modifier": "Worldgen Modifier",
   "generator.loot_table": "Loot Table",
   "generator.model": "Model",