diff --git a/resources/assets/enderio/sounds.json b/resources/assets/enderio/sounds.json index 268e0cc0..757d5884 100644 --- a/resources/assets/enderio/sounds.json +++ b/resources/assets/enderio/sounds.json @@ -44,5 +44,11 @@ "darksteel/modules/jump/jump4", "darksteel/modules/jump/jump5" ] + }, + "telepad.active": { + "category": "block", + "sounds" : [ + "telepad/active" + ] } } \ No newline at end of file diff --git a/resources/assets/enderio/sounds/telepad/active.ogg b/resources/assets/enderio/sounds/telepad/active.ogg new file mode 100644 index 00000000..7bf90a6d Binary files /dev/null and b/resources/assets/enderio/sounds/telepad/active.ogg differ diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index d508b1f4..8cdd4be1 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -60,7 +60,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi private final ResourceLocation soundRes; - protected static ResourceLocation getSoundFor(String sound) { + public static ResourceLocation getSoundFor(String sound) { return sound == null ? null : new ResourceLocation(EnderIO.MODID + ":" + sound); } diff --git a/src/main/java/crazypants/enderio/machine/MachineSound.java b/src/main/java/crazypants/enderio/machine/MachineSound.java index cc18f993..dd9dc5da 100644 --- a/src/main/java/crazypants/enderio/machine/MachineSound.java +++ b/src/main/java/crazypants/enderio/machine/MachineSound.java @@ -4,10 +4,10 @@ import net.minecraft.client.audio.ITickableSound; import net.minecraft.client.audio.PositionedSound; import net.minecraft.util.ResourceLocation; -public class MachineSound extends PositionedSound implements ITickableSound{ +public class MachineSound extends PositionedSound implements ITickableSound { private boolean donePlaying; - + public MachineSound(ResourceLocation sound, float x, float y, float z, float volume, float pitch) { super(sound); this.xPosF = x; @@ -27,12 +27,22 @@ public class MachineSound extends PositionedSound implements ITickableSound{ public boolean isDonePlaying() { return donePlaying; } - + public void endPlaying() { donePlaying = true; } - + public void startPlaying() { donePlaying = false; } + + public MachineSound setVolume(float vol) { + this.volume = vol; + return this; + } + + public MachineSound setPitch(float pitch) { + this.field_147663_c = pitch; + return this; + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index ee3ccf6e..cc57bbb4 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -12,6 +12,7 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.EnergyStorage; @@ -19,8 +20,13 @@ import cofh.api.energy.EnergyStorage; import com.google.common.collect.Lists; import com.google.common.collect.Queues; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.api.teleport.ITelePad; import crazypants.enderio.api.teleport.TravelSource; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.MachineSound; import crazypants.enderio.machine.PacketPowerStorage; import crazypants.enderio.machine.PacketProgress; import crazypants.enderio.network.PacketHandler; @@ -53,6 +59,9 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private int powerUsed; private int maxPower; private int lastSyncPowerUsed; + + private static final ResourceLocation activeRes = AbstractMachineEntity.getSoundFor("telepad.active"); + private MachineSound activeSound = null; @Override public void updateEntity() { @@ -65,7 +74,22 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei updateConnectedState(true); autoUpdate = false; } - if(!worldObj.isRemote) { + if(worldObj.isRemote) { + if(active()) { + if(activeSound == null) { + activeSound = new MachineSound(activeRes, xCoord, yCoord, zCoord, 0.01f, 1); + playSound(); + } + activeSound.setVolume(Math.min(activeSound.getVolume() + 0.01f, 0.5f)); + } else if(!active() && activeSound != null) { + if(activeSound.getVolume() > 0) { + activeSound.setVolume(activeSound.getVolume() - 0.1f); + } else { + activeSound.endPlaying(); + activeSound = null; + } + } + } else { if(active()) { System.out.println(maxPower); if(powerUsed >= maxPower) { @@ -92,6 +116,11 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } } + @SideOnly(Side.CLIENT) + private void playSound() { + FMLClientHandler.instance().getClient().getSoundHandler().playSound(activeSound); + } + private void updateQueuedEntities() { List toRemove = Lists.newArrayList(); for (Entity e : toTeleport) { @@ -234,7 +263,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } private int getPowerForTeleport() { - return new BlockCoord(this).distance(target) * 10; + return new BlockCoord(this).distance(target) * 1000; } public boolean active() { diff --git a/src/main/java/crazypants/util/Lang.java b/src/main/java/crazypants/util/Lang.java index 214b35f1..892f44d1 100644 --- a/src/main/java/crazypants/util/Lang.java +++ b/src/main/java/crazypants/util/Lang.java @@ -1,5 +1,7 @@ package crazypants.util; +import java.util.IllegalFormatException; + import net.minecraft.util.StatCollector; public class Lang { @@ -14,7 +16,12 @@ public class Lang { if(appendEIO) { s = prefix + s; } - return String.format(StatCollector.translateToLocal(s), (Object[]) args); + String ret = StatCollector.translateToLocal(s); + try { + return String.format(ret, (Object[]) args); + } catch (IllegalFormatException e) { + return ret; + } } public static String[] localizeList(String string) {