tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity
4440 commits 1 branch 0 tags 45 MiB
Commit graph

386 commits

Author SHA1 Message Date
Calclavia
f952c4eab9 Started re-adding framed wire 2014-09-21 14:57:39 +08:00
Calclavia
87b100b6a5 Fixed pipe connections 2014-09-21 14:47:53 +08:00
Calclavia
928356ed27 Fixed pipe in-hand render offset 2014-09-21 11:24:50 +08:00
Calclavia
67b7798dfa Fixed pipes not breakable 2014-09-21 11:20:55 +08:00
Calclavia
3610631e53 Converted RenderPipe to Scala 2014-09-21 11:15:25 +08:00
Calclavia
d7463300e4 Cleaned up PartFramedNode 2014-09-21 11:08:25 +08:00
Calclavia
57a1375bd7 Fixed pipe placement crash 2014-09-21 10:28:51 +08:00
Calclavia
af305ec049 Made TWire a trait and PartAbstract a class 2014-09-21 09:49:31 +08:00
Robert S
00ab7e912b Attempt to fix multipart placement issue 2014-09-19 16:23:00 -04:00
Robert S
9a3be97106 Changes due to UE 2014-09-19 14:13:42 -04:00
Robert S
db937040f4 Temp removed RenderRotatedTexture due to server side crashes 2014-09-16 15:33:25 -04:00
Robert S
0e45a80a67 Fixed crash when placing fuel rod into reactor, due to inv size = 0 2014-09-16 14:04:00 -04:00
Robert S
fa59b69337 Fixed reactor not rendering until a block update event 2014-09-16 13:54:07 -04:00
Robert S
81be33462f Fixed TileReactorCell crashing due to the use of scala break point 2014-09-16 13:50:17 -04:00
Robert S
d7eadeac5b Moved classes around in the mechanical package 2014-09-16 11:41:23 -04:00
Robert S
fdcbe5da2b Fixed detector redstone output for sides 2014-09-16 11:29:37 -04:00
Robert S
52ac2fd2e8 Fixed detector textures when placed 2014-09-16 11:22:13 -04:00
Robert S
373c9038e4 Removed rejector code as it was unused 2014-09-16 11:15:59 -04:00
Calclavia
fcf0966804 Fixed all multipart item render 2014-09-16 12:50:42 +08:00
Calclavia
e76863530c Fixed all multipart item part placement ID 2014-09-16 12:40:28 +08:00
Calclavia
9aa9090645 Fixed connections to put node instances instead of part instances 2014-09-16 12:28:38 +08:00
Calclavia
75d1dd5b3d Fixed neighbor wire change not updating connection packet 2014-09-16 12:07:09 +08:00
Calclavia
4456ac1d63 Fixed wire packet not sending 2014-09-16 12:00:10 +08:00
Calclavia
fc12296e5d Flat wires now have basic render 2014-09-16 11:33:38 +08:00
Calclavia
4598f78b60 Made MultipartNode a trait 2014-09-15 21:53:18 +08:00
Calclavia
8d38af53ed Fixed duplicate read method derp 2014-09-14 16:09:23 +08:00
Calclavia
3504a47194 Added flat wire packet read override 2014-09-14 16:08:24 +08:00
Calclavia
b5c70a5fb2 Fixed multipart trait TNodeProvider not registering 2014-09-14 16:01:21 +08:00
Calclavia
44208669ef Migrated PartFlatWire into node system 2014-09-14 15:48:55 +08:00
Calclavia
1678afe96e Added TNodePartConnector 2014-09-14 15:02:11 +08:00
Calclavia
fa255a469b Added helper create method in Resonant 2014-09-14 14:47:06 +08:00
Calclavia
0b8230f4b1 Converted PipeMaterial and ItemPipe to Scala 2014-09-14 14:30:39 +08:00
Calclavia
3498515d8f Convert PartPipe to Scala 2014-09-14 14:16:28 +08:00
Calclavia
362b00865d Added ResonantPartFactory 2014-09-14 12:49:54 +08:00
Calclavia
20b118158b Some work on PipePart 2014-09-14 11:19:54 +08:00
Calclavia
d5159e94b2 Converted PartFlatWire to Scala (error) 2014-09-14 00:35:01 +08:00
Calclavia
2a5914f56a Removed PartFramedConnection in favor of PartFramedNode 2014-09-14 00:15:30 +08:00
Robert S
0ef07abfbf Added getWire to ElectricalContent and implemented it to fix recipe errors in the same class 2014-09-13 10:25:17 -04:00
Calclavia
64ffe359b7 Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development 2014-09-13 21:57:33 +08:00
Calclavia
63be556890 Override multi-inheritance method 2014-09-13 21:57:24 +08:00
Robert S
d9b98ef4ee Fixed water and wind turbine not using meta for localized name 2014-09-13 09:53:07 -04:00
Robert S
e342cef7d6 Fixed en_US.lang file 2014-09-13 09:48:41 -04:00
Calclavia
6de100d385 Temporarily removed PartFlatSwitchWire 2014-09-13 21:45:44 +08:00
Calclavia
98674d42a9 Added canConnectTo method to TWire 2014-09-13 21:44:25 +08:00
Calclavia
07e50eb5dd More work on TWire to unify framed and flat wire code 2014-09-13 21:33:58 +08:00
Calclavia
35afb54126 Rewrote TColorableMaterial to TColorable, TMaterial and TInsulatable 2014-09-13 21:00:09 +08:00
Calclavia
f848cc5c78 Separated WireModelGenerator class from RenderFlatWire 2014-09-13 18:24:57 +08:00
Calclavia
e3c337a4f3 Cleaned up ElectricalPartFactory 2014-09-12 19:22:33 +08:00
Calclavia
48864b2701 Some wire trait reorganization 2014-09-12 19:07:04 +08:00
Calclavia
b1d8527bea Started rebuilding PartFramedWire 2014-09-12 18:59:28 +08:00
Calclavia
6fd70cfe41 Fixed error in DebugFrameMechanical 2014-09-12 18:38:35 +08:00
Robert S
67829d8ee5 Fixed TilePlacer not rendering in the inventory 2014-09-11 18:02:02 -04:00
Robert S
378c4e8d31 Fixed lighting, and see threw bug with motor renderer 2014-09-11 15:33:57 -04:00
Robert S
cc4ae541e3 Fixed TileMotor's Item Render and error spam when getNodes was called 2014-09-11 15:31:26 -04:00
Robert S
b33cd10e7b Minor cleanup, and docs on Turbine code 2014-09-11 14:58:24 -04:00
Robert S
981f1fd8fa Fixed turbines powering gears on wrong side 2014-09-11 14:42:11 -04:00
Robert S
f22116f23c Fixed TilePlacer not rendering item overlay, and disabled TOP&Bottom overlays 2014-09-11 12:30:58 -04:00
Robert S
bb3a705d29 Fixed RI not loading due to someone changing the format of Atomic module dependency var 2014-09-11 11:51:49 -04:00
Robert S
9da9b8d0eb Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development 2014-09-11 11:24:16 -04:00
Robert S
ce5bdf5266 Fixed inf loop in turbine update method 2014-09-11 11:23:57 -04:00
Calclavia
8ef2b2e5c8 Fixed some localization names 2014-09-11 18:51:19 +08:00
Robert S
ee72700954 Made an attempt to fix Block Placer not rendering its inventory 2014-09-09 22:04:35 -04:00
Robert S
2a29830a93 Fixed mech piston render rotation issue 2014-09-09 21:29:00 -04:00
Robert S
e0185f5ab5 Fixed firebox, hotplate, millstone, and yellowcake texture 2014-09-09 07:17:12 -04:00
Robert S
c81418ac74 Fixed an odd issue of .blockID being used by missed on original update 2014-09-09 05:26:56 -04:00
Calclavia
fb06356ca2 Fixed some imports for Mechanical Debug 2014-09-09 17:18:44 +08:00
Robert S
5d92c562b5 Fixed ItemCell textures 2014-09-09 03:50:59 -04:00
Calclavia
b364c3d6c9 Removed Waila API 2014-09-07 12:08:26 +08:00
Calclavia
33fc72b793 Reformat 2014-09-07 11:50:03 +08:00
Robert S
4014bbb817 Recoded IMechanicalNode interface changing how mech content interacts 2014-08-30 10:46:59 -04:00
Robert S
0f10158583 Fixed mixer and piston not connecting to gears 2014-08-30 09:41:49 -04:00
Robert S
b83a350891 Worked on fixing node connections for tile based mechanical devices 2014-08-28 20:05:54 -04:00
Robert S
9334fd1370 Minor work in attempt to fix TileMechanicalPiston 2014-08-23 23:18:04 -04:00
Robert S
3a20055199 Change from init() to start() 2014-08-23 14:50:58 -04:00
Robert S
6b444dc5b7 Fixed Gears not rotating correctly, and crashing when broken 2014-08-23 13:57:44 -04:00
Robert S
e50b502335 Updated to use the new RE resource generator replacing the old built in one 2014-08-22 16:27:53 -04:00
Robert S
f7cab8f5d8 Fixed an inf loop in TileMixer's update loop 2014-08-17 11:14:47 -04:00
Robert S
9c8c517f23 Fixed several more render issues with SpatialTiles 2014-08-17 11:11:12 -04:00
Robert S
ede81dc74c Most items now render correctly in inventory 2014-08-17 10:51:54 -04:00
Robert S
d77e3b5783 Half fixed several tile render issues 2014-08-17 08:19:50 -04:00
Robert S
e5bced2524 Made TileMechanical extend TileNode, connection logic now works for gears 2014-08-16 04:08:51 -04:00
Robert S
154ad41239 Updated INodeProvider reference for Multipart trait 2014-08-16 04:01:35 -04:00
Robert S
fd2c71ec97 Updated MechanicalNode, and gears to use new UE node prefabs 2014-08-16 04:01:05 -04:00
Robert S
91448bf592 Worked on abstracting TileGutter into a flexible node 2014-08-16 03:59:58 -04:00
Robert S
c99988e462 Fixed several errors caused by changes in UE api 2014-08-15 20:11:58 -04:00
Robert S
a7ebb5de9a Rewriting fluid nodes and grids 2014-08-15 09:59:41 -04:00
Robert S
0f17ae4269 More work, and more errors 2014-08-14 07:22:49 -04:00
Robert S
dba9e66cd8 Fixed several render issues including gears, gearshafts, turbines, and pipes 2014-08-14 02:29:09 -04:00
Robert S
2ee8c44722 RI now loads with content 2014-08-13 11:54:36 -04:00
Robert S
ba1a5d5995 Updated remaining model path names 2014-08-13 11:30:55 -04:00
Robert S
da4e046df5 Fixed Battery box model load location 2014-08-13 11:18:24 -04:00
Robert S
06dc22534d Fixed Tesla tower's models loading from the wrong location 2014-08-13 11:17:33 -04:00
Robert S
ada38cab8f Registered Atomic block/Items that were not registered 2014-08-13 11:13:11 -04:00
Robert S
e51a50148b Fixed proxies not being created due to wrong paths strings 2014-08-13 11:03:23 -04:00
Robert S
6999a77cfd Fixed RI being skipped during load time 2014-08-13 10:50:56 -04:00
Robert S
0eab566d8d 1.7.10 error correction done, Loads in MC, but we still have a long list of bugs to fix 2014-08-13 10:24:35 -04:00
Robert S
5cd22a8dd0 Update laser content to use RI reference object 2014-08-13 10:17:56 -04:00
Robert S
e522ddeb14 Commented out a few things on wires to allow for compiling 2014-08-13 10:00:26 -04:00
Robert S
9842a1a0ad Disabled wires on my end leaving those to @Calclavia to fix 2014-08-13 09:47:49 -04:00
Robert S
4be81589a3 Almost done with error correction for 1.7.10 2014-08-13 09:46:26 -04:00
Robert S
f5ad331769 More error corrections for 1.7.10 update 2014-08-13 08:08:04 -04:00
Calclavia
131b7ed790 Fixed iterable by importing alias java.lang.{Iterable=>JIterable} 2014-08-11 09:34:00 -04:00
Robert S
5eb0b4d380 Fixed errors in NEI support, made RecipeTypes a java enum, and more general updating 2014-08-11 08:41:08 -04:00
Robert S
c09d9af837 More updating to 1.7.10 aka error hunting 2014-08-11 08:13:27 -04:00
Robert S
d1e1f47441 Worked on transformer errors 2014-08-11 05:54:28 -04:00
Robert S
946959bd2e Cleaned up multimeter code, still have to correct its network code 2014-08-11 04:41:58 -04:00
Robert S
6db933cc7d All around error correction, slowly starting to compile 2014-08-11 03:47:13 -04:00
Robert S
b1a148ee97 Fixed some errors made so many more 2014-08-11 01:44:06 -04:00
Robert S
f394508574 Minor error correct, move atomic content to AtomicContent object 2014-08-11 00:41:09 -04:00
Calclavia
3d76c78d0e Fixed ItemBlockCrate ambiguous function 2014-08-10 23:49:44 -04:00
Robert S
c0fdf0a664 Worked on fluid devices 2014-08-09 04:28:14 -04:00
Robert S
2a0b831602 Corrected errors and converted Cast & millstone to SpatialBlock 2014-08-09 03:47:48 -04:00
Robert S
9379788eb0 Generic error correct 2014-08-09 02:43:42 -04:00
Robert S
7c0cea635d Some work on hotplate and firebox 2014-08-09 00:41:52 -04:00
Robert S
9a4acf902f Removed errors from tesla tower and its effects 2014-08-08 00:48:51 -04:00
Robert S
db15b85ae8 Moved Turbine package 2014-08-07 23:58:05 -04:00
Robert S
00855a5d15 Removed most errors out of atomic module, moved electrical turbine to mech module 2014-08-07 23:52:02 -04:00
Robert S
0474addef6 Worked on atomic machines 2014-08-07 02:57:34 -04:00
Robert S
d751b54b3a Updated version # for mods in build prop file 2014-08-06 22:35:04 -04:00
Robert S
8c7b2bf9f6 Updated build prop 2014-08-06 22:25:09 -04:00
Robert S
c6a9f23349 More error corrections and scala conversions 2014-08-06 12:50:58 -04:00
Robert S
9d5a41dec7 More general update work 2014-08-06 07:57:45 -04:00
Robert S
515179ea32 Worked threw and removed 90% of errors out of mech age 2014-08-06 03:50:22 -04:00
Robert S
41d5a0dc07 Mo' work, removed charger & sorter for the moment 2014-08-06 00:07:23 -04:00
Robert S
5f57391ed9 More work on 1.7 update, deleted some unused code 2014-08-05 19:54:19 -04:00
Robert S
471812e409 Mo' Work 2014-07-29 18:48:32 -04:00
Robert S
a311e2224e Worked on QuantumGate classes 2014-07-29 15:47:22 -04:00
Robert S
cc9886c126 More error removal 2014-07-29 03:56:07 -04:00
Robert S
9f36676ef7 Fixed most Atomic Item errors and start converting TileReactor to scala 2014-07-28 11:50:04 -04:00
Robert S
23f4cb743c Removed Errors from Atomic Module Block section 2014-07-28 11:03:28 -04:00
Robert S
28db0ec6d3 Converted BlockCrate to scala, still need to merge the tile with it 2014-07-25 09:34:30 -04:00
Calclavia
3a6eb9e9b1 Added implicit ItemBlockCrate conversion 2014-07-22 22:12:14 -04:00
Robert S
4978a7b9ba More work turning crate classes to scala 2014-07-22 20:47:29 -04:00
Robert S
fcce578fab Fixed errors and turned crate into a scala class 2014-07-22 15:55:33 -04:00
Robert S
1fe751f547 Changed crate crafting to use a recipe instead of handler object 2014-07-22 15:55:09 -04:00
Robert S
a20db4091b Remove extra waila api file, converted 2 classes to scala 2014-07-22 14:00:37 -04:00
Robert S
e677fa0ddf Removed Conveyor Belt 2014-07-22 12:29:18 -04:00
Robert S
cbd4df0303 Removed laser gun, and item railing 2014-07-22 12:22:27 -04:00
Robert S
8aadbab7b5 Started converting TileGrate to scala 2014-07-22 02:32:42 -04:00
Robert S
c734a80f5d Converted ItemHammer to scala 2014-07-22 02:32:26 -04:00
Robert S
f26318fbcb Some white space change by formatter 2014-07-22 02:17:12 -04:00
Robert S
def24044bb Fixed Archaic Recipe code 2014-07-22 02:12:57 -04:00
Robert S
87fa1b92d6 Small test start 2014-07-22 01:58:53 -04:00
Calclavia
887e088b14 1.7 update work 2014-07-21 11:47:39 -04:00
Calclavia
2dc5dbeb3a Fixed some tank node logic 2014-07-21 09:15:22 -04:00
Calclavia
9881d2d209 General 1.7 update 2014-07-18 19:48:40 -04:00
Calclavia
fdb94fe2a9 Changed ResourceGenerator to use name string 2014-07-16 23:48:13 -04:00
Calclavia
ffc011cbb5 1.7 update work 2014-07-16 20:07:57 -04:00
Calclavia
eeee9532ab More core update work 2014-07-15 18:58:44 -04:00
Calclavia
0db386ba12 Updated some resource classes 2014-07-15 18:41:16 -04:00
Calclavia
090743e4c8 Updated integer vector coordinate methods 2014-07-14 23:29:21 -04:00
Calclavia
66789c4658 Converted PartAdvanced to TraitPart 2014-07-14 18:09:56 -04:00
Calclavia
8fb8062ae6 Updated PacketMultiPart 2014-07-14 18:08:28 -04:00
Calclavia
ab24fa1fa1 Removed some baking items 2014-07-14 17:55:41 -04:00
Calclavia
7f56f5f656 More core resource update 2014-07-14 17:55:12 -04:00
Calclavia
4b273c9b18 Added ChickenBonesWrapper 2014-07-14 17:44:19 -04:00
Calclavia
4d314006c7 Added basic components items 2014-07-14 17:42:48 -04:00
Calclavia
0fddcd5989 Removed Armbot 2014-07-14 17:33:01 -04:00
Calclavia
fb9c712a41 Removed Encoder 2014-07-14 17:32:46 -04:00
Calclavia
4e90d5ab0a Rewrote some fluid grid 2014-07-14 17:29:24 -04:00
Calclavia
934eee39c6 Refactored fields in Reference 2014-07-14 16:35:26 -04:00
Calclavia
15ac700074 Updated initial content registration 2014-07-14 16:20:02 -04:00
Calclavia
020e13c7f8 A lot of import fixes 2014-07-14 14:46:49 -04:00
Calclavia
1890a56a8f Merged Electromagnetic Coherence 2014-07-13 22:58:16 -04:00
Calclavia
ed32742f7d Moved all classes to src/main/java 2014-07-13 22:53:45 -04:00
Calclavia
8bed6932ea #RI-37 fixed - Glitchy tank rendering 2014-06-20 16:25:30 -07:00
Robert S
182876fb09 NPE fix for CommandMachine when dev staff is null 2014-06-19 02:22:29 -04:00
Maxwolf Goodliffe
d7ec01840c Fixed missing icon for biomass. 2014-06-15 15:48:22 -07:00
Robert S
6cb7904e30 Merged left and right display for debug frames, implemented better display for gear debug frame 2014-06-15 14:23:51 -04:00
Robert S
d7cb8c8a64 Created a debug frame for pipes, improved visuals of debug frames 2014-06-15 14:06:10 -04:00
Robert S
aed4ea5f90 Fixed import issue causing RI to not compile 2014-06-13 10:30:17 -04:00
Robert S
6af3bb2d50 Toyed with debug frame adding location data and setup debug GUI content 2014-06-12 09:27:24 -04:00
Robert S
2a884fabc8 Updated MechanicalNodeFrame to extends FrameNodeDebug 2014-06-12 04:04:45 -04:00
Robert S
7468a38b8a Created a prefab for Debug Frame GUI and added a few interfaces to go with it 2014-06-12 02:20:31 -04:00
Robert S
2a6229638b Added max speed to grinder, still needs tuned but limits are setup 2014-06-11 04:50:12 -04:00
Robert S
b515691a20 Fixed a compile issue with accessing something i can't in the code 2014-06-10 12:58:08 -04:00
Robert S
1773bc4b2d Changed debug GUI for gears to support any MechanicalNode 2014-06-10 10:42:56 -04:00
Robert S
b06a5ea283 Created a prefab for tiles with several nodes 2014-06-09 20:35:47 -04:00
Maxwolf Goodliffe
e86b2daa6d Fixed NPE when breaking pipe connected to a pump. 2014-06-05 20:23:39 -07:00
Robert S
3404a103c0 Moved IMechanicalNode to fix a gradle issue 2014-06-04 09:35:44 -04:00
Robert S
7b94737915 Changed pipe node to not care if the provider is an instance of PressureNodeProvider 2014-06-03 00:57:38 -04:00
Zerotheliger
69e939fec7 changed temp cobble stone recipe for industrial cobble stone to requiring charcoal in the center and now it correctly gives 8 industrial cobble stone 2014-05-30 21:08:20 -07:00
Zerotheliger
2a7ddce1aa Refactored name of class from machine part to Industrial Stone at request of dark 
Moved industrial stone class from resources to its own block packaged
Added recipe class for all industrial stone blocks all but 2 industrial blocks can be crafted
Changed localized names to match updated class
 2014-05-30 04:44:03 -07:00
Zerotheliger
593029c815 removed unneeded trays only 2 step process for bread 
shapeless crafting with 2 wheat = 1 flour
grinder + 1 wheat = 1 flour
water bucket + flour = dough
dough in furnace = bread
 2014-05-29 20:02:39 -07:00
Zerotheliger
d40354ee9d Added Grinding Recipes For Wheat to flour 2014-05-29 03:08:13 -07:00
Zerotheliger
ee9c86d864 Added Flour :3 2014-05-29 02:43:09 -07:00
Robert S
4da9aec9f7 Worked out a few issue with /machine command 2014-05-28 20:58:30 -04:00
Robert S
0e42b23e80 Created the staff of devs item, designed to be used for debug tasks 2014-05-28 20:22:54 -04:00
Robert S
a88bc11666 Registered Machine command 2014-05-28 19:54:37 -04:00
Robert S
a0e1f50aee Worked on get and set energy commands 2014-05-28 19:49:42 -04:00
Robert S
46f6add9ba Started on a chat command to help debug machine data 2014-05-27 22:49:01 -04:00
Robert S
aff169b0b2 Changes for Return type change for INodeProvider 2014-05-23 01:15:46 -04:00
Calclavia
c79f616f32 Merge branch 'master' into development 
Conflicts:
	atomic/src/main/scala/resonantinduction/atomic/Atomic.java
 2014-05-20 07:16:12 +08:00
Anton
7d97836613 Update Reference.java 2014-05-17 22:03:32 +04:00
Robert S
88dd118577 Merge remote-tracking branch 'origin/master' into development 2014-05-17 09:13:47 -04:00
Robert S
dbcd5aad20 Moved a few prefabs into their correct packages, also removed debug spam 2014-05-17 09:12:42 -04:00
Robert S
b46c9847be Slight change in armor, and addition of biomass 2014-05-17 04:45:12 -04:00
Robert S
a3e04e0747 Tank network works again, animation still needs fixed 2014-05-16 15:06:05 -04:00
Robert S
ae3cba60f6 More work to fix issues with tanks being filled by a bucket 2014-05-16 14:41:11 -04:00
Robert S
0e5633fcd0 Rewrote tank network in attempt to fix filling issue 2014-05-16 12:03:09 -04:00