Commit graph

545 commits

Author SHA1 Message Date
Calclavia
a5c8641710 Gear teeth now align properly 2014-11-10 21:20:42 +08:00
Calclavia
50bd4d9af0 Fixed gear shaft rotation direction 2014-11-10 19:28:36 +08:00
Calclavia
f713f9e46c Fixed clientRenderMask being protected 2014-11-10 11:53:00 +08:00
Calclavia
3091c6ebf0 Some work on pump 2014-11-09 15:09:59 +08:00
Calclavia
9f3aad4d99 Added check for inverseRotation in MechanicalGrid 2014-11-09 14:59:41 +08:00
Calclavia
bdf458b84c Fixed gear shaft connections 2014-11-09 14:49:56 +08:00
Calclavia
b9e53b59e8 MechanicalGrid now triggers onTorqueChanged() and onVelocityChanged() 2014-11-09 14:10:13 +08:00
Calclavia
f039d282e1 Gears now properly render 2014-11-09 13:59:37 +08:00
Calclavia
3d8f2551c7 Fixed power not depleting to zero when no mechanical energy input 2014-11-09 13:55:01 +08:00
Calclavia
e0f341753f Removed unused methods from MechanicalNode 2014-11-09 13:44:38 +08:00
Calclavia
274442fb31 Finished initial gear energy algorithm 2014-11-09 13:28:58 +08:00
Calclavia
ba19eff873 Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development 2014-11-09 12:06:16 +08:00
Calclavia
1b83c76a56 Initial work on new mechanical grid 2014-11-09 12:06:09 +08:00
Robert S
cce49292af Removed extra interface from CrateRecipe 2014-11-08 22:54:38 -05:00
Calclavia
32297b272c More work on TileMechanical packets 2014-11-09 00:42:20 +08:00
Calclavia
c0ac84bc22 Updated TileMechanical packet system 2014-11-09 00:41:34 +08:00
Calclavia
d73b2ff520 Fixed pump place crash 2014-11-09 00:39:13 +08:00
Calclavia
5158dc6ab8 Fixed pipes not connecting onWorldJoin 2014-11-08 23:33:14 +08:00
Calclavia
c87e7e6a79 Fixed tank edge not rendering when connected to pipes 2014-11-08 22:42:35 +08:00
Calclavia
bb8c0fd47d Fixed pipe connections 2014-11-08 22:35:48 +08:00
Calclavia
e480b76b64 TPartNodeProvider now supports multiple nodes 2014-11-08 20:58:48 +08:00
Calclavia
5a7af55b39 Fixed PipeNode crash 2014-11-08 20:58:31 +08:00
Calclavia
d28c5a93cb Fixed tank edge rendering 2014-11-07 21:32:38 +08:00
Calclavia
523f37508b Improved gravity handling in NodePressureGravity 2014-11-07 12:41:07 +08:00
Calclavia
427f2ba132 Fluids in tanks now flow 2014-11-07 12:27:31 +08:00
Calclavia
28fa18f809 Fixed tank render 2014-11-07 11:16:26 +08:00
Calclavia
77ddba7c89 Updated to new packet system 2014-11-07 10:08:34 +08:00
Calclavia
c98e3ffe72 Fixed fluid errors 2014-11-07 08:35:29 +08:00
Calclavia
780250cda0 Rewrote NodeFluid 2014-11-06 23:11:08 +08:00
Calclavia
47a4ea6ef1 Started reworking MechanicalNode 2014-11-06 14:05:42 +08:00
Calclavia
eb39dcf90d Updated UE 2014-11-05 18:38:56 +08:00
Robert S
f02468edc4 Fixed generic issue for TMultipartNode 2014-11-04 22:27:44 -05:00
Robert S
fedda73826 Fixed casting issue in battery renderer code 2014-11-04 22:27:21 -05:00
Calclavia
7658924f8e Merged RenderBattery with TileBattery 2014-11-05 09:17:37 +08:00
Calclavia
32e9e3a8c4 Fixed wire resistance 2014-11-04 22:52:14 +08:00
Calclavia
48480394ee Battery now toggles 2014-11-04 22:45:58 +08:00
Calclavia
edea703bac Updated to new canConnect method 2014-11-04 22:06:08 +08:00
Calclavia
60341da346 Reworked some wire connection logic 2014-11-04 21:41:07 +08:00
Calclavia
3fc25b8fc3 Fixed tank connected texture rendering 2014-11-04 10:45:29 +08:00
Calclavia
509d369033 Attempt to fix node connections 2014-11-04 06:44:44 +08:00
Calclavia
dba426aaba Fixed Multipart trait not registering 2014-11-03 18:03:31 +08:00
Calclavia
04d37537cc Fixed wires not connecting at all 2014-11-02 22:53:45 +08:00
Calclavia
3de3e3aed1 Minor refactor in TileBattery 2014-11-02 21:18:55 +08:00
Calclavia
bece427c1e Minecraft now launches again 2014-11-02 20:56:11 +08:00
Calclavia
5af7e0e9bf Resolved all errors 2014-11-02 20:51:56 +08:00
Calclavia
1b7b4e8c9f Fixed energy storage errors 2014-11-02 20:35:27 +08:00
Calclavia
9423b0d753 Error: Updated UE and Node class changes 2014-11-02 19:33:59 +08:00
Calclavia
310638aa31 Updated OC API 2014-11-02 17:05:05 +08:00
Robert S
9412f5bea1 Fixed deprecated fluid.getUnlocalizedName() 2014-10-27 16:57:13 -04:00
Robert S
5348ef9f77 Update for new RE, no longer requires UE-Core 2014-10-27 13:31:42 -04:00
Robert S
1c1affbe62 Note for later 2014-10-26 15:59:16 -04:00
Calclavia
cc7d1599f5 Update to new DC circuit 2014-10-26 23:07:40 +08:00
Calclavia
b694f8b1f8 Fixed getTank() one-parameter in TileGrate 2014-10-26 09:08:59 +08:00
Calclavia
0feb2c8bf1 Some battery testing with DC circuit 2014-10-26 00:32:05 +08:00
Calclavia
ad85ffa8da Fixed getLightValue in tank, laser emitter and laser receiver 2014-10-25 21:36:07 +08:00
Calclavia
4d410c76ed Revived solar panel 2014-10-25 20:38:24 +08:00
Calclavia
b77f2d944d Revived Electromagnetic Coherence 2014-10-25 20:31:19 +08:00
Calclavia
944b7cd4c7 Reorganized ElectricalContent 2014-10-25 19:36:17 +08:00
Calclavia
79a8147f00 Fixed gutter and mixer item render 2014-10-25 19:32:36 +08:00
Robert S
6fbc93b6cd Fixed a few more packet write issues 2014-10-22 15:01:40 -04:00
Robert S
6ece9c2367 Fixed accelerator & centrifuge packet write error, and added a temp dir side texture to accelerator 2014-10-22 14:49:47 -04:00
Robert S
1c867b2ce0 More work on accelerator, gui is confirmed to open now 2014-10-22 11:45:02 -04:00
Robert S
14b00dba9c Some work on improving and fixing particle accelerator 2014-10-22 10:42:33 -04:00
Robert S
621b557129 Moved particle vel var to particle class and fixed a few issues not caught by the IDE 2014-10-21 18:14:05 -04:00
Robert S
1f54eee5b2 Moved Accelerator settings to settings class allowing them to be configed by users 2014-10-21 18:03:42 -04:00
Robert S
e608e9d2e1 Fixed accelerator schematic and optimized it at the same time using Schematic.getBox 2014-10-21 17:46:06 -04:00
Robert S
2383da4684 Updated schematic registration 2014-10-20 16:30:12 -04:00
Robert S
f848a8e7b8 Changes to position and packet usage due to RE update 2014-10-20 13:45:50 -04:00
Robert S
2f4be51317 Minor change 2014-10-19 12:55:56 -04:00
Robert S
7e9632225a Fixed electromagnets not rendering in the world correctly 2014-10-19 04:22:10 -04:00
Robert S
095649deed Cleanup for Settings.class to make it easier to read threw 2014-10-18 13:13:32 -04:00
Robert S
eeb8b12f52 Fixed Fissile fuel rod texture 2014-10-18 12:58:07 -04:00
Robert S
d958daa619 Fixed Archaic items and textures not showing up correctly 2014-10-18 12:54:36 -04:00
Robert S
81662d50be Removed the need for a singleton for TileMechanical 2014-10-18 12:39:24 -04:00
Robert S
9485ad241a Collapsed BlockDecoration's Singleton into its instance class 2014-10-18 09:48:04 -04:00
Robert S
2529dda2c5 Moved PartFace and PartGear Cuboid boxes to CuboidShapes singleton 2014-10-18 09:45:05 -04:00
Robert S
236ee36f9b Moved wire cuboid array to a singleton allowing for reuse & readability 2014-10-18 09:34:08 -04:00
Robert S
0e13a373bd Fixed subclasses of PartMechanical not having hit boxes 2014-10-16 12:22:43 -04:00
Robert S
453903bbee Fixed a few parts implementing getType on their own, and make getType final to prevent this in the future 2014-10-16 08:13:57 -04:00
Robert S
d7bee7f649 Temp disabled creation of uranium ore generator 2014-10-15 14:16:55 -04:00
Robert S
25eb5cf0e9 Reworked AtomicContent.class to calc's specs 2014-10-15 14:06:18 -04:00
Robert S
35e4424b98 Fixed names not showing up for decor, and a few atomic items 2014-10-15 13:44:34 -04:00
Robert S
c814eda972 Fixed gearshaft adding an extra subtype into the creative menu 2014-10-15 13:31:21 -04:00
Calclavia
e0f3540789 Attempt to get test battery pushing 100 C 2014-10-12 17:25:43 +08:00
Calclavia
1d87c44b8b Removed Electromagnetic Coherence guide book 2014-10-12 17:04:54 +08:00
Calclavia
9ae4d224c6 Some experimental work on DC 2014-10-12 16:51:44 +08:00
Calclavia
9fd2b3eac0 Fixed electrical part registry registering too late 2014-10-12 15:24:46 +08:00
Calclavia
1e38614b9f Testing experimental DC 2014-10-12 15:09:59 +08:00
Robert S
96ea35d598 Converted remaining java classes, not que to be added to RE or removed, into scala 2014-10-10 06:43:15 -04:00
Robert S
5a7de25f11 Removed unneeded try catch from Assembler's packet code 2014-10-10 06:20:24 -04:00
Robert S
2d3a2bd3e1 Attempt to fix packet issue with nuclear boiler 2014-10-09 20:06:01 -04:00
Robert S
9e0d9223a0 Removed try catch from packet method in nuclear boiler allowing for caller to catch errors correctly 2014-10-09 19:32:19 -04:00
Robert S
7531417f79 Fixed try catch in Centrifuge, and attempted to fix gear placement issue 2014-10-07 19:01:08 -04:00
Robert S
ac0b8b7796 Fixed @Synced tiles not being registered 2014-10-07 18:28:44 -04:00
Robert S
5cfd23e4b3 Fixed thermometer not rendering textures 2014-10-07 18:17:33 -04:00
Robert S
b45d935531 Fixed inf loop for thermometer 2014-10-07 18:12:58 -04:00
Robert S
ae25876952 Fixed boiler returning null for getDirection causing a render crash 2014-10-07 18:11:40 -04:00
Robert S
2d337c0e80 Fixed uranium ore lang file 2014-10-07 18:06:54 -04:00
Robert S
9bc53c0b4a Fixed crash when rendering turbine blades due to scala changes 2014-10-07 18:06:36 -04:00
Robert S
68fad2f49f Fixed inf loop with electric turbine 2014-10-07 17:42:44 -04:00
Robert S
db789cba2f Fixed metadata on gear, waterturbine, and windturbine 2014-10-07 17:37:34 -04:00
Calclavia
39f3f82ce0 Converted PartFace to Scala 2014-10-06 12:24:57 +08:00
Robert S
d7d3b4f271 Mod now loads again. Saves may have missing blocks 2014-10-04 21:40:30 -04:00
Robert S
d0a19eed44 Converted Archaic content half way back to the old system 2014-10-04 21:04:58 -04:00
Robert S
f6677aba2a Converted Aromic content half way back to the old system 2014-10-04 21:02:05 -04:00
Robert S
2efd638bd1 Converted Mech content half way back to the old system 2014-10-04 20:57:00 -04:00
Robert S
429c5c59b4 RUNTIME-ERRORS: Corrected some issues causing RI to not load 2014-10-04 20:43:12 -04:00
Robert S
ec1b398605 Recoded all modules to use content system, and set them up to load threw core. (May not function correctly) 2014-10-04 20:14:55 -04:00
Robert S
5ceb97cb6b Setup Mech's Content threw the ContentLoader 2014-10-04 18:12:13 -04:00
Robert S
b14bda2e5f Converted Breeding Reactor Schematic to scala 2014-10-04 16:27:22 -04:00
Robert S
30ad8d98cf Converted waila support to scala 2014-10-04 16:22:34 -04:00
Robert S
05bf1f6c23 Converted Engineering table to scala 2014-10-04 16:19:29 -04:00
Robert S
ae76cdfa3d Fixed RI not launching due to scala changes 2014-09-30 19:29:17 -04:00
Calclavia
1b4534ec83 Fixed sequence error 2014-09-30 11:07:42 +08:00
Calclavia
044ea4499d ERROR Converted rest of multimeter classes to Scala 2014-09-30 11:03:30 +08:00
Calclavia
feac01af4a Converted some multimeter classes to Scala 2014-09-30 09:49:57 +08:00
Calclavia
92603a456d Moved multimeter graph classes into separate package 2014-09-30 09:27:05 +08:00
Robert S
909b8910e7 Converted turbines, and some render code to scala 2014-09-29 16:36:56 -04:00
Robert S
0e0a08629a Converted NEI support to scala 2014-09-29 15:52:42 -04:00
Robert S
dafe713123 Converted Accelerator to scala 2014-09-29 15:46:08 -04:00
Robert S
164e027319 Converted Nuclear Boiler to scala, and corrected some compiler errors 2014-09-29 15:34:56 -04:00
Robert S
b2a874ba9b Converted Centrifuge to scala 2014-09-29 15:26:25 -04:00
Robert S
6deff382af Converted Chemical Extractor to scala 2014-09-29 15:17:56 -04:00
Robert S
888bd05345 Converted Fulmination generator to scala 2014-09-29 15:10:58 -04:00
Robert S
7e0d7eedb8 Converted Quantum Assembler to scala 2014-09-29 15:08:43 -04:00
Robert S
cb58118b77 Converted SteamFunnel, Reactor, ControlRod, and assorted classes to scala 2014-09-29 14:55:56 -04:00
Robert S
9b74eeae49 Converted plasma heater to scala, and fixed compile errors 2014-09-27 22:45:49 -04:00
Robert S
6c07d98cf4 Converted Thermometer to scala 2014-09-27 21:40:01 -04:00
Robert S
4bf1d4fff1 Converted ItemCell and its sub classes to scala 2014-09-27 21:19:15 -04:00
Robert S
362c250dc7 Converted Radioactive, ToxicWaste, UraniumOre, Electromagnet, and Siren to scala 2014-09-27 21:04:18 -04:00
Robert S
34c8f8e222 Converted the rest of the crate classes and imprinter to scala 2014-09-27 17:13:27 -04:00
Robert S
828006b0d1 Converted HotPlate and Firebox to scala 2014-09-27 16:51:58 -04:00
Robert S
092d90ea5e Converted Gutter to scala 2014-09-27 16:38:23 -04:00
Robert S
5b49483427 Converted Casting mold and Millstone to scala 2014-09-27 16:26:12 -04:00
Robert S
afb718af8a Converted pump to scala, and externalized PumpNode as its own class 2014-09-27 14:58:24 -04:00
Robert S
ba45bdd1a6 Converted placer&breaker to scala, as well corrected some compile errors 2014-09-27 14:53:10 -04:00
Robert S
cc31f1f0ff Converted detector to scala 2014-09-27 14:42:21 -04:00
Robert S
89e494116d Converted gear to scala 2014-09-27 14:37:05 -04:00
Robert S
99b5a3bd68 Converted GearShaft to scala 2014-09-27 13:52:43 -04:00
Robert S
0b8abe356c Converted mech piston to scala 2014-09-27 13:43:43 -04:00
Robert S
6943c5a149 Converted Grinder to scala 2014-09-27 13:35:28 -04:00
Robert S
be3ab6fd75 ERRORS, converted Mixer to scala 2014-09-27 11:10:47 -04:00
Robert S
0c7cd46bca Moved FXElectricBolt to RE allowing it to be used by other mods 2014-09-27 10:58:10 -04:00
Robert S
5fd4ae0669 Converted Tesla code to scala, with the exception of TeslaGrid as its deprecated 2014-09-27 10:57:52 -04:00
Robert S
424b79f49d Removed Item Lev by calc's request, and fixed some issue with past few scala conversion commits 2014-09-27 10:44:53 -04:00
Robert S
466efa3e36 Converted battery to scala, with the exception of the renderer due to array issues 2014-09-27 10:33:33 -04:00
Robert S
6797b4575b Converted Pressure node to scala, core is now fully scala 2014-09-27 09:48:22 -04:00
Robert S
9288caca58 Converted NodeTank to scala but removed packet code for it in the process 2014-09-27 09:45:15 -04:00
Robert S
b8e788f8f6 Fixed odd compile time error with classes not inheriting INode from NodeFluidHandler 2014-09-26 13:28:34 -04:00
Robert S
b297a059f4 ERRORS, Working on Abstracting NodeTank in order to convert it to scala easier 2014-09-25 20:30:03 -04:00
Robert S
58715f9f07 Moved some things to RE, and converted a few classes 2014-09-25 18:26:42 -04:00
Robert S
aff1d3c789 Removed some unused render code and converted two more classes to scala 2014-09-23 11:20:24 -04:00
Robert S
b938a58216 Changed turbine schematics to use the RE plate schematic to reduce code needed 2014-09-23 09:25:49 -04:00
Robert S
d6f22b8446 Converted two classes to scala 2014-09-23 08:51:46 -04:00
Calclavia
6ad354036f Fixed node parts not reconstructing on initiation 2014-09-22 19:04:25 +08:00
Calclavia
a8bd91c79e Fixed frame wire connections 2014-09-21 16:15:20 +08:00
Calclavia
f335723d1d Fixed wire render colors 2014-09-21 15:52:54 +08:00
Calclavia
99ecd7e40e Fixed frame wire renderer 2014-09-21 15:48:58 +08:00
Calclavia
89ff64596e Added framed wire renderer 2014-09-21 15:17:33 +08:00
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