Commit graph

641 commits

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