Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
410 commits 1 branch 0 tags 42 MiB
Commit graph

368 commits

Author SHA1 Message Date
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
Calclavia
edb370b7d5 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 14:38:33 -04:00
Calclavia
9bfa1bbdda Fixed electric bolt being too random 2013-08-03 14:38:24 -04:00
Aidan Brady
3209d1c671 Fixed placement rotation! 2013-08-03 14:36:48 -04:00
Calclavia
e01565f34d Fixed electric bolt, need to make less random 2013-08-03 14:33:55 -04:00
Aidan Brady
4f74f65907 Fixed automatic rotation 2013-08-03 14:28:39 -04:00
Aidan Brady
ec9835aa53 Packets! 2013-08-03 14:14:28 -04:00
Aidan Brady
8278bb7794 Adjustments 2013-08-03 13:56:29 -04:00
Aidan Brady
236e80bfe1 Merge branches 'master' and 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 13:41:55 -04:00
Aidan Brady
6c809e1555 Custom ItemBlock for Contractor 2013-08-03 13:41:37 -04:00
Calclavia
c9780a6ac4 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 13:18:39 -04:00
Aidan Brady
5262a37826 Work on automatic orientation setting 2013-08-03 13:18:12 -04:00
Aidan Brady
01458b1d5b Beginning work on inventory latching 2013-08-03 13:06:56 -04:00
Calclavia
dca07d2cf1 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 12:59:54 -04:00
Calclavia
8776f0a668 Fixed lightning random huge flickers temporarily 2013-08-03 12:59:28 -04:00
Aidan Brady
1b542f9fd9 Minor speed adjustments 2013-08-03 12:52:12 -04:00
Aidan Brady
f6dadc083c Began work on Contractor "suck" mode 2013-08-03 12:40:47 -04:00
Calclavia
d95a1429b3 Simplified some entangler code 2013-08-03 12:16:24 -04:00
Aidan Brady
dae86c39e9 Smooth enough for now. 
Signing off, will do more work tomorrow.
 2013-08-03 04:04:42 -04:00
Aidan Brady
06000aff4c Screw it, doesn't work :< 2013-08-03 03:10:59 -04:00
Aidan Brady
9a710b803c Fix attempt :( 2013-08-03 02:55:44 -04:00
Aidan Brady
d12cf1070f Attempt at fixing rough NSWE movement 2013-08-03 02:23:07 -04:00
Aidan Brady
011695b875 Fixed NSWE motion! 2013-08-03 01:55:45 -04:00
Aidan Brady
cbeb94507b Custom acceleration, fixed NSEW item movement 2013-08-03 01:41:16 -04:00
Aidan Brady
c45a426e75 Items now move! :D 2013-08-03 01:29:28 -04:00
Aidan Brady
eedad4bc2d Began work on Contractor item transport 2013-08-03 01:20:11 -04:00
Aidan Brady
139cdbf660 More efficient bounds checking 2013-08-03 01:03:57 -04:00
Aidan Brady
51e2bef632 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 00:53:55 -04:00
Aidan Brady
143b3cfdda Work on contractor bounds 2013-08-03 00:53:33 -04:00
Calclavia
8436e0aa50 Added Tesla sound fxs 2013-08-03 00:42:45 -04:00
Calclavia
c686e325b9 Fixed packet and made Tesla colors work 2013-08-03 00:24:12 -04:00
Calclavia
5bc0b50219 Fixed packet functions not static 2013-08-03 00:06:53 -04:00
Calclavia
717ef201fd Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-03 00:02:56 -04:00
Calclavia
28219bcdd0 Added Tesla colorful electric bolts! 2013-08-03 00:02:16 -04:00
Aidan Brady
dfbd1c8f79 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-02 23:59:57 -04:00
Aidan Brady
f27aaa3c4b PacketHandler! 2013-08-02 23:59:39 -04:00
Aidan Brady
19efceae92 Easy way to increment facing 2013-08-02 23:36:56 -04:00
Calclavia
a575d4476b Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-02 23:36:10 -04:00
Calclavia
c1d9385f53 Added Tesla furnace output and better multiheight control 2013-08-02 23:35:55 -04:00
Aidan Brady
de2ac756c4 Properly rotating! :) 2013-08-02 23:30:08 -04:00
Aidan Brady
5cfbb68adb Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-02 23:17:17 -04:00
Aidan Brady
1fd02a68b5 Come on, rotate! 2013-08-02 23:17:01 -04:00
Calclavia
2d742be347 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-02 22:55:59 -04:00
Calclavia
834ecd4ee5 Made eletric shock semi-working 2013-08-02 22:55:29 -04:00
Aidan Brady
40d2ff9df3 Work on contractor, base code done 2013-08-02 22:18:03 -04:00
Aidan Brady
77e5cc6e35 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-02 21:50:36 -04:00
Aidan Brady
f2dacfa919 Began work on the Electromagnetic Contractor 2013-08-02 21:50:14 -04:00
Calclavia
086f23f26f Added EM Contractor model for Aidan 2013-08-02 21:46:59 -04:00
Aidan Brady
aa49e54a2f Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-02 21:26:58 -04:00
Aidan Brady
1d9f4ab627 Fixed QE teleporting when binding vec 2013-08-02 21:25:25 -04:00
Calclavia
8ac93513ac Made tesla render based on height 2013-08-02 19:27:00 -04:00
Aidan Brady
17f29aeb7c Gave Quantum Entangler a texture. 
Signing off until around 9 PM EST.
 2013-08-02 12:45:10 -04:00
Calclavia
58831fff7c Added getDeltaPositionFromRotation; Bolt not rendering yet. Continue tonight. 2013-08-02 09:30:59 -04:00
Calclavia
3bebb340c2 Fixing electric bolt render 2013-08-02 09:21:15 -04:00
Calclavia
86e62265fd Fixed build file name 2013-08-02 09:06:32 -04:00
Calclavia
91a193dd9c Day 2, Good Morning! 2013-08-02 09:03:12 -04:00
Aidan Brady
06f724de78 Entangler now teleports! 
Done for the night, signing off. Lots of work to do tomorrow!
 2013-08-02 02:55:39 -04:00
Aidan Brady
1323384a80 Work on core mechanics of Quantum Entangler 2013-08-02 02:38:30 -04:00
Aidan Brady
32044d27ae Began work on Quantum Entangler 
Also started work on base code for Item and cleaned up core class. Expect Quantum Entangler to be finished overnight, code-wise!
 2013-08-02 01:25:41 -04:00
Calclavia
18a7cbb7b2 Rendering for previous and next segments 2013-08-02 00:31:06 -04:00
Calclavia
c1c6c781d0 Added recalculate functions 2013-08-02 00:21:55 -04:00
Calclavia
dbed6dea08 Some work on eletric bolt 2013-08-02 00:12:58 -04:00
Calclavia
1db948c0c8 Finished up bolt split function 2013-08-02 00:07:52 -04:00
Calclavia
fcbd4cad43 Aidan, go merge again :) 2013-08-01 23:55:07 -04:00
Calclavia
bcfcfdfb03 Vector3 function additions 2013-08-01 23:34:56 -04:00
Calclavia
7016ee0b76 Some work on electric bolt fxs 2013-08-01 23:07:56 -04:00
Calclavia
d6efc5540b Got Tesla transfer working 2013-08-01 22:19:01 -04:00
Calclavia
97c117b7c3 Fixed language and creative tabs 2013-08-01 22:03:44 -04:00
Calclavia
0c26e84808 Got tesla transfering power 2013-08-01 21:52:12 -04:00
Calclavia
9b3ca1e547 Added Tesla grid 2013-08-01 21:24:33 -04:00
Calclavia
6770d6d02b Added tesla middile model 2013-08-01 21:15:02 -04:00
Calclavia
0facc60e78 Added tesla model 2013-08-01 21:08:46 -04:00
Calclavia
dfe0830968 Started working on Tesla 2013-08-01 20:57:56 -04:00
Calclavia
6048c94d6d Added block base 2013-08-01 20:48:07 -04:00
Calclavia
39f82861e0 Finished base class 2013-08-01 20:38:42 -04:00
Calclavia
d4cf9300c6 More work on base class 2013-08-01 20:29:44 -04:00
Calclavia
10dabcc941 Updated build script 2013-08-01 20:24:57 -04:00
Calclavia
de2881ef84 Added build script 2013-08-01 20:20:14 -04:00
Calclavia
663d697a25 Started basic mod class 2013-08-01 20:17:42 -04:00