diff --git a/src/minecraft/assemblyline/client/SoundHandler.java b/src/minecraft/assemblyline/client/SoundHandler.java index eeb4905c..0b6e1969 100644 --- a/src/minecraft/assemblyline/client/SoundHandler.java +++ b/src/minecraft/assemblyline/client/SoundHandler.java @@ -17,7 +17,7 @@ public class SoundHandler { for (int i = 0; i < SOUND_FILES.length; i++) { - URL url = this.getClass().getResource(AssemblyLine.DIRECTORY + SOUND_FILES[i]); + URL url = this.getClass().getResource(AssemblyLine.DIRECTORY + AssemblyLine.SOUND_PATH + SOUND_FILES[i]); event.manager.soundPoolSounds.addSound(AssemblyLine.DIRECTORY_NO_SLASH + SOUND_FILES[i], url); if (url == null) diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java index 55124d27..bc9676c5 100644 --- a/src/minecraft/assemblyline/common/AssemblyLine.java +++ b/src/minecraft/assemblyline/common/AssemblyLine.java @@ -63,6 +63,7 @@ public class AssemblyLine public static final String DIRECTORY_NO_SLASH = "mods/assemblyline/"; public static final String DIRECTORY = "/" + DIRECTORY_NO_SLASH; + public static final String SOUND_PATH = "audio/"; public static final String TEXTURE_PATHS = DIRECTORY + "textures/"; public static final String MODEL_TEXTURES_PATH = TEXTURE_PATHS + "models/"; public static final String BLOCK_TEXTURES_PATH = TEXTURE_PATHS + "blocks/"; diff --git a/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java b/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java index 491be8d4..1a397a69 100644 --- a/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java +++ b/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java @@ -201,7 +201,7 @@ public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMult if (this.ticks % 5 == 0 && FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { // sound is 0.25 seconds long (20 ticks/second) - this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "assemblyline.conveyor", 0.8f, 1.7f, true); + this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "mods.assemblyline.conveyor", 0.8f, 1.7f, true); } if (Math.abs(this.renderYaw - this.rotationYaw) < this.ROTATION_SPEED + 0.1f) @@ -235,7 +235,7 @@ public class TileEntityArmbot extends TileEntityAssemblyNetwork implements IMult this.renderPitch -= 60; if (this.ticks % 4 == 0 && FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "assemblyline.conveyor", 2f, 2.5f, true); + this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "mods.assemblyline.conveyor", 2f, 2.5f, true); if (Math.abs(this.renderPitch - this.rotationPitch) < this.ROTATION_SPEED + 0.1f) { diff --git a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java index 655c97be..b688db39 100644 --- a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java +++ b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java @@ -130,7 +130,7 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements { if (this.ticks % 10 == 0 && this.worldObj.isRemote && this.worldObj.getBlockId(this.xCoord - 1, this.yCoord, this.zCoord) != AssemblyLine.blockConveyorBelt.blockID && this.worldObj.getBlockId(xCoord, yCoord, zCoord - 1) != AssemblyLine.blockConveyorBelt.blockID) { - this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "assemblyline.conveyor", 0.5f, 0.7f, true); + this.worldObj.playSound(this.xCoord, this.yCoord, this.zCoord, "mods.assemblyline.conveyor", 0.5f, 0.7f, true); } this.wheelRotation += 40;