mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-07-28 05:58:54 +00:00
Code Issues Releases Wiki Activity

Reformat everything

Browse Source 
It's been a long time comin'
But tonight is the end of the war, my friend
Tomorrow only one style will remain.
This commit is contained in:
SquidDev
2018-12-23 17:46:58 +00:00
parent 72b9d3d802
commit 2032e7a83a
173 changed files with 2028 additions and 1672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java
+16 -13
View File
@@ -110,9 +110,9 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
{
ItemComputer itemComputer = (ItemComputer) stack.getItem();
ComputerFamily family = itemComputer.getFamily( stack.getItemDamage() );
return ( family == ComputerFamily.Advanced ) ? advanced_computer : computer;
return (family == ComputerFamily.Advanced) ? advanced_computer : computer;
}
}, new String[]{ "computer", "advanced_computer" } );
}, new String[] { "computer", "advanced_computer" } );
registerItemModel( ComputerCraft.Blocks.peripheral, 0, "peripheral" );
registerItemModel( ComputerCraft.Blocks.peripheral, 1, "wireless_modem" );
registerItemModel( ComputerCraft.Blocks.peripheral, 2, "monitor" );
@@ -279,7 +279,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
private void registerItemModel( Item item, ItemMeshDefinition definition, String[] names )
{
ResourceLocation[] resources = new ResourceLocation[names.length];
for( int i=0; i<resources.length; ++i )
for( int i = 0; i < resources.length; i++ )
{
resources[i] = new ResourceLocation( "computercraft", names[i] );
}
@@ -296,7 +296,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
@Override
public boolean getGlobalCursorBlink()
{
return ( m_tick / 8) % 2 == 0;
return (m_tick / 8) % 2 == 0;
}
@Override
@@ -316,9 +316,12 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
{
List<String> info = new ArrayList<>( 1 );
recordStack.getItem().addInformation( recordStack, null, info, ITooltipFlag.TooltipFlags.NORMAL );
if( info.size() > 0 ) {
if( info.size() > 0 )
{
return info.get( 0 );
} else {
}
else
{
return super.getRecordInfo( recordStack );
}
}
@@ -427,7 +430,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
case ComputerCraftPacket.ComputerChanged:
case ComputerCraftPacket.ComputerTerminalChanged:
{
int instanceID = packet.m_dataInt[ 0 ];
int instanceID = packet.m_dataInt[0];
if( !ComputerCraft.clientComputerRegistry.contains( instanceID ) )
{
ComputerCraft.clientComputerRegistry.add( instanceID, new ClientComputer( instanceID ) );
@@ -437,7 +440,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
}
case ComputerCraftPacket.ComputerDeleted:
{
int instanceID = packet.m_dataInt[ 0 ];
int instanceID = packet.m_dataInt[0];
if( ComputerCraft.clientComputerRegistry.contains( instanceID ) )
{
ComputerCraft.clientComputerRegistry.remove( instanceID );
@@ -446,13 +449,13 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
}
case ComputerCraftPacket.PlayRecord:
{
BlockPos pos = new BlockPos( packet.m_dataInt[ 0 ], packet.m_dataInt[ 1 ], packet.m_dataInt[ 2 ] );
BlockPos pos = new BlockPos( packet.m_dataInt[0], packet.m_dataInt[1], packet.m_dataInt[2] );
Minecraft mc = Minecraft.getMinecraft();
if( packet.m_dataInt.length > 3 )
{
SoundEvent sound = SoundEvent.REGISTRY.getObjectById( packet.m_dataInt[ 3 ] );
SoundEvent sound = SoundEvent.REGISTRY.getObjectById( packet.m_dataInt[3] );
mc.world.playRecord( pos, sound );
mc.ingameGUI.setRecordPlayingMessage( packet.m_dataString[ 0 ] );
mc.ingameGUI.setRecordPlayingMessage( packet.m_dataString[0] );
}
else
{
@@ -551,7 +554,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
{
case HELMET:
case PORTAL:
//case CROSSHAIRS:
//case CROSSHAIRS:
case BOSSHEALTH:
case ARMOR:
case HEALTH:
@@ -597,7 +600,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
}
}
@SideOnly(Side.CLIENT)
@SideOnly( Side.CLIENT )
private static class DiskColorHandler implements IItemColor
{
private final ItemDiskLegacy disk;