aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines
diff options
context:
space:
mode:
authorevgengoldwar <69961523+evgengoldwar@users.noreply.github.com>2024-07-25 13:01:57 +0400
committerGitHub <noreply@github.com>2024-07-25 16:01:57 +0700
commit5a0cfd92ba396cd2c321c02639fcd93096696e7f (patch)
tree55e6250a86448f33a4b125730509484d7683f649 /src/main/java/gregtech/common/tileentities/machines
parentac8a80f18a98e218a1f240ccca37671d3b8697d1 (diff)
downloadGT5-Unofficial-5a0cfd92ba396cd2c321c02639fcd93096696e7f.tar.gz
GT5-Unofficial-5a0cfd92ba396cd2c321c02639fcd93096696e7f.tar.bz2
GT5-Unofficial-5a0cfd92ba396cd2c321c02639fcd93096696e7f.zip
Fix Compact Fusion and Fusion and Cyclotron sound (#2738)
* Fix sound for Compact Fusion * Fix sound for Cyclotron * Fix sound for Fusion * Apply spotless
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java10
1 files changed, 8 insertions, 2 deletions
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 b2e675bfcb..8edd2dea4e 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
@@ -21,6 +21,7 @@ import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
@@ -42,6 +43,8 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
import gregtech.GT_Mod;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.SoundResource;
@@ -460,6 +463,8 @@ public abstract class GT_MetaTileEntity_FusionComputer
aBaseMetaTileEntity
.setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64));
aBaseMetaTileEntity.setActive(mMaxProgresstime > 0);
+ } else {
+ doActivitySound(getActivitySoundLoop());
}
}
@@ -541,9 +546,10 @@ public abstract class GT_MetaTileEntity_FusionComputer
return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 7, 1, 12, elementBudget, env, false, true);
}
+ @SideOnly(Side.CLIENT)
@Override
- protected SoundResource getProcessStartSound() {
- return SoundResource.GT_MACHINES_FUSION_LOOP;
+ protected ResourceLocation getActivitySoundLoop() {
+ return SoundResource.GT_MACHINES_FUSION_LOOP.resourceLocation;
}
@Override