Skip to content

Commit 3b51873

Browse files
authored
Merge pull request #1147 from lonei-G/main
Add runtime sound effects for certain machines.
2 parents d8fabc7 + f41c947 commit 3b51873

File tree

4 files changed

+38
-3
lines changed

4 files changed

+38
-3
lines changed

src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_AdvancedMegaOilCracker.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,12 @@
3131
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
3232

3333
import bartworks.API.BorosilicateGlass;
34+
import cpw.mods.fml.relauncher.Side;
35+
import cpw.mods.fml.relauncher.SideOnly;
3436
import gregtech.api.GregTechAPI;
3537
import gregtech.api.enums.HeatingCoilLevel;
3638
import gregtech.api.enums.Materials;
39+
import gregtech.api.enums.SoundResource;
3740
import gregtech.api.enums.Textures;
3841
import gregtech.api.interfaces.ITexture;
3942
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -91,6 +94,12 @@ public RecipeMap<?> getRecipeMap() {
9194
return RecipeMaps.crackingRecipes;
9295
}
9396

97+
@SideOnly(Side.CLIENT)
98+
@Override
99+
protected SoundResource getActivitySoundLoop() {
100+
return SoundResource.GTCEU_LOOP_FIRE;
101+
}
102+
94103
@Override
95104
protected boolean isEnablePerfectOverclock() {
96105
return EnablePerfectOverclock_AdvancedMegaOilCracker || enablePerfectOverclock;

src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_BeeEngineer.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@
2525
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
2626
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
2727

28+
import cpw.mods.fml.relauncher.Side;
29+
import cpw.mods.fml.relauncher.SideOnly;
2830
import forestry.api.apiculture.EnumBeeType;
2931
import forestry.api.apiculture.IBee;
3032
import gregtech.api.GregTechAPI;
3133
import gregtech.api.enums.Materials;
34+
import gregtech.api.enums.SoundResource;
3235
import gregtech.api.enums.Textures;
3336
import gregtech.api.interfaces.ITexture;
3437
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -201,9 +204,9 @@ public CheckRecipeResult checkProcessing() {
201204

202205
// spotless:off
203206
protected final String[][] STRUCTURE = new String[][]{
204-
{"CCC","CCC","CCC"},
205-
{"C~C","C C","CCC"},
206-
{"CCC","CCC","CCC"}
207+
{"CCC", "CCC", "CCC"},
208+
{"C~C", "C C", "CCC"},
209+
{"CCC", "CCC", "CCC"}
207210
};
208211
// spotless:on
209212

@@ -301,4 +304,9 @@ public ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirect
301304
return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX) };
302305
}
303306

307+
@SideOnly(Side.CLIENT)
308+
@Override
309+
protected SoundResource getActivitySoundLoop() {
310+
return SoundResource.GT_MACHINES_MEGA_INDUSTRIAL_APIARY_LOOP;
311+
}
304312
}

src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_LargeSteamAlloySmelter.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
2020
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
2121

22+
import cpw.mods.fml.relauncher.Side;
23+
import cpw.mods.fml.relauncher.SideOnly;
2224
import gregtech.api.GregTechAPI;
25+
import gregtech.api.enums.SoundResource;
2326
import gregtech.api.enums.Textures;
2427
import gregtech.api.interfaces.ITexture;
2528
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -60,6 +63,12 @@ public RecipeMap<?> getRecipeMap() {
6063
return RecipeMaps.alloySmelterRecipes;
6164
}
6265

66+
@SideOnly(Side.CLIENT)
67+
@Override
68+
protected SoundResource getActivitySoundLoop() {
69+
return SoundResource.IC2_MACHINES_INDUCTION_LOOP;
70+
}
71+
6372
@Override
6473
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
6574
repairMachine();

src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_LargeSteamForgeHammer.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
1717
import com.gtnewhorizon.structurelib.structure.StructureDefinition;
1818

19+
import cpw.mods.fml.relauncher.Side;
20+
import cpw.mods.fml.relauncher.SideOnly;
21+
import gregtech.api.enums.SoundResource;
1922
import gregtech.api.enums.Textures;
2023
import gregtech.api.interfaces.ITexture;
2124
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -66,6 +69,12 @@ public int getMaxParallelRecipes() {
6669
return parallel;
6770
}
6871

72+
@SideOnly(Side.CLIENT)
73+
@Override
74+
protected SoundResource getActivitySoundLoop() {
75+
return SoundResource.GTCEU_LOOP_FORGE_HAMMER;
76+
}
77+
6978
@Override
7079
public RecipeMap<?> getRecipeMap() {
7180
return RecipeMaps.hammerRecipes;

0 commit comments

Comments
 (0)