TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-01-07 11:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

aefaef

Browse Source
This commit is contained in:
Igor Timofeev 2017-01-14 06:12:40 +03:00
parent cb965a83cd
commit 4872e5adb8
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
Applications.txt
View File

@ -537,7 +537,7 @@
type="Application",
icon="IgorTimofeev/OpenComputers/master/Applications/SmartHouse/Icon.pic",
createShortcut="desktop",
version=1.28,
version=1.29,
resources={
{
name="Modules/command_block/Icon.pic",
@ -885,7 +885,7 @@
type="Application",
icon="IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic",
createShortcut="desktop",
version=1.03,
version=1.04,
},
{
name="MineOS/Applications/Battleship",

BIN
Applications/.DS_Store vendored
View File

Binary file not shown.

13
Applications/SmartHouse/SmartHouse.lua
View File

@ -40,15 +40,6 @@ local offset = {x = 0, y = 0}
-----------------------------------------------------------------------------------------------------------------------------------
local function getComputerInfo()
local currentComputerAddress = computer.address()
for address, information in pairs(computer.getDeviceInfo()) do
if currentComputerAddress == address then
return information.description
end
end
end
local function loadModule(modulePath)
local success, module = pcall(loadfile(modulePath .. "/Main.lua"))
if success then
@ -345,8 +336,8 @@ local function createWindow()
-- Создаем главное и неебически важное устройство домашнего писюка
local homePC = createDevice(math.floor(window.width / 2 - 8), math.floor(window.height / 2 - 4), "homePC", component.proxy(computer.address()), "Сервак")
local computerDescription = getComputerInfo()
if computerDescription == "Server" then homePC.module.icon = image.load(homePC.module.modulePath .. "Server.pic"); homePC.deviceImage.image = homePC.module.icon end
homePC.module.icon = image.load(homePC.module.modulePath .. "Server.pic")
homePC.deviceImage.image = homePC.module.icon
-- Перед отрисовкой окна чистим буфер фоном и перехуячиваем позиции объектов групп
window.onDrawStarted = function()