AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 03:36:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10

Browse Source
This commit is contained in:
Florian Nücke 2016-07-27 20:44:33 +02:00
commit fe2fe1b3d3
8 changed files with 155 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/assets/opencomputers/loot/openos/bin/cp.lua
View File

@ -31,6 +31,9 @@ local result, reason
local function prompt(message)
io.write(message .. " [Y/n] ")
local result = io.read()
if not result then -- closed pipe
os.exit(1)
end
return result and (result == "" or result:sub(1, 1):lower() == "y")
end

6
src/main/resources/assets/opencomputers/loot/openos/bin/install.lua
View File

@ -4,7 +4,11 @@ local shell = require("shell")
local options
do
local basic = loadfile(package.searchpath("tools/install_basics", package.path), "bt", _G)
local basic, reason = loadfile(package.searchpath("tools/install_basics", package.path), "bt", _G)
if not basic then
io.stderr:write("failed to load install: " .. tostring(reason) .. "\n")
return 1
end
options = basic(...)
end

2
src/main/resources/assets/opencomputers/loot/openos/bin/touch.lua
View File

@ -31,7 +31,7 @@ for _,arg in ipairs(args) do
if fs.isDirectory(path) then
io.stderr:write(string.format("`%s' ignored: directories not supported\n", arg))
elseif fs.exists(path) or not options.c then
local f, reason = io.open(path, "w")
local f, reason = io.open(path, "a")
if not f then
io.stderr:write(string.format("touch: cannot touch `%s': permission denied\n", arg))
errors = 1

128
src/main/resources/assets/opencomputers/loot/openos/lib/buffer.lua
View File

@ -111,132 +111,6 @@ function buffer:read(...)
return buffer
end
local function readNumber()
local len, sub
if self.mode.b then
len = rawlen
sub = string.sub
else
len = unicode.len
sub = unicode.sub
end
local buffer = ""
local first = true
local decimal = false
local last = false
local hex = false
local pat = "^[0-9]+"
local minbuf = 3 -- "+0x" (sign + hexadecimal tag)
-- this function is used to read trailing numbers (1e2, 0x1p2, etc)
local function readnum(checksign)
local _buffer = ""
local sign = ""
while true do
if len(self.bufferRead) == 0 then
local result, reason = readChunk()
if not result then
if reason then
return nil, reason
else -- eof
return #_buffer > 0 and (sign .. _buffer) or nil
end
end
end
if checksign then
local _sign = sub(self.bufferRead, 1, 1)
if _sign == "+" or _sign == "-" then
-- "eat" the sign (Rio Lua behaviour)
sign = sub(self.bufferRead, 1, 1)
self.bufferRead = sub(self.bufferRead, 2)
end
checksign = false
else
local x,y = string.find(self.bufferRead, pat)
if not x then
break
else
_buffer = _buffer .. sub(self.bufferRead, 1, y)
self.bufferRead = sub(self.bufferRead, y + 1)
end
end
end
return #_buffer > 0 and (sign .. _buffer) or nil
end
while true do
if len(self.bufferRead) == 0 or len(self.bufferRead) < minbuf then
local result, reason = readChunk()
if not result then
if reason then
return nil, reason
else -- eof
return #buffer > 0 and tonumber(buffer) or nil
end
end
end
-- these ifs are here so we run the buffer check above
if first then
local sign = sub(self.bufferRead, 1, 1)
if sign == "+" or sign == "-" then
-- "eat" the sign (Rio Lua behaviour)
buffer = buffer .. sub(self.bufferRead, 1, 1)
self.bufferRead = sub(self.bufferRead, 2)
end
local hextag = sub(self.bufferRead, 1, 2)
if hextag == "0x" or hextag == "0X" then
pat = "^[0-9A-Fa-f]+"
-- "eat" the 0x, see https://gist.github.com/SoniEx2/570a363d81b743353151
buffer = buffer .. sub(self.bufferRead, 1, 2)
self.bufferRead = sub(self.bufferRead, 3)
hex = true
end
minbuf = 0
first = false
elseif decimal then
local sep = sub(self.bufferRead, 1, 1)
if sep == "." then
buffer = buffer .. sep
self.bufferRead = sub(self.bufferRead, 2)
local temp = readnum(false) -- no sign
if temp then
buffer = buffer .. temp
end
end
if not tonumber(buffer) then break end
decimal = false
last = true
minbuf = 1
elseif last then
local tag = sub(self.bufferRead, 1, 1)
if hex and (tag == "p" or tag == "P") then
local temp = sub(self.bufferRead, 1, 1)
self.bufferRead = sub(self.bufferRead, 2)
local temp2 = readnum(true) -- this eats the next sign if any
if temp2 then
buffer = buffer .. temp .. temp2
end
elseif tag == "e" or tag == "E" then
local temp = sub(self.bufferRead, 1, 1)
self.bufferRead = sub(self.bufferRead, 2)
local temp2 = readnum(true) -- this eats the next sign if any
if temp2 then
buffer = buffer .. temp .. temp2
end
end
break
else
local x,y = string.find(self.bufferRead, pat)
if not x then
minbuf = 1
decimal = true
else
buffer = buffer .. sub(self.bufferRead, 1, y)
self.bufferRead = sub(self.bufferRead, y + 1)
end
end
end
return tonumber(buffer)
end
local function readLine(chop)
local start = 1
while true do
@ -289,7 +163,7 @@ function buffer:read(...)
end
format = unicode.sub(format, 2, 2)
if format == "n" then
return readNumber()
return require("tools/advanced-buffering").readNumber(self, readChunk)
elseif format == "l" then
return readLine(true)
elseif format == "L" then

132
src/main/resources/assets/opencomputers/loot/openos/lib/tools/advanced-buffering.lua Normal file
View File

@ -0,0 +1,132 @@
local unicode = require("unicode")
--for k in pairs(buffer.reads) do print(k, #buffer.reads[k]) end
local adv_buf = {}
function adv_buf.readNumber(self, readChunk)
local len, sub
if self.mode.b then
len = rawlen
sub = string.sub
else
len = unicode.len
sub = unicode.sub
end
local buffer = ""
local first = true
local decimal = false
local last = false
local hex = false
local pat = "^[0-9]+"
local minbuf = 3 -- "+0x" (sign + hexadecimal tag)
-- this function is used to read trailing numbers (1e2, 0x1p2, etc)
local function readnum(checksign)
local _buffer = ""
local sign = ""
while true do
if len(self.bufferRead) == 0 then
local result, reason = readChunk()
if not result then
if reason then
return nil, reason
else -- eof
return #_buffer > 0 and (sign .. _buffer) or nil
end
end
end
if checksign then
local _sign = sub(self.bufferRead, 1, 1)
if _sign == "+" or _sign == "-" then
-- "eat" the sign (Rio Lua behaviour)
sign = sub(self.bufferRead, 1, 1)
self.bufferRead = sub(self.bufferRead, 2)
end
checksign = false
else
local x,y = string.find(self.bufferRead, pat)
if not x then
break
else
_buffer = _buffer .. sub(self.bufferRead, 1, y)
self.bufferRead = sub(self.bufferRead, y + 1)
end
end
end
return #_buffer > 0 and (sign .. _buffer) or nil
end
while true do
if len(self.bufferRead) == 0 or len(self.bufferRead) < minbuf then
local result, reason = readChunk()
if not result then
if reason then
return nil, reason
else -- eof
return #buffer > 0 and tonumber(buffer) or nil
end
end
end
-- these ifs are here so we run the buffer check above
if first then
local sign = sub(self.bufferRead, 1, 1)
if sign == "+" or sign == "-" then
-- "eat" the sign (Rio Lua behaviour)
buffer = buffer .. sub(self.bufferRead, 1, 1)
self.bufferRead = sub(self.bufferRead, 2)
end
local hextag = sub(self.bufferRead, 1, 2)
if hextag == "0x" or hextag == "0X" then
pat = "^[0-9A-Fa-f]+"
-- "eat" the 0x, see https://gist.github.com/SoniEx2/570a363d81b743353151
buffer = buffer .. sub(self.bufferRead, 1, 2)
self.bufferRead = sub(self.bufferRead, 3)
hex = true
end
minbuf = 0
first = false
elseif decimal then
local sep = sub(self.bufferRead, 1, 1)
if sep == "." then
buffer = buffer .. sep
self.bufferRead = sub(self.bufferRead, 2)
local temp = readnum(false) -- no sign
if temp then
buffer = buffer .. temp
end
end
if not tonumber(buffer) then break end
decimal = false
last = true
minbuf = 1
elseif last then
local tag = sub(self.bufferRead, 1, 1)
if hex and (tag == "p" or tag == "P") then
local temp = sub(self.bufferRead, 1, 1)
self.bufferRead = sub(self.bufferRead, 2)
local temp2 = readnum(true) -- this eats the next sign if any
if temp2 then
buffer = buffer .. temp .. temp2
end
elseif tag == "e" or tag == "E" then
local temp = sub(self.bufferRead, 1, 1)
self.bufferRead = sub(self.bufferRead, 2)
local temp2 = readnum(true) -- this eats the next sign if any
if temp2 then
buffer = buffer .. temp .. temp2
end
end
break
else
local x,y = string.find(self.bufferRead, pat)
if not x then
minbuf = 1
decimal = true
else
buffer = buffer .. sub(self.bufferRead, 1, y)
self.bufferRead = sub(self.bufferRead, y + 1)
end
end
end
return tonumber(buffer)
end
return adv_buf

6
src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala
View File

@ -71,14 +71,18 @@ object TextBufferRenderCache extends Callable[Int] with RemovalListener[TileEnti
}
else {
GL11.glCallList(list)
GlStateManager.enableTexture2D()
GlStateManager.depthMask(true)
GlStateManager.color(1, 1, 1)
GlStateManager.color(1, 1, 1, 1)
// Because display lists and the GlStateManager don't like each other, apparently.
GL11.glEnable(GL11.GL_TEXTURE_2D)
RenderState.bindTexture(0)
GL11.glDepthMask(true)
GL11.glColor4f(1, 1, 1, 1)
RenderState.disableBlend()
RenderState.checkError(getClass.getName + ".compileOrDraw: glCallList")
}
}

12
src/main/scala/li/cil/oc/client/renderer/font/TextureFontRenderer.scala
View File

@ -40,9 +40,9 @@ abstract class TextureFontRenderer {
GlStateManager.scale(0.5f, 0.5f, 1)
GlStateManager.depthMask(false)
GL11.glDepthMask(false)
RenderState.makeItBlend()
GlStateManager.disableTexture2D()
GL11.glDisable(GL11.GL_TEXTURE_2D)
RenderState.checkError(getClass.getName + ".drawBuffer: configure state")
@ -69,7 +69,7 @@ abstract class TextureFontRenderer {
RenderState.checkError(getClass.getName + ".drawBuffer: background")
GlStateManager.enableTexture2D()
GL11.glEnable(GL11.GL_TEXTURE_2D)
if (Settings.get.textLinearFiltering) {
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR)
@ -92,7 +92,7 @@ abstract class TextureFontRenderer {
// Check if color changed.
if (col != cfg) {
cfg = col
GlStateManager.color(
GL11.glColor3f(
((cfg & 0xFF0000) >> 16) / 255f,
((cfg & 0x00FF00) >> 8) / 255f,
((cfg & 0x0000FF) >> 0) / 255f)
@ -110,8 +110,8 @@ abstract class TextureFontRenderer {
RenderState.checkError(getClass.getName + ".drawBuffer: foreground")
GlStateManager.bindTexture(0)
GlStateManager.depthMask(true)
GlStateManager.color(1, 1, 1)
GL11.glDepthMask(true)
GL11.glColor3f(1, 1, 1)
RenderState.disableBlend()
RenderState.popAttrib()
GlStateManager.popMatrix()

3
src/main/scala/li/cil/oc/server/network/Node.scala
View File

@ -1,5 +1,6 @@
package li.cil.oc.server.network
import com.google.common.base.Strings
import li.cil.oc.OpenComputers
import li.cil.oc.api
import li.cil.oc.api.network.Environment
@ -68,7 +69,7 @@ trait Node extends ImmutableNode {
def load(nbt: NBTTagCompound) = {
if (nbt.hasKey("address")) {
val newAddress = nbt.getString("address")
if (newAddress != address) network match {
if (!Strings.isNullOrEmpty(newAddress) && newAddress != address) network match {
case wrapper: Network.Wrapper => wrapper.network.remap(this, newAddress)
case _ => address = newAddress
}