mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-07-13 07:22:52 +00:00
Code Issues Releases Wiki Activity

Format TileSpeaker and TurtleSpeaker

Browse Source
This commit is contained in:
Lignum 2017-05-19 20:25:08 +02:00
parent a402fc9093
commit c2af482615
No known key found for this signature in database
GPG Key ID: E4DE8F54CA0912BA
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java
View File

@ -13,10 +13,10 @@ import net.minecraft.util.EnumFacing;
public class TileSpeaker extends TilePeripheralBase public class TileSpeaker extends TilePeripheralBase
{ {
// Statics // Statics
static final int MIN_TICKS_BETWEEN_SOUNDS = 1; public static final int MIN_TICKS_BETWEEN_SOUNDS = 1;
// Members // Members
private SpeakerPeripheral m_peripheral; private final SpeakerPeripheral m_peripheral;
public TileSpeaker() public TileSpeaker()
{ {
@ -25,7 +25,8 @@ public class TileSpeaker extends TilePeripheralBase
} }
@Override @Override
public synchronized void update() { public synchronized void update()
{
m_peripheral.update(); m_peripheral.update();
} }
@ -35,5 +36,4 @@ public class TileSpeaker extends TilePeripheralBase
{ {
return m_peripheral; return m_peripheral;
} }
} }

7
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java
View File

@ -146,8 +146,8 @@ public class TurtleSpeaker implements ITurtleUpgrade
@Nonnull @Nonnull
@Override @Override
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
public Pair<IBakedModel, Matrix4f> getModel(ITurtleAccess turtle, @Nonnull TurtleSide side ) { public Pair<IBakedModel, Matrix4f> getModel( ITurtleAccess turtle, @Nonnull TurtleSide side )
{
loadModelLocations(); loadModelLocations();
ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager();
@ -155,19 +155,16 @@ public class TurtleSpeaker implements ITurtleUpgrade
{ {
return Pair.of( modelManager.getModel( m_leftModel ), null ); return Pair.of( modelManager.getModel( m_leftModel ), null );
} }
else else
{ {
return Pair.of( modelManager.getModel( m_rightModel ), null ); return Pair.of( modelManager.getModel( m_rightModel ), null );
} }
} }
@Override @Override
public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide turtleSide ) public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide turtleSide )
{ {
IPeripheral turtlePeripheral = turtle.getPeripheral( turtleSide ); IPeripheral turtlePeripheral = turtle.getPeripheral( turtleSide );
if ( turtlePeripheral instanceof Peripheral ) if ( turtlePeripheral instanceof Peripheral )
{ {
Peripheral peripheral = (Peripheral) turtlePeripheral; Peripheral peripheral = (Peripheral) turtlePeripheral;