Bump the base range of the industrial alarm from 16 blocks to 128 mek…

…anism/Mekanism-Feature-Requests#75
mekanism · Nov 24, 2021 · db16910 · db16910
1 parent 8b84a51
commit db16910
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/datagen/generated/mekanism/.cache/cache b/src/datagen/generated/mekanism/.cache/cache
@@ -154,7 +154,7 @@ c7181d53186374a647e7cf34237820a1a0dd81a0 assets/mekanism/models/item/superheated
 fa6512208feb8d8194da7f12d003bd97c57e69e3 assets/mekanism/models/item/uranium_hexafluoride_bucket.json
 728c060c219764de51661a9cae75980bb60f18f7 assets/mekanism/models/item/uranium_ore.json
 dba7d09f164a0f838d403d5fcbb0662584fbcd0c assets/mekanism/models/item/uranium_oxide_bucket.json
-45aa875b37c740360e768f3845358c49e860d225 assets/mekanism/sounds.json
+a7cfb1683e13e40abd38c6e773fc608472aeb91b assets/mekanism/sounds.json
 8e559c50c083efd4ea1d44deefe886dfa41aba1d data/create/tags/fluids/no_infinite_draining.json
 5ba124118746786175ed10c4eea2834b7622e7d9 data/forge/tags/blocks/chests.json
 8d9a785d66c9847b06109e41ad61c71906f7c585 data/forge/tags/blocks/chests/electric.json

diff --git a/src/datagen/generated/mekanism/assets/mekanism/sounds.json b/src/datagen/generated/mekanism/assets/mekanism/sounds.json
@@ -140,7 +140,10 @@
   "tile.machine.industrial_alarm": {
     "subtitle": "sound_event.mekanism.tile.machine.industrial_alarm",
     "sounds": [
-      "mekanism:tile/industrial_alarm"
+      {
+        "name": "mekanism:tile/industrial_alarm",
+        "attenuation_distance": 128
+      }
     ]
   },
   "tile.machine.antiprotonic_nucleosynthesizer": {

diff --git a/src/datagen/generators/java/mekanism/generators/client/GeneratorsSoundProvider.java b/src/datagen/generators/java/mekanism/generators/client/GeneratorsSoundProvider.java
@@ -1,11 +1,9 @@
 package mekanism.generators.client;
 
 import mekanism.client.sound.BaseSoundProvider;
-import mekanism.common.registration.impl.SoundEventRegistryObject;
 import mekanism.generators.common.MekanismGenerators;
 import mekanism.generators.common.registries.GeneratorsSounds;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.data.ExistingFileHelper;
 
 public class GeneratorsSoundProvider extends BaseSoundProvider {
@@ -30,8 +28,4 @@ private void addGeneratorSoundEvents() {
         addSoundEventWithSubtitle(GeneratorsSounds.SOLAR_GENERATOR, MekanismGenerators.rl(basePath + "solar"), 8);
         addSoundEventWithSubtitle(GeneratorsSounds.WIND_GENERATOR, MekanismGenerators.rl(basePath + "wind"), 8);
     }
-
-    private void addSoundEventWithSubtitle(SoundEventRegistryObject<?> soundEventRO, ResourceLocation location, int attenuationDistance) {
-        add(soundEventRO, definition(soundEventRO).with(sound(location).attenuationDistance(attenuationDistance)));
-    }
 }
diff --git a/src/datagen/main/java/mekanism/client/sound/BaseSoundProvider.java b/src/datagen/main/java/mekanism/client/sound/BaseSoundProvider.java
@@ -33,6 +33,10 @@ protected void addSoundEvent(SoundEventRegistryObject<?> soundEventRO, ResourceL
         add(soundEventRO, definition().with(sound(location)));
     }
 
+    protected void addSoundEventWithSubtitle(SoundEventRegistryObject<?> soundEventRO, ResourceLocation location, int attenuationDistance) {
+        add(soundEventRO, definition(soundEventRO).with(sound(location).attenuationDistance(attenuationDistance)));
+    }
+
     protected void addSoundEventWithSubtitle(SoundEventRegistryObject<?> soundEventRO, ResourceLocation location) {
         add(soundEventRO, definition(soundEventRO).with(sound(location)));
     }

diff --git a/src/datagen/main/java/mekanism/client/sound/MekanismSoundProvider.java b/src/datagen/main/java/mekanism/client/sound/MekanismSoundProvider.java
@@ -44,7 +44,7 @@ private void addTileSoundEvents() {
         addSoundEventWithSubtitle(MekanismSounds.ENERGIZED_SMELTER, Mekanism.rl(basePath + "energized_smelter"));
         addSoundEventWithSubtitle(MekanismSounds.ISOTOPIC_CENTRIFUGE, Mekanism.rl(basePath + "isotopic_centrifuge"));
         addSoundEventWithSubtitle(MekanismSounds.NUTRITIONAL_LIQUIFIER, Mekanism.rl(basePath + "nutritional_liquifier"));
-        addSoundEventWithSubtitle(MekanismSounds.INDUSTRIAL_ALARM, Mekanism.rl(basePath + "industrial_alarm"));
+        addSoundEventWithSubtitle(MekanismSounds.INDUSTRIAL_ALARM, Mekanism.rl(basePath + "industrial_alarm"), 128);
         addSoundEventWithSubtitle(MekanismSounds.ANTIPROTONIC_NUCLEOSYNTHESIZER, Mekanism.rl(basePath + "antiprotonic_nucleosynthesizer"));
         //TODO - 10.1: Actually create sounds for these machines and add them
         //addSoundEventWithSubtitle(MekanismSounds.PIGMENT_EXTRACTOR, Mekanism.rl(basePath + "pigment_extractor"));