Commit graph

228 commits

Author SHA1 Message Date
Aidan Brady
75b1a9804d Battery bugfixes 2013-08-05 01:29:39 -04:00
Calclavia
ee64d65d62 Prevented face from rendering when blocked by non-opaque block 2013-08-05 01:02:06 -04:00
Calclavia
aef0e8f44e Added capacitor charge to creative 2013-08-05 00:58:59 -04:00
Calclavia
6537a7b7ae Made capacitors render on battery block 2013-08-05 00:54:01 -04:00
Calclavia
91328615fa Added recipe for everything 2013-08-04 23:50:59 -04:00
Calclavia
ba5f23f540 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 23:45:36 -04:00
Aidan Brady
0134b505d2 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 23:45:08 -04:00
Aidan Brady
ae70542bbd Battery is mostly working! 2013-08-04 23:44:58 -04:00
Calclavia
d29252386a Fixed raytrace bug 2013-08-04 23:13:21 -04:00
Calclavia
9e1feca3e8 Inter-dimensional transfer working! 2013-08-04 22:56:45 -04:00
Calclavia
258afcd33f Added quantum tesla 2013-08-04 22:45:32 -04:00
Aidan Brady
e3ab3e67ea Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 22:32:46 -04:00
Aidan Brady
ccbaf105eb Work on battery GUI 2013-08-04 22:32:28 -04:00
Calclavia
01f871011f Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 22:07:04 -04:00
Calclavia
2a2dcb16df Fixed multimeter GUI bar 2013-08-04 22:06:57 -04:00
Aidan Brady
54b8800ff5 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 22:05:50 -04:00
Aidan Brady
a26a698b4b A bit of work on logistics 2013-08-04 22:05:35 -04:00
Calclavia
b4650a95f2 Added modular battery box click zones 2013-08-04 21:47:28 -04:00
Calclavia
f14f1ec50e Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 21:28:42 -04:00
Calclavia
c606fe0cd8 Fixed blocks breaking instantly 2013-08-04 21:28:29 -04:00
Aidan Brady
ab02a09159 Visible inventory logistical management (hopefully) complete 2013-08-04 21:27:56 -04:00
Calclavia
07ac511e17 Fixed Tesla zapping 2013-08-04 21:21:07 -04:00
Aidan Brady
0bb73d5183 Just about finished inventory management, onto logistics 2013-08-04 21:15:16 -04:00
Aidan Brady
afb563898a More inventory implementation 2013-08-04 20:39:25 -04:00
Aidan Brady
26393f8d72 Beginning work on inventory management 2013-08-04 20:18:40 -04:00
Aidan Brady
b4028d8fcb Fix crash when splitting inventories 2013-08-04 19:21:59 -04:00
Aidan Brady
c95031de2e Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 18:59:42 -04:00
Aidan Brady
1834bc09d8 Work on new (hopefully more efficient) multiblock system 2013-08-04 18:56:59 -04:00
Calclavia
48fee60770 Fixed path NPE 2013-08-04 18:22:33 -04:00
Calclavia
e189636464 Fixed EM Contractor link packets 2013-08-04 18:19:24 -04:00
Calclavia
797f50f84a Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 18:04:51 -04:00
Calclavia
68b90336c8 Another attempt at fixing saving 2013-08-04 18:04:36 -04:00
Aidan Brady
a2d955d6a3 Fixed contractor spinning 2013-08-04 18:02:07 -04:00
Calclavia
869c6c1861 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 17:56:28 -04:00
Calclavia
fb4ed3aa3b Fixed link not saving 2013-08-04 17:56:13 -04:00
Aidan Brady
7c9bc8bb8d Added algorithm to split HashSets 2013-08-04 17:45:15 -04:00
Calclavia
fd3f60a3d5 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 13:02:06 -04:00
Calclavia
9ebbb2fb0c Added EM Contractor coloring 2013-08-04 13:01:54 -04:00
Calclavia
54fd6b4d2f Finished EM Contractor move 2013-08-04 12:53:58 -04:00
Calclavia
f5bae17e35 Added electrical path line 2013-08-04 12:43:41 -04:00
Aidan Brady
a34d9d86a9 Gave the Battery a model 2013-08-04 11:56:31 -04:00
Calclavia
b727502276 Made linking work 2013-08-04 11:33:42 -04:00
Calclavia
dc9cf65660 Fixed pathfinder NPE and EM Contractor model 2013-08-04 11:18:39 -04:00
Calclavia
1fd0bac321 Added battery model and renderer 2013-08-04 11:13:02 -04:00
Calclavia
98c15becad Added EM contractor link and pathfind 2013-08-04 10:21:02 -04:00
Calclavia
43f770fd66 Added electrostatic linker 2013-08-04 10:20:45 -04:00
Calclavia
be5d59180c Made ItemCoordLink parent class 2013-08-04 10:04:31 -04:00
Aidan Brady
4ddb716101 Work on cell implementation of Battery
(really signing off now)
2013-08-04 04:04:02 -04:00
Aidan Brady
ca44ee4cf4 I lied, I'm not signing off. Packets for Battery multiblock 2013-08-04 03:35:33 -04:00
Aidan Brady
796ab2eee2 Fixed cuboid algorithm! Multiblock now code-wise functions properly
Signing off. Night all!
2013-08-04 03:17:46 -04:00
Aidan Brady
935b257f51 The algorithm is not recognizing invalid cuboids :( 2013-08-04 03:02:19 -04:00
Aidan Brady
64706f7a37 More battery work, algorithm semi-working 2013-08-04 02:48:17 -04:00
Aidan Brady
bea61449b4 And yet more work. 2013-08-04 02:37:49 -04:00
Aidan Brady
c6eb7eba25 More work on battery multi block 2013-08-04 02:27:37 -04:00
Aidan Brady
dea370c0e3 Work on Battery Multiblock 2013-08-04 02:16:24 -04:00
Aidan Brady
1535e1de10 Merge branch 2013-08-04 00:12:20 -04:00
Aidan Brady
eb77e593d6 Began work on Multiblock battery 2013-08-04 00:11:06 -04:00
Calclavia
d094f0baf6 Finished A* Pathfinder 2013-08-04 00:04:16 -04:00
Calclavia
dc9d5da1a9 More work on pathfinder 2013-08-04 00:00:48 -04:00
Calclavia
ff78509019 Added basic findNode function 2013-08-03 23:53:13 -04:00
Calclavia
06e5fb1e7a Start work on A* pathfinding algorithm 2013-08-03 23:46:29 -04:00
Aidan Brady
3539173e6b Don't spin Contractor if game is paused 2013-08-03 23:03:15 -04:00
Aidan Brady
5fa79a9807 Re-added electricity :) 2013-08-03 22:49:03 -04:00
Aidan Brady
a57f8fb022 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 22:35:47 -04:00
Aidan Brady
f8091d1b15 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction
Conflicts:
	src/resonantinduction/contractor/TileEntityEMContractor.java
	src/resonantinduction/model/ModelEMContractor.java
	src/resonantinduction/render/RenderEMContractor.java
2013-08-03 22:35:23 -04:00
Calclavia
4e4d6d2d18 Added set energy options 2013-08-03 22:29:56 -04:00
Aidan Brady
07d6380681 Cleanup 2013-08-03 22:25:57 -04:00
Calclavia
f6ab9e1f9b Added capacitor 2013-08-03 22:23:06 -04:00
Calclavia
ee2dc80248 Added modular battery 2013-08-03 22:14:47 -04:00
Calclavia
7eaf73341b Added handheld multimeter reading feature 2013-08-03 22:00:43 -04:00
Calclavia
f77f7387b7 Added block rendering for multimeter 2013-08-03 21:38:12 -04:00
Calclavia
50fe6c44d0 Added lightning to EM Contractor 2013-08-03 21:27:12 -04:00
Calclavia
37d9200af2 Added multimeter detection mechanism 2013-08-03 21:16:59 -04:00
Aidan Brady
6b94b4d05a Polished off Contractor, just need to finish energy usage. 2013-08-03 21:09:49 -04:00
Aidan Brady
ca0fca1fa1 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 19:58:32 -04:00
Aidan Brady
e0556e36f9 Work on rotation 2013-08-03 19:57:59 -04:00
Calclavia
8e88109eac Fixed multimeter gui 2013-08-03 19:46:13 -04:00
Calclavia
2586b061e3 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 19:45:00 -04:00
Calclavia
30349128f3 Added GUI for multimeter 2013-08-03 19:43:10 -04:00
Aidan Brady
3e194f16e4 Config values for Contractor, began work on energy usage 2013-08-03 19:32:54 -04:00
Calclavia
32cbb970f4 Added multimeter, no OP 2013-08-03 19:19:20 -04:00
Calclavia
ba0494c624 Added sound configuration 2013-08-03 19:11:50 -04:00
Aidan Brady
05eca54839 ISidedInventory done, fixed crash.
CONTRACTOR BASE CODE IS DONE!
2013-08-03 19:04:06 -04:00
Aidan Brady
e832a4ae55 IInventory suck inventory implementation complete 2013-08-03 18:47:34 -04:00
Aidan Brady
8f54d8622c ISidedInventory support implemented for ejecting, onto insertion 2013-08-03 18:13:40 -04:00
Aidan Brady
47b30b8160 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 17:47:02 -04:00
Aidan Brady
77f5ef7930 Fixed item ejecting 2013-08-03 17:46:25 -04:00
Calclavia
3aab19b32e Some more work on entity shock raytrace 2013-08-03 17:19:04 -04:00
Calclavia
d18265e44b Made Tesla do raytrace 2013-08-03 16:50:37 -04:00
Calclavia
0496b44c0d Added some raytrace functions 2013-08-03 16:39:11 -04:00
Calclavia
eee616a58c Added entity attack and redstone upgrade 2013-08-03 15:56:27 -04:00
Calclavia
ab0567c875 Added receive mode toggle and color tunes 2013-08-03 15:44:11 -04:00
Calclavia
cf20ea9e96 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 15:10:09 -04:00
Aidan Brady
83a922a87d Bugfixing ejecting, currently broken (severely) 2013-08-03 15:09:18 -04:00
Calclavia
489154b92d Cached Tesla objects; improving performance 2013-08-03 15:09:08 -04:00
Calclavia
052f14c540 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 15:05:47 -04:00
Aidan Brady
8879d29f4f More work on ejecting 2013-08-03 15:02:02 -04:00
Calclavia
bb74338ae1 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 14:59:19 -04:00
Calclavia
2ed7e01e5e Improved Tesla transfer mechanism 2013-08-03 14:59:07 -04:00
Aidan Brady
a65d05e9d4 Beginning work on IInventory/ISidedInventory push implementation 2013-08-03 14:51:49 -04:00