Fix sounds not being registered

CyclopsMC · Jun 21, 2024 · 8b60ff4 · 8b60ff4
1 parent 79ef901
commit 8b60ff4
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 4 deletions.
diff --git a/src/main/java/org/cyclops/integrateddynamics/Configs.java b/src/main/java/org/cyclops/integrateddynamics/Configs.java
@@ -29,6 +29,8 @@
 import org.cyclops.integrateddynamics.recipe.RecipeSerializerCraftingSpecialShapedOmniDirectional3Config;
 import org.cyclops.integrateddynamics.recipe.RecipeSerializerCraftingSpecialShapedOmniDirectionalConfig;
 import org.cyclops.integrateddynamics.recipe.RecipeSerializerCraftingSpecialShapelessOmniDirectionalConfig;
+import org.cyclops.integrateddynamics.sound.SoundEventEffectPageFlipMultipleConfig;
+import org.cyclops.integrateddynamics.sound.SoundEventEffectPageFlipSingleConfig;
 import org.cyclops.integrateddynamics.world.gen.foliageplacer.FoliagePlacerMenrilConfig;
 import org.cyclops.integrateddynamics.world.gen.trunkplacer.TrunkPlacerMenrilConfig;
 
@@ -183,6 +185,10 @@ public static void registerBlocks(ConfigHandler configHandler) {
         configHandler.addConfigurable(new LootFunctionCopyMechanicalMachineEnergyConfig());
         configHandler.addConfigurable(new LootFunctionCopyMechanicalSqueezerTankConfig());
         configHandler.addConfigurable(new LootFunctionCopyProxyIdConfig());
+
+        // Sounds
+        configHandler.addConfigurable(new SoundEventEffectPageFlipMultipleConfig());
+        configHandler.addConfigurable(new SoundEventEffectPageFlipSingleConfig());
     }
 
 }
diff --git a/src/main/java/org/cyclops/integrateddynamics/RegistryEntries.java b/src/main/java/org/cyclops/integrateddynamics/RegistryEntries.java
@@ -152,8 +152,8 @@ public class RegistryEntries {
     public static final DeferredHolder<RecipeSerializer<?>, SimpleCraftingRecipeSerializer<ItemFacadeRecipe>> RECIPESERIALIZER_FACADE = DeferredHolder.create(Registries.RECIPE_SERIALIZER, new ResourceLocation("integrateddynamics:crafting_special_facade"));
     public static final DeferredHolder<RecipeSerializer<?>, SimpleCraftingRecipeSerializer<ItemVariableCopyRecipe>> RECIPESERIALIZER_VARIABLE_COPY = DeferredHolder.create(Registries.RECIPE_SERIALIZER, new ResourceLocation("integrateddynamics:crafting_special_variable_copy"));
 
-    public static final DeferredHolder<SoundEvent, SoundEvent> SOUNDEVENT_EFFECT_PAGE_FLIPSINGLE = DeferredHolder.create(Registries.SOUND_EVENT, new ResourceLocation("item.book.page_turn"));
-    public static final DeferredHolder<SoundEvent, SoundEvent> SOUNDEVENT_EFFECT_PAGE_FLIPMULTIPLE = DeferredHolder.create(Registries.SOUND_EVENT, new ResourceLocation("item.book.put"));
+    public static final DeferredHolder<SoundEvent, SoundEvent> SOUNDEVENT_EFFECT_PAGE_FLIPSINGLE = DeferredHolder.create(Registries.SOUND_EVENT, new ResourceLocation("integrateddynamics:effect_page_flipsingle"));
+    public static final DeferredHolder<SoundEvent, SoundEvent> SOUNDEVENT_EFFECT_PAGE_FLIPMULTIPLE = DeferredHolder.create(Registries.SOUND_EVENT, new ResourceLocation("integrateddynamics:effect_page_flipmultiple"));
 
 
 }
diff --git a/...ain/java/org/cyclops/integrateddynamics/sound/SoundEventEffectPageFlipMultipleConfig.java b/...ain/java/org/cyclops/integrateddynamics/sound/SoundEventEffectPageFlipMultipleConfig.java
@@ -0,0 +1,18 @@
+package org.cyclops.integrateddynamics.sound;
+
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvent;
+import org.cyclops.integrateddynamics.IntegratedDynamics;
+
+/**
+ * @author rubensworks
+ */
+public class SoundEventEffectPageFlipMultipleConfig extends org.cyclops.cyclopscore.config.extendedconfig.SoundEventConfig {
+    public SoundEventEffectPageFlipMultipleConfig() {
+        super(
+                IntegratedDynamics._instance,
+                "effect_page_flipmultiple",
+                (eConfig) -> SoundEvent.createVariableRangeEvent(new ResourceLocation(eConfig.getMod().getModId(), eConfig.getNamedId()))
+        );
+    }
+}
diff --git a/src/main/java/org/cyclops/integrateddynamics/sound/SoundEventEffectPageFlipSingleConfig.java b/src/main/java/org/cyclops/integrateddynamics/sound/SoundEventEffectPageFlipSingleConfig.java
@@ -0,0 +1,18 @@
+package org.cyclops.integrateddynamics.sound;
+
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvent;
+import org.cyclops.integrateddynamics.IntegratedDynamics;
+
+/**
+ * @author rubensworks
+ */
+public class SoundEventEffectPageFlipSingleConfig extends org.cyclops.cyclopscore.config.extendedconfig.SoundEventConfig {
+    public SoundEventEffectPageFlipSingleConfig() {
+        super(
+                IntegratedDynamics._instance,
+                "effect_page_flipsingle",
+                (eConfig) -> SoundEvent.createVariableRangeEvent(new ResourceLocation(eConfig.getMod().getModId(), eConfig.getNamedId()))
+        );
+    }
+}
diff --git a/src/main/resources/assets/integrateddynamics/sounds.json b/src/main/resources/assets/integrateddynamics/sounds.json
@@ -1,13 +1,13 @@
 {
-    "effect.page.flipsingle": {
+    "effect_page_flipsingle": {
         "sounds": [
             "integrateddynamics:page_flip1",
             "integrateddynamics:page_flip2",
             "integrateddynamics:page_flip3"
         ],
         "subtitle": "subtitles.integrateddynamics.effect.page.flipsingle"
     },
-    "effect.page.flipmultiple": {
+    "effect_page_flipmultiple": {
         "sounds": [
             "integrateddynamics:pages_flip"
         ],