mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-07-07 04:22:53 +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

10
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,15 +25,15 @@ public class TileSpeaker extends TilePeripheralBase
} }
@Override @Override
public synchronized void update() { public synchronized void update()
{
m_peripheral.update(); m_peripheral.update();
} }
// IPeripheralTile implementation // IPeripheralTile implementation
public IPeripheral getPeripheral(EnumFacing side) public IPeripheral getPeripheral( EnumFacing side )
{ {
return m_peripheral; return m_peripheral;
} }
} }

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

@ -81,7 +81,7 @@ public class TurtleSpeaker implements ITurtleUpgrade
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
private ModelResourceLocation m_rightModel; private ModelResourceLocation m_rightModel;
public TurtleSpeaker(ResourceLocation id, int legacyId) public TurtleSpeaker( ResourceLocation id, int legacyId )
{ {
m_id = id; m_id = id;
m_legacyID = legacyId; m_legacyID = legacyId;
@ -128,7 +128,7 @@ public class TurtleSpeaker implements ITurtleUpgrade
@Nonnull @Nonnull
@Override @Override
public TurtleCommandResult useTool(@Nonnull ITurtleAccess turtleAccess, @Nonnull TurtleSide turtleSide, @Nonnull TurtleVerb verb, @Nonnull EnumFacing direction) public TurtleCommandResult useTool( @Nonnull ITurtleAccess turtleAccess, @Nonnull TurtleSide turtleSide, @Nonnull TurtleVerb verb, @Nonnull EnumFacing direction )
{ {
return TurtleCommandResult.failure(); return TurtleCommandResult.failure();
} }
@ -146,29 +146,26 @@ 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();
if (side == TurtleSide.Left) if( side == TurtleSide.Left )
{ {
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;
peripheral.update(); peripheral.update();