mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-15 03:35:42 +00:00
Code Issues Releases Wiki Activity

Enabled setTextColour/setBackgroundColour with all colours on greyscale monitors

Browse Source 
It's fine, now that we have greyscale rendering
This commit is contained in:
Daniel Ratcliffe 2017-05-07 17:24:45 +01:00 committed by GitHub
parent a5e1dad5fc
commit 5f22d8bac6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorPeripheral.java
View File

@ -169,7 +169,7 @@ public class MonitorPeripheral implements IPeripheral
case 10: case 10:
{ {
// setTextColour/setTextColor // setTextColour/setTextColor
int colour = dan200.computercraft.core.apis.TermAPI.parseColour( args, m_monitor.getTerminal().isColour() ); int colour = dan200.computercraft.core.apis.TermAPI.parseColour( args );
Terminal terminal = m_monitor.getTerminal().getTerminal(); Terminal terminal = m_monitor.getTerminal().getTerminal();
terminal.setTextColour( colour ); terminal.setTextColour( colour );
return null; return null;
@ -178,7 +178,7 @@ public class MonitorPeripheral implements IPeripheral
case 12: case 12:
{ {
// setBackgroundColour/setBackgroundColor // setBackgroundColour/setBackgroundColor
int colour = dan200.computercraft.core.apis.TermAPI.parseColour( args, m_monitor.getTerminal().isColour() ); int colour = dan200.computercraft.core.apis.TermAPI.parseColour( args );
Terminal terminal = m_monitor.getTerminal().getTerminal(); Terminal terminal = m_monitor.getTerminal().getTerminal();
terminal.setBackgroundColour( colour ); terminal.setBackgroundColour( colour );
return null; return null;
@ -234,7 +234,7 @@ public class MonitorPeripheral implements IPeripheral
if(args.length == 2 && args[0] instanceof Double && args[1] instanceof Double) if(args.length == 2 && args[0] instanceof Double && args[1] instanceof Double)
{ {
int colour = 15 - dan200.computercraft.core.apis.TermAPI.parseColour( args, true ); int colour = 15 - dan200.computercraft.core.apis.TermAPI.parseColour( args );
int hex = ((Double)args[1]).intValue(); int hex = ((Double)args[1]).intValue();
float[] rgb = Palette.decodeRGB8( hex ); float[] rgb = Palette.decodeRGB8( hex );
dan200.computercraft.core.apis.TermAPI.setColour( terminal, colour, rgb[0], rgb[1], rgb[2] ); dan200.computercraft.core.apis.TermAPI.setColour( terminal, colour, rgb[0], rgb[1], rgb[2] );
@ -243,7 +243,7 @@ public class MonitorPeripheral implements IPeripheral
if (args.length >= 4 && args[0] instanceof Double && args[1] instanceof Double && args[2] instanceof Double && args[3] instanceof Double) if (args.length >= 4 && args[0] instanceof Double && args[1] instanceof Double && args[2] instanceof Double && args[3] instanceof Double)
{ {
int colour = 15 - dan200.computercraft.core.apis.TermAPI.parseColour( args, true ); int colour = 15 - dan200.computercraft.core.apis.TermAPI.parseColour( args );
float r = ((Double)args[1]).floatValue(); float r = ((Double)args[1]).floatValue();
float g = ((Double)args[2]).floatValue(); float g = ((Double)args[2]).floatValue();
float b = ((Double)args[3]).floatValue(); float b = ((Double)args[3]).floatValue();
@ -251,7 +251,7 @@ public class MonitorPeripheral implements IPeripheral
return null; return null;
} }
throw new LuaException( "Expected number, number or number, number, number, number" ); throw new LuaException( "Expected number, number, number, number" );
} }
case 22: case 22:
case 23: case 23:
@ -260,7 +260,7 @@ public class MonitorPeripheral implements IPeripheral
Terminal terminal = m_monitor.getTerminal().getTerminal(); Terminal terminal = m_monitor.getTerminal().getTerminal();
Palette palette = terminal.getPalette(); Palette palette = terminal.getPalette();
int colour = 15 - dan200.computercraft.core.apis.TermAPI.parseColour( args, m_monitor.getTerminal().isColour() ); int colour = 15 - dan200.computercraft.core.apis.TermAPI.parseColour( args );
if( palette != null ) if( palette != null )
{ {