Attempt to fix git history #2

src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java

@@ -0,0 +1,220 @@
+/**
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2016. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.shared.peripheral.speaker;
+
+import dan200.computercraft.api.lua.ILuaContext;
+import dan200.computercraft.api.lua.LuaException;
+import dan200.computercraft.api.peripheral.IComputerAccess;
+import dan200.computercraft.api.peripheral.IPeripheral;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.SoundEvent;
+
+public class SpeakerPeripheral implements IPeripheral {
+
+    private final TileSpeaker m_speaker;
+    private long m_clock;
+    private long m_lastPlayTime;
+
+    public SpeakerPeripheral(TileSpeaker speaker)
+    {
+        m_speaker = speaker;
+        m_clock = 0;
+        m_lastPlayTime = 0;
+    }
+
+    protected void updateClock()
+    {
+        m_clock++;
+    }
+
+
+    /* IPeripheral implementations */
+
+    @Override
+    public boolean equals(IPeripheral other)
+    {
+        if (other != null && other instanceof SpeakerPeripheral)
+        {
+            SpeakerPeripheral otherSpeaker = (SpeakerPeripheral) other;
+            return otherSpeaker.m_speaker == m_speaker;
+        }
+
+        else
+        {
+            return false;
+        }
+
+    }
+
+
+    @Override
+    public void attach(IComputerAccess computerAccess)
+    {
+    }
+
+    @Override
+    public void detach(IComputerAccess computerAccess)
+    {
+    }
+
+    @Override
+    public String getType()
+    {
+        return "speaker";
+    }
+
+    @Override
+    public String[] getMethodNames()
+    {
+        return new String[] {
+                "playsound", // Plays sound at resourceLocator
+                "playnote" // Plays note
+        };
+    }
+
+    @Override
+    public Object[] callMethod(IComputerAccess computerAccess, ILuaContext context, int methodIndex, Object[] args) throws LuaException
+    {
+
+        switch (methodIndex)
+        {
+            // playsound
+            case 0: {
+                return playSound(args);
+            }
+
+            // playnote
+            case 1:
+            {
+                return playNote(args);
+            }
+
+            default:
+            {
+                return null;
+            }
+
+        }
+    }
+
+    private Object[] playNote(Object[] arguments) throws LuaException
+    {
+        float volume = 1f;
+        float pitch = 1f;
+
+        // Check if arguments are correct
+        if (arguments.length == 0) // Too few args
+        {
+            throw new LuaException("Expected string, number (optional), number (optional)");
+        }
+
+        if (!(arguments[0] instanceof String)) // Arg wrong type
+            {
+            throw new LuaException("Expected string, number (optional), number (optional)");
+        }
+
+        if (!SoundEvent.REGISTRY.containsKey(new ResourceLocation("block.note." + arguments[0])))
+        {
+            throw new LuaException("Invalid instrument, \"" + arguments[0] + "\"!");
+        }
+
+        if (arguments.length > 1)
+        {
+            if (!(arguments[1] instanceof Double))  // Arg wrong type
+            {
+                throw new LuaException("Expected string, number (optional), number (optional)");
+            }
+            volume = ((Double) arguments[1]).floatValue();
+
+        }
+
+        if (arguments.length > 2)
+        {
+            if (!(arguments[2] instanceof Double)) // Arg wrong type
+            {
+                throw new LuaException("Expected string, number (optional), number (optional)");
+            }
+            pitch = ((Double) arguments[2]).floatValue();
+        }
+
+        if (arguments.length > 3)
+        {
+            throw new LuaException("Expected string, number (optional), number (optional)");
+        }
+
+        return playSound(new Object[] {"block.note." + arguments[0], volume, pitch});
+
+    }
+
+    private Object[] playSound(Object[] arguments) throws LuaException
+    {
+
+        float volume = 1f;
+        float pitch = 1f;
+
+        // Check if arguments are correct
+        if (arguments.length == 0) // Too few args
+        {
+            throw new LuaException("Expected string, number (optional), number (optional)");
+        }
+
+        if (!(arguments[0] instanceof String)) // Arg wrong type
+        {
+            throw new LuaException("Expected string, number (optional), number (optional)");
+        }
+
+        if (arguments.length > 1)
+        {
+            if (!(arguments[1] instanceof Double))  // Arg wrong type
+            {
+                throw new LuaException("Expected string, number (optional), number (optional)");
+            }
+            volume = ((Double) arguments[1]).floatValue();
+
+        }
+
+        if (arguments.length > 2)
+        {
+            if (!(arguments[2] instanceof Double)) // Arg wrong type
+            {
+                throw new LuaException("Expected string, number (optional), number (optional)");
+            }
+            pitch = ((Double) arguments[2]).floatValue();
+        }
+
+        if (arguments.length > 3)
+        {
+            throw new LuaException("Expected string, number (optional), number (optional)");
+        }
+
+        ResourceLocation resourceName = new ResourceLocation((String) arguments[0]);
+
+        if (m_clock - m_lastPlayTime > TileSpeaker.MIN_TICKS_BETWEEN_SOUNDS)
+        {
+
+            if (SoundEvent.REGISTRY.containsKey(resourceName))
+            {
+                m_speaker.getWorld().playSound(null, m_speaker.getPos(), new SoundEvent(resourceName), SoundCategory.RECORDS, volume, pitch);
+                m_lastPlayTime = m_clock;
+                return new Object[]{true}; // Success, return true
+            }
+
+            else
+            {
+                return new Object[]{false}; // Failed - sound not existent, return false
+            }
+
+        }
+
+        else
+        {
+            return new Object[]{false}; // Failed - rate limited, return false
+        }
+    }
+}
+

src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java

@@ -0,0 +1,38 @@
+/**
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2016. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.shared.peripheral.speaker;
+
+import dan200.computercraft.api.peripheral.IPeripheral;
+import dan200.computercraft.shared.peripheral.common.TilePeripheralBase;
+import net.minecraft.util.EnumFacing;
+
+public class TileSpeaker extends TilePeripheralBase
+{
+    // Statics
+    public static final int MIN_TICKS_BETWEEN_SOUNDS = 1;
+
+    // Members
+    private SpeakerPeripheral m_peripheral;
+
+    @Override
+    public synchronized void update()
+    {
+        if (m_peripheral != null)
+        {
+            m_peripheral.updateClock();
+        }
+
+    }
+
+    // IPeripheralTile implementation
+    public IPeripheral getPeripheral(EnumFacing side)
+    {
+        m_peripheral = new SpeakerPeripheral(this);
+        return m_peripheral;
+    }
+
+}