Commit graph

3306 commits

Author SHA1 Message Date
asiekierka
605ef0fe28 fix up zone planner gui, add tablet improvements, merge, etc 2015-04-12 14:27:47 +02:00
asiekierka
ed5fd2b375 BuildCraft 6.4.10 2015-04-11 08:41:23 +02:00
asiekierka
6af362a89d further 1355+ fluid fixes 2015-04-11 08:22:09 +02:00
asiekierka
b6ac3bb406 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-10 21:04:27 +02:00
Adrian Siekierka
27570d8db5 Merge pull request #2626 from hea3ven/6.4.x
fix fluid dupe with the pump robot
2015-04-10 19:45:49 +02:00
asiekierka
b291458e4a BuildCraft 6.4.9 2015-04-10 20:43:42 +02:00
asiekierka
445957588f cleanup, add warning checks for invalid item/block names in MappingRegistry 2015-04-10 20:34:55 +02:00
asiekierka
5c767249a6 fix fluid pipe crash on Forge 1355+ 2015-04-10 16:03:08 +02:00
asiekierka
4fc8db5339 fix robot crash post-refactor 2015-04-10 16:01:45 +02:00
Hea3veN
3e859b38d9 fix fluid dupe with the pump robot 2015-04-10 07:35:28 -03:00
asiekierka
a364104d47 fix pipe plug crash, add font parsing to tablets 2015-04-09 22:19:40 +02:00
asiekierka
27b385d1d0 Merge branch '6.5.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-09 18:48:45 +02:00
asiekierka
5a2dc4db3c add early tablet code, add facade non-laser recipe option, minor tweaks and refactors 2015-04-09 18:48:34 +02:00
Hea3veN
413cfc595d add a new Load/Unload area for robots 2015-04-08 20:47:03 -03:00
Hea3veN
7ab7019691 make robots drop as items when shift right click with wrench 2015-04-07 08:10:04 -03:00
Hea3veN
7e5270685e allow robots to continue working if there is no available recharging station 2015-04-07 08:09:52 -03:00
Hea3veN
9ee5947397 robots now shutdown in stead of dropping as items 2015-04-07 08:09:29 -03:00
Hea3veN
7a80a80fad cleanup fluid carrier robot 2015-04-07 08:06:39 -03:00
Hea3veN
2889c2bdb4 cleanup carrier and bomber robot 2015-04-07 08:06:24 -03:00
Hea3veN
63472e04f2 make sure all robot AI properly handle errors in delegate AIs 2015-04-07 08:06:07 -03:00
Hea3veN
542add1ff7 fix formatting of the robot position in the debugger 2015-04-06 19:15:51 -03:00
Hea3veN
5ad693bea8 refactor common robot ai code 2015-04-06 19:15:51 -03:00
Hea3veN
d76f164f0d fix robots ignoring gate configuration on load 2015-04-06 19:15:51 -03:00
Hea3veN
0945972f60 robotics package cleanup 2015-04-06 19:15:51 -03:00
Hea3veN
7c0a2ebbb5 fix compiler error 2015-04-06 19:15:51 -03:00
asiekierka
5de8bb327b Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	build.gradle
	common/buildcraft/core/recipes/FlexibleRecipe.java
2015-04-06 21:21:49 +02:00
asiekierka
1f9280c4b4 fix #2616 2015-04-06 20:00:04 +02:00
asiekierka
7f52097896 add weighted fluid sorting for diamond fluid pipes, mirroring diamond item pipes 2015-04-06 09:53:31 +02:00
asiekierka
0509624c89 fix for Java 6/7 2015-04-06 09:37:32 +02:00
asiekierka
32dfc3cdf7 output fake player UUID/name to console on postInit to help server owners 2015-04-05 14:56:57 +02:00
asiekierka
9d93d515f0 rewrite fluid extraction pipe mechanics 2015-04-05 14:44:03 +02:00
asiekierka
a6048f22a2 fixes to render refreshing 2015-04-05 12:11:45 +02:00
Hea3veN
d73f176950 fix robots changing color when picking leaf blocks 2015-04-05 11:45:35 +02:00
asiekierka
aeea0dddf4 optimize pipe chunk updates properly 2015-04-05 11:43:56 +02:00
asiekierka
ad4d418f78 more zone plan changes 2015-04-05 10:39:42 +02:00
asiekierka
24441a1ae5 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	build.gradle
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/pipes/PipeFluidsWood.java
2015-04-03 23:18:40 +02:00
asiekierka
eeaef4d9e0 BuildCraft 6.4.7 2015-04-03 22:03:51 +02:00
asiekierka
26691038ea Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-04-03 21:59:56 +02:00
asiekierka
93d136f61b work around multiple fluids in pipes issues 2015-04-03 21:54:44 +02:00
asiekierka
fb1c7a5561 BlockGenericPipe now returns proper pipe icon, might help WAILA icon rendering 2015-04-03 13:45:44 +02:00
asiekierka
93df0d82be fix some pipe empty render pass bugs, try to fix TCon fluid pipe loss and fluid pipe massive liquid extraction buffers
Conflicts:
	common/buildcraft/transport/render/PipeRendererWorld.java
2015-04-03 13:35:25 +02:00
asiekierka
9d655ec110 fix some pipe empty render pass bugs, try to fix TCon fluid pipe loss and fluid pipe massive liquid extraction buffers 2015-04-03 13:34:53 +02:00
asiekierka
a9c7c1a2e8 refactors to robot docking station code, allow TEs to provide a singular docking station (wip) 2015-04-03 13:16:22 +02:00
asiekierka
27bee0a886 Make mining well build plain pipes for free again. Pondering on the MiniMiner. 2015-04-03 11:56:03 +02:00
asiekierka
ec8308ae50 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-03 10:03:41 +02:00
asiekierka
2c72127495 fix engine rendering bug that spilled back into BC 6 2015-04-03 09:54:43 +02:00
asiekierka
b977138ec4 more null checks 2015-04-03 09:30:27 +02:00
asiekierka
9b06dff367 use BitSet for templates and blueprints rather than BlockIndex Sets 2015-04-02 21:13:10 +02:00
asiekierka
bf8403fd4e fix combustion engine never resetting its fuel value... did anyone ever test these things? 2015-04-02 14:58:01 +02:00
asiekierka
4e52c134fb Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-04-02 14:50:51 +02:00
asiekierka
d6f5063c42 begin work on ingame config 2015-04-02 14:46:57 +02:00
asiekierka
341f311ab6 make mining.depth work with quarries 2015-04-02 08:15:19 +02:00
asiekierka
aeb580cd78 add comparator support for tanks 2015-04-01 23:12:44 +02:00
asiekierka
a1e67124cd further cleanup, fixes 2015-04-01 22:08:52 +02:00
asiekierka
9363e6478c fix compile error, add facade recipes without Silicon 2015-04-01 18:07:33 +02:00
asiekierka
4378884e78 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-04-01 16:28:29 +02:00
asiekierka
16d6770c07 BuildCraft 6.4.6 2015-04-01 16:21:30 +02:00
asiekierka
c5f99464b8 fix #2600, #2591, #2589, #2584, etc 2015-04-01 16:15:10 +02:00
asiekierka
d570950059 fix #2593 2015-04-01 15:26:52 +02:00
asiekierka
f54f0a4c9f add hollow tabs to creative (#2587) 2015-04-01 15:05:33 +02:00
asiekierka
97a40ea176 add particle FX setting for robots, add heat-up for lasers, fix up fancy pipe rendering 2015-04-01 15:00:17 +02:00
asiekierka
cfa504a02e add #2567, #2599 2015-04-01 09:53:28 +02:00
asiekierka
59b7a660e2 fix #2602, #2603 2015-04-01 08:13:06 +02:00
asiekierka
835974e530 checkstyle fixes, module fixes, prepare for early beta release 2015-03-31 23:21:00 +02:00
asiekierka
fa447318a4 add round-robin sorting to diamond pipes, fix #2372, fix minor lens bugs 2015-03-31 18:01:00 +02:00
asiekierka
99dd73e70f [API change] Make the Redstone Board API rely on energy cost and not probability 2015-03-30 21:45:07 +02:00
Hea3veN
4dfca53a35 fix en error in the planter when path length == 1 2015-03-29 20:40:29 +02:00
Hea3veN
9dd279dd9b fix the search robot ai running for too long if no valid blocks are available 2015-03-29 20:40:23 +02:00
asiekierka
60d2135bb4 Merge branch '6.5.x' of gitlab.com:asiekierka/BuildCraft into 6.5.x 2015-03-29 14:32:48 +02:00
asiekierka
ccf758d807 fixes 2015-03-29 14:32:38 +02:00
Hea3veN
cac6f5cac7 fix robots looking for tools outside of their work area, fixes #2556 2015-03-28 10:25:39 -03:00
Hea3veN
e9e7d4b6c6 fix en error in the planter when path length == 1 2015-03-28 10:06:25 -03:00
Hea3veN
a1f195e896 fix the search robot ai running for too long if no valid blocks are available 2015-03-28 10:04:19 -03:00
Hea3veN
e8fd472d2a fix errors with openjdk compiler 2015-03-28 09:59:07 -03:00
asiekierka
dd686999c0 minor tweaks to bpt code 2015-03-27 22:50:57 +01:00
asiekierka
493c261d9e finish laser table renders 2015-03-26 22:40:59 +01:00
asiekierka
cef844212d Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	build.gradle
2015-03-25 16:31:22 +01:00
asiekierka
5adaf78a02 BuildCraft 6.4.5 2015-03-25 15:42:26 +01:00
asiekierka
60802f5045 try to fix #2584 2015-03-25 15:35:19 +01:00
asiekierka
91194fc36d update changelog, texture 2015-03-25 15:34:00 +01:00
asiekierka
0faccaf1d3 new auto workbench implementation - allows for stackables 2015-03-25 12:20:07 +01:00
asiekierka
ce01c5773e allow placing machines on any side of a marker box 2015-03-24 17:29:27 +01:00
asiekierka
3608844213 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-24 16:42:38 +01:00
asiekierka
1bfab4373d Fix #2585 2015-03-24 16:42:18 +01:00
asiekierka
7fa702a3ae robot code changes - @hea3ven please review 2015-03-23 23:16:00 +01:00
davboecki
9bf8885297 Fix #2582. 2015-03-23 17:13:58 +01:00
asiekierka
097492883d fix addOrStripPipePluggable ignoring false, add global event handlers, clean up 2015-03-22 19:11:38 +01:00
asiekierka
0b329169ae API, etc. improvements 2015-03-22 14:06:05 +01:00
asiekierka
971f3614c9 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-03-22 12:59:35 +01:00
asiekierka
aad7319590 add display list caching to builder/filler rendering, remove duplicate code, minor optimizations 2015-03-22 10:13:11 +01:00
asiekierka
7bf6f02da3 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-22 00:31:30 +01:00
asiekierka
16bceed0d0 fix #2574 2015-03-22 00:30:52 +01:00
asiekierka
0a20b53c6d add RF power support to Auto Workbenches 2015-03-21 20:01:01 +01:00
asiekierka
bcb2a40fa5 make StatementParameterItemStacks override the description and output the item stack desc 2015-03-21 18:31:37 +01:00
asiekierka
b59ce91945 no more recursive list matching 2015-03-21 18:21:42 +01:00
asiekierka
ed76c9a4f1 Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x
Conflicts:
	common/buildcraft/BuildCraftTransport.java
2015-03-21 18:12:37 +01:00
asiekierka
69e9173a12 changes to robot accept/request behaviour 2015-03-21 18:11:22 +01:00
asiekierka
c4e1e73c27 fix #2574 2015-03-21 17:41:55 +01:00
Hea3veN
e1135ed183 fix a ConcurrentModificationException on the planter, fixes #2566 2015-03-21 10:22:29 -03:00
Hea3veN
45882961ca fix planters sometimes not finding valid planting blocks 2015-03-21 10:02:29 -03:00
asiekierka
8e6901a66b fixes to stripes pipe behaviour 2015-03-21 13:08:09 +01:00
asiekierka
2186fbdd48 new features to stripes pipes 2015-03-21 11:20:07 +01:00
asiekierka
5cb7c9fe00 add stripes pipe direction control, add stripes handler priority system to API, add IBlueprintItem API thing 2015-03-20 17:03:46 +01:00
asiekierka
36ec39a59e improvements to Stripes Pipes 2015-03-20 15:07:12 +01:00
asiekierka
fd00ca3138 finish initial modularization refactor 2015-03-20 10:47:52 +01:00
asiekierka
18add8b847 write global zone map system to replace earlier zone planner system 2015-03-19 22:01:52 +01:00
Robert Allen
9966ad3a4e Slimeballs don't have meta 2015-03-19 13:43:39 -07:00
asiekierka
1053a74e35 update, cleanup 2015-03-18 09:19:47 +01:00
asiekierka
96492136c5 update 2015-03-17 08:24:14 +01:00
asiekierka
88f71fdca9 add nameable map locations, fix zone planner rendering issues 2015-03-16 19:57:00 +01:00
asiekierka
54088c2249 add assembly table, advanced crafting table and charging table models; improve pipe/gate speed further; add NEI support for gate recipes 2015-03-16 16:46:18 +01:00
asiekierka
8acd085b2b allow robots to use modded pickaxes, closes #2555 2015-03-16 16:45:51 +01:00
asiekierka
ed164c2a01 fix slimeball recipe 2015-03-16 16:45:10 +01:00
asiekierka
470dfc0049 raise packet sending frequency, sync lang 2015-03-15 17:23:08 +01:00
asiekierka
f3d14f105a improvements in APIs, threaded packet sending, light sensor expansion, highly optimized pipe code 2015-03-15 15:59:10 +01:00
Kubuxu
dd6c019bfc Potential fix for block breaking robots hanging up on air blocks. 2015-03-15 09:09:38 +01:00
asiekierka
082cda0653 update Essence, fix wrenches and non-rotatables, add glowing laser rendering, add paintbrushes 2015-03-14 17:03:20 +01:00
asiekierka
d2143a09b6 minor optimizations 2015-03-14 12:36:34 +01:00
asiekierka
b9755f7915 optimize block/TE lookups, optimize rare edge case in lasers 2015-03-13 21:50:32 +01:00
asiekierka
5a0a5dd519 add smooth item movement rendering 2015-03-13 18:27:41 +01:00
asiekierka
0b4ee815d3 add a limit to wooden transport pipes to stop them from exploding 2015-03-13 15:19:50 +01:00
asiekierka
dd9c8fc84a blueprint library is now electronic library, can store books; add LibraryAPI 2015-03-13 14:27:22 +01:00
asiekierka
360047ed45 project essence, part 2 2015-03-13 09:27:06 +01:00
asiekierka
e3f28b5826 project essence, part 1 2015-03-11 22:07:02 +01:00
asiekierka
c5408d95d6 fix structure pipes not respecting blocking pluggables 2015-03-10 19:40:07 +01:00
asiekierka
5541c8e7fd BuildCraft 6.4.3 2015-03-10 08:11:23 +01:00
Hea3veN
6b3409736d fix robot dupe when unloaded on a station other than the main link 2015-03-09 19:13:42 -03:00
asiekierka
a110ed1071 fix robot rendering in inventory 2015-03-09 21:33:30 +01:00
asiekierka
d77aa4e9fa Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-09 21:24:15 +01:00
asiekierka
d3288d107a Merge with 6.5.x energy value tweaks 2015-03-09 21:24:02 +01:00
asiekierka
457f69e5e0 tweak energy values in robots 2015-03-09 21:23:35 +01:00
asiekierka
7eb936ee4f Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-03-09 21:22:43 +01:00
asiekierka
d4a66f73eb Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.4.x 2015-03-09 21:21:46 +01:00
asiekierka
af2ea54b6d fix sleep usage being too high 2015-03-09 21:21:18 +01:00
asiekierka
8b05cc921d make robots try to recharge at a bit less than max 2015-03-09 21:21:13 +01:00
asiekierka
e73b19fd75 improve robot light handling to include charging 2015-03-09 21:19:38 +01:00
asiekierka
511a8e1b31 make robots try to recharge at a bit less than max 2015-03-09 21:19:02 +01:00
asiekierka
499f4ca6a0 fix sleep usage being too high 2015-03-09 21:13:35 +01:00
Adrian Siekierka
a7764683e0 Merge pull request #2544 from warlordjones/6.4.x
Should fix #2541
2015-03-09 20:22:34 +01:00
asiekierka
07036941e5 made robot side light denote sleeping and energy level 2015-03-09 16:45:56 +01:00
Arona Jones
c03df68e9a Possible fix for #2541 2015-03-09 14:18:48 +00:00
asiekierka
0ac6acdc53 Merge branch '6.5.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-03-09 14:12:11 +01:00
asiekierka
e1c80c7ead Merge branch '6.4.x' of github.com:BuildCraft/BuildCraft into 6.5.x 2015-03-09 14:11:06 +01:00
asiekierka
4e6903547d massive resources refactor, add robot reserved/linkes/in station triggers 2015-03-09 13:59:13 +01:00
Adrian Siekierka
c5fb869bbc Merge pull request #2542 from viliml/patch-3
Add a cooling buffer, fix #2530
2015-03-09 13:07:06 +01:00
Hea3veN
61ffce7622 fix planters not working with zone planner areas 2015-03-08 19:48:17 -03:00
Vilim Lendvaj
f99777f903 Add a cooling buffer, fix #2530
Now no coolant is lost due to rounding, and coolants that are too strong will not cause engines to blow up before even being used.
2015-03-08 23:21:45 +01:00
Adrian Siekierka
e6df71f1f0 Merge pull request #2540 from Kubuxu/carrier
Make carrier robots load to full from one station
2015-03-08 18:17:04 +01:00
Kubuxu
1c8b0b48ba
Make carrier robots load to full from one station 2015-03-08 14:54:54 +01:00
Thog
9214f48459 Knights now search IMob instead of EntityMob (Fix #2537) 2015-03-08 14:11:07 +01:00