Commit graph

1030 commits

Author SHA1 Message Date
Calclavia
605d4212c5 Added new battery model 2014-01-12 14:38:48 +08:00
Calclavia
a54e0d066a Added engineering table filter/blueprint support 2014-01-12 13:54:53 +08:00
Calclavia
d860d672d1 Removed useless container 2014-01-12 13:48:49 +08:00
Calclavia
57800e0e0f Engineering table now reaps resources from your inventory 2014-01-12 13:48:26 +08:00
Calclavia
f581ade242 Fixed stackSize tooltip being "1" and added inventory clear method 2014-01-12 13:07:18 +08:00
Calclavia
05241e740e Added ability to mass craft with Engineering Table 2014-01-12 12:37:58 +08:00
Calclavia
8c7e8d7601 Added crafting tooltips 2014-01-12 01:15:43 +08:00
Calclavia
d1315fb585 Finsihed engineering table 2014-01-12 01:03:30 +08:00
Calclavia
f073591ec8 Engineering table render and item placing working 2014-01-12 00:43:19 +08:00
Calclavia
518643b438 Added engineering table 2014-01-11 23:43:15 +08:00
Calclavia
699788b19b Fixed some tank derp connections 2014-01-11 23:29:00 +08:00
Calclavia
a884d59309 Fixed more tank packet issues 2014-01-11 23:20:18 +08:00
Calclavia
77ae26235a Fixed pipe packet and using bitmasks 2014-01-11 22:49:21 +08:00
Calclavia
b41c1ce033 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-11 22:27:33 +08:00
DarkGuardsman
de54ac908c Try two on fixing config 2014-01-11 06:38:15 -05:00
DarkGuardsman
9771db804c Possible fix for config issues 2014-01-11 06:16:34 -05:00
Calclavia
58e7179a36 Some work on Tank bitmask 2014-01-11 19:14:28 +08:00
DarkGuardsman
0747c2ffad Moved tank prefabs 2014-01-11 06:13:50 -05:00
DarkGuardsman
7706d5bd65 Found and re-added Tank & Pipe item renderers 2014-01-11 05:48:25 -05:00
Calclavia
f3f6d7858b Readded Armbot 2014-01-11 18:31:58 +08:00
Calclavia
a31b12ba30 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-11 18:20:24 +08:00
Calclavia
9f53320123 Using new block registration 2014-01-11 18:19:26 +08:00
Vexatos
5eefcfa051 de_DE.properties edited 2014-01-11 10:17:15 +00:00
Calclavia
51ae09aa3b Refactored crafting table and imprinter 2014-01-11 17:56:26 +08:00
Calclavia
f4d88b0efc Moved archive out of test folder 2014-01-11 17:44:07 +08:00
Calclavia
d362bab7c4 Removed IPowerless 2014-01-11 17:30:24 +08:00
Calclavia
e8b0e56a80 Moved more stuff to core 2014-01-11 17:28:38 +08:00
Calclavia
68e9b95ffb Moved some of stuff into core 2014-01-11 17:22:03 +08:00
Calclavia
6b1766fc3b Purged all errors! 2014-01-11 13:59:55 +08:00
Calclavia
99a3827bbd Readded Crates 2014-01-11 13:18:14 +08:00
Calclavia
d62a3e075e Readded Grate and Pump 2014-01-11 13:03:42 +08:00
Calclavia
870a5338ba Readded pipes 2014-01-11 12:51:00 +08:00
Calclavia
08a47e9b3a Removed all pipe textures, we only need white 2014-01-11 12:23:15 +08:00
Calclavia
904461936f Readded tanks 2014-01-11 12:09:02 +08:00
Calclavia
033f6e4460 Made a copy of all files into Java test directory for safekeeping 2014-01-11 11:31:21 +08:00
Calclavia
7e781c2e6f Renabled Conveyor Belt 2014-01-11 11:28:48 +08:00
Calclavia
eab51b61cc Fixed EMLevitator 2014-01-11 11:04:30 +08:00
Calclavia
0f2ab328f9 Fixed vanilla texture not loading 2014-01-11 00:15:40 +08:00
Calclavia
ab24bb2746 Added solar panels 2014-01-11 00:08:58 +08:00
Calclavia
67fc891420 Fixed dust colors too dark 2014-01-10 23:20:38 +08:00
Calclavia
ede36bfead Fixed errors in Armbot 2014-01-10 22:39:03 +08:00
Calclavia
660288b230 Moved appropriate classes to Electrical module 2014-01-10 22:06:56 +08:00
Calclavia
dc950d7989 Using new ID registration system 2014-01-10 20:24:33 +08:00
Calclavia
b78d5d1c8e Updated Calclavia Core 2014-01-10 19:11:31 +08:00
Calclavia
662acb7c23 Moved some of Dark Library into Calclavia Core 2014-01-10 17:38:29 +08:00
Calclavia
dc63af95fb Fixed proxy, Minecraft now loading again 2014-01-10 16:57:49 +08:00
DarkGuardsman
dfabc9e1d8 Little bit of work 2014-01-10 03:00:46 -05:00
DarkGuardsman
d7c536211e Moved a few things 2014-01-09 18:40:49 -05:00
Calclavia
b20537b0a4 Readded electrical module 2014-01-09 23:08:22 +08:00
Calclavia
c5ed109d97 Some work done on the dust generator 2014-01-09 22:52:37 +08:00
Calclavia
3aaeb5d3d3 Got dust auto-generating 2014-01-09 21:59:28 +08:00
Calclavia
ea7c34e467 Minecraft now at least loads up 2014-01-09 20:54:02 +08:00
Calclavia
8f99dd32ae Moved all files to old and starting to recode and organize everything 2014-01-09 20:49:52 +08:00
Calclavia
9b8cad0ab3 Moved Built Broken library into RI 2014-01-09 20:35:05 +08:00
DarkGuardsman
363ce7ad11 More error correction 2014-01-09 01:15:16 -05:00
DarkGuardsman
c0e93e23b3 More work on cleanup & correction of classes 2014-01-08 21:23:16 -05:00
DarkGuardsman
bb781a6685 Working on cleanup 2014-01-08 18:55:59 -05:00
Calclavia
84a023c66c More organization 2014-01-08 22:44:19 +08:00
Calclavia
b8fecae832 More refactor and clean up 2014-01-08 22:27:39 +08:00
Calclavia
27107a8ba1 Reorganized imports and format 2014-01-08 22:18:24 +08:00
Calclavia
4d3b6e48e4 Gave each RI module a loader 2014-01-08 22:09:27 +08:00
Calclavia
8107bfa21c Added settings class 2014-01-08 21:52:56 +08:00
Calclavia
193eacea96 Some loader refactor 2014-01-08 21:42:52 +08:00
Calclavia
3697ad371a Finished initial merge 2014-01-08 21:34:24 +08:00
Calclavia
0f2a7fad45 Reorganized and refactored half of everything 2014-01-08 21:24:25 +08:00
Calclavia
03df09471b Merged language files 2014-01-08 21:02:08 +08:00
Calclavia
1a75116926 Refactored assets 2014-01-08 21:01:12 +08:00
Calclavia
9d30da80e7 Moved models out of RI assets folder 2014-01-08 20:54:45 +08:00
Calclavia
00edfac28c Refactored AL package into RI 2014-01-08 20:51:43 +08:00
Calclavia
3e8fe6a4ec Refactored main RI things into core module 2014-01-08 20:49:22 +08:00
DarkGuardsman
db443d5129 Folder change of newly merged content 2014-01-08 07:24:08 -05:00
Calclavia
3badd4a966 Separated into modules 2014-01-08 20:03:25 +08:00
Calclavia
022e0d04af Added getWorld() override for BuildCraft ASM 2014-01-08 14:26:49 +08:00
Calclavia
b5a1f82db6 Added purifier rotor 2014-01-07 21:49:26 +08:00
Calclavia
c4e0a03da8 Removed linker in favor of Calclavia Core's Multitool 2014-01-07 20:52:29 +08:00
Calclavia
751d040487 Updated Calclavia Core 2014-01-07 19:08:59 +08:00
DarkGuardsman
4d2e0aaab2 Attempted to fix wires not updating to transformer rotation 2014-01-07 00:29:18 -05:00
DarkGuardsman
4d4c437ac2 Finished transformers complex multi side rotation 2014-01-06 23:33:57 -05:00
Calclavia
2da3f0fdca Forgot a dot in the build version 2014-01-07 08:46:00 +08:00
Calclavia
60a2b3f9f5 Switched to Gradle system 2014-01-06 22:25:27 +08:00
Alex_hawks
b2c3d0d348 oops 2014-01-06 19:52:25 +08:00
Alex_hawks
76ed58c305 MultipartRI is refactor-proof, and move ItemDust 2014-01-06 19:47:27 +08:00
Calclavia
c9bd412bb8 Preventing conflicting wheels to be placed together 2014-01-05 19:50:51 +08:00
Calclavia
9cce3f302e Fixed grinder to separate client and server statics 2014-01-05 19:35:56 +08:00
Calclavia
23223da214 Added grinding sound effect 2014-01-05 19:35:43 +08:00
Calclavia
19d62fac01 Made grinder only grind one at a time 2014-01-05 19:02:49 +08:00
Calclavia
d9a251905d Grinding now working 2014-01-05 18:57:49 +08:00
Calclavia
f467c82f13 Fixed recipe comparisons 2014-01-05 18:33:00 +08:00
Calclavia
7acfada35c Switched to use Java equals() 2014-01-05 17:43:59 +08:00
Calclavia
26a269a6b5 Fixed glitchy item bouncing 2014-01-05 17:28:31 +08:00
Calclavia
b9deff12a7 Fixed canGrind crash 2014-01-05 16:02:19 +08:00
Calclavia
b9eba8778d Updated TileGrinderWheel to new recipe functions 2014-01-05 16:00:36 +08:00
Calclavia
da01b0f37e Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-05 15:58:44 +08:00
Calclavia
cc765887c0 Initial grinder working 2014-01-05 15:58:38 +08:00
Alex_hawks
3a80796832 change the recipe handler, and add a simple get output method 2014-01-05 15:53:29 +08:00
Calclavia
474fb6d529 Added grinder wheel 2014-01-05 15:35:42 +08:00
Calclavia
2357384a8c Refactored Crusher to Grinder 2014-01-05 15:30:30 +08:00
Calclavia
6355b98943 Some more work on fluid 2014-01-05 15:12:33 +08:00
Calclavia
d6df9bb0a3 Added basic fluid merging 2014-01-05 14:50:43 +08:00
Calclavia
ba6a56ab7e Added fluid mixture NBT saving 2014-01-05 14:26:59 +08:00
Calclavia
cfd5359a2f Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-05 14:20:08 +08:00
Calclavia
1b4a25fc0b Added fluid mixture 2014-01-05 14:20:01 +08:00
Alex_hawks
6a8461216d Blacklist for the ore-detection 2014-01-05 14:03:55 +08:00
Calclavia
013c5fb53a Some multimeter refactor 2014-01-05 13:46:07 +08:00
Calclavia
b7dfecb966 Added pick block for BlockBattery 2014-01-05 13:37:55 +08:00
Calclavia
702eda6366 Rendering new battery model 2014-01-05 13:26:34 +08:00
Calclavia
47f6f07d69 Fixed wire connection not checking canConnect() 2014-01-05 04:26:51 +08:00
Calclavia
f41aa679e8 Registered Machine Part Block 2014-01-05 04:10:47 +08:00
Alex_hawks
3d7328b520 Fix dust auto-generation to require an ore, and no existing dust of the same type 2014-01-05 11:46:01 +08:00
Alex_hawks
bc9171f3f2 Colour works better, and recalculates when the resource pack is reloaded 2014-01-05 11:33:00 +08:00
Alex_hawks
9f436b5f6b And the name is now localized... 2014-01-05 01:10:39 +08:00
Alex_hawks
6ba6f5aa23 I forgot that we weren't loading the texture in a Block class 2014-01-05 00:41:08 +08:00
Calclavia
503a2f050c Made dusts render color 2014-01-05 00:13:10 +08:00
Calclavia
118e64b9be Fixed some IO issues 2014-01-05 00:08:39 +08:00
Alex_hawks
f078b765e6 Make it get the colour properly for the dust 2014-01-04 23:57:42 +08:00
Calclavia
cce4db4a9c Refactored EM Levitator 2014-01-04 23:38:19 +08:00
Calclavia
c55ef8eebd Added IO modification support for Battery and Tesla 2014-01-04 23:31:47 +08:00
Calclavia
dd789c8aca Added machine part block 2014-01-04 22:48:03 +08:00
Calclavia
b1cb33932d Added average color computation 2014-01-04 22:38:57 +08:00
Calclavia
6579ecb9b0 Some more work on the dust 2014-01-04 14:15:41 +08:00
Calclavia
1858ea7891 Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-04 13:52:16 +08:00
Alex_hawks
6dbfa03cca Changed recipe handler to handle fluids 2014-01-04 21:26:19 +08:00
Calclavia
49e3a67d61 Updated Calclavia Core 2014-01-04 13:51:55 +08:00
Calclavia
457404b6bf Started working on auto-gen ItemDust 2014-01-04 13:18:26 +08:00
Calclavia
a1ac29149c Reorganized packages 2014-01-04 12:04:43 +08:00
Calclavia
0ea073d797 Smoothened out vanilla furnace smelt code 2014-01-04 13:30:46 +08:00
Calclavia
ebc1e90f80 Fixed flat wires casting without check 2014-01-04 00:39:21 +08:00
Calclavia
ed5e0cd1d0 Fixed redistribute calls 2014-01-04 00:24:49 +08:00
Calclavia
4f67cf6b17 Attempt to fix multimeter GUI toggle crash 2014-01-04 00:07:59 +08:00
Calclavia
f6a9cbd5a0 Minor battery fixes 2014-01-03 23:48:47 +08:00
Calclavia
59bf99c105 Got basic battery multiblock structure connecting 2014-01-03 23:42:07 +08:00
calclavia
e19a8b9712 Merged in Vexatos/resonant-induction/Vexatos/de_deproperties-edited-1388736572299 (pull request #1)
de_DE.properties edited
2014-01-03 16:57:55 +08:00
Calclavia
7891ba7640 Fixed another missed-out activate null check 2014-01-03 16:56:37 +08:00
Calclavia
1dd2151b9b Added null check to right click framed wire 2014-01-03 16:53:29 +08:00
Vexatos
16c9be1833 de_DE.properties edited 2014-01-03 08:13:40 +00:00
Vexatos
0261df9388 en_US.properties edited 2014-01-03 08:10:16 +00:00
Vexatos
0693ab6802 de_DE.properties edited 2014-01-03 08:09:37 +00:00
Alex_hawks
a0a1d68f7b Framed Switches, and fixes... 2014-01-03 10:43:52 +08:00
Calclavia
86a46fddba Merge branch 'master' of https://bitbucket.org/calclavia/resonant-induction 2014-01-03 00:42:10 +08:00
Calclavia
1338b83a02 Fixed framed wire not connecting 2014-01-03 00:42:05 +08:00
Alex_hawks
4005a8f07c Localize ALL the things, and tesla colouring now accepts non-vanilla dyes 2014-01-02 23:51:52 +08:00
Alex_hawks
794656477a Begin Localizing everything 2014-01-02 22:33:04 +08:00
Calclavia
4ced4bec81 Switched linker to use VectorWorld 2014-01-02 19:20:39 +08:00
Calclavia
7427f5422e Removed basic component registry 2014-01-01 00:48:01 +08:00
Alex_hawks
4188288032 Recipe Handler Lite™ is mostly done 2013-12-31 16:49:06 +08:00
Calclavia
662837fb3d Fixed wires causing TE conduits to malfunction 2013-12-31 16:30:04 +08:00
Calclavia
77ae252000 MCP doesn't use Java 7 by default 2013-12-31 11:59:55 +08:00
Calclavia
2eec7f95c8 Minor clean up 2013-12-31 02:25:31 +08:00
Calclavia
2ee938dc33 Fixed multimeter's RF detection 2013-12-31 01:59:23 +08:00
Alex_hawks
0122b481a8 The standalone wires render! :D 2013-12-31 00:43:23 +08:00
Calclavia
cb9d7a60cb Made battery store energy 2013-12-31 00:39:23 +08:00
Calclavia
e1a16d4bcd Temporarily disabled OBJ rendering 2013-12-31 00:17:20 +08:00
Calclavia
a12f51ffea Fixed trait path 2013-12-30 23:42:23 +08:00
Calclavia
5bbaae4c24 Readded framed wire multipart code. Semi-functional 2013-12-30 23:29:36 +08:00
Calclavia
b644cd25bc Updated submodules 2013-12-30 23:03:55 +08:00
Calclavia
6acb127517 Readded Calclavia Core 2013-12-30 21:20:28 +08:00
Alex_hawks
5b3002cc3f Create a utility method to make my life easier 2013-12-30 20:52:40 +08:00
Alex_hawks
22eb0f6404 Switch wires now respond to redstone parts in the same tile, and actually drop the lever when broken... 2013-12-30 18:09:35 +08:00
Alex_hawks
b33f13de2c Switch Wires! and finish respecting creative-mode players (don't use/drop items) 2013-12-30 15:07:44 +08:00
Calclavia
eb75c2b7d1 Reduced wire capacitance 2013-12-30 13:00:08 +08:00
DarkGaurdsman
d50b4b3d6f Updated UE api & fixed a bug in the wires 2013-12-29 00:00:44 -05:00
DarkGaurdsman
2c779cda17 Started work on transformer 2013-12-28 23:36:57 -05:00
Alex_hawks
3f4c3cb255 Update to new Calclavia-Core, respect creative-mode players for insulating, and use ore dict for dying, no painters yet... 2013-12-28 18:27:52 +08:00
Calclavia
77d73c5f2f Minor Tesla refactor 2013-12-28 00:31:31 +08:00
Calclavia
c8c0033186 Updated UE network interface 2013-12-27 16:57:42 +08:00
Calclavia
7ba0786c0b Starting gradlization 2013-12-26 22:55:47 +08:00
Calclavia
1c0dbbe860 Updated Calclavia Core 2013-12-26 01:06:05 +08:00
Calclavia
0de0c7b385 Made build not include Calclavia Core anymore 2013-12-25 23:47:16 +08:00
Calclavia
2d14ce5e07 Added particles and texture change to vanilla electric furnace 2013-12-25 00:08:23 +08:00
Calclavia
1ba7e3281a Made Tesla packets a lot more efficient 2013-12-24 23:50:53 +08:00
Calclavia
8f3d78ce1d Worked on multiblock battery 2013-12-24 17:28:09 +08:00
Calclavia
2f397145a0 Got transformers rendering 2013-12-24 16:36:58 +08:00
Calclavia
6df2b0421f Fixed register EnergyTileLoadEvent multiple times 2013-12-24 16:18:16 +08:00
Calclavia
5164f86590 Fixed multimeter no-clipping 2013-12-24 16:05:38 +08:00
Calclavia
041f8ff5cd Tweaked multimeter detection code and gui 2013-12-24 15:38:09 +08:00
Calclavia
2f497bad58 Added mechanic to increase energy transfer rate with higher voltage 2013-12-24 14:59:31 +08:00
Calclavia
6ba873d572 Rebalanced wire capacities 2013-12-24 14:28:52 +08:00
Calclavia
18c9e3f94c Aded TE support to flat wires 2013-12-24 14:20:16 +08:00
Calclavia
415a187b0c Started working on IC2 Trait 2013-12-24 00:22:35 +08:00
Calclavia
1369a9af98 Made vanilla electric furnace a universal tile 2013-12-23 23:57:30 +08:00
Calclavia
b4dba9b6d5 Switched to use A Star Pathfinding from Calclavia Library 2013-12-23 23:50:32 +08:00
Calclavia
c244ee7c17 Added ability for item battery to store charge 2013-12-23 23:10:49 +08:00
Calclavia
f51b0c67b7 Fixed battery render 2013-12-23 22:23:55 +08:00
Calclavia
e3d043f5e5 Small refactor 2013-12-23 22:19:48 +08:00
Calclavia
76873c9873 Cleared battery classes, starting rewrite 2013-12-23 21:56:30 +08:00
Calclavia
8e27fb2364 Removed battery inventory 2013-12-23 21:40:20 +08:00
Calclavia
34a0cdfc6b Made transformer Multipart, aesthetics only 2013-12-23 21:29:38 +08:00
Calclavia
2eba46403e Added transformer, non-functional 2013-12-23 21:12:23 +08:00
Calclavia
2120899b20 Removed quantum entangler 2013-12-23 20:45:37 +08:00
Calclavia
a8f3b7fbca Preparing to add IO Panels 2013-12-23 20:32:09 +08:00
Calclavia
eb1fe81b4e Updated UE API 2013-12-23 20:16:17 +08:00
Calclavia
1818682c0a Temporarily added back Modular Battery 2013-12-23 17:56:25 +08:00
Calclavia
2d8af00e89 Revert "Removed modular battery in favor of new design"
This reverts commit e7cc2c07f3.
2013-12-23 17:50:23 +08:00
Calclavia
bbf1ade144 Fixed #77 - Duplicate tile ID 2013-12-23 17:48:11 +08:00
Calclavia
8046f99144 Fixed multimeter gui 2013-12-23 16:51:24 +08:00
Calclavia
b83b2f8336 Turned multimeter into a multipart 2013-12-23 16:18:45 +08:00
Calclavia
53ce24127e Fixed internal connection divider 2013-12-23 15:09:52 +08:00
Calclavia
7dfcd2e6a2 Fixed not detecting EAST WEST machines 2013-12-23 13:40:31 +08:00
Calclavia
1743f428c4 Tweaked material specialty 2013-12-23 12:38:55 +08:00
Calclavia
6056a2215a Added uninsulated wire shock mechanism 2013-12-23 11:26:39 +08:00
Calclavia
18b3219a61 Fixed connecting only to wires sitting on the face 2013-12-23 11:19:41 +08:00
Calclavia
5e8dc4da03 Fixed wires connecting through strips and panels 2013-12-23 10:57:13 +08:00
Calclavia
7f6c7cd678 Fixed different materials merging 2013-12-23 10:38:08 +08:00
Calclavia
5b2e6c0cb7 Tweaked capacitance and resistance 2013-12-23 01:03:53 +08:00
Calclavia
bf0eee7058 Added insulation ability and color 2013-12-23 00:55:08 +08:00
Calclavia
34881cb453 Got network split and merge working 2013-12-22 23:49:43 +08:00
Calclavia
da4d87d6b5 Wire merge now working 2013-12-22 23:24:09 +08:00
Calclavia
bbe89086a1 Reworked vanilla electric furnace 2013-12-22 22:33:50 +08:00
Calclavia
aa8a2b9726 Attempt to get energy to flow 2013-12-22 17:48:15 +08:00
Calclavia
2421259bbd Got wire connections loading 2013-12-22 17:22:46 +08:00
Calclavia
54ed10a33e Allowed multiple wires to be placed within one block 2013-12-22 15:58:30 +08:00
Calclavia
b478e67025 Fixed flat wire glitchy texture 2013-12-22 13:45:21 +08:00
Calclavia
3bdcceddf1 Removed some unused textures 2013-12-22 13:31:04 +08:00
Calclavia
8c63bbb457 Minor color and texture tweak 2013-12-22 13:24:55 +08:00
Calclavia
b5e4fa9fc0 Removed part wire 2013-12-22 13:24:41 +08:00
Calclavia
a53a40470c Fixed wire render having alpha of "1" 2013-12-22 12:06:29 +08:00
Calclavia
256c66f7b6 Fixed packet crash bug 2013-12-22 01:08:58 +08:00
Calclavia
c9831d33db Got side-placing working 2013-12-22 00:14:01 +08:00
Calclavia
635ed87a6e Got multipart interface passthrough working 2013-12-21 23:59:18 +08:00
Calclavia
405d1450b3 Version bump 2013-12-21 19:02:12 +08:00
Calclavia
acc7cfb24f Cleared all bugs 2013-12-21 16:50:08 +08:00
Calclavia
e7cc2c07f3 Removed modular battery in favor of new design 2013-12-21 16:39:04 +08:00
Calclavia
e2691ff96c Calclavia library overhaul 2013-12-21 16:38:34 +08:00
Calclavia
f9a4efa89b Started work on lain down wires 2013-12-21 14:23:59 +08:00
Calclavia
3261ce11c3 Fixed wire item textures 2013-12-21 11:39:32 +08:00
Calclavia
49668fb60a Updated UE and standardized ratio 2013-12-21 11:10:21 +08:00
Calclavia
a499f5781e Revived advanced furnace 2013-12-21 00:01:30 +08:00
Calclavia
0240818f1d Removed non-multipart wire. Now FMP dependent 2013-12-20 22:23:47 +08:00
Calclavia
f8bfa1ddde Updated UE 2013-12-20 21:59:52 +08:00
Calclavia
3f2e74299b Started implementing UE 3.0 2013-12-20 16:29:13 +08:00
Calclavia
49427ab5a6 Started revive on Resonant Induction 2013-12-19 21:12:46 +08:00
Calclavia
54f203705a Added ability to charge players and entities standing on the battery (redstone activated) 2013-10-26 18:28:43 +08:00
Calclavia
2596dfb1c5 Added ability to increase output threshhold of modular battery by multi-blocking it 2013-10-26 18:09:23 +08:00
Calclavia
37f4669ac4 Fixed #42 - Bad buildcraft energy consumption calculation 2013-10-17 15:07:11 +08:00
Calclavia
467a6c2907 Fixed furnace invalidation in network issue 2013-10-17 14:35:29 +08:00
Calclavia
1288e7ecd5 Changed vanilla furnace generation from 2 to 10 2013-10-14 16:32:19 +08:00
Calclavia
417c5858d8 Fixed render wire server crash 2013-10-14 16:24:06 +08:00
Ben Spiers
7a65a88735 Fix advanced furnaces secretly invalidating themselves without telling anyone 2013-10-13 11:54:01 +01:00
Calclavia
5c5657de1c Made vanilla furnace stop producing power upon no request 2013-10-10 22:22:36 +08:00
Calclavia
49e6fed4fc Version bump 2013-10-10 22:06:41 +08:00
Calclavia
671373f13a Removed ticking wires 2013-10-09 23:02:02 +08:00
Calclavia
56a3f7a74a Got vanilla electric furnace working with wires without shift right click 2013-10-09 23:00:18 +08:00
Calclavia
4e28aeec6b Replaced vanilla furnace, thanks to Xhamolk 2013-10-09 14:46:50 +08:00
Calclavia
2917ccdf7c Fixed recipe character derp 2013-10-09 14:17:51 +08:00
Calclavia
6195541693 RI should now work without multipart 2013-10-09 14:11:00 +08:00
Calclavia
883c0458da Added recipes for multipart wires 2013-10-09 14:02:46 +08:00
Calclavia
e44027bcf5 Fixed unamed MultiPart wires 2013-10-02 20:38:46 +08:00
Ben Spiers
a2d05d04ec Of course IC2 would be awkward. Add a prewritten java trait as I don't think it's possible to make auto-generated ones not crash. 2013-09-30 02:52:42 +01:00
Ben Spiers
39b28888cd Update some of the IC2 stuff in PartUniversalConductor 2013-09-30 02:51:27 +01:00
Ben Spiers
86165e0271 An accidental infinite buildcraft power buffer for superconductors is not a good idea. 2013-09-29 04:08:07 +01:00
Ben Spiers
86ada23be6 That might help compatibility 2013-09-29 04:07:05 +01:00
Ben Spiers
827ae480ef It would probably be best if I didn't mess up other renderers just to make mine shiny. 2013-09-29 00:27:11 +01:00
Ben Spiers
bf92e166b0 Update/improve the renderer a bit 2013-09-28 22:59:49 +01:00
Ben Spiers
a392540570 Update the caching of connections to account for acceptors 2013-09-28 22:23:51 +01:00
Ben Spiers
f18af3964b Move some PartWire stuff up into superclasses 2013-09-27 00:41:29 +01:00
Ben Spiers
f51a371559 Insulation cleaning 2013-09-27 00:40:39 +01:00
Ben Spiers
a70bf89aac Override bind to replace tile in network when it changes 2013-09-26 20:29:06 +01:00
Ben Spiers
5e832d86ac Unused imports 2013-09-26 20:27:19 +01:00
Ben Spiers
484c3a83a6 getTile() is deprecated. 2013-09-26 20:26:54 +01:00
Ben Spiers
a7579ff98f Big refactor of connection code. Connections can now be blocked by covers but pass through hollow covers. 2013-09-26 20:26:02 +01:00
Ben Spiers
2bf6c2de9c Chickenbones fixed that bug 2013-09-26 20:19:19 +01:00
Ben Spiers
98990b3d54 Add option for silver to be shiny. It's not great but it's the best I can do 2013-09-26 17:55:28 +01:00
Ben Spiers
db9acd9058 Realise why increasing the "V" in HSV seemed to be having no effect, feel silly.
It would be cool if we could do some sort of specular reflection on the silver and maybe superconductor wires, but I don't think we can. Or if we could it would be way beyond the scope of this mod.
2013-09-24 04:12:49 +01:00
Ben Spiers
9df402ea96 Refine some metal colours to make the grey metals a bit more different and the others look a bit better (I think). 2013-09-24 03:09:13 +01:00
Ben Spiers
56ff149fdf Add breaking particle effects. 2013-09-24 03:06:28 +01:00
Ben Spiers
e8a75ed2ff Add a bit more distinctness to the UVs and add a config option for lo-fi insulation textures. 2013-09-24 03:03:59 +01:00
Ben Spiers
0e01a0b132 I don't think it needed that interface. 2013-09-23 00:06:18 +01:00
Ben Spiers
df80d749ab Move refresh on neighbor change to PartConductor 2013-09-23 00:06:18 +01:00
Calclavia
22e69669f3 Merge branch 'master' into multipart-experimental
Conflicts:
	src/resonantinduction/ResonantInduction.java
2013-09-22 11:08:00 +08:00
Ben Spiers
0b5f5c470c Refine some colours: pink was too light, brown was nearly white and cyan was... not cyan 2013-09-22 01:47:11 +01:00
Ben Spiers
f53c129c10 Add obj models to fix weird rendering. 2013-09-22 01:47:11 +01:00
Ben Spiers
095355418a Stop them from always dropping wool. derp. 2013-09-22 01:47:10 +01:00
Ben Spiers
81778cebb6 Make networks form when loaded.
That was so annoying, feel like there should be a way of doing this with tile entities, but hey, I've always said multiparts are nicer to work with than vanilla block/tiles
2013-09-22 01:47:10 +01:00
Calclavia
c57ea54f85 Added copper wire oredict support 2013-09-21 23:34:05 +08:00
Calclavia
39edccc54b Updated to Minecraft 1.6.4 2013-09-21 11:20:39 +08:00
Calclavia
21ec04da42 Started work on injecting new furnace tile class in... 2013-09-21 10:54:03 +08:00
Ben Spiers
eb6fddd839 Useful while I'm debugging 2013-09-20 04:00:10 +01:00
Ben Spiers
e0877af41b Fix insulation and redstone signals having no effect other than visual.
I'm not sure that it worked before I started but it's fixed now anyway.
2013-09-20 03:59:37 +01:00
Ben Spiers
e6fdacc8f0 Allow shearing insulation off wires 2013-09-20 03:57:32 +01:00
Ben Spiers
9697763856 Move the neighbor update to PartAdvanced 2013-09-20 03:56:44 +01:00
Ben Spiers
397bf28db2 Apply new interfaces to old tileentity so they work nicely together 2013-09-19 21:12:30 +01:00
Ben Spiers
50b3414788 Use EnumWireMaterial more in PartWire, apply material interface. 2013-09-19 21:01:37 +01:00
Ben Spiers
1017308d47 Material Interfaces 2013-09-19 21:00:35 +01:00
Ben Spiers
7f110bed7a This is starting to come together pretty nicely:
* Works with unmodified UE. THANKS CB!
* Multiple wire materials again (only via /get for now)
* Icons on multiwire item
* IInsulation. Maybe integrate up to UE when this is done?
* Drops items
* Proper clientsyncing
* Probably more, I forget
2013-09-19 20:18:50 +01:00
Ben Spiers
900d823fde And add the stuff to the mod 2013-09-17 04:28:27 +01:00
Ben Spiers
9ee8691858 For some reason. 2013-09-17 04:28:26 +01:00
Ben Spiers
a3b37b2b95 For debugging 2013-09-17 04:28:26 +01:00
Ben Spiers
4ba7492601 Start work on multipart integration. Needs some edits to UE to not crash when placing a wire next to an old wire.
Won't PR to UE yet in case CB can apply a fix for it to stop it being an issue. Might push the UE changes to my github.
2013-09-17 04:25:09 +01:00
Calclavia
e27a6a1f5c Fixed inconsistant Tesla electric bolt 2013-09-13 18:20:54 +08:00
Calclavia
20e864b1e0 Fixed outputting BuildCraft power if UE network is detected 2013-09-13 18:07:42 +08:00
Calclavia
7d57f983e0 Attempt to fix render battery crash 2013-09-08 19:58:19 +08:00
Calclavia
e2a1b5c08a Added Mekanism universal cable conversion recipe 2013-09-07 23:24:48 +08:00
Calclavia
dc3a6e7b87 Added basic BuildCraft support for wires 2013-08-29 20:28:31 +08:00
Calclavia
1b8ed1d8b8 Got multimeter working with IC2 and BuildCraft machines 2013-08-27 21:48:31 +08:00
Calclavia
02c44613d4 Made battery GUI display precise units 2013-08-25 21:05:38 +08:00
Calclavia
a7b94b483f Fixed #24 - Wires not working with furnace 2013-08-25 21:00:30 +08:00
Calclavia
7c07ab9436 Some work on wire furnace burn time 2013-08-25 17:55:48 +08:00
Calclavia
c72b57cc34 Fixed #8 2013-08-25 17:48:52 +08:00
Calclavia
9c4cf9d727 Fixed #18 - Furnace wire crash 2013-08-25 17:46:05 +08:00
Calclavia
d66e4dca9a Fixed #17 - Tesla not transfering power 2013-08-25 17:41:41 +08:00
Calclavia
d3bcfd9a0a Added infinite capacitors 2013-08-25 17:31:27 +08:00
Calclavia
258a479d38 Added IC2 interchangeable recipes 2013-08-25 17:15:00 +08:00
Calclavia
8f4427d14c Added insulation and colored wires 2013-08-25 16:59:52 +08:00
Calclavia
b19963a050 Got multimeter working with wires 2013-08-24 20:00:33 +08:00
Calclavia
4eede3ad02 Added transfer threshold to battery 2013-08-24 19:46:08 +08:00
Calclavia
2a6d12da8c Prepared wire for insulation render; still need a model 2013-08-24 19:32:28 +08:00
Calclavia
8cee88502b Added ability to toggle wire ticking via shift-right-click 2013-08-23 21:31:05 +08:00
Calclavia
2701b2b39c Added wire coloring, no visuals yet 2013-08-23 21:08:01 +08:00
Calclavia
e3551fcefd Added wire material colors 2013-08-23 20:49:01 +08:00
Calclavia
a8317525bc Moved Modstats to Modding Library 2013-08-23 20:22:55 +08:00
Calclavia
3f034e6bd5 Fixed shift-click in battery output losing all internal cells 2013-08-22 22:45:38 +08:00
Calclavia
3022e5056d Fixed EM path going through lava 2013-08-14 10:42:33 +08:00
Calclavia
a52b4d39a3 Fixed #10 - Render wire NPE 2013-08-14 08:45:26 +08:00
Calclavia
09244798f6 Made wires treat furnaces as machines 2013-08-12 20:47:42 +08:00
Calclavia
78e520727d Removed Tesla interacting with furnace ability 2013-08-12 20:16:56 +08:00
Calclavia
0f66ba8360 Improved battery GUI information 2013-08-12 20:04:48 +08:00
Calclavia
53054f6c5e Added UE integration for recipes 2013-08-12 19:05:59 +08:00
Calclavia
8fad437af2 Added quantum Tesla render 2013-08-08 12:36:18 -04:00
Calclavia
8c97aab508 Allowed EM Contractor to send items underwater/liquids 2013-08-08 11:38:57 -04:00
Calclavia
ac0dec12b2 Added German translation thanks to Vexatos! 2013-08-08 10:49:37 -04:00
Calclavia
3a10605112 Fixed battery output/input sides not saving 2013-08-07 23:39:18 -04:00
Calclavia
ada50089e9 Fixed Modular Battery not working with BuildCraft 2013-08-07 23:25:48 -04:00
Calclavia
2710f976f9 Fixed crash with BuildCraft 2013-08-07 22:45:00 -04:00
Calclavia
ceca58d5f9 Made EM Contractor render straight beams, less lag 2013-08-07 22:27:34 -04:00
Calclavia
3e2a5bd268 Added less draw calls for fast graphics 2013-08-07 22:22:58 -04:00
Calclavia
0fd548153f Fixed electrical shock render not showing up sometimes 2013-08-07 22:14:08 -04:00
Calclavia
c083670b55 Fixed right clicking more cells than max 2013-08-07 21:27:50 -04:00
Calclavia
84e6df0b93 Uploaded all models 2013-08-07 17:59:02 -04:00
Calclavia
c099462b3f More work on UE integration 2013-08-07 00:38:51 -04:00
Calclavia
a93571ad33 Got modular battery working with UE 2013-08-07 00:33:50 -04:00
Calclavia
c5bad9c491 Fixed a lot of Vector3 clone issues 2013-08-06 23:34:06 -04:00
Calclavia
0231e7ab68 Added ability to split wires via redstone 2013-08-06 20:33:18 -04:00
Calclavia
267c598b7f Wires will not connect with different material ones 2013-08-06 19:51:50 -04:00
Calclavia
79866e2b2e Got wires working 2013-08-06 19:46:08 -04:00
Calclavia
fd7e15a5c7 Fixed mod metadata 2013-08-06 19:24:24 -04:00
Calclavia
3c5d00eb1e Added various material wires 2013-08-06 19:14:05 -04:00
Calclavia
e5c071a8aa Added basic wires 2013-08-06 19:03:29 -04:00
Calclavia
4597384813 Some UE Tile integration 2013-08-06 18:52:49 -04:00
Calclavia
b4cc4cc925 Switched to UE Vector3 and IItemElectric 2013-08-06 18:47:34 -04:00
Calclavia
4324901ee4 Added ModStat integration 2013-08-06 17:58:17 -04:00
Calclavia
eda2a54ab0 Removed printlin 2013-08-05 17:24:34 -04:00
Calclavia
de0ad48a2d Added EMC Contractor multithreading 2013-08-05 17:20:08 -04:00
Aidan Brady
78bc4a666a Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 17:03:05 -04:00
Calclavia
b1babdaeec Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 17:02:15 -04:00
Calclavia
f70eef5e3a Made pink darker 2013-08-05 16:59:41 -04:00
Aidan Brady
bf500ae6dc More dynamic rendering! 2013-08-05 16:59:22 -04:00
Aidan Brady
4e35a9f6d5 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 16:50:31 -04:00
Aidan Brady
624700a0b4 More dynamic item rendering 2013-08-05 16:49:56 -04:00
Calclavia
104dc30e5a Fixed green color 2013-08-05 16:45:23 -04:00
Calclavia
f5790d85ce Fixed pink dye color 2013-08-05 16:43:11 -04:00
Calclavia
d9498069a3 Fixed colors 2013-08-05 16:39:53 -04:00
Calclavia
cef14e88d1 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 16:22:53 -04:00
Calclavia
a34ef725de Increased Tesla transfer rate 2013-08-05 16:22:26 -04:00
Aidan Brady
32317b4b68 Fixed laggy renderer 2013-08-05 16:21:58 -04:00
Aidan Brady
23b939d7aa Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 16:01:46 -04:00
Aidan Brady
0c2ea100d8 Battery now updates state on chunk load 2013-08-05 16:00:41 -04:00
Calclavia
ec8e259d0b Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 15:55:41 -04:00
Aidan Brady
66c94f9e14 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 15:54:43 -04:00
Aidan Brady
a726314370 Fixed packets :) 2013-08-05 15:53:54 -04:00
Calclavia
38cd248069 Fixed link name output 2013-08-05 15:50:50 -04:00
Calclavia
20fd0d2e46 Fixed stacking electrostatic linker 2013-08-05 15:48:21 -04:00
Calclavia
64bc122890 Fixed EM contractor not sucking things in 2013-08-05 15:48:08 -04:00
Calclavia
dce4307e03 Fixed recipes involving capacitor 2013-08-05 15:34:34 -04:00
Calclavia
e867ff03fa Changed EM Contractor to use metadata for direction for better performance. Take that Aidan! 2013-08-05 15:28:33 -04:00
Calclavia
cbb670370f Fixed server side EM velocity crash 2013-08-05 15:14:22 -04:00
Calclavia
edb5d4c958 Added Tesla battery withdraw ability 2013-08-05 14:19:00 -04:00
Calclavia
d1c9529ab9 Fixed #15 pathfinding going through contractors itself 2013-08-05 14:04:47 -04:00
Calclavia
6b5f8cbf14 Added base to EM Contractor thanks to Archadia 2013-08-05 13:53:26 -04:00
Calclavia
e09dc2c489 Clean up and reformat 2013-08-05 13:36:31 -04:00
Calclavia
747bbd4c3f Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 13:26:18 -04:00
Calclavia
f30bdb931b Made electric bolt slightly less random; resolves #13 2013-08-05 13:25:33 -04:00
Aidan Brady
dc735b7336 Removed tick handler 2013-08-05 13:25:10 -04:00
Calclavia
19208dd01a Added ability to left/right click capacitors into battery 2013-08-05 13:20:10 -04:00
Aidan Brady
daa52ba109 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 13:17:47 -04:00
Aidan Brady
5b1a070664 Cells now render dynamically on battery 2013-08-05 13:16:39 -04:00
Calclavia
fd8806ffee Finished multimeter bounds 2013-08-05 13:07:32 -04:00
Calclavia
cafd17a9ac Merge branch 'master' of https://github.com/calclavia/Resonant-Induction
Conflicts:
	src/resonantinduction/battery/TileEntityBattery.java
2013-08-05 13:02:31 -04:00
Aidan Brady
0de97ab6fa Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 12:54:32 -04:00
Aidan Brady
32a346633f Battery now charges/discharges items, fixed capacitor energy bar 2013-08-05 12:54:22 -04:00
Calclavia
86b9d9d4ec Tweaked some gameplay balance 2013-08-05 12:45:44 -04:00
Calclavia
b6e5e22725 Fixed capacitor being changed on crafted 2013-08-05 12:41:38 -04:00
Calclavia
2c023d4902 Fixed battery getting power without cells inside 2013-08-05 12:40:16 -04:00
Calclavia
43a4d4ab4c Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 12:37:51 -04:00
Calclavia
db5d1a002a Fixed multimeter detection wrong side 2013-08-05 12:37:27 -04:00
Aidan Brady
bb9c3b6c32 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 12:36:07 -04:00
Aidan Brady
9055ae71d5 Round energy, fixed NBT, added new texture for battery when in multi block form 2013-08-05 12:35:56 -04:00
Calclavia
8dbef429f5 Finished multimeter model render 2013-08-05 12:33:09 -04:00
Calclavia
b7e391ce89 Fixed multimeter item render 2013-08-05 12:10:43 -04:00
Calclavia
5530ab352b Added model for multimeter 2013-08-05 11:59:14 -04:00
Aidan Brady
b0ffec41d3 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 11:56:52 -04:00
Aidan Brady
051d19be32 Fix multimeter GUI 2013-08-05 11:56:42 -04:00
Calclavia
d54f02b126 Added ability for handheld multimeter to store last detection 2013-08-05 11:39:45 -04:00
Aidan Brady
c7592ef4c6 Merge branches 'master' and 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 11:32:24 -04:00
Aidan Brady
6db24c8dd6 Tesla integration for Battery 2013-08-05 11:32:01 -04:00
Calclavia
2c5a034548 Some work on multimeter 2013-08-05 11:27:36 -04:00
Aidan Brady
d77d6292f6 Finished energy add/remove algorithms for Battery.
Signing off. Good work day today! :D
2013-08-05 03:49:00 -04:00
Aidan Brady
686642e6f5 Fixed Battery item render, fixed ListUtil.split() 2013-08-05 03:35:18 -04:00
Aidan Brady
a00acf06b5 Item ejecting! Still have a minor bug to fix. 2013-08-05 03:10:13 -04:00
Aidan Brady
ab262c9b54 Fixed crash when shift-clicking items 2013-08-05 02:45:44 -04:00
Aidan Brady
f5068bda2b Fixed Battery NBT loading 2013-08-05 02:38:04 -04:00
Aidan Brady
b44ea67b46 Lists > Sets in this situation 2013-08-05 02:08:37 -04:00
Aidan Brady
0d052c8090 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 01:29:47 -04:00
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