From b50d3872eebfcd2d2b34f323dea5d7842b31384e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 27 May 2016 13:32:12 +0200 Subject: [PATCH] Moved all the things! Renamed all the things! Broke all the things! Made most component ROMs into loot disks (except robot for hopefully obvious reasons). Changed loot disk naming convention (this will break existing loot disks). Closes #1456. Made all loot disks craftable by cycling through them by crafting one with a wrench (so e.g. craft OpenOS then cycle through). --- .../assets/opencomputers/loot/README.md | 2 +- .../loot/{Builder => builder}/build.lua | 0 .../loot/{Builder => builder}/build.man | 0 .../loot/{Builder => builder}/example.plan | 0 .../{lua/component => loot}/data/.autorun.lua | 0 .../loot/{Plan9k/usr => data}/bin/base64.lua | 0 .../loot/{Plan9k/usr => data}/bin/deflate.lua | 0 .../{lua/component => loot}/data/bin/gpg.lua | 0 .../loot/{Plan9k/usr => data}/bin/inflate.lua | 0 .../component => loot}/data/bin/md5sum.lua | 54 ++++++------ .../{Plan9k/usr => data}/bin/sha256sum.lua | 0 .../loot/{Plan9k/usr => data}/lib/data.lua | 0 .../loot/{TheDig => dig}/dig.lua | 0 .../loot/{TheDig => dig}/dig.man | 0 .../component => loot}/generator/.autorun.lua | 0 .../generator/bin/refuel.lua | 0 .../component => loot}/internet/.autorun.lua | 0 .../internet/bin/pastebin.lua | 0 .../component => loot}/internet/bin/wget.lua | 0 .../internet/lib/internet.lua | 0 .../internet/usr/man/pastebin | 0 .../component => loot}/internet/usr/man/wget | 0 .../loot/{OpenIRC => irc}/irc.lua | 0 .../assets/opencomputers/loot/loot.properties | 30 ++++--- .../loot/{MazeGen => maze}/maze.lua | 0 .../loot/{MazeGen => maze}/maze.man | 0 .../loot/{Network => network}/autorun.lua | 0 .../{Network => network}/data/bin/arp.lua | 0 .../data/bin/ifconfig.lua | 0 .../{Network => network}/data/bin/ping.lua | 0 .../{Network => network}/data/bin/route.lua | 0 .../data/boot/80_network.lua | 0 .../data/boot/95_hostname.lua | 0 .../{Network => network}/data/lib/network.lua | 0 .../data/lib/network/loopback.lua | 0 .../data/lib/network/modem.lua | 0 .../data/lib/network/tunnel.lua | 0 .../{Network => network}/data/usr/bin/nc.lua | 0 .../data/usr/man/ifconfig | 0 .../{Network => network}/data/usr/man/network | 0 .../{Network => network}/data/usr/man/ping | 0 .../{Network => network}/installNetwork.lua | 0 .../loot/{Network => network}/protocol | 0 .../{OpenLoader => openloader}/OpenLoader.man | 0 .../{OpenLoader => openloader}/autorun.lua | 0 .../bin/opl-flash.lua | 0 .../loot/{OpenLoader => openloader}/init.lua | 0 .../loot/{OpenOS => openos}/.osprop | 0 .../loot/{OpenOS => openos}/bin/address.lua | 0 .../loot/{OpenOS => openos}/bin/alias.lua | 0 .../loot/{OpenOS => openos}/bin/cat.lua | 0 .../loot/{OpenOS => openos}/bin/cd.lua | 0 .../loot/{OpenOS => openos}/bin/clear.lua | 0 .../{OpenOS => openos}/bin/components.lua | 0 .../loot/{OpenOS => openos}/bin/cp.lua | 0 .../loot/{OpenOS => openos}/bin/date.lua | 0 .../loot/{OpenOS => openos}/bin/df.lua | 0 .../loot/{OpenOS => openos}/bin/dmesg.lua | 0 .../loot/{OpenOS => openos}/bin/du.lua | 0 .../loot/{OpenOS => openos}/bin/echo.lua | 0 .../loot/{OpenOS => openos}/bin/edit.lua | 0 .../loot/{OpenOS => openos}/bin/find.lua | 0 .../loot/{OpenOS => openos}/bin/flash.lua | 0 .../loot/{OpenOS => openos}/bin/grep.lua | 0 .../loot/{OpenOS => openos}/bin/head.lua | 0 .../loot/{OpenOS => openos}/bin/hostname.lua | 0 .../loot/{OpenOS => openos}/bin/install.lua | 0 .../loot/{OpenOS => openos}/bin/label.lua | 0 .../loot/{OpenOS => openos}/bin/ln.lua | 0 .../loot/{OpenOS => openos}/bin/ls.lua | 0 .../loot/{OpenOS => openos}/bin/lua.lua | 0 .../loot/{OpenOS => openos}/bin/man.lua | 0 .../loot/{OpenOS => openos}/bin/mkdir.lua | 0 .../loot/{OpenOS => openos}/bin/mktmp.lua | 0 .../loot/{OpenOS => openos}/bin/more.lua | 0 .../loot/{OpenOS => openos}/bin/mount.lua | 0 .../loot/{OpenOS => openos}/bin/mv.lua | 0 .../loot/{OpenOS => openos}/bin/primary.lua | 0 .../loot/{OpenOS => openos}/bin/pwd.lua | 0 .../loot/{OpenOS => openos}/bin/rc.lua | 0 .../loot/{OpenOS => openos}/bin/reboot.lua | 0 .../loot/{OpenOS => openos}/bin/redstone.lua | 0 .../{OpenOS => openos}/bin/resolution.lua | 0 .../loot/{OpenOS => openos}/bin/rm.lua | 0 .../loot/{OpenOS => openos}/bin/rmdir.lua | 0 .../loot/{OpenOS => openos}/bin/set.lua | 0 .../loot/{OpenOS => openos}/bin/sh.lua | 0 .../loot/{OpenOS => openos}/bin/shutdown.lua | 0 .../loot/{OpenOS => openos}/bin/sleep.lua | 0 .../loot/{OpenOS => openos}/bin/source.lua | 0 .../loot/{OpenOS => openos}/bin/time.lua | 0 .../loot/{OpenOS => openos}/bin/touch.lua | 0 .../loot/{OpenOS => openos}/bin/umount.lua | 0 .../loot/{OpenOS => openos}/bin/unalias.lua | 0 .../loot/{OpenOS => openos}/bin/unset.lua | 0 .../loot/{OpenOS => openos}/bin/uptime.lua | 0 .../loot/{OpenOS => openos}/bin/useradd.lua | 0 .../loot/{OpenOS => openos}/bin/userdel.lua | 0 .../loot/{OpenOS => openos}/bin/which.lua | 0 .../loot/{OpenOS => openos}/bin/yes.lua | 0 .../loot/{OpenOS => openos}/boot/00_base.lua | 0 .../{OpenOS => openos}/boot/01_process.lua | 0 .../loot/{OpenOS => openos}/boot/02_os.lua | 0 .../loot/{OpenOS => openos}/boot/03_io.lua | 0 .../{OpenOS => openos}/boot/04_component.lua | 0 .../loot/{OpenOS => openos}/boot/10_devfs.lua | 0 .../{OpenOS => openos}/boot/90_filesystem.lua | 0 .../loot/{OpenOS => openos}/boot/91_gpu.lua | 0 .../{OpenOS => openos}/boot/92_keyboard.lua | 0 .../loot/{OpenOS => openos}/boot/93_term.lua | 0 .../loot/{OpenOS => openos}/boot/94_shell.lua | 0 .../loot/{OpenOS => openos}/boot/99_rc.lua | 0 .../loot/{OpenOS => openos}/etc/motd | 0 .../loot/{OpenOS => openos}/etc/profile | 0 .../loot/{OpenOS => openos}/etc/rc.cfg | 0 .../{OpenOS => openos}/etc/rc.d/example.lua | 0 .../loot/{OpenOS => openos}/home/.shrc | 0 .../loot/{OpenOS => openos}/init.lua | 0 .../loot/{OpenOS => openos}/lib/bit32.lua | 0 .../loot/{OpenOS => openos}/lib/buffer.lua | 0 .../loot/{OpenOS => openos}/lib/colors.lua | 0 .../loot/{OpenOS => openos}/lib/devfs.lua | 0 .../loot/{OpenOS => openos}/lib/event.lua | 0 .../{OpenOS => openos}/lib/filesystem.lua | 0 .../loot/{OpenOS => openos}/lib/guid.lua | 0 .../loot/{OpenOS => openos}/lib/io.lua | 0 .../loot/{OpenOS => openos}/lib/keyboard.lua | 0 .../loot/{OpenOS => openos}/lib/note.lua | 0 .../loot/{OpenOS => openos}/lib/package.lua | 0 .../loot/{OpenOS => openos}/lib/pipes.lua | 0 .../loot/{OpenOS => openos}/lib/process.lua | 0 .../loot/{OpenOS => openos}/lib/rc.lua | 0 .../{OpenOS => openos}/lib/serialization.lua | 0 .../loot/{OpenOS => openos}/lib/sh.lua | 0 .../loot/{OpenOS => openos}/lib/shell.lua | 0 .../loot/{OpenOS => openos}/lib/sides.lua | 0 .../loot/{OpenOS => openos}/lib/term.lua | 0 .../loot/{OpenOS => openos}/lib/text.lua | 0 .../lib/tools/delayLookup.lua | 0 .../lib/tools/delayParse.lua | 0 .../lib/tools/keyboard_full.lua | 0 .../{OpenOS => openos}/lib/transforms.lua | 0 .../loot/{OpenOS => openos}/usr/man/address | 0 .../loot/{OpenOS => openos}/usr/man/alias | 0 .../loot/{OpenOS => openos}/usr/man/cat | 0 .../loot/{OpenOS => openos}/usr/man/cd | 0 .../loot/{OpenOS => openos}/usr/man/clear | 0 .../loot/{OpenOS => openos}/usr/man/cp | 0 .../loot/{OpenOS => openos}/usr/man/date | 0 .../loot/{OpenOS => openos}/usr/man/df | 0 .../loot/{OpenOS => openos}/usr/man/dmesg | 0 .../loot/{OpenOS => openos}/usr/man/echo | 0 .../loot/{OpenOS => openos}/usr/man/edit | 0 .../loot/{OpenOS => openos}/usr/man/grep | 0 .../loot/{OpenOS => openos}/usr/man/head | 0 .../loot/{OpenOS => openos}/usr/man/hostname | 0 .../loot/{OpenOS => openos}/usr/man/label | 0 .../loot/{OpenOS => openos}/usr/man/ln | 0 .../loot/{OpenOS => openos}/usr/man/ls | 0 .../loot/{OpenOS => openos}/usr/man/lua | 0 .../loot/{OpenOS => openos}/usr/man/man | 0 .../loot/{OpenOS => openos}/usr/man/mkdir | 0 .../loot/{OpenOS => openos}/usr/man/more | 0 .../loot/{OpenOS => openos}/usr/man/mount | 0 .../loot/{OpenOS => openos}/usr/man/mv | 0 .../loot/{OpenOS => openos}/usr/man/primary | 0 .../loot/{OpenOS => openos}/usr/man/pwd | 0 .../loot/{OpenOS => openos}/usr/man/rc | 0 .../loot/{OpenOS => openos}/usr/man/reboot | 0 .../loot/{OpenOS => openos}/usr/man/redstone | 0 .../{OpenOS => openos}/usr/man/resolution | 0 .../loot/{OpenOS => openos}/usr/man/rm | 0 .../loot/{OpenOS => openos}/usr/man/sh | 0 .../loot/{OpenOS => openos}/usr/man/shutdown | 0 .../loot/{OpenOS => openos}/usr/man/umount | 0 .../loot/{OpenOS => openos}/usr/man/unalias | 0 .../loot/{OpenOS => openos}/usr/man/uptime | 0 .../loot/{OpenOS => openos}/usr/man/useradd | 0 .../loot/{OpenOS => openos}/usr/man/userdel | 0 .../loot/{OpenOS => openos}/usr/man/which | 0 .../loot/{OpenOS => openos}/usr/man/yes | 0 .../{OpenOS => openos}/usr/misc/greetings.txt | 0 .../loot/{OPPM => oppm}/autorun.lua | 0 .../loot/{OPPM => oppm}/etc/oppm.cfg | 0 .../loot/{OPPM => oppm}/oppm.lua | 0 .../loot/{Plan9k => plan9k}/bin/arp.lua | 0 .../loot/{Plan9k => plan9k}/bin/cat.lua | 0 .../loot/{Plan9k => plan9k}/bin/clear.lua | 0 .../{Plan9k => plan9k}/bin/components.lua | 0 .../loot/{Plan9k => plan9k}/bin/cp.lua | 0 .../loot/{Plan9k => plan9k}/bin/dd.lua | 0 .../loot/{Plan9k => plan9k}/bin/df.lua | 0 .../loot/{Plan9k => plan9k}/bin/dmesg.lua | 0 .../loot/{Plan9k => plan9k}/bin/du.lua | 0 .../loot/{Plan9k => plan9k}/bin/echo.lua | 0 .../loot/{Plan9k => plan9k}/bin/edit.lua | 0 .../loot/{Plan9k => plan9k}/bin/getty.lua | 0 .../loot/{Plan9k => plan9k}/bin/hostname.lua | 0 .../loot/{Plan9k => plan9k}/bin/ifconfig.lua | 0 .../loot/{Plan9k => plan9k}/bin/init.lua | 0 .../loot/{Plan9k => plan9k}/bin/install.lua | 0 .../loot/{Plan9k => plan9k}/bin/kill.lua | 0 .../loot/{Plan9k => plan9k}/bin/label.lua | 0 .../loot/{Plan9k => plan9k}/bin/ln.lua | 0 .../loot/{Plan9k => plan9k}/bin/ls.lua | 0 .../loot/{Plan9k => plan9k}/bin/lua.lua | 0 .../loot/{Plan9k => plan9k}/bin/mkdir.lua | 0 .../loot/{Plan9k => plan9k}/bin/more.lua | 0 .../loot/{Plan9k => plan9k}/bin/mount.cow.lua | 0 .../loot/{Plan9k => plan9k}/bin/mount.lua | 0 .../{Plan9k => plan9k}/bin/mount.msdos.lua | 0 .../loot/{Plan9k => plan9k}/bin/mv.lua | 0 .../loot/{Plan9k => plan9k}/bin/passwd.lua | 0 .../loot/{Plan9k => plan9k}/bin/pastebin.lua | 0 .../loot/{Plan9k => plan9k}/bin/ping.lua | 0 .../loot/{Plan9k => plan9k}/bin/ps.lua | 0 .../loot/{Plan9k => plan9k}/bin/pwd.lua | 0 .../loot/{Plan9k => plan9k}/bin/rc.lua | 0 .../loot/{Plan9k => plan9k}/bin/readkey.lua | 0 .../loot/{Plan9k => plan9k}/bin/reboot.lua | 0 .../{Plan9k => plan9k}/bin/resolution.lua | 0 .../loot/{Plan9k => plan9k}/bin/rm.lua | 0 .../loot/{Plan9k => plan9k}/bin/route.lua | 0 .../loot/{Plan9k => plan9k}/bin/sandbox.lua | 0 .../loot/{Plan9k => plan9k}/bin/sh.lua | 0 .../loot/{Plan9k => plan9k}/bin/shutdown.lua | 0 .../loot/{Plan9k => plan9k}/bin/sleep.lua | 0 .../loot/{Plan9k => plan9k}/bin/sshd.lua | 0 .../loot/{Plan9k => plan9k}/bin/tee.lua | 0 .../loot/{Plan9k => plan9k}/bin/touch.lua | 0 .../loot/{Plan9k => plan9k}/bin/uptime.lua | 0 .../loot/{Plan9k => plan9k}/bin/watch.lua | 0 .../loot/{Plan9k => plan9k}/bin/wc.lua | 0 .../loot/{Plan9k => plan9k}/bin/wget.lua | 0 .../loot/{Plan9k => plan9k}/boot/kernel/pipes | 0 .../etc/rc.d/autoupdate.lua | 0 .../loot/{Plan9k => plan9k}/etc/rc.d/sshd.lua | 0 .../loot/{Plan9k => plan9k}/init.lua | 0 .../loot/{Plan9k => plan9k}/lib/event.lua | 0 .../loot/{Plan9k => plan9k}/lib/internet.lua | 0 .../lib/modules/base/01_gc.lua | 0 .../lib/modules/base/01_util.lua | 0 .../lib/modules/base/02_cmd.lua | 0 .../lib/modules/base/05_vfs.lua | 0 .../lib/modules/base/06_cowfs.lua | 0 .../lib/modules/base/09_rootfs.lua | 0 .../lib/modules/base/10_devfs.lua | 0 .../lib/modules/base/10_procfs.lua | 0 .../lib/modules/base/15_keventd.lua | 0 .../lib/modules/base/15_userspace.lua | 0 .../lib/modules/base/16_buffer.lua | 0 .../lib/modules/base/16_component.lua | 0 .../lib/modules/base/16_require.lua | 0 .../lib/modules/base/17_chatbox.lua | 0 .../lib/modules/base/17_data.lua | 0 .../lib/modules/base/17_drive.lua | 0 .../lib/modules/base/17_eeprom.lua | 0 .../lib/modules/base/17_io.lua | 0 .../lib/modules/base/17_ipc.lua | 0 .../lib/modules/base/17_keyboard.lua | 0 .../lib/modules/base/17_network.lua | 0 .../lib/modules/base/17_nfc.lua | 0 .../lib/modules/base/17_tape.lua | 0 .../lib/modules/base/18_pty.lua | 0 .../lib/modules/base/18_syscall.lua | 0 .../lib/modules/base/19_cgroups.lua | 0 .../lib/modules/base/19_libnetwork.lua | 0 .../lib/modules/base/19_manageg.lua | 0 .../lib/modules/base/20_threading.lua | 0 .../lib/modules/base/21_threadUtil.lua | 0 .../lib/modules/base/21_timer.lua | 0 .../lib/modules/base/25_init.lua | 0 .../lib/modules/network/loopback.lua | 0 .../lib/modules/network/modem.lua | 0 .../lib/modules/network/tunnel.lua | 0 .../loot/{Plan9k => plan9k}/lib/msdosfs.lua | 0 .../loot/{Plan9k => plan9k}/lib/rc.lua | 0 .../{Plan9k => plan9k}/lib/serialization.lua | 0 .../loot/{Plan9k => plan9k}/lib/shell.lua | 0 .../loot/{Plan9k => plan9k}/lib/term.lua | 0 .../loot/{Plan9k => plan9k}/lib/text.lua | 0 .../data => loot/plan9k/usr}/bin/base64.lua | 84 +++++++++---------- .../data => loot/plan9k/usr}/bin/deflate.lua | 50 +++++------ .../loot/{Plan9k => plan9k}/usr/bin/gpg.lua | 0 .../data => loot/plan9k/usr}/bin/inflate.lua | 50 +++++------ .../{Plan9k => plan9k}/usr/bin/md5sum.lua | 0 .../{Plan9k => plan9k}/usr/bin/mkdosfs.lua | 0 .../loot/{Plan9k => plan9k}/usr/bin/mpt.lua | 0 .../loot/{Plan9k => plan9k}/usr/bin/nc.lua | 0 .../plan9k/usr}/bin/sha256sum.lua | 54 ++++++------ .../loot/{Plan9k => plan9k}/usr/bin/ssh.lua | 0 .../data => loot/plan9k/usr}/lib/data.lua | 52 ++++++------ .../loot/{Plan9k => plan9k}/usr/man/pipes | 0 .../usr/sbin/sshsession.lua | 0 .../{Plan9k => plan9k}/var/lib/mpt/config.db | 0 .../{Plan9k => plan9k}/var/lib/mpt/mpt.db | 0 .../opencomputers/recipes/default.recipes | 4 +- src/main/scala/li/cil/oc/Constants.scala | 2 +- .../scala/li/cil/oc/common/EventHandler.scala | 16 ++++ src/main/scala/li/cil/oc/common/Loot.scala | 26 +++--- .../common/recipe/LootDiskCyclingRecipe.scala | 40 +++++++++ .../li/cil/oc/common/recipe/Recipes.scala | 43 ++++++---- .../recipes/LootDiskProgrammableRecipe.scala | 2 +- .../scala/li/cil/oc/server/PacketSender.scala | 2 +- .../li/cil/oc/server/component/DataCard.scala | 33 -------- .../oc/server/component/InternetCard.scala | 49 +++++------ .../server/component/UpgradeGenerator.scala | 20 +---- 307 files changed, 316 insertions(+), 297 deletions(-) rename src/main/resources/assets/opencomputers/loot/{Builder => builder}/build.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Builder => builder}/build.man (100%) rename src/main/resources/assets/opencomputers/loot/{Builder => builder}/example.plan (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/data/.autorun.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k/usr => data}/bin/base64.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k/usr => data}/bin/deflate.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/data/bin/gpg.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k/usr => data}/bin/inflate.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/data/bin/md5sum.lua (96%) rename src/main/resources/assets/opencomputers/loot/{Plan9k/usr => data}/bin/sha256sum.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k/usr => data}/lib/data.lua (100%) rename src/main/resources/assets/opencomputers/loot/{TheDig => dig}/dig.lua (100%) rename src/main/resources/assets/opencomputers/loot/{TheDig => dig}/dig.man (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/generator/.autorun.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/generator/bin/refuel.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/internet/.autorun.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/internet/bin/pastebin.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/internet/bin/wget.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/internet/lib/internet.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/internet/usr/man/pastebin (100%) rename src/main/resources/assets/opencomputers/{lua/component => loot}/internet/usr/man/wget (100%) rename src/main/resources/assets/opencomputers/loot/{OpenIRC => irc}/irc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{MazeGen => maze}/maze.lua (100%) rename src/main/resources/assets/opencomputers/loot/{MazeGen => maze}/maze.man (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/autorun.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/bin/arp.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/bin/ifconfig.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/bin/ping.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/bin/route.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/boot/80_network.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/boot/95_hostname.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/lib/network.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/lib/network/loopback.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/lib/network/modem.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/lib/network/tunnel.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/usr/bin/nc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/usr/man/ifconfig (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/usr/man/network (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/data/usr/man/ping (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/installNetwork.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Network => network}/protocol (100%) rename src/main/resources/assets/opencomputers/loot/{OpenLoader => openloader}/OpenLoader.man (100%) rename src/main/resources/assets/opencomputers/loot/{OpenLoader => openloader}/autorun.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenLoader => openloader}/bin/opl-flash.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenLoader => openloader}/init.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/.osprop (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/address.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/alias.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/cat.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/cd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/clear.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/components.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/cp.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/date.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/df.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/dmesg.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/du.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/echo.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/edit.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/find.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/flash.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/grep.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/head.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/hostname.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/install.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/label.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/ln.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/ls.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/lua.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/man.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/mkdir.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/mktmp.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/more.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/mount.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/mv.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/primary.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/pwd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/rc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/reboot.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/redstone.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/resolution.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/rm.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/rmdir.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/set.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/sh.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/shutdown.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/sleep.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/source.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/time.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/touch.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/umount.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/unalias.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/unset.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/uptime.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/useradd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/userdel.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/which.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/bin/yes.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/00_base.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/01_process.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/02_os.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/03_io.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/04_component.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/10_devfs.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/90_filesystem.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/91_gpu.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/92_keyboard.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/93_term.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/94_shell.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/boot/99_rc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/etc/motd (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/etc/profile (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/etc/rc.cfg (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/etc/rc.d/example.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/home/.shrc (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/init.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/bit32.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/buffer.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/colors.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/devfs.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/event.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/filesystem.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/guid.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/io.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/keyboard.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/note.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/package.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/pipes.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/process.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/rc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/serialization.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/sh.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/shell.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/sides.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/term.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/text.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/tools/delayLookup.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/tools/delayParse.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/tools/keyboard_full.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/lib/transforms.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/address (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/alias (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/cat (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/cd (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/clear (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/cp (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/date (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/df (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/dmesg (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/echo (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/edit (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/grep (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/head (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/hostname (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/label (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/ln (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/ls (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/lua (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/man (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/mkdir (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/more (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/mount (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/mv (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/primary (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/pwd (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/rc (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/reboot (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/redstone (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/resolution (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/rm (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/sh (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/shutdown (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/umount (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/unalias (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/uptime (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/useradd (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/userdel (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/which (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/man/yes (100%) rename src/main/resources/assets/opencomputers/loot/{OpenOS => openos}/usr/misc/greetings.txt (100%) rename src/main/resources/assets/opencomputers/loot/{OPPM => oppm}/autorun.lua (100%) rename src/main/resources/assets/opencomputers/loot/{OPPM => oppm}/etc/oppm.cfg (100%) rename src/main/resources/assets/opencomputers/loot/{OPPM => oppm}/oppm.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/arp.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/cat.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/clear.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/components.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/cp.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/dd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/df.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/dmesg.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/du.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/echo.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/edit.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/getty.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/hostname.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/ifconfig.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/init.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/install.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/kill.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/label.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/ln.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/ls.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/lua.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/mkdir.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/more.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/mount.cow.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/mount.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/mount.msdos.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/mv.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/passwd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/pastebin.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/ping.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/ps.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/pwd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/rc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/readkey.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/reboot.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/resolution.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/rm.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/route.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/sandbox.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/sh.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/shutdown.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/sleep.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/sshd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/tee.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/touch.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/uptime.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/watch.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/wc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/bin/wget.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/boot/kernel/pipes (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/etc/rc.d/autoupdate.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/etc/rc.d/sshd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/init.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/event.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/internet.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/01_gc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/01_util.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/02_cmd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/05_vfs.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/06_cowfs.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/09_rootfs.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/10_devfs.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/10_procfs.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/15_keventd.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/15_userspace.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/16_buffer.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/16_component.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/16_require.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_chatbox.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_data.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_drive.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_eeprom.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_io.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_ipc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_keyboard.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_network.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_nfc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/17_tape.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/18_pty.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/18_syscall.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/19_cgroups.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/19_libnetwork.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/19_manageg.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/20_threading.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/21_threadUtil.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/21_timer.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/base/25_init.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/network/loopback.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/network/modem.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/modules/network/tunnel.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/msdosfs.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/rc.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/serialization.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/shell.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/term.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/lib/text.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component/data => loot/plan9k/usr}/bin/base64.lua (95%) rename src/main/resources/assets/opencomputers/{lua/component/data => loot/plan9k/usr}/bin/deflate.lua (95%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/usr/bin/gpg.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component/data => loot/plan9k/usr}/bin/inflate.lua (95%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/usr/bin/md5sum.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/usr/bin/mkdosfs.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/usr/bin/mpt.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/usr/bin/nc.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component/data => loot/plan9k/usr}/bin/sha256sum.lua (96%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/usr/bin/ssh.lua (100%) rename src/main/resources/assets/opencomputers/{lua/component/data => loot/plan9k/usr}/lib/data.lua (96%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/usr/man/pipes (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/usr/sbin/sshsession.lua (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/var/lib/mpt/config.db (100%) rename src/main/resources/assets/opencomputers/loot/{Plan9k => plan9k}/var/lib/mpt/mpt.db (100%) create mode 100644 src/main/scala/li/cil/oc/common/recipe/LootDiskCyclingRecipe.scala diff --git a/src/main/resources/assets/opencomputers/loot/README.md b/src/main/resources/assets/opencomputers/loot/README.md index a0da8107a..05528523a 100644 --- a/src/main/resources/assets/opencomputers/loot/README.md +++ b/src/main/resources/assets/opencomputers/loot/README.md @@ -7,4 +7,4 @@ To add a disk, create a folder and put the files the disk should contain into th You are invited to submit your own programs as pull requests! The more the merrier :-) -For example, say you have a program named "chat.lua". You'd create a folder, say `NetChat` or whatever the program likes to call itself, and put the `chat.lua` file into that folder. You then add the line `NetChat=chat` to the `loot.properties` file. And that's it. Make a pull request and your program is in OpenComputers - unless it fails the arbitrary quality check, of course. Feel free to submit pull requests for fixes to your submitted programs (or of others) at any time! +For example, say you have a program named "chat.lua". You'd create a folder, say `netchat` or whatever the program likes to call itself, and put the `chat.lua` file into that folder. You then add the line `netchat=NetChat` to the `loot.properties` file. And that's it. Make a pull request and your program is in OpenComputers - unless it fails the arbitrary quality check, of course. Feel free to submit pull requests for fixes to your submitted programs (or of others) at any time! diff --git a/src/main/resources/assets/opencomputers/loot/Builder/build.lua b/src/main/resources/assets/opencomputers/loot/builder/build.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Builder/build.lua rename to src/main/resources/assets/opencomputers/loot/builder/build.lua diff --git a/src/main/resources/assets/opencomputers/loot/Builder/build.man b/src/main/resources/assets/opencomputers/loot/builder/build.man similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Builder/build.man rename to src/main/resources/assets/opencomputers/loot/builder/build.man diff --git a/src/main/resources/assets/opencomputers/loot/Builder/example.plan b/src/main/resources/assets/opencomputers/loot/builder/example.plan similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Builder/example.plan rename to src/main/resources/assets/opencomputers/loot/builder/example.plan diff --git a/src/main/resources/assets/opencomputers/lua/component/data/.autorun.lua b/src/main/resources/assets/opencomputers/loot/data/.autorun.lua similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/data/.autorun.lua rename to src/main/resources/assets/opencomputers/loot/data/.autorun.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/base64.lua b/src/main/resources/assets/opencomputers/loot/data/bin/base64.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/base64.lua rename to src/main/resources/assets/opencomputers/loot/data/bin/base64.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/deflate.lua b/src/main/resources/assets/opencomputers/loot/data/bin/deflate.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/deflate.lua rename to src/main/resources/assets/opencomputers/loot/data/bin/deflate.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/data/bin/gpg.lua b/src/main/resources/assets/opencomputers/loot/data/bin/gpg.lua similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/data/bin/gpg.lua rename to src/main/resources/assets/opencomputers/loot/data/bin/gpg.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/inflate.lua b/src/main/resources/assets/opencomputers/loot/data/bin/inflate.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/inflate.lua rename to src/main/resources/assets/opencomputers/loot/data/bin/inflate.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/data/bin/md5sum.lua b/src/main/resources/assets/opencomputers/loot/data/bin/md5sum.lua similarity index 96% rename from src/main/resources/assets/opencomputers/lua/component/data/bin/md5sum.lua rename to src/main/resources/assets/opencomputers/loot/data/bin/md5sum.lua index ebdb3ba2c..65c45a962 100644 --- a/src/main/resources/assets/opencomputers/lua/component/data/bin/md5sum.lua +++ b/src/main/resources/assets/opencomputers/loot/data/bin/md5sum.lua @@ -1,27 +1,27 @@ -local shell = require("shell") -local data = require("data") - -local args = shell.parse(...) -if #args == 0 then - local read = "" - repeat - local current = io.read("*a") - read = read .. current - until current ~= "" - io.write(data.toHex(data.md5(read))) -else - for i = 1, #args do - local read = "" - local file, reason = io.open(shell.resolve(args[i])) - if not file then - io.stderr:write(tostring(reason) .. "\n") - os.exit(false) - end - repeat - local current = file:read("*a") - read = read .. current - until current ~= "" - file:close() - io.write(data.toHex(data.md5(read)) .. "\t".. args[i] .. "\n") - end -end +local shell = require("shell") +local data = require("data") + +local args = shell.parse(...) +if #args == 0 then + local read = "" + repeat + local current = io.read("*a") + read = read .. current + until current ~= "" + io.write(data.toHex(data.md5(read))) +else + for i = 1, #args do + local read = "" + local file, reason = io.open(shell.resolve(args[i])) + if not file then + io.stderr:write(tostring(reason) .. "\n") + os.exit(false) + end + repeat + local current = file:read("*a") + read = read .. current + until current ~= "" + file:close() + io.write(data.toHex(data.md5(read)) .. "\t".. args[i] .. "\n") + end +end diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/sha256sum.lua b/src/main/resources/assets/opencomputers/loot/data/bin/sha256sum.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/sha256sum.lua rename to src/main/resources/assets/opencomputers/loot/data/bin/sha256sum.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/lib/data.lua b/src/main/resources/assets/opencomputers/loot/data/lib/data.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/lib/data.lua rename to src/main/resources/assets/opencomputers/loot/data/lib/data.lua diff --git a/src/main/resources/assets/opencomputers/loot/TheDig/dig.lua b/src/main/resources/assets/opencomputers/loot/dig/dig.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/TheDig/dig.lua rename to src/main/resources/assets/opencomputers/loot/dig/dig.lua diff --git a/src/main/resources/assets/opencomputers/loot/TheDig/dig.man b/src/main/resources/assets/opencomputers/loot/dig/dig.man similarity index 100% rename from src/main/resources/assets/opencomputers/loot/TheDig/dig.man rename to src/main/resources/assets/opencomputers/loot/dig/dig.man diff --git a/src/main/resources/assets/opencomputers/lua/component/generator/.autorun.lua b/src/main/resources/assets/opencomputers/loot/generator/.autorun.lua similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/generator/.autorun.lua rename to src/main/resources/assets/opencomputers/loot/generator/.autorun.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/generator/bin/refuel.lua b/src/main/resources/assets/opencomputers/loot/generator/bin/refuel.lua similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/generator/bin/refuel.lua rename to src/main/resources/assets/opencomputers/loot/generator/bin/refuel.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/internet/.autorun.lua b/src/main/resources/assets/opencomputers/loot/internet/.autorun.lua similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/internet/.autorun.lua rename to src/main/resources/assets/opencomputers/loot/internet/.autorun.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/internet/bin/pastebin.lua b/src/main/resources/assets/opencomputers/loot/internet/bin/pastebin.lua similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/internet/bin/pastebin.lua rename to src/main/resources/assets/opencomputers/loot/internet/bin/pastebin.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/internet/bin/wget.lua b/src/main/resources/assets/opencomputers/loot/internet/bin/wget.lua similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/internet/bin/wget.lua rename to src/main/resources/assets/opencomputers/loot/internet/bin/wget.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/internet/lib/internet.lua b/src/main/resources/assets/opencomputers/loot/internet/lib/internet.lua similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/internet/lib/internet.lua rename to src/main/resources/assets/opencomputers/loot/internet/lib/internet.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/internet/usr/man/pastebin b/src/main/resources/assets/opencomputers/loot/internet/usr/man/pastebin similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/internet/usr/man/pastebin rename to src/main/resources/assets/opencomputers/loot/internet/usr/man/pastebin diff --git a/src/main/resources/assets/opencomputers/lua/component/internet/usr/man/wget b/src/main/resources/assets/opencomputers/loot/internet/usr/man/wget similarity index 100% rename from src/main/resources/assets/opencomputers/lua/component/internet/usr/man/wget rename to src/main/resources/assets/opencomputers/loot/internet/usr/man/wget diff --git a/src/main/resources/assets/opencomputers/loot/OpenIRC/irc.lua b/src/main/resources/assets/opencomputers/loot/irc/irc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenIRC/irc.lua rename to src/main/resources/assets/opencomputers/loot/irc/irc.lua diff --git a/src/main/resources/assets/opencomputers/loot/loot.properties b/src/main/resources/assets/opencomputers/loot/loot.properties index 22fc94ac4..aab1c027a 100644 --- a/src/main/resources/assets/opencomputers/loot/loot.properties +++ b/src/main/resources/assets/opencomputers/loot/loot.properties @@ -5,15 +5,21 @@ # weight 2 is two times as likely to be generated than an item with # weight 1. Weight 0 means it will not spawn at all. #The color defaults to gray. It must be a dye's ore-dict name. -Builder=build:1:dyeYellow -MazeGen=maze:1:dyeOrange -Network=network:1:dyeLime -Plan9k=plan9k:1:dyeRed -OpenIRC=irc:1:dyeLightBlue -OpenLoader=openloader:1:dyeMagenta -OpenOS=openOS:0:dyeGreen -OPPM=oppm:0:dyeCyan -# Higher chance to find the dig program, because it has the most immediate -# use - OpenOS is craftable and IRC can be downloaded once an internet card -# is available - which one needs anyway, to use the program... -TheDig=dig:2:dyeBrown + +# General purpose. +network=Network (Network Stack):1:dyeLime +plan9k=Plan9k (Operating System):1:dyeRed +irc=OpenIRC (IRC Client):1:dyeLightBlue +openloader=OpenLoader (Boot Loader):1:dyeMagenta +openos=OpenOS (Operating System):0:dyeGreen +oppm=OPPM (Package Manager):0:dyeCyan + +# Robot utilities. +builder=Builder:1:dyeYellow +dig=Digger:2:dyeBrown +maze=Mazer:1:dyeOrange + +# Drivers for components. +data=Data Card Software:0:dyePink +generator=Generator Upgrade Software:0:dyePurple +internet=Internet Card Software:0:dyeBlue \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/loot/MazeGen/maze.lua b/src/main/resources/assets/opencomputers/loot/maze/maze.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/MazeGen/maze.lua rename to src/main/resources/assets/opencomputers/loot/maze/maze.lua diff --git a/src/main/resources/assets/opencomputers/loot/MazeGen/maze.man b/src/main/resources/assets/opencomputers/loot/maze/maze.man similarity index 100% rename from src/main/resources/assets/opencomputers/loot/MazeGen/maze.man rename to src/main/resources/assets/opencomputers/loot/maze/maze.man diff --git a/src/main/resources/assets/opencomputers/loot/Network/autorun.lua b/src/main/resources/assets/opencomputers/loot/network/autorun.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/autorun.lua rename to src/main/resources/assets/opencomputers/loot/network/autorun.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/bin/arp.lua b/src/main/resources/assets/opencomputers/loot/network/data/bin/arp.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/bin/arp.lua rename to src/main/resources/assets/opencomputers/loot/network/data/bin/arp.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/bin/ifconfig.lua b/src/main/resources/assets/opencomputers/loot/network/data/bin/ifconfig.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/bin/ifconfig.lua rename to src/main/resources/assets/opencomputers/loot/network/data/bin/ifconfig.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/bin/ping.lua b/src/main/resources/assets/opencomputers/loot/network/data/bin/ping.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/bin/ping.lua rename to src/main/resources/assets/opencomputers/loot/network/data/bin/ping.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/bin/route.lua b/src/main/resources/assets/opencomputers/loot/network/data/bin/route.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/bin/route.lua rename to src/main/resources/assets/opencomputers/loot/network/data/bin/route.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/boot/80_network.lua b/src/main/resources/assets/opencomputers/loot/network/data/boot/80_network.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/boot/80_network.lua rename to src/main/resources/assets/opencomputers/loot/network/data/boot/80_network.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/boot/95_hostname.lua b/src/main/resources/assets/opencomputers/loot/network/data/boot/95_hostname.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/boot/95_hostname.lua rename to src/main/resources/assets/opencomputers/loot/network/data/boot/95_hostname.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/lib/network.lua b/src/main/resources/assets/opencomputers/loot/network/data/lib/network.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/lib/network.lua rename to src/main/resources/assets/opencomputers/loot/network/data/lib/network.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/lib/network/loopback.lua b/src/main/resources/assets/opencomputers/loot/network/data/lib/network/loopback.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/lib/network/loopback.lua rename to src/main/resources/assets/opencomputers/loot/network/data/lib/network/loopback.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/lib/network/modem.lua b/src/main/resources/assets/opencomputers/loot/network/data/lib/network/modem.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/lib/network/modem.lua rename to src/main/resources/assets/opencomputers/loot/network/data/lib/network/modem.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/lib/network/tunnel.lua b/src/main/resources/assets/opencomputers/loot/network/data/lib/network/tunnel.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/lib/network/tunnel.lua rename to src/main/resources/assets/opencomputers/loot/network/data/lib/network/tunnel.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/usr/bin/nc.lua b/src/main/resources/assets/opencomputers/loot/network/data/usr/bin/nc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/usr/bin/nc.lua rename to src/main/resources/assets/opencomputers/loot/network/data/usr/bin/nc.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/usr/man/ifconfig b/src/main/resources/assets/opencomputers/loot/network/data/usr/man/ifconfig similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/usr/man/ifconfig rename to src/main/resources/assets/opencomputers/loot/network/data/usr/man/ifconfig diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/usr/man/network b/src/main/resources/assets/opencomputers/loot/network/data/usr/man/network similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/usr/man/network rename to src/main/resources/assets/opencomputers/loot/network/data/usr/man/network diff --git a/src/main/resources/assets/opencomputers/loot/Network/data/usr/man/ping b/src/main/resources/assets/opencomputers/loot/network/data/usr/man/ping similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/data/usr/man/ping rename to src/main/resources/assets/opencomputers/loot/network/data/usr/man/ping diff --git a/src/main/resources/assets/opencomputers/loot/Network/installNetwork.lua b/src/main/resources/assets/opencomputers/loot/network/installNetwork.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/installNetwork.lua rename to src/main/resources/assets/opencomputers/loot/network/installNetwork.lua diff --git a/src/main/resources/assets/opencomputers/loot/Network/protocol b/src/main/resources/assets/opencomputers/loot/network/protocol similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Network/protocol rename to src/main/resources/assets/opencomputers/loot/network/protocol diff --git a/src/main/resources/assets/opencomputers/loot/OpenLoader/OpenLoader.man b/src/main/resources/assets/opencomputers/loot/openloader/OpenLoader.man similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenLoader/OpenLoader.man rename to src/main/resources/assets/opencomputers/loot/openloader/OpenLoader.man diff --git a/src/main/resources/assets/opencomputers/loot/OpenLoader/autorun.lua b/src/main/resources/assets/opencomputers/loot/openloader/autorun.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenLoader/autorun.lua rename to src/main/resources/assets/opencomputers/loot/openloader/autorun.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenLoader/bin/opl-flash.lua b/src/main/resources/assets/opencomputers/loot/openloader/bin/opl-flash.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenLoader/bin/opl-flash.lua rename to src/main/resources/assets/opencomputers/loot/openloader/bin/opl-flash.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenLoader/init.lua b/src/main/resources/assets/opencomputers/loot/openloader/init.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenLoader/init.lua rename to src/main/resources/assets/opencomputers/loot/openloader/init.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/.osprop b/src/main/resources/assets/opencomputers/loot/openos/.osprop similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/.osprop rename to src/main/resources/assets/opencomputers/loot/openos/.osprop diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/address.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/address.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/address.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/address.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/alias.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/alias.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/alias.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/alias.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/cat.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/cat.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/cat.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/cat.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/cd.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/cd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/cd.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/cd.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/clear.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/clear.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/clear.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/clear.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/components.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/components.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/components.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/components.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/cp.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/cp.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/cp.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/cp.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/date.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/date.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/date.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/date.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/df.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/df.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/df.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/df.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/dmesg.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/dmesg.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/dmesg.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/dmesg.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/du.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/du.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/du.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/du.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/echo.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/echo.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/echo.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/echo.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/edit.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/edit.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/edit.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/find.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/find.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/find.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/find.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/flash.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/flash.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/flash.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/flash.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/grep.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/grep.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/grep.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/grep.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/head.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/head.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/head.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/head.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/hostname.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/hostname.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/install.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/install.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/install.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/install.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/label.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/label.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/label.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/label.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/ln.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/ln.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/ln.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/ln.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/ls.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/ls.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/ls.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/ls.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/lua.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/lua.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/lua.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/lua.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/man.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/man.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/man.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/man.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/mkdir.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/mkdir.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/mkdir.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/mkdir.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/mktmp.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/mktmp.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/mktmp.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/mktmp.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/more.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/more.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/more.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/more.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/mount.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/mount.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/mount.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/mount.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/mv.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/mv.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/mv.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/mv.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/primary.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/primary.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/primary.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/primary.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/pwd.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/pwd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/pwd.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/pwd.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/rc.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/rc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/rc.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/rc.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/reboot.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/reboot.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/reboot.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/reboot.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/redstone.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/redstone.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/redstone.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/redstone.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/resolution.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/resolution.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/resolution.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/resolution.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/rm.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/rm.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/rm.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/rm.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/rmdir.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/rmdir.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/rmdir.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/rmdir.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/set.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/set.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/set.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/set.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/sh.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/sh.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/shutdown.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/shutdown.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/shutdown.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/shutdown.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/sleep.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/sleep.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/sleep.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/sleep.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/source.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/source.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/source.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/source.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/time.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/time.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/time.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/time.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/touch.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/touch.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/touch.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/touch.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/umount.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/umount.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/umount.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/umount.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/unalias.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/unalias.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/unalias.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/unalias.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/unset.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/unset.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/unset.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/unset.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/uptime.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/uptime.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/uptime.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/uptime.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/useradd.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/useradd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/useradd.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/useradd.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/userdel.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/userdel.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/userdel.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/userdel.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/which.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/which.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/which.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/which.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/yes.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/yes.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/bin/yes.lua rename to src/main/resources/assets/opencomputers/loot/openos/bin/yes.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/00_base.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/00_base.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/00_base.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/00_base.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/01_process.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/01_process.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/01_process.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/01_process.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/02_os.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/02_os.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/03_io.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/03_io.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/03_io.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/03_io.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/04_component.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/04_component.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/04_component.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/04_component.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/10_devfs.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/10_devfs.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/10_devfs.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/10_devfs.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/90_filesystem.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/90_filesystem.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/90_filesystem.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/90_filesystem.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/91_gpu.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/91_gpu.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/91_gpu.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/91_gpu.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/92_keyboard.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/92_keyboard.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/92_keyboard.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/92_keyboard.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/93_term.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/93_term.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/93_term.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/93_term.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/94_shell.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/94_shell.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/99_rc.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/99_rc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/boot/99_rc.lua rename to src/main/resources/assets/opencomputers/loot/openos/boot/99_rc.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/etc/motd b/src/main/resources/assets/opencomputers/loot/openos/etc/motd similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/etc/motd rename to src/main/resources/assets/opencomputers/loot/openos/etc/motd diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/etc/profile b/src/main/resources/assets/opencomputers/loot/openos/etc/profile similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/etc/profile rename to src/main/resources/assets/opencomputers/loot/openos/etc/profile diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/etc/rc.cfg b/src/main/resources/assets/opencomputers/loot/openos/etc/rc.cfg similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/etc/rc.cfg rename to src/main/resources/assets/opencomputers/loot/openos/etc/rc.cfg diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/etc/rc.d/example.lua b/src/main/resources/assets/opencomputers/loot/openos/etc/rc.d/example.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/etc/rc.d/example.lua rename to src/main/resources/assets/opencomputers/loot/openos/etc/rc.d/example.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/home/.shrc b/src/main/resources/assets/opencomputers/loot/openos/home/.shrc similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/home/.shrc rename to src/main/resources/assets/opencomputers/loot/openos/home/.shrc diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/init.lua b/src/main/resources/assets/opencomputers/loot/openos/init.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/init.lua rename to src/main/resources/assets/opencomputers/loot/openos/init.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/bit32.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/bit32.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/bit32.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/bit32.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/buffer.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/buffer.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/buffer.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/buffer.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/colors.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/colors.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/colors.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/colors.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/devfs.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/devfs.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/devfs.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/devfs.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/event.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/event.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/event.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/event.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/filesystem.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/filesystem.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/filesystem.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/filesystem.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/guid.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/guid.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/guid.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/guid.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/io.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/io.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/io.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/io.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/keyboard.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/keyboard.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/keyboard.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/keyboard.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/note.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/note.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/note.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/note.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/package.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/package.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/package.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/package.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/pipes.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/pipes.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/pipes.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/pipes.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/process.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/process.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/process.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/process.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/rc.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/rc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/rc.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/rc.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/serialization.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/serialization.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/serialization.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/serialization.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/sh.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/sh.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/sh.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/sh.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/shell.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/shell.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/shell.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/shell.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/sides.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/sides.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/sides.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/sides.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/term.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/term.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/term.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/term.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/text.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/text.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/text.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/text.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/tools/delayLookup.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/tools/delayLookup.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/tools/delayLookup.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/tools/delayLookup.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/tools/delayParse.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/tools/delayParse.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/tools/delayParse.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/tools/delayParse.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/tools/keyboard_full.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/tools/keyboard_full.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/tools/keyboard_full.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/tools/keyboard_full.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/transforms.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/transforms.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/lib/transforms.lua rename to src/main/resources/assets/opencomputers/loot/openos/lib/transforms.lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/address b/src/main/resources/assets/opencomputers/loot/openos/usr/man/address similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/address rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/address diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/alias b/src/main/resources/assets/opencomputers/loot/openos/usr/man/alias similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/alias rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/alias diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/cat b/src/main/resources/assets/opencomputers/loot/openos/usr/man/cat similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/cat rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/cat diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/cd b/src/main/resources/assets/opencomputers/loot/openos/usr/man/cd similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/cd rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/cd diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/clear b/src/main/resources/assets/opencomputers/loot/openos/usr/man/clear similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/clear rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/clear diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/cp b/src/main/resources/assets/opencomputers/loot/openos/usr/man/cp similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/cp rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/cp diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/date b/src/main/resources/assets/opencomputers/loot/openos/usr/man/date similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/date rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/date diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/df b/src/main/resources/assets/opencomputers/loot/openos/usr/man/df similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/df rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/df diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/dmesg b/src/main/resources/assets/opencomputers/loot/openos/usr/man/dmesg similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/dmesg rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/dmesg diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/echo b/src/main/resources/assets/opencomputers/loot/openos/usr/man/echo similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/echo rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/echo diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/edit b/src/main/resources/assets/opencomputers/loot/openos/usr/man/edit similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/edit rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/edit diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/grep b/src/main/resources/assets/opencomputers/loot/openos/usr/man/grep similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/grep rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/grep diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/head b/src/main/resources/assets/opencomputers/loot/openos/usr/man/head similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/head rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/head diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/hostname b/src/main/resources/assets/opencomputers/loot/openos/usr/man/hostname similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/hostname rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/hostname diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/label b/src/main/resources/assets/opencomputers/loot/openos/usr/man/label similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/label rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/label diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/ln b/src/main/resources/assets/opencomputers/loot/openos/usr/man/ln similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/ln rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/ln diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/ls b/src/main/resources/assets/opencomputers/loot/openos/usr/man/ls similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/ls rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/ls diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/lua b/src/main/resources/assets/opencomputers/loot/openos/usr/man/lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/lua rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/lua diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/man b/src/main/resources/assets/opencomputers/loot/openos/usr/man/man similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/man rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/man diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/mkdir b/src/main/resources/assets/opencomputers/loot/openos/usr/man/mkdir similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/mkdir rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/mkdir diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/more b/src/main/resources/assets/opencomputers/loot/openos/usr/man/more similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/more rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/more diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/mount b/src/main/resources/assets/opencomputers/loot/openos/usr/man/mount similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/mount rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/mount diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/mv b/src/main/resources/assets/opencomputers/loot/openos/usr/man/mv similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/mv rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/mv diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/primary b/src/main/resources/assets/opencomputers/loot/openos/usr/man/primary similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/primary rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/primary diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/pwd b/src/main/resources/assets/opencomputers/loot/openos/usr/man/pwd similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/pwd rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/pwd diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/rc b/src/main/resources/assets/opencomputers/loot/openos/usr/man/rc similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/rc rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/rc diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/reboot b/src/main/resources/assets/opencomputers/loot/openos/usr/man/reboot similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/reboot rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/reboot diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/redstone b/src/main/resources/assets/opencomputers/loot/openos/usr/man/redstone similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/redstone rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/redstone diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/resolution b/src/main/resources/assets/opencomputers/loot/openos/usr/man/resolution similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/resolution rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/resolution diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/rm b/src/main/resources/assets/opencomputers/loot/openos/usr/man/rm similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/rm rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/rm diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/sh b/src/main/resources/assets/opencomputers/loot/openos/usr/man/sh similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/sh rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/sh diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/shutdown b/src/main/resources/assets/opencomputers/loot/openos/usr/man/shutdown similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/shutdown rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/shutdown diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/umount b/src/main/resources/assets/opencomputers/loot/openos/usr/man/umount similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/umount rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/umount diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/unalias b/src/main/resources/assets/opencomputers/loot/openos/usr/man/unalias similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/unalias rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/unalias diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/uptime b/src/main/resources/assets/opencomputers/loot/openos/usr/man/uptime similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/uptime rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/uptime diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/useradd b/src/main/resources/assets/opencomputers/loot/openos/usr/man/useradd similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/useradd rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/useradd diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/userdel b/src/main/resources/assets/opencomputers/loot/openos/usr/man/userdel similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/userdel rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/userdel diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/which b/src/main/resources/assets/opencomputers/loot/openos/usr/man/which similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/which rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/which diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/yes b/src/main/resources/assets/opencomputers/loot/openos/usr/man/yes similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/yes rename to src/main/resources/assets/opencomputers/loot/openos/usr/man/yes diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/misc/greetings.txt b/src/main/resources/assets/opencomputers/loot/openos/usr/misc/greetings.txt similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OpenOS/usr/misc/greetings.txt rename to src/main/resources/assets/opencomputers/loot/openos/usr/misc/greetings.txt diff --git a/src/main/resources/assets/opencomputers/loot/OPPM/autorun.lua b/src/main/resources/assets/opencomputers/loot/oppm/autorun.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OPPM/autorun.lua rename to src/main/resources/assets/opencomputers/loot/oppm/autorun.lua diff --git a/src/main/resources/assets/opencomputers/loot/OPPM/etc/oppm.cfg b/src/main/resources/assets/opencomputers/loot/oppm/etc/oppm.cfg similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OPPM/etc/oppm.cfg rename to src/main/resources/assets/opencomputers/loot/oppm/etc/oppm.cfg diff --git a/src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua b/src/main/resources/assets/opencomputers/loot/oppm/oppm.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/OPPM/oppm.lua rename to src/main/resources/assets/opencomputers/loot/oppm/oppm.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/arp.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/arp.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/arp.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/arp.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/cat.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/cat.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/cat.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/cat.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/clear.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/clear.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/clear.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/clear.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/components.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/components.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/components.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/components.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/cp.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/cp.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/cp.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/cp.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/dd.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/dd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/dd.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/dd.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/df.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/df.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/df.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/df.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/dmesg.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/dmesg.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/dmesg.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/dmesg.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/du.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/du.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/du.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/du.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/echo.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/echo.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/echo.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/echo.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/edit.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/edit.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/edit.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/edit.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/getty.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/getty.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/getty.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/getty.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/hostname.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/hostname.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/hostname.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/hostname.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/ifconfig.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/ifconfig.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/ifconfig.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/ifconfig.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/init.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/init.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/init.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/init.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/install.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/install.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/install.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/install.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/kill.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/kill.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/kill.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/kill.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/label.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/label.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/label.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/label.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/ln.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/ln.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/ln.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/ln.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/ls.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/ls.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/ls.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/ls.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/lua.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/lua.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/lua.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/lua.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/mkdir.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/mkdir.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/mkdir.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/mkdir.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/more.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/more.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/more.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/more.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/mount.cow.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/mount.cow.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/mount.cow.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/mount.cow.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/mount.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/mount.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/mount.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/mount.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/mount.msdos.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/mount.msdos.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/mount.msdos.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/mount.msdos.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/mv.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/mv.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/mv.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/mv.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/passwd.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/passwd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/passwd.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/passwd.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/pastebin.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/pastebin.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/pastebin.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/pastebin.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/ping.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/ping.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/ping.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/ping.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/ps.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/ps.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/ps.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/ps.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/pwd.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/pwd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/pwd.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/pwd.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/rc.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/rc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/rc.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/rc.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/readkey.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/readkey.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/readkey.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/readkey.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/reboot.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/reboot.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/reboot.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/reboot.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/resolution.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/resolution.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/resolution.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/resolution.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/rm.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/rm.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/rm.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/rm.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/route.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/route.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/route.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/route.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/sandbox.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/sandbox.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/sandbox.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/sandbox.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/sh.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/sh.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/sh.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/sh.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/shutdown.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/shutdown.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/shutdown.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/shutdown.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/sleep.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/sleep.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/sleep.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/sleep.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/sshd.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/sshd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/sshd.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/sshd.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/tee.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/tee.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/tee.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/tee.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/touch.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/touch.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/touch.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/touch.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/uptime.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/uptime.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/uptime.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/uptime.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/watch.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/watch.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/watch.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/watch.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/wc.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/wc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/wc.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/wc.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/bin/wget.lua b/src/main/resources/assets/opencomputers/loot/plan9k/bin/wget.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/bin/wget.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/bin/wget.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/boot/kernel/pipes b/src/main/resources/assets/opencomputers/loot/plan9k/boot/kernel/pipes similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/boot/kernel/pipes rename to src/main/resources/assets/opencomputers/loot/plan9k/boot/kernel/pipes diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/etc/rc.d/autoupdate.lua b/src/main/resources/assets/opencomputers/loot/plan9k/etc/rc.d/autoupdate.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/etc/rc.d/autoupdate.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/etc/rc.d/autoupdate.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/etc/rc.d/sshd.lua b/src/main/resources/assets/opencomputers/loot/plan9k/etc/rc.d/sshd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/etc/rc.d/sshd.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/etc/rc.d/sshd.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/init.lua b/src/main/resources/assets/opencomputers/loot/plan9k/init.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/init.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/init.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/event.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/event.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/event.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/event.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/internet.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/internet.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/internet.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/internet.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/01_gc.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/01_gc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/01_gc.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/01_gc.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/01_util.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/01_util.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/01_util.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/01_util.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/02_cmd.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/02_cmd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/02_cmd.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/02_cmd.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/05_vfs.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/05_vfs.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/05_vfs.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/05_vfs.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/06_cowfs.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/06_cowfs.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/06_cowfs.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/06_cowfs.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/09_rootfs.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/09_rootfs.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/09_rootfs.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/09_rootfs.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/10_devfs.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/10_devfs.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/10_devfs.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/10_devfs.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/10_procfs.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/10_procfs.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/10_procfs.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/10_procfs.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/15_keventd.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/15_keventd.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/15_keventd.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/15_keventd.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/15_userspace.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/15_userspace.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/15_userspace.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/15_userspace.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_buffer.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/16_buffer.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_buffer.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/16_buffer.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_component.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/16_component.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_component.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/16_component.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_require.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/16_require.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_require.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/16_require.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_chatbox.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_chatbox.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_chatbox.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_chatbox.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_data.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_data.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_data.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_data.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_drive.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_drive.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_drive.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_drive.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_eeprom.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_eeprom.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_eeprom.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_eeprom.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_io.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_io.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_io.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_io.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_ipc.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_ipc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_ipc.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_ipc.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_keyboard.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_keyboard.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_keyboard.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_keyboard.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_network.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_network.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_network.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_network.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_nfc.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_nfc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_nfc.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_nfc.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_tape.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_tape.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/17_tape.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/17_tape.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/18_pty.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/18_pty.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/18_pty.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/18_pty.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/18_syscall.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/18_syscall.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/18_syscall.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/18_syscall.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/19_cgroups.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/19_cgroups.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/19_cgroups.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/19_cgroups.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/19_libnetwork.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/19_libnetwork.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/19_libnetwork.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/19_libnetwork.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/19_manageg.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/19_manageg.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/19_manageg.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/19_manageg.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/20_threading.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/20_threading.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/20_threading.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/20_threading.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/21_threadUtil.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/21_threadUtil.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/21_threadUtil.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/21_threadUtil.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/21_timer.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/21_timer.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/21_timer.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/21_timer.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/25_init.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/25_init.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/25_init.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/base/25_init.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/network/loopback.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/network/loopback.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/network/loopback.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/network/loopback.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/network/modem.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/network/modem.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/network/modem.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/network/modem.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/network/tunnel.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/network/tunnel.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/network/tunnel.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/modules/network/tunnel.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/msdosfs.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/msdosfs.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/msdosfs.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/msdosfs.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/rc.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/rc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/rc.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/rc.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/serialization.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/serialization.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/serialization.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/serialization.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/shell.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/shell.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/shell.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/shell.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/term.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/term.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/term.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/term.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/text.lua b/src/main/resources/assets/opencomputers/loot/plan9k/lib/text.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/lib/text.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/lib/text.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/data/bin/base64.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/base64.lua similarity index 95% rename from src/main/resources/assets/opencomputers/lua/component/data/bin/base64.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/base64.lua index 155dba981..2a5d9d58f 100644 --- a/src/main/resources/assets/opencomputers/lua/component/data/bin/base64.lua +++ b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/base64.lua @@ -1,42 +1,42 @@ -local shell = require("shell") -local data = require("data") - - -local args, parms = shell.parse(...) -if parms.h or parms.help then - io.stderr:write("See: man base64" .. "\n") - os.exit(true) -end -local encodingfun = nil -local encode -if parms.d or parms.decode then - encodingfun = data.decode64 - encode = false -else - encodingfun = data.encode64 - encode = true -end - -if #args == 0 then - repeat - local read = io.read(encode and 3 or 4) - if read then - io.write(encodingfun(read)) - end - until not read -else - for i = 1, #args do - local file, reason = io.open(shell.resolve(args[i])) - if not file then - io.stderr:write(tostring(reason) .. "\n") - os.exit(false) - end - repeat - local line = file:read(encode and 3 or 4) - if line then - io.write(encodingfun(line)) - end - until not line - file:close() - end -end +local shell = require("shell") +local data = require("data") + + +local args, parms = shell.parse(...) +if parms.h or parms.help then + io.stderr:write("See: man base64" .. "\n") + os.exit(true) +end +local encodingfun = nil +local encode +if parms.d or parms.decode then + encodingfun = data.decode64 + encode = false +else + encodingfun = data.encode64 + encode = true +end + +if #args == 0 then + repeat + local read = io.read(encode and 3 or 4) + if read then + io.write(encodingfun(read)) + end + until not read +else + for i = 1, #args do + local file, reason = io.open(shell.resolve(args[i])) + if not file then + io.stderr:write(tostring(reason) .. "\n") + os.exit(false) + end + repeat + local line = file:read(encode and 3 or 4) + if line then + io.write(encodingfun(line)) + end + until not line + file:close() + end +end diff --git a/src/main/resources/assets/opencomputers/lua/component/data/bin/deflate.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/deflate.lua similarity index 95% rename from src/main/resources/assets/opencomputers/lua/component/data/bin/deflate.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/deflate.lua index 0ba356e3a..cd8660ac2 100644 --- a/src/main/resources/assets/opencomputers/lua/component/data/bin/deflate.lua +++ b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/deflate.lua @@ -1,25 +1,25 @@ -local shell = require("shell") -local data = require("data") - -local args = shell.parse(...) -if #args == 0 then - local read = "" - repeat - local current = io.read("*a") - read = read .. current - until current ~= "" - io.write(data.deflate(read)) -else - local read = "" - local file, reason = io.open(shell.resolve(args[1])) - if not file then - io.stderr:write(tostring(reason) .. "\n") - os.exit(false) - end - repeat - local current = file:read("*a") - read = read .. current - until current ~= "" - file:close() - io.write(data.deflate(read)) -end +local shell = require("shell") +local data = require("data") + +local args = shell.parse(...) +if #args == 0 then + local read = "" + repeat + local current = io.read("*a") + read = read .. current + until current ~= "" + io.write(data.deflate(read)) +else + local read = "" + local file, reason = io.open(shell.resolve(args[1])) + if not file then + io.stderr:write(tostring(reason) .. "\n") + os.exit(false) + end + repeat + local current = file:read("*a") + read = read .. current + until current ~= "" + file:close() + io.write(data.deflate(read)) +end diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/gpg.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/gpg.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/gpg.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/gpg.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/data/bin/inflate.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/inflate.lua similarity index 95% rename from src/main/resources/assets/opencomputers/lua/component/data/bin/inflate.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/inflate.lua index c78fd7287..349c5f18b 100644 --- a/src/main/resources/assets/opencomputers/lua/component/data/bin/inflate.lua +++ b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/inflate.lua @@ -1,25 +1,25 @@ -local shell = require("shell") -local data = require("data") - -local args = shell.parse(...) -if #args == 0 then - local read = "" - repeat - local current = io.read("*a") - read = read .. current - until current ~= "" - io.write(data.inflate(read)) -else - local read = "" - local file, reason = io.open(shell.resolve(args[1])) - if not file then - io.stderr:write(tostring(reason) .. "\n") - os.exit(false) - end - repeat - local current = file:read("*a") - read = read .. current - until current ~= "" - file:close() - io.write(data.inflate(read)) -end +local shell = require("shell") +local data = require("data") + +local args = shell.parse(...) +if #args == 0 then + local read = "" + repeat + local current = io.read("*a") + read = read .. current + until current ~= "" + io.write(data.inflate(read)) +else + local read = "" + local file, reason = io.open(shell.resolve(args[1])) + if not file then + io.stderr:write(tostring(reason) .. "\n") + os.exit(false) + end + repeat + local current = file:read("*a") + read = read .. current + until current ~= "" + file:close() + io.write(data.inflate(read)) +end diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/md5sum.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/md5sum.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/md5sum.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/md5sum.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/mkdosfs.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/mkdosfs.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/mkdosfs.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/mkdosfs.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/mpt.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/mpt.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/mpt.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/mpt.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/nc.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/nc.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/nc.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/nc.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/data/bin/sha256sum.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/sha256sum.lua similarity index 96% rename from src/main/resources/assets/opencomputers/lua/component/data/bin/sha256sum.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/sha256sum.lua index 5e63c7c61..33d5b25c7 100644 --- a/src/main/resources/assets/opencomputers/lua/component/data/bin/sha256sum.lua +++ b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/sha256sum.lua @@ -1,27 +1,27 @@ -local shell = require("shell") -local data = require("data") - -local args = shell.parse(...) -if #args == 0 then - local read = "" - repeat - local current = io.read("*a") - read = read .. current - until current ~= "" - io.write(data.toHex(data.sha256(read))) -else - for i = 1, #args do - local read = "" - local file, reason = io.open(shell.resolve(args[i])) - if not file then - io.stderr:write(tostring(reason) .. "\n") - os.exit(false) - end - repeat - local current = file:read("*a") - read = read .. current - until current ~= "" - file:close() - io.write(data.toHex(data.sha256(read)) .. "\t".. args[i] .. "\n") - end -end +local shell = require("shell") +local data = require("data") + +local args = shell.parse(...) +if #args == 0 then + local read = "" + repeat + local current = io.read("*a") + read = read .. current + until current ~= "" + io.write(data.toHex(data.sha256(read))) +else + for i = 1, #args do + local read = "" + local file, reason = io.open(shell.resolve(args[i])) + if not file then + io.stderr:write(tostring(reason) .. "\n") + os.exit(false) + end + repeat + local current = file:read("*a") + read = read .. current + until current ~= "" + file:close() + io.write(data.toHex(data.sha256(read)) .. "\t".. args[i] .. "\n") + end +end diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/ssh.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/ssh.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/bin/ssh.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/bin/ssh.lua diff --git a/src/main/resources/assets/opencomputers/lua/component/data/lib/data.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/lib/data.lua similarity index 96% rename from src/main/resources/assets/opencomputers/lua/component/data/lib/data.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/lib/data.lua index 38251a926..04fa9ff9c 100644 --- a/src/main/resources/assets/opencomputers/lua/component/data/lib/data.lua +++ b/src/main/resources/assets/opencomputers/loot/plan9k/usr/lib/data.lua @@ -1,26 +1,26 @@ -local component = require("component") - -local data = {} - -------------------------------------------------------------------------------- - --- Converts binary data into hexadecimal string. -function data.toHex(data) - return (data:gsub('.', function (c) - return string.format('%02X', string.byte(c)) - end)) -end - --- Converts hexadecimal string into binary data. -function data.fromHex(hex) - return (hex:gsub('..', function (cc) - return string.char(tonumber(cc, 16)) - end)) -end - --- Forward everything else to the primary data card. -setmetatable(data, { __index = function(_, key) return component.data[key] end }) - -------------------------------------------------------------------------------- - -return data +local component = require("component") + +local data = {} + +------------------------------------------------------------------------------- + +-- Converts binary data into hexadecimal string. +function data.toHex(data) + return (data:gsub('.', function (c) + return string.format('%02X', string.byte(c)) + end)) +end + +-- Converts hexadecimal string into binary data. +function data.fromHex(hex) + return (hex:gsub('..', function (cc) + return string.char(tonumber(cc, 16)) + end)) +end + +-- Forward everything else to the primary data card. +setmetatable(data, { __index = function(_, key) return component.data[key] end }) + +------------------------------------------------------------------------------- + +return data diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/man/pipes b/src/main/resources/assets/opencomputers/loot/plan9k/usr/man/pipes similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/man/pipes rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/man/pipes diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/usr/sbin/sshsession.lua b/src/main/resources/assets/opencomputers/loot/plan9k/usr/sbin/sshsession.lua similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/usr/sbin/sshsession.lua rename to src/main/resources/assets/opencomputers/loot/plan9k/usr/sbin/sshsession.lua diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/config.db b/src/main/resources/assets/opencomputers/loot/plan9k/var/lib/mpt/config.db similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/config.db rename to src/main/resources/assets/opencomputers/loot/plan9k/var/lib/mpt/config.db diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/mpt.db b/src/main/resources/assets/opencomputers/loot/plan9k/var/lib/mpt/mpt.db similarity index 100% rename from src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/mpt.db rename to src/main/resources/assets/opencomputers/loot/plan9k/var/lib/mpt/mpt.db diff --git a/src/main/resources/assets/opencomputers/recipes/default.recipes b/src/main/resources/assets/opencomputers/recipes/default.recipes index d006c6b61..bf1ae8df7 100644 --- a/src/main/resources/assets/opencomputers/recipes/default.recipes +++ b/src/main/resources/assets/opencomputers/recipes/default.recipes @@ -32,12 +32,12 @@ wrench { } lootDisks: [ { - name: OpenOS + name: "OpenComputers:openos" type: shapeless input: ["oc:floppy", "oc:manual"] }, { - name: OPPM + name: "OpenComputers:oppm" type: shapeless input: ["oc:floppy", "oc:materialInterweb"] } diff --git a/src/main/scala/li/cil/oc/Constants.scala b/src/main/scala/li/cil/oc/Constants.scala index d43386194..b2aa91fe6 100644 --- a/src/main/scala/li/cil/oc/Constants.scala +++ b/src/main/scala/li/cil/oc/Constants.scala @@ -126,7 +126,7 @@ object Constants { final val NavigationUpgrade = "navigationUpgrade" final val NetworkCard = "lanCard" final val NumPad = "numPad" - final val OpenOS = "openOS" + final val OpenOS = "openos" final val PistonUpgrade = "pistonUpgrade" final val Present = "present" final val PrintedCircuitBoard = "printedCircuitBoard" diff --git a/src/main/scala/li/cil/oc/common/EventHandler.scala b/src/main/scala/li/cil/oc/common/EventHandler.scala index 6b1b2c21c..3d4922f5e 100644 --- a/src/main/scala/li/cil/oc/common/EventHandler.scala +++ b/src/main/scala/li/cil/oc/common/EventHandler.scala @@ -26,6 +26,7 @@ import li.cil.oc.common.tileentity.Robot import li.cil.oc.common.tileentity.traits.power import li.cil.oc.integration.Mods import li.cil.oc.integration.util +import li.cil.oc.integration.util.Wrench import li.cil.oc.server.component.Keyboard import li.cil.oc.server.machine.Callbacks import li.cil.oc.server.machine.Machine @@ -269,6 +270,7 @@ object EventHandler { lazy val drone = api.Items.get(Constants.ItemName.Drone) lazy val eeprom = api.Items.get(Constants.ItemName.EEPROM) + lazy val floppy = api.Items.get(Constants.ItemName.Floppy) lazy val mcu = api.Items.get(Constants.BlockName.Microcontroller) lazy val navigationUpgrade = api.Items.get(Constants.ItemName.NavigationUpgrade) lazy val robot = api.Items.get(Constants.BlockName.Robot) @@ -306,6 +308,20 @@ object EventHandler { new TabletData(stack).items.collect { case Some(item) => item }.find(api.Items.get(_) == eeprom) }) || didRecraft + didRecraft = { + if (Loot.isLootDisk(e.crafting)) { + val stacks = (0 until e.craftMatrix.getSizeInventory).flatMap(i => Option(e.craftMatrix.getStackInSlot(i))).toArray + if (stacks.length == 2) stacks.find(Wrench.isWrench) match { + case Some(stack) => + stack.stackSize += 1 + true + case _ => didRecraft + } + else didRecraft + } + else didRecraft + } + // Presents? e.player match { case _: FakePlayer => // No presents for you, automaton. Such discrimination. Much bad conscience. diff --git a/src/main/scala/li/cil/oc/common/Loot.scala b/src/main/scala/li/cil/oc/common/Loot.scala index 2cb79c1b3..0f2d23cde 100644 --- a/src/main/scala/li/cil/oc/common/Loot.scala +++ b/src/main/scala/li/cil/oc/common/Loot.scala @@ -19,6 +19,7 @@ import net.minecraft.nbt.NBTTagCompound import net.minecraft.util.WeightedRandomChestContent import net.minecraftforge.common.ChestGenHooks import net.minecraftforge.common.DimensionManager +import net.minecraftforge.common.util.Constants.NBT import net.minecraftforge.event.world.WorldEvent import scala.collection.convert.WrapAsScala._ @@ -41,14 +42,16 @@ object Loot { val factories = mutable.Map.empty[String, Callable[FileSystem]] - val globalDisks = mutable.Map.empty[String, (ItemStack, Int)] + val globalDisks = mutable.ArrayBuffer.empty[(ItemStack, Int)] - val worldDisks = mutable.Map.empty[String, (ItemStack, Int)] + val worldDisks = mutable.ArrayBuffer.empty[(ItemStack, Int)] val disksForSampling = mutable.ArrayBuffer.empty[ItemStack] val disksForClient = mutable.ArrayBuffer.empty[ItemStack] + def isLootDisk(stack: ItemStack): Boolean = api.Items.get(stack) == api.Items.get(Constants.ItemName.Floppy) && stack.hasTagCompound && stack.getTagCompound.hasKey(Settings.namespace + "lootFactory", NBT.TAG_STRING) + def registerLootDisk(name: String, color: Int, factory: Callable[FileSystem]): ItemStack = { val mod = Loader.instance.activeModContainer.getModId @@ -106,26 +109,26 @@ object Loot { } } } - for ((name, entry) <- globalDisks if !worldDisks.contains(name)) { - worldDisks += name -> entry + for (entry <- globalDisks if !worldDisks.contains(entry)) { + worldDisks += entry } - for ((_, (stack, count)) <- worldDisks) { + for ((stack, count) <- worldDisks) { for (i <- 0 until count) { disksForSampling += stack } } } - private def parseLootDisks(list: java.util.Properties, acc: mutable.Map[String, (ItemStack, Int)], external: Boolean) { + private def parseLootDisks(list: java.util.Properties, acc: mutable.ArrayBuffer[(ItemStack, Int)], external: Boolean) { for (key <- list.stringPropertyNames) { val value = list.getProperty(key) try value.split(":") match { case Array(name, count, color) => - acc += key -> ((createLootDisk(name, key, external, Some(Color.dyes.indexOf(color))), count.toInt)) + acc += ((createLootDisk(name, key, external, Some(Color.dyes.indexOf(color))), count.toInt)) case Array(name, count) => - acc += key -> ((createLootDisk(name, key, external), count.toInt)) + acc += ((createLootDisk(name, key, external), count.toInt)) case _ => - acc += key -> ((createLootDisk(value, key, external), 1)) + acc += ((createLootDisk(value, key, external), 1)) } catch { case t: Throwable => OpenComputers.log.warn("Bad loot descriptor: " + value, t) @@ -139,9 +142,10 @@ object Loot { } else new Callable[FileSystem] { override def call(): FileSystem = api.FileSystem.fromClass(OpenComputers.getClass, Settings.resourceDomain, "loot/" + path) } - val stack = registerLootDisk(name, color.getOrElse(8), callable) + val stack = registerLootDisk(path, color.getOrElse(8), callable) + stack.setStackDisplayName(name) if (!external) { - Items.registerStack(stack, name) + Items.registerStack(stack, path) } stack } diff --git a/src/main/scala/li/cil/oc/common/recipe/LootDiskCyclingRecipe.scala b/src/main/scala/li/cil/oc/common/recipe/LootDiskCyclingRecipe.scala new file mode 100644 index 000000000..90dd4d315 --- /dev/null +++ b/src/main/scala/li/cil/oc/common/recipe/LootDiskCyclingRecipe.scala @@ -0,0 +1,40 @@ +package li.cil.oc.common.recipe + +import li.cil.oc.Constants +import li.cil.oc.Settings +import li.cil.oc.api +import li.cil.oc.common.Loot +import li.cil.oc.integration.util.Wrench +import net.minecraft.inventory.InventoryCrafting +import net.minecraft.item.ItemStack +import net.minecraft.item.crafting.IRecipe +import net.minecraft.world.World + +class LootDiskCyclingRecipe extends IRecipe { + private final val Floppy = api.Items.get(Constants.ItemName.Floppy) + + override def matches(crafting: InventoryCrafting, world: World): Boolean = { + val stacks = collectStacks(crafting).toArray + stacks.length == 2 && stacks.exists(Loot.isLootDisk) && stacks.exists(Wrench.isWrench) + } + + override def getCraftingResult(crafting: InventoryCrafting): ItemStack = { + collectStacks(crafting).find(Loot.isLootDisk) match { + case Some(lootDisk) => + val lootFactoryName = getLootFactoryName(lootDisk) + val lootDiskStacks = Loot.worldDisks.map(_._1) + val oldIndex = lootDiskStacks.indexWhere(s => getLootFactoryName(s) == lootFactoryName) + val newIndex = (oldIndex + 1) % lootDiskStacks.length + lootDiskStacks(newIndex).copy() + case _ => null + } + } + + def getLootFactoryName(stack: ItemStack) = stack.getTagCompound.getString(Settings.namespace + "lootFactory") + + def collectStacks(crafting: InventoryCrafting) = (0 until crafting.getSizeInventory).flatMap(i => Option(crafting.getStackInSlot(i))) + + override def getRecipeSize: Int = 2 + + override def getRecipeOutput: ItemStack = null +} diff --git a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala index 041847848..0db93fe56 100644 --- a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala +++ b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala @@ -157,10 +157,11 @@ object Recipes { // Register all unknown recipes. Well. Loot disk recipes. if (recipes.hasPath("lootDisks")) try { val lootRecipes = recipes.getConfigList("lootDisks") + val lootStacks = Loot.globalDisks.map(_._1) for (recipe <- lootRecipes) { val name = recipe.getString("name") - Loot.globalDisks.get(name) match { - case Some((stack, _)) => addRecipe(stack, recipe, s"loot disk '$name'") + lootStacks.find(s => s.getTagCompound.getString(Settings.namespace + "lootFactory") == name) match { + case Some(stack) => addRecipe(stack, recipe, s"loot disk '$name'") case _ => OpenComputers.log.warn(s"Failed adding recipe for loot disk '$name': No such global loot disk.") hadErrors = true @@ -192,17 +193,22 @@ object Recipes { } // Recrafting operations. - val navigationUpgrade = api.Items.get(Constants.ItemName.NavigationUpgrade) - val mcu = api.Items.get(Constants.BlockName.Microcontroller) - val floppy = api.Items.get(Constants.ItemName.Floppy) - val lootDisk = api.Items.get(Constants.ItemName.LootDisk) - val drone = api.Items.get(Constants.ItemName.Drone) - val eeprom = api.Items.get(Constants.ItemName.EEPROM) - val robot = api.Items.get(Constants.BlockName.Robot) - val tablet = api.Items.get(Constants.ItemName.Tablet) + val accessPoint = api.Items.get(Constants.BlockName.AccessPoint) + val cable = api.Items.get(Constants.BlockName.Cable) val chamelium = api.Items.get(Constants.ItemName.Chamelium) val chameliumBlock = api.Items.get(Constants.BlockName.ChameliumBlock) + val drone = api.Items.get(Constants.ItemName.Drone) + val eeprom = api.Items.get(Constants.ItemName.EEPROM) + val floppy = api.Items.get(Constants.ItemName.Floppy) + val hoverBoots = api.Items.get(Constants.ItemName.HoverBoots) + val lootDisk = api.Items.get(Constants.ItemName.LootDisk) + val mcu = api.Items.get(Constants.BlockName.Microcontroller) + val navigationUpgrade = api.Items.get(Constants.ItemName.NavigationUpgrade) val print = api.Items.get(Constants.BlockName.Print) + val relay = api.Items.get(Constants.BlockName.Relay) + val robot = api.Items.get(Constants.BlockName.Robot) + val switch = api.Items.get(Constants.BlockName.Switch) + val tablet = api.Items.get(Constants.ItemName.Tablet) // Navigation upgrade recrafting. GameRegistry.addRecipe(new ExtendedShapelessOreRecipe( @@ -320,18 +326,19 @@ object Recipes { print.createItemStack(1), new ItemStack(net.minecraft.init.Blocks.glowstone))) // Switch/AccessPoint -> Relay conversion - GameRegistry.addShapelessRecipe(api.Items.get(Constants.BlockName.Relay).createItemStack(1), - api.Items.get(Constants.BlockName.AccessPoint).createItemStack(1)) - GameRegistry.addShapelessRecipe(api.Items.get(Constants.BlockName.Relay).createItemStack(1), - api.Items.get(Constants.BlockName.Switch).createItemStack(1)) + GameRegistry.addShapelessRecipe(relay.createItemStack(1), accessPoint.createItemStack(1)) + GameRegistry.addShapelessRecipe(relay.createItemStack(1), switch.createItemStack(1)) // Hover Boot dyeing - GameRegistry.addRecipe(new ColorizeRecipe(api.Items.get(Constants.ItemName.HoverBoots).item())) - GameRegistry.addRecipe(new DecolorizeRecipe(api.Items.get(Constants.ItemName.HoverBoots).item())) + GameRegistry.addRecipe(new ColorizeRecipe(hoverBoots.item())) + GameRegistry.addRecipe(new DecolorizeRecipe(hoverBoots.item())) // Cable dyeing - GameRegistry.addRecipe(new ColorizeRecipe(api.Items.get(Constants.BlockName.Cable).block())) - GameRegistry.addRecipe(new DecolorizeRecipe(api.Items.get(Constants.BlockName.Cable).block())) + GameRegistry.addRecipe(new ColorizeRecipe(cable.block())) + GameRegistry.addRecipe(new DecolorizeRecipe(cable.block())) + + // Loot disk cycling. + GameRegistry.addRecipe(new LootDiskCyclingRecipe()) } catch { case e: Throwable => OpenComputers.log.error("Error parsing recipes, you may not be able to craft any items from this mod!", e) diff --git a/src/main/scala/li/cil/oc/integration/buildcraft/recipes/LootDiskProgrammableRecipe.scala b/src/main/scala/li/cil/oc/integration/buildcraft/recipes/LootDiskProgrammableRecipe.scala index 4af8c2c39..137802cc3 100644 --- a/src/main/scala/li/cil/oc/integration/buildcraft/recipes/LootDiskProgrammableRecipe.scala +++ b/src/main/scala/li/cil/oc/integration/buildcraft/recipes/LootDiskProgrammableRecipe.scala @@ -24,7 +24,7 @@ object LootDiskProgrammableRecipe extends IProgrammingRecipe { val options = mutable.ArrayBuffer.empty[ItemStack] options.sizeHint(width * height) - for ((name, (stack, chance)) <- Loot.worldDisks) { + for ((stack, _) <- Loot.worldDisks) { options += stack.copy() } diff --git a/src/main/scala/li/cil/oc/server/PacketSender.scala b/src/main/scala/li/cil/oc/server/PacketSender.scala index d0dd30a65..a8ea39da0 100644 --- a/src/main/scala/li/cil/oc/server/PacketSender.scala +++ b/src/main/scala/li/cil/oc/server/PacketSender.scala @@ -279,7 +279,7 @@ object PacketSender { def sendLootDisks(p: EntityPlayerMP): Unit = { // Sending as separate packets, because CompressedStreamTools hiccups otherwise... - val stacks = Loot.worldDisks.values.map(_._1) + val stacks = Loot.worldDisks.map(_._1) for (stack <- stacks) { val pb = new SimplePacketBuilder(PacketType.LootDisk) diff --git a/src/main/scala/li/cil/oc/server/component/DataCard.scala b/src/main/scala/li/cil/oc/server/component/DataCard.scala index bb5189960..5eddb1227 100644 --- a/src/main/scala/li/cil/oc/server/component/DataCard.scala +++ b/src/main/scala/li/cil/oc/server/component/DataCard.scala @@ -13,17 +13,13 @@ import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.SecretKeySpec import com.google.common.hash.Hashing -import li.cil.oc.OpenComputers import li.cil.oc.Settings -import li.cil.oc.api import li.cil.oc.api.Network import li.cil.oc.api.machine.Arguments import li.cil.oc.api.machine.Callback import li.cil.oc.api.machine.Context -import li.cil.oc.api.network.Node import li.cil.oc.api.network.Visibility import li.cil.oc.api.prefab -import li.cil.oc.util.ExtendedNBT._ import net.minecraft.nbt.NBTTagCompound import org.apache.commons.codec.binary.Base64 import org.apache.commons.io.output.ByteArrayOutputStream @@ -34,9 +30,6 @@ abstract class DataCard extends prefab.ManagedEnvironment { withConnector(). create() - val romData = Option(api.FileSystem.asManagedEnvironment(api.FileSystem. - fromClass(OpenComputers.getClass, Settings.resourceDomain, "lua/component/data"), "data")) - // ----------------------------------------------------------------------- // protected def checkCost(context: Context, args: Arguments, baseCost: Double, byteCost: Double): Array[Byte] = { @@ -70,32 +63,6 @@ abstract class DataCard extends prefab.ManagedEnvironment { def getLimit(context: Context, args: Arguments): Array[AnyRef] = { result(Settings.get.dataCardHardLimit) } - - // ----------------------------------------------------------------------- // - - override def onConnect(node: Node) { - super.onConnect(node) - if (node.isNeighborOf(this.node)) { - romData.foreach(fs => node.connect(fs.node)) - } - } - - override def onDisconnect(node: Node) { - super.onDisconnect(node) - if (node == this.node) { - romData.foreach(_.node.remove()) - } - } - - override def load(nbt: NBTTagCompound) { - super.load(nbt) - romData.foreach(_.load(nbt.getCompoundTag("romData"))) - } - - override def save(nbt: NBTTagCompound) { - super.save(nbt) - romData.foreach(fs => nbt.setNewCompoundTag("romData", fs.save)) - } } object DataCard { diff --git a/src/main/scala/li/cil/oc/server/component/InternetCard.scala b/src/main/scala/li/cil/oc/server/component/InternetCard.scala index ff57fb9fa..8d3fa2bd6 100644 --- a/src/main/scala/li/cil/oc/server/component/InternetCard.scala +++ b/src/main/scala/li/cil/oc/server/component/InternetCard.scala @@ -1,19 +1,27 @@ package li.cil.oc.server.component -import java.io.{BufferedWriter, FileNotFoundException, IOException, InputStream, OutputStreamWriter} +import java.io.BufferedWriter +import java.io.FileNotFoundException +import java.io.IOException +import java.io.InputStream +import java.io.OutputStreamWriter import java.net._ import java.nio.ByteBuffer import java.nio.channels.SocketChannel -import java.util.concurrent.{Callable, ConcurrentLinkedQueue, ExecutionException, Future} +import java.util.concurrent.Callable +import java.util.concurrent.ConcurrentLinkedQueue +import java.util.concurrent.ExecutionException +import java.util.concurrent.Future -import li.cil.oc.{OpenComputers, Settings, api} -import li.cil.oc.api.machine.{Arguments, Callback, Context} +import li.cil.oc.Settings +import li.cil.oc.api.machine.Arguments +import li.cil.oc.api.machine.Callback +import li.cil.oc.api.machine.Context import li.cil.oc.api.network._ -import li.cil.oc.api.{Network, prefab} import li.cil.oc.api.prefab.AbstractValue -import li.cil.oc.util.ExtendedNBT._ +import li.cil.oc.api.Network +import li.cil.oc.api.prefab import li.cil.oc.util.ThreadPoolFactory -import net.minecraft.nbt.NBTTagCompound import net.minecraft.server.MinecraftServer import scala.collection.convert.WrapAsScala._ @@ -24,9 +32,6 @@ class InternetCard extends prefab.ManagedEnvironment { withComponent("internet", Visibility.Neighbors). create() - val romInternet = Option(api.FileSystem.asManagedEnvironment(api.FileSystem. - fromClass(OpenComputers.getClass, Settings.resourceDomain, "lua/component/internet"), "internet")) - protected var owner: Option[Context] = None protected val connections = mutable.Set.empty[InternetCard.Closable] @@ -48,8 +53,9 @@ class InternetCard extends prefab.ManagedEnvironment { } val post = if (args.isString(1)) Option(args.checkString(1)) else None val headers = if (args.isTable(2)) args.checkTable(2).collect { - case (key: String, value: AnyRef) => (key, value.toString) - }.toMap else Map.empty[String, String] + case (key: String, value: AnyRef) => (key, value.toString) + }.toMap + else Map.empty[String, String] if (!Settings.get.httpHeadersEnabled && headers.nonEmpty) { return result(Unit, "http request headers are unavailable") } @@ -90,7 +96,6 @@ class InternetCard extends prefab.ManagedEnvironment { super.onConnect(node) if (owner.isEmpty && node.host.isInstanceOf[Context] && node.isNeighborOf(this.node)) { owner = Some(node.host.asInstanceOf[Context]) - romInternet.foreach(fs => node.connect(fs.node)) } } @@ -102,7 +107,6 @@ class InternetCard extends prefab.ManagedEnvironment { connections.foreach(_.close()) connections.clear() } - romInternet.foreach(_.node.remove()) } } @@ -120,18 +124,6 @@ class InternetCard extends prefab.ManagedEnvironment { // ----------------------------------------------------------------------- // - override def load(nbt: NBTTagCompound) { - super.load(nbt) - romInternet.foreach(_.load(nbt.getCompoundTag("romInternet"))) - } - - override def save(nbt: NBTTagCompound) { - super.save(nbt) - romInternet.foreach(fs => nbt.setNewCompoundTag("romInternet", fs.save)) - } - - // ----------------------------------------------------------------------- // - private def checkUri(address: String, port: Int): URI = { try { val parsed = new URI(address) @@ -271,13 +263,14 @@ object InternetCard { resolved } } + } def checkLists(inetAddress: InetAddress, host: String) { - if (Settings.get.httpHostWhitelist.length > 0 && !Settings.get.httpHostWhitelist.exists(_(inetAddress, host))) { + if (Settings.get.httpHostWhitelist.length > 0 && !Settings.get.httpHostWhitelist.exists(_ (inetAddress, host))) { throw new FileNotFoundException("address is not whitelisted") } - if (Settings.get.httpHostBlacklist.length > 0 && Settings.get.httpHostBlacklist.exists(_(inetAddress, host))) { + if (Settings.get.httpHostBlacklist.length > 0 && Settings.get.httpHostBlacklist.exists(_ (inetAddress, host))) { throw new FileNotFoundException("address is blacklisted") } } diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala b/src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala index 1ec4abd90..ef69e0f47 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeGenerator.scala @@ -1,14 +1,12 @@ package li.cil.oc.server.component -import li.cil.oc.OpenComputers import li.cil.oc.Settings -import li.cil.oc.api import li.cil.oc.api.Network -import li.cil.oc.api.network.EnvironmentHost import li.cil.oc.api.internal import li.cil.oc.api.machine.Arguments import li.cil.oc.api.machine.Callback import li.cil.oc.api.machine.Context +import li.cil.oc.api.network.EnvironmentHost import li.cil.oc.api.network._ import li.cil.oc.api.prefab import li.cil.oc.util.ExtendedNBT._ @@ -23,9 +21,6 @@ class UpgradeGenerator(val host: EnvironmentHost with internal.Agent) extends pr withConnector(). create() - val romGenerator = Option(api.FileSystem.asManagedEnvironment(api.FileSystem. - fromClass(OpenComputers.getClass, Settings.resourceDomain, "lua/component/generator"), "generator")) - var inventory: Option[ItemStack] = None var remainingTicks = 0 @@ -94,7 +89,8 @@ class UpgradeGenerator(val host: EnvironmentHost with internal.Agent) extends pr if (remainingTicks <= 0 && inventory.isDefined) { val stack = inventory.get remainingTicks = TileEntityFurnace.getItemBurnTime(stack) - if (remainingTicks > 0) { // If not we probably have a container item now (e.g. bucket after lava bucket). + if (remainingTicks > 0) { + // If not we probably have a container item now (e.g. bucket after lava bucket). updateClient() stack.stackSize -= 1 if (stack.stackSize <= 0) { @@ -121,13 +117,6 @@ class UpgradeGenerator(val host: EnvironmentHost with internal.Agent) extends pr // ----------------------------------------------------------------------- // - override def onConnect(node: Node) { - super.onConnect(node) - if (node.isNeighborOf(this.node)) { - romGenerator.foreach(fs => node.connect(fs.node)) - } - } - override def onDisconnect(node: Node) { super.onDisconnect(node) if (node == this.node) { @@ -142,13 +131,11 @@ class UpgradeGenerator(val host: EnvironmentHost with internal.Agent) extends pr case _ => } remainingTicks = 0 - romGenerator.foreach(_.node.remove()) } } override def load(nbt: NBTTagCompound) { super.load(nbt) - romGenerator.foreach(_.load(nbt.getCompoundTag("romGenerator"))) if (nbt.hasKey("inventory")) { inventory = Option(ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("inventory"))) } @@ -157,7 +144,6 @@ class UpgradeGenerator(val host: EnvironmentHost with internal.Agent) extends pr override def save(nbt: NBTTagCompound) { super.save(nbt) - romGenerator.foreach(fs => nbt.setNewCompoundTag("romGenerator", fs.save)) inventory match { case Some(stack) => nbt.setNewCompoundTag("inventory", stack.writeToNBT) case _ =>