3929 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Florian Nücke	4abc4b3367	fixed possible NPE in computer stop; adjusted comments in kernel	2014-01-20 22:09:17 +01:00
Florian Nücke	959e5676cc	tcp connections for the internet card; reworked Lua bootstrapping a lot, now using package module where possible, and not injecting our custom modules into the global namespace by default. this WILL BREAK STUFF but if so it should be relatively simple to fix - just put a local <x> = require("<x>") on top of the borked script; renamed http lib to internet since it now also contains util methods for working on tcp sockets (wraps them as a [buffered] stream). more breaking. just rename all http references to internet and you're good.	2014-01-20 19:31:12 +01:00
Florian Nücke	92f42035ab	added explicit check for project red to avoid crashes when its version is too old and showing a message on login instead; also showing a message on login if native libraries aren't available	2014-01-19 18:56:13 +01:00
Florian Nücke	03ed617de8	moved http stuff to new extra card, the internet card	2014-01-19 18:13:30 +01:00
Florian Nücke	51b2f05ed9	added gui elements to server rack gui to adjust wireless range of server racks; server racks now draw energy each tick, depending on the strength of the set wireless signal, for each running server in the rack. cost computes based on the wireless cost settings of wireless cards; changed rack recipe a little to include a wireless network card	2014-01-18 18:17:41 +01:00
Florian Nücke	1335536c5d	fgsfds	2014-01-18 16:54:12 +01:00
Florian Nücke	14f7037e46	basic abstraction for lua stuff for luaj, but... it'll probably be easier to copy paste the api stuff after all, jnlua and luaj's interfacing is just too different	2014-01-18 16:34:49 +01:00
Florian Nücke	c12a59270d	Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.2 ... Conflicts: li/cil/oc/common/block/Delegator.scala mcmod.info	2014-01-18 14:17:55 +01:00
Florian Nücke	e042d16f68	using oc specific parameter checking function in package lib and adjusted error messages to be more consistent with vanilla Lua v1.1.3	2014-01-18 14:13:58 +01:00
Florian Nücke	aba968f6d7	converted package lib indentation to spaces to be consistent with other libs	2014-01-18 13:51:08 +01:00
Florian Nücke	8b9a243581	Merge pull request #83 from Wobbo/master ... Added package module to /lib	2014-01-18 04:10:47 -08:00
Florian Nücke	428161562e	added a robot with max xp and full energy to creative tab for easier testing; fixed robot.level() value's post decimal value	2014-01-18 00:46:15 +01:00
Florian Nücke	62b704ae69	fixed robot movement glitch when their tile entity was queried during their break/invalidate phase (e.g. from SGT2's network scan)	2014-01-17 23:45:26 +01:00
Wobbo	695ec80a30	Added package module to /lib	2014-01-17 21:44:11 +01:00
Florian Nücke	0c464a7801	better check for which terminal is allowed to talk to which server; added basic range check (range not yet configurable); some localization stuff	2014-01-17 20:04:33 +01:00
Florian Nücke	0f067e37c4	remote terminal basic stuff. can be bound and used to control servers. servers simply have a neighbor visible built-in screen and keyboard for which the gui can be opened using the terminal item once bound. still missing a couple of checks.	2014-01-17 17:34:19 +01:00
Florian Nücke	125cedeadc	made server rack a power distributor; added buffer to distributor sides and setting for buffer size. this allow directly connecting two distributors without additional storage capacity in the network between them (such as capacitors); added recipes for new ram, cpus rack and server; renamed oredict entries to follow a NameTierX pattern instead of NameBasic...NameElite; minor recipe adjustments	2014-01-17 12:47:14 +01:00
Florian Nücke	dcc6a97302	sorting items in creative tab by their unlocalized name now	2014-01-16 18:15:29 +01:00
Florian Nücke	65d951d50c	added cpu slot to computer cases, computer cases now also require a cpu to define the number of components they support	2014-01-16 18:04:29 +01:00
Florian Nücke	87f5192724	locking server item that is currently being edited to avoid duping	2014-01-16 17:18:55 +01:00
Florian Nücke	39d9b4e598	the side servers allow component connections from is now configurable via the gui (allows individual servers to control individual component subnetworks)	2014-01-16 16:28:17 +01:00
Florian Nücke	e94dd03df5	extracted router into parent trait and implementing that in the server rack	2014-01-16 14:39:51 +01:00
Florian Nücke	b07c3e202f	added hard component count limit, computers can now only be connected to a limited number of components or they won't start/crash. this number increases with the tier, and can be increased in servers by adding cpus.	2014-01-16 02:25:37 +01:00
Florian Nücke	e560a9ee47	refactored computer class to extract any language specific logic (Lua) from the main running logic. this makes it a little less massive and should make it easier to add other language implementations, such as a Java implementation of Lua, or even altogether different languages such as an assembly emulator, for example	2014-01-15 19:30:24 +01:00
Florian Nücke	775236dc9d	fixed localization names for server rack	2014-01-15 17:08:12 +01:00
Florian Nücke	35f904d8ff	tile entity renderer for server rack for power indication; manual synchronization of server presence for rendering	2014-01-15 16:47:27 +01:00
Florian Nücke	0377cc53f1	block renderer for server rack	2014-01-15 16:07:41 +01:00
Florian Nücke	9128e82741	made racks save and load properly; made the rack block a redstone aware block; some more fixes; renamed the computer component to Machine	2014-01-15 13:09:45 +01:00
Florian Nücke	f0a900a014	Merge branch '1.2' into servers ... Conflicts: li/cil/oc/common/tileentity/Computer.scala	2014-01-14 17:08:20 +01:00
Florian Nücke	206e188a31	Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.2	2014-01-14 17:07:00 +01:00
Florian Nücke	7e803cdb8e	fixes optional interface derp making the mod crash if stargatetech 2 isn't present. this is actually a hacky workaround because I have no clue why IBusDevice cannot be implemented by AbstractBusAware, after all the same pattern works for redstone and cc's peripheral interface... the mysteries of class loading. fixes #81 v1.1.2a	2014-01-14 16:43:53 +01:00
Florian Nücke	3aac30b8ae	Merge branch '1.2' into servers ... Conflicts: li/cil/oc/Items.scala li/cil/oc/common/Proxy.scala li/cil/oc/common/tileentity/Computer.scala	2014-01-14 00:36:48 +01:00
Florian Nücke	48da13c51d	Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.2 ... Conflicts: li/cil/oc/Items.scala	2014-01-14 00:25:15 +01:00
Florian Nücke	53afad753f	updated sgt2 api (fixes obfuscation issue) v1.1.2	2014-01-13 23:22:45 +01:00
Florian Nücke	ff98a24147	updated stargatetech api	2014-01-13 22:20:52 +01:00
Florian Nücke	e6631a6335	bump version number	2014-01-13 22:05:54 +01:00
Florian Nücke	ae60f1a5c1	fixed stack tracebacks always being returned to lua	2014-01-13 22:01:41 +01:00
Florian Nücke	02e387cd85	Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into StargateTech2 ... Conflicts: mcmod.info	2014-01-13 21:51:39 +01:00
Florian Nücke	2339c88821	kinda got server racks doing stuff (once)	2014-01-13 21:49:40 +01:00
Florian Nücke	d47013df42	added power buttons to server rack gui and sending and handling packet to toggle power	2014-01-13 18:21:14 +01:00
Florian Nücke	5de05dfe90	added two more tiers for cpus, since those will be used to control the number of components a server is able to address; server item texture and tooltips	2014-01-13 17:39:27 +01:00
Florian Nücke	b1a78975e8	server item gui and inventory is working; fixed rendering of 3d items when in a gui with tiered slots	2014-01-13 16:21:17 +01:00
Florian Nücke	d98e0b7317	post-merge adjustments	2014-01-13 12:22:35 +01:00
Florian Nücke	b52181346b	Merge branch '1.2' into servers ... Conflicts: li/cil/oc/Blocks.scala li/cil/oc/Items.scala li/cil/oc/common/GuiType.scala	2014-01-13 12:19:10 +01:00
Florian Nücke	d19e0f641f	Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.2	2014-01-12 23:15:19 +01:00
Florian Nücke	072600ae46	adjusted version for next release v1.1.1	2014-01-12 20:56:14 +01:00
Florian Nücke	8643fb4338	also checking whether the nbt data of an item changed when used by a robot, to return true in that case (e.g. for ic2 electric items such as the mining laser); explicit check for mining laser use to avoid robots shooting themselves	2014-01-12 20:31:42 +01:00
Florian Nücke	92c9a46d8c	fixed bundled redstone output resetting after loading	2014-01-12 15:16:45 +01:00
Florian Nücke	8475597838	do vertical multi-block screen merges first to prefer in-chunk merges, hopefully helping a bit with non-determinism when chunk loading is involved	2014-01-11 22:04:21 +01:00
Florian Nücke	0578b4af15	tweaked obstacle detection for wireless networking a bit to avoid self-collisions and have a better distribution of the samples on diagonals	2014-01-11 21:59:59 +01:00