mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

setColour -> setPaletteColour

This commit is contained in:
Lignum 2017-05-07 12:40:31 +02:00
parent 287c6f172c
commit 156e74b69c
No known key found for this signature in database
GPG Key ID: 0889206F5A8A700D
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,10 +74,10 @@ public String[] getMethodNames()
"getBackgroundColour",
"getBackgroundColor",
"blit",
"setColour",
"setColor",
"getColour",
"getColor"
"setPaletteColour",
"setPaletteColor",
"getPaletteColour",
"getPaletteColor"
};
}

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

@ -57,10 +57,10 @@ public String[] getMethodNames()
"getBackgroundColour",
"getBackgroundColor",
"blit",
"setColour",
"setColor",
"getColour",
"getColor"
"setPaletteColour",
"setPaletteColor",
"getPaletteColour",
"getPaletteColor"
};
}

12
src/main/resources/assets/computercraft/lua/rom/apis/window
View File

@ -72,7 +72,7 @@ function create( parent, nX, nY, nWidth, nHeight, bStartVisible )
for i=0,15 do
local c = 2 ^ i
tPalette[c] = { parent.getColour( c ) }
tPalette[c] = { parent.getPaletteColour( c ) }
end
end
@ -107,7 +107,7 @@ function create( parent, nX, nY, nWidth, nHeight, bStartVisible )
end
local function updatePalette()
return parent.setColour( tPalette )
return parent.setPaletteColour( tPalette )
end
local function internalBlit( sText, sTextColor, sBackgroundColor )
@ -286,7 +286,7 @@ function create( parent, nX, nY, nWidth, nHeight, bStartVisible )
setTextColor( color )
end
function window.setColour( colour, r, g, b )
function window.setPaletteColour( colour, r, g, b )
if type(colour) == "table" then
for k,v in pairs(colour) do
tPalette[k] = v
@ -305,13 +305,13 @@ function create( parent, nX, nY, nWidth, nHeight, bStartVisible )
end
end
window.setColor = window.setColour
window.setPaletteColor = window.setPaletteColour
function window.getColour( colour )
function window.getPaletteColour( colour )
return table.unpack( tPalette[ colour ] )
end
window.getColor = window.getColour
window.getPaletteColor = window.getPaletteColour
local function setBackgroundColor( color )
if not parent.isColor() then