feat!: Phoenix and Recrafted support through libcompat

.gitmodules

@@ -4,3 +4,9 @@
 [submodule ".definitions/cc-tweaked"]
 	path = .definitions/cc-tweaked
 	url = https://gitlab.com/carsakiller/cc-tweaked-documentation
+[submodule "vendor/libcompat"]
+	path = vendor/libcompat
+	url = https://github.com/unicornpkg/libcompat
+[submodule "vendor/semver"]
+	path = vendor/semver.lua
+	url = https://github.com/kikito/semver.lua

Justfile

@@ -1,5 +1,9 @@
 #!/usr/bin/env just --justfile
 
+set export
+
+COMPUTER_ID := "1970301799" # 'upkg' in octal
+
 default: lint
 
 lint:
@@ -14,3 +18,30 @@ docs:
 
 sync:
 	git pull --rebase; git push
+
+# install lib and vendored dependencies to CraftOS-PC computer #1970301799
+craftos-install:
+  #!/usr/bin/env sh
+  if [ $(uname) = "Darwin" ]; then
+    datadir="$HOME/Library/Application Support/CraftOS-PC"
+  else
+    datadir="$HOME/.craftos-pc"
+  fi
+
+  computerdir="$datadir/computer/$COMPUTER_ID"
+
+  mkdir -p "$computerdir/lib"
+
+  [ -L "$computerdir/lib/unicorn" ] && rm "$computerdir/lib/unicorn"
+  [ -L "$computerdir/lib/libcompat.lua" ] && rm "$computerdir/lib/libcompat.lua"
+  [ -L "$computerdir/lib/semver.lua" ] && rm "$computerdir/lib/semver.lua"
+  ln -s "$(pwd)/unicorn" "$computerdir/lib/unicorn"
+  ln -s "$(pwd)/vendor/libcompat/libcompat.lua" "$computerdir/lib/libcompat.lua"
+  ln -s "$(pwd)/vendor/semver/semver.lua" "$computerdir/lib/semver.lua"
+
+# run computer #1970301799 in CraftOS-PC
+craftos-run:
+  #!/usr/bin/env sh
+
+  craftos --id $COMPUTER_ID
+

README.md

@@ -3,3 +3,6 @@
 The primary library and reference implementation for [unicornpkg](https://unicornpkg.madefor.cc).
 
 Please see the documentation for more information.
+
+## Dependencies
+This library requires the [`semver.lua`](https://github.com/kikito/semver.lua) and [`libcompat`](https://github.com/unicornpkg/libcompat) libraries.

unicorn/core.lua

@@ -2,6 +2,7 @@
 -- @module unicorn.core
 
 package.path = "/lib/?.lua;/lib/?;/lib/?/init.lua;" .. package.path
+local stdlib = require("libcompat")
 local unicorn = {}
 unicorn.core = {}
 unicorn.util = require("unicorn.util")
@@ -10,15 +11,10 @@ local sha256 = _G.sha256 or require("sha256") -- Some servers provide access to
 
 -- better handling of globals with Lua diagnostics
 -- @diagnostic disable:undefined-global
-local fs = fs
-local textutils = textutils
+local fs = stdlib.fs
+local textutils = stdlib.textutils
 -- @diagnostic enable:undefined-global
 
-if _HOST:find("Recrafted") then -- Recrafted support
-	fs = require("fs")
-	textutils = require("textutils")
-end
-
 local function is_installed(package_name)
 	if fs.exists("/etc/unicorn/packages/installed/" .. package_name) then
 		return true

unicorn/remote.lua

@@ -2,6 +2,7 @@
 -- @module unicorn.remote
 
 package.path = "/lib/?.lua;/lib/?;/lib/?/init.lua;" .. package.path
+local stdlib = require("libcompat")
 local unicorn = {}
 unicorn.core = require("unicorn.core")
 unicorn.util = require("unicorn.util")
@@ -12,12 +13,12 @@ function unicorn.remote.install(package_name)
 	while not downloaded do
 		-- TODO: Change the variable names into something more descriptive
 		-- TODO: Split this into smaller local functions
-		for _, v0 in pairs(fs.list("/etc/unicorn/remotes/")) do
-			if not fs.isDir("/etc/unicorn/remotes/" .. v0) then
-				local v1 = fs.open("/etc/unicorn/remotes/" .. v0, "r")
+		for _, v0 in pairs(stdlib.fs.list("/etc/unicorn/remotes/")) do
+			if not stdlib.fs.isDir("/etc/unicorn/remotes/" .. v0) then
+				local v1 = stdlib.fs.open("/etc/unicorn/remotes/" .. v0, "r")
 				local v2 = v1.readLine()
 				local v3 = v2:gsub("https://", "") -- have to remove the https:// prefix because fs.combine does weird stuff with it if it's left in
-				local v4 = fs.combine(v3, package_name .. ".lua")
+				local v4 = stdlib.fs.combine(v3, package_name .. ".lua")
 				local v5 = "https://" .. v4
 				local response, httpError = unicorn.util.smartHttp(v5)
 				if httpError then

unicorn/util.lua

@@ -1,6 +1,7 @@
 --- Utility functions for use with unicornpkg.
 -- @module unicorn.util
-
+package.path = "/lib/?.lua;/lib/?;/lib/?/init.lua;" .. package.path
+local stdlib = require("libcompat")
 local unicorn = {}
 unicorn.util = {}
 
@@ -16,7 +17,7 @@ end
 -- @param url string A valid HTTP or HTTPS URL.
 function unicorn.util.smartHttp(url)
 	print("Connecting to " .. url .. "... ")
-	local response, httpError = http.get(url)
+	local response, httpError = stdlib.http.get(url)
 
 	if response then
 		print("HTTP success.")
@@ -34,7 +35,7 @@ end
 -- @param path string The full path of the file to be written.
 function unicorn.util.fileWrite(content, path)
 	if content then -- Checking to m @ake sure content is there, to prevent writing an empty file
-		local file1 = fs.open(path, "w")
+		local file1 = stdlib.fs.open(path, "w")
 		file1.write(content)
 		file1.flush()
 	else

vendor/README.md

@@ -0,0 +1,3 @@
+# `/vender`
+
+This folder contains vendored dependencies for use in an offline developer environment.