mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-24 09:04:49 +00:00
Code Issues Releases Wiki Activity

Un-break the non-table setPaletteColour overload

Browse Source
This commit is contained in:
Lignum
2017-05-07 12:55:16 +02:00
parent 54273fc6e5
commit 70c2f50aa8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dan200/computercraft/core/apis/TermAPI.java
View File

@@ -336,7 +336,7 @@ public class TermAPI implements ILuaAPI
case 19:
case 20:
{
// setColour/setColor
// setPaletteColour/setPaletteColor
if( !m_environment.isColour() )
{
// Make sure you can't circumvent greyscale terminals with this function.
@@ -375,8 +375,8 @@ public class TermAPI implements ILuaAPI
case 21:
case 22:
{
// getColour/getColor
if (args.length < 1 || !(args[0] instanceof Double))
// getPaletteColour/getPaletteColor
if(args.length < 1 || !(args[0] instanceof Double))
{
throw new LuaException( "Expected number" );
}

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

@@ -229,7 +229,7 @@ public class MonitorPeripheral implements IPeripheral
case 20:
case 21:
{
// setColour/setColor
// setPaletteColour/setPaletteColor
Terminal terminal = m_monitor.getTerminal().getTerminal();
boolean isColour = m_monitor.getTerminal().isColour();
@@ -270,7 +270,7 @@ public class MonitorPeripheral implements IPeripheral
case 22:
case 23:
{
// getColour/getColor
// getPaletteColour/getPaletteColor
Terminal terminal = m_monitor.getTerminal().getTerminal();
Palette palette = terminal.getPalette();