630 Commits

Author SHA1 Message Date
Florian Nücke
52592c57cb cleaned up recipes class a bit 2013-12-24 14:30:09 +01:00
Florian Nücke
30434a960a made craftinghandler for navigation upgrade non-sided so that the retrieved map properly shows up in client's inventory immediately; moved adding of old map to inventory to after the loop, to avoid it being reused in certain scenarios 2013-12-24 14:19:43 +01:00
Florian Nücke
f8329df0ce Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into robot_components 2013-12-24 14:08:28 +01:00
Florian Nücke
cc1c262fa0 organized imports 2013-12-24 14:07:37 +01:00
Florian Nücke
b78bdef513 no longer using client side method for cable neighbor checking on server, fixes #23 2013-12-24 13:12:59 +01:00
Florian Nücke
22bcc5756e moved example whitelist entries to comment so we default to using the blacklist as suggested in #19; better message when http api fails parsing binary data (see #21) 2013-12-24 12:58:47 +01:00
Florian Nücke
ba46bd5049 little bit of refactoring, renaming the new upgrades 2013-12-23 21:39:07 +01:00
Florian Nücke
8fbbd92f99 general clean up and formatting; removed gt api import; returning y position together with x and y in nav upgrade 2013-12-23 21:19:20 +01:00
Florian Nücke
28c504d342 added sneaky parameter to robot.swing, as discussed in #13 2013-12-23 19:17:01 +01:00
Johannes Lohrer
4fd46c3f48 fixed names 2013-12-23 16:42:59 +01:00
Johannes Lohrer
28ed13f9c1 Merge branch 'master' of cil.li:oc into recipes 2013-12-23 16:39:05 +01:00
Johannes Lohrer
b699a37473 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into recipes 2013-12-23 16:38:59 +01:00
Johannes Lohrer
f6ab7e4a67 tried recrafting of map 2013-12-23 16:38:38 +01:00
Daniel Kaltenthaler
44f5d641ce Added item icons for locator, solar generator and writer. 2013-12-23 16:23:36 +01:00
Johannes Lohrer
4a46e0f054 added recipes for locator,solargenerator and reader 2013-12-23 15:38:36 +01:00
Florian Nücke
c0adb97603 making sure robot upgrade is properly sent to client on load in case TE is sent before first update (player triggered load) by sending it again in the first update 2013-12-23 14:25:08 +01:00
Johannes Lohrer
0a29aad3c3 added basic recipes 2013-12-23 03:02:49 +01:00
Johannes Lohrer
e56cab7fad Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into recipes 2013-12-22 22:22:43 +01:00
Florian Nücke
73999ff939 avoiding errors for upgrades that don't have a component and possibly timing issues (sending to client before it was initialized) 2013-12-22 22:18:51 +01:00
Johannes Lohrer
fbf68095c2 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into recipes 2013-12-22 21:07:47 +01:00
Johannes Lohrer
9976658699 made shapeless and shaped recipes configurable in a config file. Recipes not yet done, just methods for parsing 2013-12-22 21:07:28 +01:00
Florian Nücke
c260ac0c7e bump version number to 1.0.3; forgot to push before drafting the Github release - this is the actual version of the released ZIP file. 2013-12-21 20:18:39 +01:00
Florian Nücke
31cb37b8e8 added rendering for crafting upgrade v1.0.3 2013-12-21 19:55:57 +01:00
Florian Nücke
8a6b1e7cb9 sending fewer syncs to client from generator upgrade 2013-12-21 19:16:08 +01:00
Florian Nücke
5dae4cd20e added callback to robot context that allows forcing an upgrade to be saved and resent to clients, to allow upgrades to manually synchronize their data with clients for state specific rendering; using this to transmit generator state (running or not) and show a different texture accordingly; fixed a bug where remaining runtime wasn't saved for generators when no more items were in their internal inventory; implementing contexts in their respective tile entities, too, to allow external components to refer to their owners via the context interfaces 2013-12-21 19:06:52 +01:00
Florian Nücke
26b5d0543e synchronizing the upgrade installed on robots to clients and checking it in renderer, if present use the item's item renderer to render it in its "equipped" state, which for robot upgrades should take of rendering the upgrade appropriately on its robot; basic generator renderer, still needs syncing of whether its currently active or not to show the appropriate texture 2013-12-21 17:36:21 +01:00
Florian Nücke
60431cf4e0 fixed copy-paste error (grrr) that made wireless broadcasts skip the first passed parameter, fixes #16 2013-12-20 21:08:04 +01:00
Florian Nücke
a10d4fdce5 updated typesafe config (I should probably make this a sub-repo eventually) 2013-12-20 20:26:58 +01:00
Florian Nücke
3a87ecd6ce fixed default config failing to load on some systems (reported on Minecraft Forums, could not reproduce but this change reportedly did the trick) 2013-12-20 19:53:57 +01:00
Florian Nücke
eb28209f1b fixed invalid placement orientations for computer case and disk drive introduced in 30d9cc8 (why do I always find this stuff shortly *after* pushing a release?) 2013-12-20 16:19:58 +01:00
Florian Nücke
cb647e3f6e bump version for 1.0.2 hotfix v1.0.2 2013-12-20 15:03:06 +01:00
Florian Nücke
596a8da0e8 manually removing compatibility entries for 5.1 if present, should fix #14 (may break one last time if the compat entries were used while saving) 2013-12-20 12:32:10 +01:00
Florian Nücke
30d9cc8b0f explicitly marked SidedEnvironment.canConnect as client side; changed treatment of forge's Block.validRotations implementation to return what it actually should and adjusted a couple of things accordingly; no longer allowing to rotate keyboard since that could lead to invalid facings with no solid block beneath them; allowing to place keyboards anywhere, adding some special rules where to check for screens (in front of them, and when on the wall below them) to allow input on 2013-12-19 22:31:11 +01:00
Johannes Lohrer
d35ad805bb Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into robot_components 2013-12-19 18:17:33 +01:00
Florian Nücke
07dee573c5 native libraries for (intel) Mac OS 2013-12-19 16:44:01 +01:00
Florian Nücke
9c465f02d8 fixed robots also being added to outer network, fixes #12, introduced in 407d251
fixed robots total buffer size not initializing correctly
2013-12-19 13:40:05 +01:00
Johannes Lohrer
d3a403b4b4 removed souts and fixed default value for scale 2013-12-19 10:46:46 +01:00
Johannes Lohrer
22ab545175 added many items and blocks to the ore dictionary 2013-12-18 23:41:05 +01:00
Johannes Lohrer
c66ecb0f1e created locator
made components use context instead of owner
2013-12-18 23:31:35 +01:00
Johannes Lohrer
d49040945a Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into robot_components 2013-12-18 18:51:37 +01:00
Florian Nücke
9fdef1f4a8 bumping version number for 1.0.1 release v1.0.1 2013-12-18 17:22:58 +01:00
Florian Nücke
718077abaa also fixed AltGr in term.read, fixing special character input in shell and Lua interpreter 2013-12-18 00:15:10 +01:00
Johannes Lohrer
8d4ac186c4 localisation and tool-tips 2013-12-18 00:04:48 +01:00
Florian Nücke
add557c914 overlay for up/down facing screens indicating their orientation to make it less confusing why screens won't connect 2013-12-17 23:57:36 +01:00
Johannes Lohrer
9e87548837 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into robot_components
Conflicts:
	reference.conf
2013-12-17 23:49:43 +01:00
Johannes Lohrer
717de3f468 added reader not WIP 2013-12-17 23:49:05 +01:00
Johannes Lohrer
f9e6381635 fixed components not updated when inserted 2013-12-17 21:05:52 +01:00
Johannes Lohrer
073ef1fee5 fixed components not updated when inserted 2013-12-17 20:42:41 +01:00
Florian Nücke
7cd405361b centering text when setting lower resolution in robot; clearing screen when changing resolution to avoid dirty buffer space and cursor going out of scope 2013-12-17 14:01:56 +01:00
Florian Nücke
9a0ebf1bae casting some black regex magic to format the render output of the typesafe config to make it feasible to write it back to file. the order still gets jumbled, but whatever. 2013-12-17 13:38:02 +01:00