From 59c64fef98b87d8ee2680eae2989a6a54ed8c425 Mon Sep 17 00:00:00 2001 From: Maxim Date: Mon, 20 Mar 2023 13:27:14 +0100 Subject: Added machine sound to fusion reactors (#1805) --- src/main/java/gregtech/api/enums/SoundResource.java | 2 ++ .../multi/GT_MetaTileEntity_FusionComputer.java | 6 ++++++ src/main/resources/assets/gregtech/sounds.json | 9 +++++++++ .../resources/assets/gregtech/sounds/FusionLoop.ogg | Bin 0 -> 95417 bytes 4 files changed, 17 insertions(+) create mode 100644 src/main/resources/assets/gregtech/sounds/FusionLoop.ogg diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java index 45cb6e3bc8..6ba7d39495 100644 --- a/src/main/java/gregtech/api/enums/SoundResource.java +++ b/src/main/java/gregtech/api/enums/SoundResource.java @@ -56,6 +56,8 @@ public enum SoundResource { IC2_MACHINES_KA_CHING(211, MOD_ID_IC2, "machines.KaChing"), IC2_MACHINES_MAGNETIZER_LOOP(212, MOD_ID_IC2, "machines.MagnetizerLoop"), + GT_MACHINES_FUSION_LOOP(230, MOD_ID, "machines.FusionLoop"), + 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_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index c180741313..34da12c590 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -37,6 +37,7 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.gui.modularui.GUITextureSet; @@ -520,6 +521,11 @@ public abstract class GT_MetaTileEntity_FusionComputer return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 7, 1, 12, elementBudget, env, false, true); } + @Override + protected SoundResource getProcessStartSound() { + return SoundResource.GT_MACHINES_FUSION_LOOP; + } + @Override public boolean doesBindPlayerInventory() { return false; diff --git a/src/main/resources/assets/gregtech/sounds.json b/src/main/resources/assets/gregtech/sounds.json index dcf17b55bb..189ee5b20b 100644 --- a/src/main/resources/assets/gregtech/sounds.json +++ b/src/main/resources/assets/gregtech/sounds.json @@ -16,5 +16,14 @@ "stream": false } ] + }, + "machines.FusionLoop": { + "category": "block", + "sounds": [ + { + "name": "FusionLoop", + "stream": false + } + ] } } diff --git a/src/main/resources/assets/gregtech/sounds/FusionLoop.ogg b/src/main/resources/assets/gregtech/sounds/FusionLoop.ogg new file mode 100644 index 0000000000..d532f1a083 Binary files /dev/null and b/src/main/resources/assets/gregtech/sounds/FusionLoop.ogg differ -- cgit