Merge pull request #1966 from mystchonky/record-fix

fix Hellforged Record jukebox interaction
WayofTime · Aug 18, 2023 · 26ebaf3 · 26ebaf3
2 parents 773ad17 + 83f6dc1
commit 26ebaf3
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 42 deletions.
diff --git a/src/generated/resources/data/minecraft/tags/items/music_discs.json b/src/generated/resources/data/minecraft/tags/items/music_discs.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "bloodmagic:bleedingedge"
+  ]
+}
diff --git a/src/main/java/wayoftime/bloodmagic/BloodMagic.java b/src/main/java/wayoftime/bloodmagic/BloodMagic.java
@@ -32,7 +32,7 @@
 import wayoftime.bloodmagic.client.key.KeyBindingBloodMagic;
 import wayoftime.bloodmagic.client.model.MimicModelLoader;
 import wayoftime.bloodmagic.client.model.SigilHoldingModelLoader;
-import wayoftime.bloodmagic.client.sounds.SoundRegisterListener;
+import wayoftime.bloodmagic.client.sounds.SoundRegistry;
 import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
 import wayoftime.bloodmagic.common.data.*;
 import wayoftime.bloodmagic.common.fluid.BloodMagicFluids;
@@ -111,6 +111,7 @@ public BloodMagic() {
         BloodMagicRecipeType.RECIPE_TYPES.register(modBus);
         BloodMagicPotions.MOB_EFFECTS.register(modBus);
         BloodMagicCreativeTabs.CREATIVE_TABS.register(modBus);
+        SoundRegistry.SOUNDS.register(modBus);
 
         // Register the setup method for modloading
         modBus.addListener(this::setup);
@@ -130,7 +131,6 @@ public BloodMagic() {
         modBus.addListener(ConfigManager::onClientReload);
 
         MinecraftForge.EVENT_BUS.register(new GenericHandler());
-        MinecraftForge.EVENT_BUS.register(new SoundRegisterListener());
         modBus.addListener(this::registerColors);
 
         MinecraftForge.EVENT_BUS.register(new WillHandler());

diff --git a/src/main/java/wayoftime/bloodmagic/client/sounds/SoundRegisterListener.java b/src/main/java/wayoftime/bloodmagic/client/sounds/SoundRegisterListener.java
diff --git a/src/main/java/wayoftime/bloodmagic/client/sounds/SoundRegistrator.java b/src/main/java/wayoftime/bloodmagic/client/sounds/SoundRegistrator.java
diff --git a/src/main/java/wayoftime/bloodmagic/client/sounds/SoundRegistry.java b/src/main/java/wayoftime/bloodmagic/client/sounds/SoundRegistry.java
@@ -0,0 +1,19 @@
+package wayoftime.bloodmagic.client.sounds;
+
+import net.minecraft.sounds.SoundEvent;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
+import wayoftime.bloodmagic.BloodMagic;
+
+public class SoundRegistry
+{
+
+	public static final DeferredRegister<SoundEvent> SOUNDS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, BloodMagic.MODID);
+	public static final RegistryObject<SoundEvent> BLEEDING_EDGE_MUSIC = SOUNDS.register("bleedingedge" , ()-> addSoundsToRegistry("bleedingedge"));
+
+	private static SoundEvent addSoundsToRegistry(String soundId)
+	{
+		return SoundEvent.createVariableRangeEvent(BloodMagic.rl(soundId));
+	}
+}
diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java
@@ -6,6 +6,7 @@
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
@@ -60,6 +61,8 @@ public void addTags(HolderLookup.Provider provider)
 		this.tag(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.VENGEFUL_CRYSTAL.get());
 		this.tag(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.STEADFAST_CRYSTAL.get());
 
+		this.tag(ItemTags.MUSIC_DISCS).add(BloodMagicItems.BLEEDING_EDGE_MUSIC.get());
+
 //		this.copy(BloodMagicTags.Blocks.MUSHROOM_STEM, BloodMagicTags.MUSHROOM_STEM); // FIXME
 //		this.copy(BloodMagicTags.Blocks.MUSHROOM_HYPHAE, BloodMagicTags.MUSHROOM_HYPHAE);
 

diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java
@@ -1,14 +1,13 @@
 package wayoftime.bloodmagic.common.item;
 
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.*;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 import wayoftime.bloodmagic.BloodMagic;
 import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
-import wayoftime.bloodmagic.client.sounds.SoundRegistrator;
+import wayoftime.bloodmagic.client.sounds.SoundRegistry;
 import wayoftime.bloodmagic.common.block.BloodMagicBlocks;
 import wayoftime.bloodmagic.common.fluid.BloodMagicFluids;
 import wayoftime.bloodmagic.common.item.arc.ItemARCToolBase;
@@ -468,6 +467,6 @@ public class BloodMagicItems
 	public static final RegistryObject<Item> DUNGEON_MINE_ENTRANCE_KEY = BASICITEMS.register("mineentrancekey", () -> new ItemDungeonKey("mineentrancekey", "mine_entrances"));
 	public static final RegistryObject<Item> DUNGEON_MINE_KEY = BASICITEMS.register("minekey", () -> new ItemDungeonKey("minekey", "mines"));
 
-	public static final RegistryObject<Item> BLEEDING_EDGE_MUSIC = BASICITEMS.register("bleedingedge", () -> new RecordItem(15, () -> SoundRegistrator.BLEEDING_EDGE_MUSIC, new Item.Properties().stacksTo(1), 4600));
+	public static final RegistryObject<Item> BLEEDING_EDGE_MUSIC = BASICITEMS.register("bleedingedge", () -> new RecordItem(15, () -> SoundRegistry.BLEEDING_EDGE_MUSIC.get(), new Item.Properties().stacksTo(1), 4600));
 
 }