Remove deprecated sound reference

Noaaan · Aug 20, 2024 · f228eb5 · f228eb5
1 parent 3144854
commit f228eb5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/nourl/mythicmetals/armor/MythicArmorMaterials.java b/src/main/java/nourl/mythicmetals/armor/MythicArmorMaterials.java
@@ -1,7 +1,6 @@
 package nourl.mythicmetals.armor;
 
 import io.wispforest.owo.registration.reflect.AutoRegistryContainer;
-import io.wispforest.owo.util.RegistryAccess;
 import net.minecraft.item.*;
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.registry.Registries;
@@ -227,7 +226,7 @@ public Class<ArmorMaterial> getTargetFieldType() {
     }
 
     private static RegistryEntry<SoundEvent> sound(SoundEvent sound) {
-        return RegistryAccess.getEntry(Registries.SOUND_EVENT, sound);
+        return Registries.SOUND_EVENT.getEntry(sound);
     }
 
     private static ArmorMaterial.Layer layer(String name) {

diff --git a/src/main/java/nourl/mythicmetals/item/tools/MythicTools.java b/src/main/java/nourl/mythicmetals/item/tools/MythicTools.java
@@ -9,7 +9,8 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.*;
 import net.minecraft.potion.Potion;
-import net.minecraft.registry.Registries;
+import net.minecraft.registry.*;
+import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.*;
 import nourl.mythicmetals.MythicMetals;
 import nourl.mythicmetals.armor.AquariumToolSet;
@@ -162,6 +163,7 @@ public void afterFieldProcessing() {
         RegistryHelper.item("banglum_tnt_minecart", BANGLUM_TNT_MINECART);
         RegistryHelper.item("doge", Frogery.DOGE);
         RegistryHelper.item("froge", Frogery.FROGE);
+        Registry.registerReference(Registries.SOUND_EVENT, RegistryHelper.id("music_disc.dog4"), SoundEvent.of(RegistryHelper.id("music_disc.dog4")));
         RegistryHelper.item("red_aegis_sword", RED_AEGIS_SWORD);
         RegistryHelper.item("white_aegis_sword", WHITE_AEGIS_SWORD);
         RegistryHelper.item("carmot_staff", CARMOT_STAFF);
@@ -199,7 +201,7 @@ public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity
         public static final Item DOGE = new Item(new Item.Settings()
             .rarity(Rarity.EPIC).fireproof()
             .equipmentSlot((entity, stack) -> EquipmentSlot.HEAD)
-            .maxCount(1));
-        //.component(DataComponentTypes.JUKEBOX_PLAYABLE, new JukeboxPlayableComponent()), 162);
+            .maxCount(1)
+            .jukeboxPlayable(RegistryKey.of(RegistryKeys.JUKEBOX_SONG, RegistryHelper.id("dog4"))));
     }
 }
diff --git a/src/main/resources/data/mythicmetals/jukebox_song/dog4.json b/src/main/resources/data/mythicmetals/jukebox_song/dog4.json
@@ -0,0 +1,8 @@
+{
+  "comparator_output": 4,
+  "description": {
+    "translate": "jukebox_song.mythicmetals.doge"
+  },
+  "length_in_seconds": 162.0,
+  "sound_event": "mythicmetals:music_disc.dog4"
+}