Fixed melotta related issues including relic song and the music box

Waterpicker · Waterpicker · commit 96c71f627231 · 2025-07-02T23:17:37.000-05:00
Also purged generations pokedex in favor of converting to cobbelmon pokedex.
diff --git a/common/src/main/generated/resources/assets/generations_core/lang/en_us.json b/common/src/main/generated/resources/assets/generations_core/lang/en_us.json
diff --git a/common/src/main/generated/resources/assets/generations_core/models/item/pokedex.json b/common/src/main/generated/resources/assets/generations_core/models/item/pokedex.json
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/azalea_town.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/azalea_town.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.azalea_town_disc.desc"
+    "translate": "jukebox_song.generations_core.azalea_town"
   },
   "length_in_seconds": 200.0,
   "sound_event": "generations_core:generations_core.music.ambient.azalea_town"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/cascarrafa_city.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/cascarrafa_city.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.cascarrafa_city_disc.desc"
+    "translate": "jukebox_song.generations_core.cascarrafa_city"
   },
   "length_in_seconds": 169.0,
   "sound_event": "generations_core:generations_core.music.ambient.cascarrafa_city"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/cerulean_city.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/cerulean_city.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.cerulean_city_disc.desc"
+    "translate": "jukebox_song.generations_core.cerulean_city"
   },
   "length_in_seconds": 184.0,
   "sound_event": "generations_core:generations_core.music.ambient.cerulean_city"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/cynthia.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/cynthia.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.cynthia_disc.desc"
+    "translate": "jukebox_song.generations_core.cynthia"
   },
   "length_in_seconds": 385.0,
   "sound_event": "generations_core:generations_core.music.battle.cynthia"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/deoxys.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/deoxys.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.deoxys_disc.desc"
+    "translate": "jukebox_song.generations_core.deoxys"
   },
   "length_in_seconds": 414.0,
   "sound_event": "generations_core:generations_core.music.battle.deoxys"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/eterna_city.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/eterna_city.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.eterna_city_disc.desc"
+    "translate": "jukebox_song.generations_core.eterna_city"
   },
   "length_in_seconds": 136.0,
   "sound_event": "generations_core:generations_core.music.ambient.eterna_city"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/goldenrod_city.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/goldenrod_city.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.goldenrod_city_disc.desc"
+    "translate": "jukebox_song.generations_core.goldenrod_city"
   },
   "length_in_seconds": 182.0,
   "sound_event": "generations_core:generations_core.music.ambient.goldenrod_city"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/icirrus_city.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/icirrus_city.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.icirrus_city_disc.desc"
+    "translate": "jukebox_song.generations_core.icirrus_city"
   },
   "length_in_seconds": 148.0,
   "sound_event": "generations_core:generations_core.music.ambient.icirrus_city"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/iris.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/iris.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.iris_disc.desc"
+    "translate": "jukebox_song.generations_core.iris"
   },
   "length_in_seconds": 291.0,
   "sound_event": "generations_core:generations_core.music.battle.iris"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/jubilife_village.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/jubilife_village.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.jubilife_village_disc.desc"
+    "translate": "jukebox_song.generations_core.jubilife_village"
   },
   "length_in_seconds": 202.0,
   "sound_event": "generations_core:generations_core.music.ambient.jubilife_village"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/kanto.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/kanto.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.kanto_disc.desc"
+    "translate": "jukebox_song.generations_core.kanto"
   },
   "length_in_seconds": 337.0,
   "sound_event": "generations_core:generations_core.music.battle.kanto"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/lake_of_rage.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/lake_of_rage.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.lake_of_rage_disc.desc"
+    "translate": "jukebox_song.generations_core.lake_of_rage"
   },
   "length_in_seconds": 139.0,
   "sound_event": "generations_core:generations_core.music.ambient.lake_of_rage"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/lavender_town.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/lavender_town.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.lavender_town_disc.desc"
+    "translate": "jukebox_song.generations_core.lavender_town"
   },
   "length_in_seconds": 369.0,
   "sound_event": "generations_core:generations_core.music.special.lavender_town"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/laverre_city.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/laverre_city.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.laverre_city_disc.desc"
+    "translate": "jukebox_song.generations_core.laverre_city"
   },
   "length_in_seconds": 281.0,
   "sound_event": "generations_core:generations_core.music.ambient.laverre_city"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/lillie.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/lillie.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.lillie_disc.desc"
+    "translate": "jukebox_song.generations_core.lillie"
   },
   "length_in_seconds": 312.0,
   "sound_event": "generations_core:generations_core.music.ambient.lillie"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/lugia.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/lugia.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.lugia_disc.desc"
+    "translate": "jukebox_song.generations_core.lugia"
   },
   "length_in_seconds": 341.0,
   "sound_event": "generations_core:generations_core.music.special.lugia"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/lusamine.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/lusamine.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.lusamine_disc.desc"
+    "translate": "jukebox_song.generations_core.lusamine"
   },
   "length_in_seconds": 337.0,
   "sound_event": "generations_core:generations_core.music.battle.lusamine"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/meloettas_relic_song.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/meloettas_relic_song.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.meloettas_relic_song_disc.desc"
+    "translate": "jukebox_song.generations_core.meloettas_relic_song"
   },
   "length_in_seconds": 30.0,
   "sound_event": "generations_core:generations_core.item.meloettas_relic_song"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/mt_pyre.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/mt_pyre.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.mt_pyre_disc.desc"
+    "translate": "jukebox_song.generations_core.mt_pyre"
   },
   "length_in_seconds": 219.0,
   "sound_event": "generations_core:generations_core.music.special.mt_pyre"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/nemona.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/nemona.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.nemona_disc.desc"
+    "translate": "jukebox_song.generations_core.nemona"
   },
   "length_in_seconds": 158.0,
   "sound_event": "generations_core:generations_core.music.battle.nemona"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/nessa.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/nessa.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.nessa_disc.desc"
+    "translate": "jukebox_song.generations_core.nessa"
   },
   "length_in_seconds": 263.0,
   "sound_event": "generations_core:generations_core.music.battle.nessa"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/penny.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/penny.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.penny_disc.desc"
+    "translate": "jukebox_song.generations_core.penny"
   },
   "length_in_seconds": 267.0,
   "sound_event": "generations_core:generations_core.music.battle.penny"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/pokemon_center.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/pokemon_center.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.pokemon_center_disc.desc"
+    "translate": "jukebox_song.generations_core.pokemon_center"
   },
   "length_in_seconds": 240.0,
   "sound_event": "generations_core:generations_core.music.ambient.pokemon_center"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/rival.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/rival.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.rival_disc.desc"
+    "translate": "jukebox_song.generations_core.rival"
   },
   "length_in_seconds": 221.0,
   "sound_event": "generations_core:generations_core.music.battle.rival"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/route_228.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/route_228.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.route_228_disc.desc"
+    "translate": "jukebox_song.generations_core.route_228"
   },
   "length_in_seconds": 418.0,
   "sound_event": "generations_core:generations_core.music.ambient.route_228"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/sada_and_turo.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/sada_and_turo.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.sada_and_turo_disc.desc"
+    "translate": "jukebox_song.generations_core.sada_and_turo"
   },
   "length_in_seconds": 349.0,
   "sound_event": "generations_core:generations_core.music.battle.sada_and_turo"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/slumbering_weald.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/slumbering_weald.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.slumbering_weald_disc.desc"
+    "translate": "jukebox_song.generations_core.slumbering_weald"
   },
   "length_in_seconds": 262.0,
   "sound_event": "generations_core:generations_core.music.ambient.slumbering_weald"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/south_province.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/south_province.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.south_province_disc.desc"
+    "translate": "jukebox_song.generations_core.south_province"
   },
   "length_in_seconds": 214.0,
   "sound_event": "generations_core:generations_core.music.battle.south_province"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/surf.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/surf.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.surf_disc.desc"
+    "translate": "jukebox_song.generations_core.surf"
   },
   "length_in_seconds": 261.0,
   "sound_event": "generations_core:generations_core.music.ambient.surf"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/team_rocket.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/team_rocket.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.team_rocket_disc.desc"
+    "translate": "jukebox_song.generations_core.team_rocket"
   },
   "length_in_seconds": 186.0,
   "sound_event": "generations_core:generations_core.music.battle.team_rocket"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/ultra_necrozma.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/ultra_necrozma.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.ultra_necrozma_disc.desc"
+    "translate": "jukebox_song.generations_core.ultra_necrozma"
   },
   "length_in_seconds": 296.0,
   "sound_event": "generations_core:generations_core.music.battle.ultra_necrozma"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/vermilion_city.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/vermilion_city.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.vermilion_city_disc.desc"
+    "translate": "jukebox_song.generations_core.vermilion_city"
   },
   "length_in_seconds": 216.0,
   "sound_event": "generations_core:generations_core.music.ambient.vermilion_city"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/xy_legendary.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/xy_legendary.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.xy_legendary_disc.desc"
+    "translate": "jukebox_song.generations_core.xy_legendary"
   },
   "length_in_seconds": 261.0,
   "sound_event": "generations_core:generations_core.music.battle.xy_legendary"
diff --git a/common/src/main/generated/resources/data/generations_core/jukebox_song/zinnia.json b/common/src/main/generated/resources/data/generations_core/jukebox_song/zinnia.json
@@ -1,7 +1,7 @@
 {
   "comparator_output": 0,
   "description": {
-    "translate": "item.generations_core.zinnia_disc.desc"
+    "translate": "jukebox_song.generations_core.zinnia"
   },
   "length_in_seconds": 320.0,
   "sound_event": "generations_core:generations_core.music.battle.zinnia"
diff --git a/common/src/main/generated/resources/data/generations_core/tags/item/player_items.json b/common/src/main/generated/resources/data/generations_core/tags/item/player_items.json
@@ -270,7 +270,6 @@
     "generations_core:z_ring",
     "generations_core:tera_orb",
     "generations_core:rotom_catalog",
-    "generations_core:pokedex",
     "generations_core:lure_module",
     "generations_core:bottle_cap",
     "generations_core:gold_bottle_cap",
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.kt
@@ -124,8 +124,6 @@ object GenerationsCoreClient {
 //            }
 //        }
 
-        ModelRegistry.init()
-
         ITextureLoader.setInstance(GenerationsTextureLoader)
 
         implementation.registerResourceReloader(GenerationsCore.id("model_registry"), CompiledModelLoader(), emptyList())
@@ -163,6 +161,8 @@ object GenerationsCoreClient {
         event.tell({
             val renderer = PokemonItemRenderer()
 
+            ModelRegistry.init()
+
             CobblemonBuiltinItemRendererRegistry.register(GenerationsItems.TIME_CAPSULE.value(), renderer)
             CobblemonBuiltinItemRendererRegistry.register(GenerationsItems.SUICUNE_STATUE.value(), renderer)
             CobblemonBuiltinItemRendererRegistry.register(GenerationsItems.RAIKOU_STATUE.value(), renderer)
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/InstanceProvider.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/InstanceProvider.kt
@@ -0,0 +1,9 @@
+package generations.gg.generations.core.generationscore.common.client.model
+
+import gg.generations.rarecandy.renderer.rendering.ObjectInstance
+
+interface InstanceProvider {
+    fun generateInstance(): ObjectInstance?
+
+    var instanceArray: Array<ObjectInstance?>?
+}
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/ModelContextProviders.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/ModelContextProviders.java
@@ -1,6 +1,8 @@
 package generations.gg.generations.core.generationscore.common.client.model;
 
+import gg.generations.rarecandy.renderer.rendering.ObjectInstance;
 import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
 
@@ -32,4 +34,5 @@ public interface FrameProvider extends ModelProvider {
     public interface TintProvider {
         @Nullable Vector3f getTint();
     }
+
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/block/entity/GeneralUseBlockEntityRenderer.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/block/entity/GeneralUseBlockEntityRenderer.kt
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/datafixer/GenerationsSchemas.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/datafixer/GenerationsSchemas.kt
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/JukeboxSongPlayerMixin.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/JukeboxSongPlayerMixin.java
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/RecordSongs.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/RecordSongs.kt
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/RelicSongItem.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/RelicSongItem.kt
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/creativetab/GenerationsCreativeTabs.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/creativetab/GenerationsCreativeTabs.kt
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/JukeBoxExtension.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/JukeBoxExtension.java
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/MeloettaMusicBoxBlockEntity.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/MeloettaMusicBoxBlockEntity.kt
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/ModelProvidingBlockEntity.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/ModelProvidingBlockEntity.kt
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/MeloettaMusicBoxBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/MeloettaMusicBoxBlock.kt
diff --git a/common/src/main/resources/GenerationsCore-common.mixins.json b/common/src/main/resources/GenerationsCore-common.mixins.json
diff --git a/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/datagen/DataGen.kt b/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/datagen/DataGen.kt
diff --git a/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/datagen/lang/GeneralLang.kt b/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/datagen/lang/GeneralLang.kt
diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/items/ItemDatagen.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/items/ItemDatagen.kt
diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/lang/GeneralLang.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/lang/GeneralLang.kt

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"comparator_output": 0,`
`3`	`3`	`"description": {`
`4`		`- "translate": "item.generations_core.azalea_town_disc.desc"`
	`4`	`+ "translate": "jukebox_song.generations_core.azalea_town"`
`5`	`5`	`},`
`6`	`6`	`"length_in_seconds": 200.0,`
`7`	`7`	`"sound_event": "generations_core:generations_core.music.ambient.azalea_town"`