aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/threads
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api/threads')
-rw-r--r--src/main/java/gregtech/api/threads/GT_Runnable_Sound.java19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java b/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java
index dad93ff98c..441d46ad58 100644
--- a/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java
+++ b/src/main/java/gregtech/api/threads/GT_Runnable_Sound.java
@@ -2,32 +2,41 @@ package gregtech.api.threads;
import gregtech.api.util.GT_PlayedSound;
import gregtech.api.util.GT_Utility;
+import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
public class GT_Runnable_Sound implements Runnable {
private final int mX, mY, mZ, mTimeUntilNextSound;
private final World mWorld;
- private final String mSoundName;
+ private final ResourceLocation mSoundResourceLocation;
private final float mSoundStrength, mSoundModulation;
- public GT_Runnable_Sound(World aWorld, int aX, int aY, int aZ, int aTimeUntilNextSound, String aSoundName, float aSoundStrength, float aSoundModulation) {
+ public GT_Runnable_Sound(World aWorld, int aX, int aY, int aZ, int aTimeUntilNextSound, ResourceLocation aSoundResourceLocation, float aSoundStrength, float aSoundModulation) {
mWorld = aWorld;
mX = aX;
mY = aY;
mZ = aZ;
mTimeUntilNextSound = aTimeUntilNextSound;
- mSoundName = aSoundName;
+ mSoundResourceLocation = aSoundResourceLocation;
mSoundStrength = aSoundStrength;
mSoundModulation = aSoundModulation;
}
+ /**
+ * @deprecated Use {@link #GT_Runnable_Sound(World, int, int, int, int, ResourceLocation, float, float)}
+ */
+ @Deprecated
+ public GT_Runnable_Sound(World aWorld, int aX, int aY, int aZ, int aTimeUntilNextSound, String aSoundName, float aSoundStrength, float aSoundModulation) {
+ this(aWorld, aX, aY, aZ, aTimeUntilNextSound, new ResourceLocation(aSoundName), aSoundStrength, aSoundModulation);
+ }
+
@Override
public void run() {
try {
GT_PlayedSound tSound;
- if (GT_Utility.sPlayedSoundMap.keySet().contains(tSound = new GT_PlayedSound(mSoundName, mX, mY, mZ)))
+ if (GT_Utility.sPlayedSoundMap.containsKey(tSound = new GT_PlayedSound(mSoundResourceLocation, mX, mY, mZ)))
return;
- mWorld.playSound(mX, mY, mZ, mSoundName, mSoundStrength, mSoundModulation, false);
+ mWorld.playSound(mX, mY, mZ, mSoundResourceLocation.toString(), mSoundStrength, mSoundModulation, false);
GT_Utility.sPlayedSoundMap.put(tSound, mTimeUntilNextSound);
} catch (Throwable e) {/**/}
}