Add term.setColour/term.getColour

src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java

@@ -29,7 +29,7 @@ public class WidgetTerminal extends Widget
     private static final ResourceLocation background = new ResourceLocation( "computercraft", "textures/gui/termBackground.png" );
     private static float TERMINATE_TIME = 0.5f;
 
-    private IComputerContainer m_computer;
+    private final IComputerContainer m_computer;
 
     private float m_terminateTimer;
     private float m_rebootTimer;
@@ -369,6 +369,8 @@ public class WidgetTerminal extends Widget
         int startX = xOrigin + getXPosition();
         int startY = yOrigin + getYPosition();
 
+        synchronized( m_computer )
+        {
             // Draw the screen contents
             IComputer computer = m_computer.getComputer();
             Terminal terminal = ( computer != null ) ? computer.getTerminal() : null;
@@ -376,8 +378,7 @@ public class WidgetTerminal extends Widget
             {
                 // Draw the terminal
                 boolean greyscale = !computer.isColour();
-            synchronized( terminal )
+
-            {
                 Palette palette = terminal.getPalette();
 
                 // Get the data from the terminal first
@@ -428,9 +429,7 @@ public class WidgetTerminal extends Widget
                             palette
                     );
                 }
-            }
+            } else
-        }
-        else
             {
                 // Draw a black background
                 mc.getTextureManager().bindTexture( background );
@@ -439,13 +438,13 @@ public class WidgetTerminal extends Widget
                 try
                 {
                     drawTexturedModalRect( startX, startY, 0, 0, getWidth(), getHeight() );
-            }
+                } finally
-            finally
                 {
                     GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
                 }
             }
         }
+    }
 
     @Override
     public boolean suppressKeyPress( char c, int k )

src/main/java/dan200/computercraft/core/apis/TermAPI.java

@@ -10,11 +10,12 @@ import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.core.computer.IComputerEnvironment;
 import dan200.computercraft.core.terminal.Terminal;
+import org.apache.commons.lang3.ArrayUtils;
 
 public class TermAPI implements ILuaAPI
 {
-    private Terminal m_terminal;
+    private final Terminal m_terminal;
-    private IComputerEnvironment m_environment;
+    private final IComputerEnvironment m_environment;
 
     public TermAPI( IAPIEnvironment _environment )
     {
@@ -67,13 +68,19 @@ public class TermAPI implements ILuaAPI
             "getTextColor",
             "getBackgroundColour",
             "getBackgroundColor",
-            "blit"
+            "blit",
+            "setColour",
+            "setColor",
+            "getColour",
+            "getColor",
+            "resetColour",
+            "resetColor"
         };
     }
     
     public static int parseColour( Object[] args, boolean _enableColours ) throws LuaException
     {
-        if( args.length != 1 || args[0] == null || !(args[0] instanceof Double) )
+        if( args.length < 1 || args[0] == null || !(args[0] instanceof Double) )
         {
             throw new LuaException( "Expected number" );
         }            
@@ -160,7 +167,7 @@ public class TermAPI implements ILuaAPI
                 {
                     throw new LuaException( "Expected boolean" );
                 }
-                boolean b = ((Boolean)args[0]).booleanValue();
+                boolean b = (Boolean) args[ 0 ];
                 synchronized( m_terminal )
                 {
                     m_terminal.setCursorBlink( b );
@@ -270,6 +277,55 @@ public class TermAPI implements ILuaAPI
                 }
                 return null;
             }
+            case 19:
+            case 20:
+            {
+                // setColour/setColor
+                if ( args.length < 4 || !(args[0] instanceof Double) || !(args[1] instanceof Double) || !(args[2] instanceof Double) || !(args[3] instanceof Double) ) // toil and trouble
+                {
+                    throw new LuaException( "Expected number, number, number, number" );
+                }
+
+                if ( !m_environment.isColour() )
+                {
+                    // Make sure you can't circumvent greyscale terminals with this function.
+                    throw new LuaException( "Colour not supported" );
+                }
+
+                int colour = 15 - parseColour( args, m_environment.isColour() );
+                float r = ((Double)args[1]).floatValue();
+                float g = ((Double)args[2]).floatValue();
+                float b = ((Double)args[3]).floatValue();
+
+                synchronized( m_terminal )
+                {
+                    if( m_terminal.getPalette() != null )
+                    {
+                        m_terminal.getPalette().setColour( colour, r, g, b );
+                    }
+                }
+                return null;
+            }
+            case 21:
+            case 22:
+            {
+                // getColour/getColor
+                if (args.length < 1 || !(args[0] instanceof Double))
+                {
+                    throw new LuaException( "Expected number" );
+                }
+
+                int colour = 15 - parseColour( args, m_environment.isColour() );
+
+                synchronized( m_terminal )
+                {
+                    if ( m_terminal.getPalette() != null )
+                    {
+                        return ArrayUtils.toObject( m_terminal.getPalette().getColour64( colour ) );
+                    }
+                }
+                return null;
+            }
             default:
             {
                 return null;

src/main/java/dan200/computercraft/shared/util/Palette.java

@@ -68,12 +68,30 @@ public class Palette
         return null;
     }
 
-    public void resetColours()
+    public double[] getColour64( int i )
     {
-        for(int i = 0; i < Colour.values().length; ++i)
+        if( i >= 0 && i < colours.length )
+        {
+            PaletteColour c = colours[ i ];
+            return new double[] { (double)c.m_r, (double)c.m_g, (double)c.m_b };
+        }
+        return null;
+    }
+
+    public void resetColour( int i )
+    {
+        if(i >= 0 && i < colours.length )
         {
             Colour c = Colour.values()[ i ];
             colours[i] = new PaletteColour( c.getR(), c.getG(), c.getB() );
         }
     }
+
+    public void resetColours()
+    {
+        for(int i = 0; i < Colour.values().length; ++i)
+        {
+            resetColour( i );
+        }
+    }
 }