AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-29 07:51:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source 
Conflicts:
	build.properties
This commit is contained in:
Florian Nücke 2014-04-30 12:56:37 +02:00
commit a6a6c5e009
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -1,6 +1,6 @@
minecraft.version=1.7.2 minecraft.version=1.7.2
forge.version=10.12.1.1061 forge.version=10.12.1.1061
oc.version=1.2.8 oc.version=1.2.9
ccl.version=1.0.0.62 ccl.version=1.0.0.62
fmp.version=1.0.0.250 fmp.version=1.0.0.250
maven.url=file:///var/www/users/fnuecke/maven.cil.li maven.url=file:///var/www/users/fnuecke/maven.cil.li

12
src/main/resources/assets/opencomputers/loot/OpenIRC/irc.lua
View File

@ -2,6 +2,7 @@
-- http://tools.ietf.org/html/rfc2812 -- http://tools.ietf.org/html/rfc2812
local component = require("component") local component = require("component")
local computer = require("computer")
if not component.isAvailable("internet") then if not component.isAvailable("internet") then
io.stderr:write("OpenIRC requires an Internet Card to run!\n") io.stderr:write("OpenIRC requires an Internet Card to run!\n")
@ -173,7 +174,14 @@ local function handleCommand(prefix, command, args, message)
sock:write("NOTICE " .. name(prefix) .. " :" .. message .. "\001\r\n") sock:write("NOTICE " .. name(prefix) .. " :" .. message .. "\001\r\n")
sock:flush() sock:flush()
end end
if string.find(message, nick) then
computer.beep()
end
if string.find(message, "\001ACTION") then
print("[" .. args[1] .. "] " .. name(prefix) .. string.gsub(string.gsub(message, "\001ACTION", ""), "\001", ""))
else
print("[" .. args[1] .. "] " .. name(prefix) .. ": " .. message) print("[" .. args[1] .. "] " .. name(prefix) .. ": " .. message)
end
elseif command == "NOTICE" then elseif command == "NOTICE" then
print("[NOTICE] " .. message) print("[NOTICE] " .. message)
elseif command == "ERROR" then elseif command == "ERROR" then
@ -368,7 +376,11 @@ local result, reason = pcall(function()
local line = term.read(history) local line = term.read(history)
if sock and line and line ~= "" then if sock and line and line ~= "" then
line = text.trim(line) line = text.trim(line)
if line:lower():sub(1,4) == "/me " then
print("[" .. (target or "?") .. "] You " .. string.gsub(line, "/me ", ""), true)
else
print("[" .. (target or "?") .. "] me: " .. line, true) print("[" .. (target or "?") .. "] me: " .. line, true)
end
if line:lower():sub(1, 5) == "/msg " then if line:lower():sub(1, 5) == "/msg " then
local user, message = line:sub(6):match("^(%S+) (.+)$") local user, message = line:sub(6):match("^(%S+) (.+)$")
if message then if message then