1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-19 05:32:55 +00:00

Speaker rendering and name

This commit is contained in:
gegy1000 2017-05-07 18:32:43 +02:00 committed by Restioson
parent a748d0167b
commit 2444245b80
9 changed files with 23 additions and 0 deletions

View File

@ -97,6 +97,8 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
registerItemModel( ComputerCraft.Blocks.peripheral, 3, "printer" ); registerItemModel( ComputerCraft.Blocks.peripheral, 3, "printer" );
registerItemModel( ComputerCraft.Blocks.peripheral, 4, "advanced_monitor" ); registerItemModel( ComputerCraft.Blocks.peripheral, 4, "advanced_monitor" );
registerItemModel( ComputerCraft.Blocks.cable, 0, "cable" ); registerItemModel( ComputerCraft.Blocks.cable, 0, "cable" );
registerItemModel( ComputerCraft.Blocks.peripheral, 5, "speaker" );
registerItemModel( ComputerCraft.Blocks.cable, 0, "CC-Cable" );
registerItemModel( ComputerCraft.Blocks.cable, 1, "wired_modem" ); registerItemModel( ComputerCraft.Blocks.cable, 1, "wired_modem" );
registerItemModel( ComputerCraft.Blocks.commandComputer, "command_computer" ); registerItemModel( ComputerCraft.Blocks.commandComputer, "command_computer" );
registerItemModel( ComputerCraft.Blocks.advancedModem, "advanced_modem" ); registerItemModel( ComputerCraft.Blocks.advancedModem, "advanced_modem" );

View File

@ -98,6 +98,10 @@ public abstract class ItemPeripheralBase extends ItemBlock implements IPeriphera
{ {
return "tile.computercraft:advanced_modem"; return "tile.computercraft:advanced_modem";
} }
case Speaker:
{
return "tile.computercraft:speaker";
}
} }
} }

View File

@ -13,6 +13,11 @@
"facing=west,variant=disk_drive_invalid": { "model": "computercraft:disk_drive_invalid", "y": 270 }, "facing=west,variant=disk_drive_invalid": { "model": "computercraft:disk_drive_invalid", "y": 270 },
"facing=east,variant=disk_drive_invalid": { "model": "computercraft:disk_drive_invalid", "y": 90 }, "facing=east,variant=disk_drive_invalid": { "model": "computercraft:disk_drive_invalid", "y": 90 },
"facing=north,variant=speaker": { "model": "computercraft:speaker" },
"facing=south,variant=speaker": { "model": "computercraft:speaker", "y": 180 },
"facing=west,variant=speaker": { "model": "computercraft:speaker", "y": 270 },
"facing=east,variant=speaker": { "model": "computercraft:speaker", "y": 90 },
"facing=north,variant=printer_empty": { "model": "computercraft:printer_empty" }, "facing=north,variant=printer_empty": { "model": "computercraft:printer_empty" },
"facing=south,variant=printer_empty": { "model": "computercraft:printer_empty", "y": 180 }, "facing=south,variant=printer_empty": { "model": "computercraft:printer_empty", "y": 180 },
"facing=west,variant=printer_empty": { "model": "computercraft:printer_empty", "y": 270 }, "facing=west,variant=printer_empty": { "model": "computercraft:printer_empty", "y": 270 },

View File

@ -9,6 +9,7 @@ tile.computercraft:wired_modem.name=Wired Modem
tile.computercraft:cable.name=Networking Cable tile.computercraft:cable.name=Networking Cable
tile.computercraft:command_computer.name=Command Computer tile.computercraft:command_computer.name=Command Computer
tile.computercraft:advanced_modem.name=Ender Modem tile.computercraft:advanced_modem.name=Ender Modem
tile.computercraft:speaker.name=Speaker
tile.computercraft:turtle.name=Turtle tile.computercraft:turtle.name=Turtle
tile.computercraft:turtle.upgraded.name=%s Turtle tile.computercraft:turtle.upgraded.name=%s Turtle

View File

@ -0,0 +1,8 @@
{
"parent": "block/orientable",
"textures": {
"front": "computercraft:blocks/speakerFront",
"side": "computercraft:blocks/speakerSide",
"top": "computercraft:blocks/speakerTop"
}
}

View File

@ -0,0 +1,3 @@
{
"parent": "computercraft:block/speaker"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 493 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B