diff --git a/resources/assets/enderio/sounds.json b/resources/assets/enderio/sounds.json index 1365bb06..6fe25a9e 100644 --- a/resources/assets/enderio/sounds.json +++ b/resources/assets/enderio/sounds.json @@ -4,5 +4,11 @@ "sounds": [ "generator/zombie/bubble" ] + }, + "generator.stirling": { + "category": "block", + "sounds": [ + "generator/stirling/burn" + ] } } \ No newline at end of file diff --git a/resources/assets/enderio/sounds/generator/stirling/burn.ogg b/resources/assets/enderio/sounds/generator/stirling/burn.ogg new file mode 100644 index 00000000..374fe56b Binary files /dev/null and b/resources/assets/enderio/sounds/generator/stirling/burn.ogg differ diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 4c935fb1..0f52f379 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -13,12 +13,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.terraingen.BiomeEvent.GetGrassColor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.network.PacketHandler; @@ -66,6 +69,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi protected boolean notifyNeighbours = false; + @SideOnly(Side.CLIENT) + private MachineSound sound; + public AbstractMachineEntity(SlotDefinition slotDefinition, Type powerType) { this.slotDefinition = slotDefinition; facing = 3; @@ -194,6 +200,33 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi public abstract float getProgress(); + @SideOnly(Side.CLIENT) + public ResourceLocation getSound() { + return null; + } + + @SideOnly(Side.CLIENT) + public boolean hasSound() { + return getSound() != null; + } + + public float getVolume() { + return 0.75f; + } + + @SideOnly(Side.CLIENT) + private void updateSound() { + if(isActive() && !isInvalid()) { + if(sound == null) { + sound = new MachineSound(getSound(), xCoord + 0.5f, yCoord + 0.5f, zCoord + 0.5f, getVolume()); + FMLClientHandler.instance().getClient().getSoundHandler().playSound(sound); + } + } else if(sound != null) { + sound.endPlaying(); + sound = null; + } + } + public int getProgressScaled(int scale) { int result = (int) (getProgress() * scale); return result; @@ -302,10 +335,16 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } } - if(forceClientUpdate) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - forceClientUpdate = false; + if(hasSound()) { + updateSound(); } + + if(worldObj.isRemote && isActive()) + + if(forceClientUpdate) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + forceClientUpdate = false; + } return; } // else is server, do all logic only on the server @@ -474,6 +513,12 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi // ---- Tile Entity // ------------------------------------------------------------------------------ + @Override + public void invalidate() { + super.invalidate(); + updateSound(); + } + @Override public void readCustomNBT(NBTTagCompound nbtRoot) { diff --git a/src/main/java/crazypants/enderio/machine/MachineSound.java b/src/main/java/crazypants/enderio/machine/MachineSound.java new file mode 100644 index 00000000..0a8477a1 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/MachineSound.java @@ -0,0 +1,37 @@ +package crazypants.enderio.machine; + +import net.minecraft.client.audio.ITickableSound; +import net.minecraft.client.audio.PositionedSound; +import net.minecraft.util.ResourceLocation; + +public class MachineSound extends PositionedSound implements ITickableSound{ + + private boolean donePlaying; + + public MachineSound(ResourceLocation sound, float x, float y, float z, float volume) { + super(sound); + this.xPosF = x; + this.yPosF = y; + this.zPosF = z; + this.volume = volume; + this.repeat = true; + } + + @Override + public void update() { + ; + } + + @Override + public boolean isDonePlaying() { + return donePlaying; + } + + public void endPlaying() { + donePlaying = true; + } + + public void startPlaying() { + donePlaying = false; + } +} diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java index 90c11458..7afdd702 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java @@ -1,8 +1,14 @@ package crazypants.enderio.machine.generator.stirling; +import java.util.Random; + +import com.sun.org.apache.xml.internal.resolver.readers.XCatalogReader; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; @@ -11,9 +17,9 @@ import crazypants.enderio.network.PacketHandler; public class BlockStirlingGenerator extends AbstractMachineBlock { public static BlockStirlingGenerator create() { - + PacketHandler.INSTANCE.registerMessage(PacketBurnTime.class, PacketBurnTime.class, PacketHandler.nextID(), Side.CLIENT); - + BlockStirlingGenerator gen = new BlockStirlingGenerator(); gen.init(); return gen; @@ -46,5 +52,30 @@ public class BlockStirlingGenerator extends AbstractMachineBlock