mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-06-27 15:43:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #289 from Wojbie/ComputerCraft/Speaker-pocket-computer-light

Browse Source 
Add pocket computer light support to Speaker.
This commit is contained in:
SquidDev 2017-11-14 22:46:01 +00:00
commit bc2b481918
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
View File

@ -59,6 +59,11 @@ public class SpeakerPeripheral implements IPeripheral {
return m_speaker.getPos(); return m_speaker.getPos();
} }
public synchronized boolean madeSound(long ticks)
{
return (m_clock - m_lastPlayTime <= ticks) ;
}
/* IPeripheral implementation */ /* IPeripheral implementation */
@Override @Override

2
src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeaker.java
View File

@ -11,6 +11,7 @@ import dan200.computercraft.api.pocket.IPocketAccess;
import dan200.computercraft.api.pocket.IPocketUpgrade; import dan200.computercraft.api.pocket.IPocketUpgrade;
import dan200.computercraft.shared.peripheral.PeripheralType; import dan200.computercraft.shared.peripheral.PeripheralType;
import dan200.computercraft.shared.peripheral.common.PeripheralItemFactory; import dan200.computercraft.shared.peripheral.common.PeripheralItemFactory;
import dan200.computercraft.shared.util.Colour;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -73,6 +74,7 @@ public class PocketSpeaker implements IPocketUpgrade
speaker.setLocation( entity.getEntityWorld(), entity.posX, entity.posY, entity.posZ ); speaker.setLocation( entity.getEntityWorld(), entity.posX, entity.posY, entity.posZ );
} }
speaker.update(); speaker.update();
access.setLight( speaker.madeSound(20) ? 0x3320fc : -1 );
} }
} }
} }