Added sound to distillery (#1809)

GTNewHorizons · Mar 22, 2023 · 5857de7 · 5857de7
1 parent 9474600
commit 5857de7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java
@@ -57,6 +57,7 @@ public enum SoundResource {
     IC2_MACHINES_MAGNETIZER_LOOP(212, MOD_ID_IC2, "machines.MagnetizerLoop"),
 
     GT_MACHINES_FUSION_LOOP(230, MOD_ID, "machines.FusionLoop"),
+    GT_MACHINES_DISTILLERY_LOOP(231, MOD_ID, "machines.DistilleryLoop"),
 
     GUI_BUTTON_DOWN(-1, MOD_ID, "gui.buttonDown"),
     GUI_BUTTON_UP(-1, MOD_ID, "gui.buttonUp"),

diff --git a/...java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/...java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
@@ -27,6 +27,7 @@
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.SoundResource;
 import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
 import gregtech.api.interfaces.IHatchElement;
@@ -376,4 +377,9 @@ public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBu
                 false,
                 true);
     }
+
+    @Override
+    protected SoundResource getProcessStartSound() {
+        return SoundResource.GT_MACHINES_DISTILLERY_LOOP;
+    }
 }
diff --git a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java
@@ -61,7 +61,7 @@ public static void registerDefaultGregtechMaps() {
         // Distillery
         GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.distillery", GT_Recipe_Map.sDistilleryRecipes);
         GT_ProcessingArray_Manager
-                .addSoundResourceToPA("basicmachine.distillery", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
+                .addSoundResourceToPA("basicmachine.distillery", SoundResource.GT_MACHINES_DISTILLERY_LOOP);
         // Electrolyzer
         GT_ProcessingArray_Manager
                 .addRecipeMapToPA("basicmachine.electrolyzer", GT_Recipe_Map.sMultiblockElectrolyzerRecipes);

diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -6375,7 +6375,7 @@ private static void run2() {
                         0,
                         1,
                         "Distillery.png",
-                        SoundResource.IC2_MACHINES_EXTRACTOR_OP,
+                        SoundResource.GT_MACHINES_DISTILLERY_LOOP,
                         false,
                         false,
                         SpecialEffects.NONE,
@@ -6401,7 +6401,7 @@ private static void run2() {
                         0,
                         1,
                         "Distillery.png",
-                        SoundResource.IC2_MACHINES_EXTRACTOR_OP,
+                        SoundResource.GT_MACHINES_DISTILLERY_LOOP,
                         false,
                         false,
                         SpecialEffects.NONE,
@@ -6427,7 +6427,7 @@ private static void run2() {
                         0,
                         1,
                         "Distillery.png",
-                        SoundResource.IC2_MACHINES_EXTRACTOR_OP,
+                        SoundResource.GT_MACHINES_DISTILLERY_LOOP,
                         false,
                         false,
                         SpecialEffects.NONE,
@@ -6453,7 +6453,7 @@ private static void run2() {
                         0,
                         1,
                         "Distillery.png",
-                        SoundResource.IC2_MACHINES_EXTRACTOR_OP,
+                        SoundResource.GT_MACHINES_DISTILLERY_LOOP,
                         false,
                         false,
                         SpecialEffects.NONE,
@@ -6479,7 +6479,7 @@ private static void run2() {
                         0,
                         1,
                         "Distillery.png",
-                        SoundResource.IC2_MACHINES_EXTRACTOR_OP,
+                        SoundResource.GT_MACHINES_DISTILLERY_LOOP,
                         false,
                         false,
                         SpecialEffects.NONE,

diff --git a/src/main/resources/assets/gregtech/sounds.json b/src/main/resources/assets/gregtech/sounds.json
@@ -25,5 +25,14 @@
         "stream": false
       }
     ]
+  },
+  "machines.DistilleryLoop": {
+    "category": "block",
+    "sounds": [
+      {
+        "name": "DistilleryLoop",
+        "stream": false
+      }
+    ]
   }
 }
diff --git a/src/main/resources/assets/gregtech/sounds/DistilleryLoop.ogg b/src/main/resources/assets/gregtech/sounds/DistilleryLoop.ogg