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

495 commits

Author SHA1 Message Date
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