diff options
Diffstat (limited to 'src')
6 files changed, 22 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java index 6ba7d39495..af6f768c67 100644 --- 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/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java index c6c98912e0..7302625406 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java @@ -27,6 +27,7 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; 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 class GT_MetaTileEntity_DistillationTower 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 index 3d65408371..b018e6bbf8 100644 --- 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 class GT_ProcessingArrayRecipeLoader { // 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 index f8eca60b6c..f7652b3c86 100644 --- 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 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, 1, "Distillery.png", - SoundResource.IC2_MACHINES_EXTRACTOR_OP, + SoundResource.GT_MACHINES_DISTILLERY_LOOP, false, false, SpecialEffects.NONE, @@ -6401,7 +6401,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, 1, "Distillery.png", - SoundResource.IC2_MACHINES_EXTRACTOR_OP, + SoundResource.GT_MACHINES_DISTILLERY_LOOP, false, false, SpecialEffects.NONE, @@ -6427,7 +6427,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, 1, "Distillery.png", - SoundResource.IC2_MACHINES_EXTRACTOR_OP, + SoundResource.GT_MACHINES_DISTILLERY_LOOP, false, false, SpecialEffects.NONE, @@ -6453,7 +6453,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, 1, "Distillery.png", - SoundResource.IC2_MACHINES_EXTRACTOR_OP, + SoundResource.GT_MACHINES_DISTILLERY_LOOP, false, false, SpecialEffects.NONE, @@ -6479,7 +6479,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 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 index 189ee5b20b..1286fb0633 100644 --- 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 Binary files differnew file mode 100644 index 0000000000..594036c312 --- /dev/null +++ b/src/main/resources/assets/gregtech/sounds/DistilleryLoop.ogg |