Commit graph

197 commits

Author SHA1 Message Date
AEnterprise
fb706ae1ab detect interaction with pipes (for gates, plugs and robot stations) 2014-09-17 18:13:00 +02:00
AEnterprise
b01533e1d5 make it possible to differenciate between the lasertables and engines 2014-09-17 15:41:45 +02:00
SpaceToad
1ec9d92699 added variable timeout for schematic, down to 1. close #1971 2014-09-14 20:52:53 +02:00
AEnterprise
6b76b63ba7 fix style 2014-09-10 14:56:17 +02:00
AEnterprise
cfb63644b4 create events for external research 2014-09-10 14:43:06 +02:00
SpaceToad
579252a473 Further progress on composite blueprints (#1544).
Markers now display if they're recording a composition or not.
Architects save / load their sub-blueprints.
Composition links have a maximum reach.
2014-09-07 11:52:15 +02:00
SpaceToad
a703d946b1 Merge branch 'iron-engine' of github.com:Prototik/BuildCraft into Prototik-iron-engine
Conflicts:
	common/buildcraft/energy/TileEngineIron.java
2014-09-06 12:28:50 +02:00
SpaceToad
9f71fdfe0e fixed style 2014-09-04 20:55:50 +02:00
asiekierka
3c06e37347 Did not mean to include this one. 2014-09-04 20:00:37 +02:00
asiekierka
af6297c73b fix robots in API 2014-09-04 19:51:50 +02:00
asiekierka
cba7b0ba18 Port over everything but pipes. 2014-09-03 19:22:15 +02:00
asiekierka
ab84e095cd start removing the "new" MJ API, commit RedBuildCraft engine implementation 2014-09-03 11:21:08 +02:00
asiekierka
75d8779d65 add CoFH RF API to tree 2014-09-03 11:09:51 +02:00
Prototik
ae184f76b2 Rewrite fuel/coolant api for iron engine
Add lava as fuel source
2014-08-29 19:08:34 +08:00
SpaceToad
dd4b1c53f8 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-08-18 23:33:08 +02:00
SpaceToad
f9b769bdde Implemented pump robot, close #1985.
Fixed race conditions with robot registry.
2014-08-18 23:32:11 +02:00
SpaceToad
a2247bf315 Merge pull request #1988 from darkevilmac/6.1.x
Fixed a crash on dedicated servers with EnumColor
2014-08-18 20:08:42 +02:00
SpaceToad
4f41d134a7 added control of wether an AI can be loaded from NBT 2014-08-18 09:07:57 +02:00
darkevilmac
a38ec8612b Fixed a crash on dedicated servers with EnumColor. You can see the crash here https://gist.github.com/darkevilmac/f9587498216118ebf49a 2014-08-17 22:05:01 -07:00
SpaceToad
2c69299172 finish first implementation of fluid transporter, #1985 2014-08-16 18:03:20 +02:00
SpaceToad
19989256e2 moved ResourceId to API, fixing compilation errors 2014-08-15 00:39:22 +02:00
SpaceToad
3b9b1af204 further work in requesting orders, for #1973 2014-08-14 23:24:53 +02:00
SpaceToad
221a4416e5 implemented stack requesting mechanism, for #1973 2014-08-14 18:58:17 +02:00
SpaceToad
f864f16f0a added assembly table drivers to crafting robot, for #1973 2014-08-13 22:11:44 +02:00
SpaceToad
7798953087 Progress on crafting robots (#1973)
Added centralized notion of resources for robots.
Removed urbanist tasks, as they're being replaced by robot ai.
2014-08-12 23:23:43 +02:00
SpaceToad
0e78b4a308 progress in interaction of crafting robot and furnace, for #1973 2014-08-08 09:36:11 +02:00
SpaceToad
0b6ff77515 made progress for crafter robot, #1973 2014-08-07 09:40:17 +02:00
SpaceToad
9475faf2a8 minor fixes from previous modifications 2014-08-07 09:33:03 +02:00
SpaceToad
e92b7e9828 Merge pull request #1965 from Parker8283/patch-log4j
Updated logging to log4j2
2014-08-03 20:34:33 +02:00
SpaceToad
6c88ad2ae8 Started convergence on a pre-alpha release.
Science book is deactivated.
Redstone parameter mechanics have been removed, all replaced by gates.
2014-08-03 12:19:58 +02:00
Parker
37adec2afe Updated logging to log4j2 2014-08-02 11:33:58 -04:00
AEnterprise
854b733e92 more accurate aiming of the lasers 2014-07-27 14:07:18 +02:00
SpaceToad
01273bd63c Fixed style. 2014-07-22 19:52:10 +02:00
SpaceToad
e155b9b761 robots can now work on a zone defined from a map 2014-07-21 14:34:21 +02:00
SpaceToad
b117a23c5d added multi-area selection capabilities 2014-07-20 23:41:43 +02:00
SpaceToad
bc60546eb9 added energy management for builder robot, close #1908 2014-07-15 15:55:32 +02:00
simon816
7a941c1279 Add support for injecting colored items in pipes 2014-07-08 22:38:24 +01:00
SpaceToad
b71fe3cce8 made progress for builder robot, for #1920 2014-07-08 22:40:39 +02:00
SpaceToad
40c882de25 Various fixes in robot behavior. 2014-07-06 13:22:58 +02:00
SpaceToad
6de8ad01ea improved behavior of farmer robot 2014-07-06 00:21:37 +02:00
SpaceToad
ffcd8188de fixed various regressions with gates logic 2014-07-05 10:08:36 +02:00
SpaceToad
4d35532ad1 made progress with ai load / save, for #1921 2014-07-04 08:59:23 +02:00
SpaceToad
5554cf41bc improved save / load of stations, for #1921 2014-07-03 09:32:57 +02:00
SpaceToad
3372c3f997 finished bucher and shovelman, close #1924, close #1925 2014-07-01 08:15:44 +02:00
SpaceToad
504911cff0 planter can now plant seeds, part of #1922 2014-06-30 20:54:50 +02:00
SpaceToad
99d93d46e4 fixed API build 2014-06-30 00:19:04 +02:00
SpaceToad
7721d0d95d added farmer and harvester robots, part of #1922 2014-06-30 00:07:48 +02:00
SpaceToad
1ab3bcef10 finished initial save / load loop, for #1921 2014-06-29 18:57:46 +02:00
SpaceToad
27cf9473c6 made progress with robot loading / unloading, for #1921 2014-06-29 16:58:44 +02:00
SpaceToad
8ca47462d5 Progress made in robot life cycle.
Robot now die if they have no more energy or if their station is destroyed.
Improved energy requirements (by default, all robots consume 0.1 MJ / cycle).
Part of #1921
2014-06-29 16:07:19 +02:00
SpaceToad
99309b381a improved carrier robot behavior and adjusted energy consumption 2014-06-29 11:55:19 +02:00
SpaceToad
bb3618aaf9 Further work in robot carrier control.
Items can now be filtered.
It's now possible to put items in a pipe.
For #1877.
2014-06-28 17:15:34 +02:00
SpaceToad
ecd0464379 added area control for lumberjack and planter, for #1877 2014-06-28 14:05:02 +02:00
SpaceToad
8e58dd97de decrease load of picker robots 2014-06-28 11:04:37 +02:00
SpaceToad
ab699b2480 no need for systematic cycle latency with sleep implementation 2014-06-28 00:51:47 +02:00
SpaceToad
9f1187c3aa implemented robot sleep / wakeup, for #1873 and #1877 2014-06-27 23:42:30 +02:00
SpaceToad
e4e477a241 implement miner robot, close #1915 2014-06-26 23:07:51 +02:00
SpaceToad
3c409ca0b9 started work on bomber, for #1913 2014-06-26 08:51:28 +02:00
SpaceToad
2e209805b8 separate normal terminaison from abort 2014-06-22 23:31:07 +02:00
SpaceToad
eeb637d59f Generalized latency property, for #1873 2014-06-22 17:49:22 +02:00
SpaceToad
0d4f021dd3 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-22 11:51:30 +02:00
SpaceToad
9577c53313 Fixed gate extension ids synchronization, for #1895.
Added a new concept of NetworkId, allowing to transfer ids over the network
instead of strings.
RPCs are now all handled the same way (except RPC Pipes, to be completed when
actually used).
2014-06-22 11:49:59 +02:00
SpaceToad
bcc0f37e82 Merge pull request #1893 from tambry/MoreParameterization
Even more parameterization and cleanup!
2014-06-17 21:42:21 +02:00
SpaceToad
afbfe26fa0 Factorised station scan code.
Fixed world property analysis.
2014-06-16 02:59:43 +02:00
SpaceToad
c6430035ff first attempt with AI overriding, #1877 2014-06-15 23:54:20 +02:00
Raul Tambre
5292bc6f19 Even more parameterization and cleanup 2014-06-15 22:05:06 +03:00
SpaceToad
e53f267d06 fixed and / or computation with parameter actions 2014-06-15 20:52:08 +02:00
SpaceToad
7bb2351b67 Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x
Conflicts:
	common/buildcraft/core/ItemMapLocation.java
2014-06-15 19:51:49 +02:00
SpaceToad
002caaca38 first attempt at overriding AI, for #1877 2014-06-15 19:50:55 +02:00
Raul Tambre
5ecbe57320 Parameterization and minor cleanup 2014-06-15 20:27:17 +03:00
SpaceToad
4c2b425d10 fixed builds 2014-06-15 17:33:09 +02:00
SpaceToad
4d955da51f improved docking / undocking API, #1877 2014-06-15 17:20:54 +02:00
SpaceToad
7d2e546a66 Completed support for action parameters and parametrized pipe signal.
Finalized implementation of emerald gate.
Close #1880.
2014-06-15 15:01:10 +02:00
Prototik
c01bfe8783 Make support for sided gates 2014-06-15 14:18:32 +08:00
SpaceToad
44d4e4e3b9 started work on docking action, #1877 2014-06-15 02:41:00 +02:00
SpaceToad
4f8e82b153 Continuation on gates refactoring.
Moved some packets into RPCs.
Part of #1880.
2014-06-14 15:29:45 +02:00
SpaceToad
b1076d8556 fixed API builds 2014-06-13 13:36:02 +02:00
SpaceToad
70c1cd0535 Started a major refactor of the trigger action system.
Triggers and actions are moving towards more factorization in statements.
Actions will now accept parameters.
Triggers and actions will accept up to 3 parameters.
Parameters will not only be stacks, in particular for pipe wire.
This is supporting in particular the emerald gate implementation, for #1880.
2014-06-13 13:15:33 +02:00
SpaceToad
101f591f8f Implemented leave cutter, close #1876 2014-06-12 18:29:02 +02:00
SpaceToad
6389baa9cb Implemented planter robot, close #1874. 2014-06-12 13:46:52 +02:00
SpaceToad
6c52e912c7 First pass of optimization, using a chunk buffer for properties.
Part of #1873
2014-06-11 16:58:09 +02:00
SpaceToad
53b5176297 fixed registry cleanup 2014-06-10 17:10:07 +02:00
SpaceToad
9e1a6ebf03 Implemented robot energy management - close #1867.
Finished robot lumberjack - close #1869.
Implemented docking station mutual exclusion - close #1868.
2014-06-10 13:21:17 +02:00
SpaceToad
bdda0fb476 Refactored Robot AI system into smaller units. 2014-06-10 00:22:22 +02:00
SpaceToad
b83f2ae6dc fixed style 2014-06-09 17:43:16 +02:00
SpaceToad
1605a36c03 lumberjack robot now manages its axe and corresponding damage, #1869 2014-06-09 17:40:56 +02:00
SpaceToad
41479f2021 fixed style 2014-06-07 16:45:14 +02:00
SpaceToad
1a74389a5c added additional random parameters for robot, #1732 2014-06-07 11:25:32 +02:00
SpaceToad
da32818bad Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-06 09:00:23 +02:00
SpaceToad
81bc0fe11b finalized recipe refactoring, close #1861 2014-06-06 09:00:11 +02:00
Prototik
27754198ac Fix fluid energy requirement 2014-06-03 11:07:49 +08:00
Prototik
091ae87333 Make Builder support fluids via containers/pipes 2014-06-02 23:33:03 +08:00
SpaceToad
cfb9095139 Initial refactoring of recipe mechanics.
Assembly table should be ok, integration table and refinery still to go.
For #1851
2014-06-02 16:29:13 +02:00
SpaceToad
fbf2cef772 Merge branch 'integration-table-advanced-recipe' of https://github.com/Prototik/BuildCraft into Prototik-integration-table-advanced-recipe 2014-06-01 15:17:22 +02:00
SpaceToad
02e8ef057e removed unused files and graphic components 2014-06-01 15:16:39 +02:00
SpaceToad
e193d634cf made progress in board parameters, #1732 2014-06-01 15:13:23 +02:00
Prototik
1c49dddf35 Advanced integration recipe 2014-06-01 18:35:35 +08:00
SpaceToad
e99f0a3c4b made progress with boards and parameters, #1732 2014-05-30 09:04:00 +02:00
SpaceToad
3f925ae0e9 completed a first robot+board, #1732 2014-05-29 21:58:08 +02:00
SpaceToad
ce55fe5eb1 fixed redstone board writing, #1732 2014-05-29 15:07:18 +02:00