mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-03-16 04:49:43 +00:00
Code Issues Releases Wiki Activity

Merge pull request #237 from Restioson/feature/speaker

Browse Source 
[Peripheral] Speaker
This commit is contained in:
Daniel Ratcliffe
2017-05-16 19:52:10 +01:00
committed by GitHub
parent aa8455e0b1 0113e7229f
commit cd85a03429
28 changed files with 742 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java
View File

@@ -44,10 +44,12 @@ import dan200.computercraft.shared.peripheral.modem.TileWirelessModem;
import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
import dan200.computercraft.shared.peripheral.printer.TilePrinter;
import dan200.computercraft.shared.peripheral.speaker.TileSpeaker;
import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
import dan200.computercraft.shared.pocket.items.PocketComputerItemFactory;
import dan200.computercraft.shared.pocket.peripherals.PocketModem;
import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
import dan200.computercraft.shared.pocket.recipes.PocketComputerUpgradeRecipe;
import dan200.computercraft.shared.turtle.blocks.TileTurtle;
import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
@@ -306,6 +308,15 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
'Y', Items.REDSTONE
);
// Speaker
ItemStack speaker = PeripheralItemFactory.create( PeripheralType.Speaker, null, 1);
GameRegistry.addRecipe( speaker,
"XXX", "XYX", "XZX",
'X', Blocks.STONE,
'Y', Blocks.NOTEBLOCK,
'Z', Items.REDSTONE
);
// Wireless Modem
ItemStack wirelessModem = PeripheralItemFactory.create( PeripheralType.WirelessModem, null, 1 );
GameRegistry.addRecipe( wirelessModem,
@@ -441,6 +452,9 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
ComputerCraft.PocketUpgrades.advancedModem = new PocketModem( true );
ComputerCraftAPI.registerPocketUpgrade( ComputerCraft.PocketUpgrades.advancedModem );
ComputerCraft.PocketUpgrades.pocketSpeaker = new PocketSpeaker();
ComputerCraftAPI.registerPocketUpgrade( ComputerCraft.PocketUpgrades.pocketSpeaker );
// Wireless Pocket Computer
GameRegistry.addRecipe( new PocketComputerUpgradeRecipe() );
@@ -547,6 +561,7 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
registerTileEntity( TileCable.class, "wiredmodem" );
registerTileEntity( TileCommandComputer.class, "command_computer" );
registerTileEntity( TileAdvancedModem.class, "advanced_modem" );
registerTileEntity( TileSpeaker.class, "speaker" );
// Register peripheral providers
ComputerCraftAPI.registerPeripheralProvider( new DefaultPeripheralProvider() );