Commit graph

2948 commits

Author SHA1 Message Date
SpaceToad
a670949a9c Gates are now specifically providing actions specific to their side,
for #1895.
2014-06-22 13:02:12 +02:00
SpaceToad
8801cdedc9 removed PacketCoordinates from mapped packets, as it's only derived 2014-06-22 12:04:42 +02:00
SpaceToad
79c1ad7b7d fixed indentation 2014-06-22 12:01:40 +02:00
SpaceToad
5591de3654 Merge branch '6.0.x' into 6.1.x 2014-06-22 11:52:00 +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
4a97bf3c48 Merge pull request #1894 from tambry/MarkerCrashFix
Prevent a possible crash when rendering a marker
2014-06-17 21:41:25 +02:00
SpaceToad
ff0307702e Inventory triggers should not be side specific by default, following #1886 2014-06-16 23:37:42 +02:00
Raul Tambre
753e4693bc Prevent possible crash when rendering a marker 2014-06-16 21:23:33 +03:00
SpaceToad
fa98a71d18 Redstone output is send to all sides again, following up on #1886. 2014-06-16 08:52:23 +02:00
SpaceToad
3630875761 Made redstone input back to non-side specific behavior. This follows behavior
of other blocks, although side-sensitive parameter could be added. Following
up on #1886.
2014-06-16 08:39:23 +02:00
SpaceToad
cd10225538 fixed bug when no station is found 2014-06-16 03:23:16 +02:00
SpaceToad
68ef23dbdf removed OBE comment 2014-06-16 03:00:29 +02:00
SpaceToad
afbfe26fa0 Factorised station scan code.
Fixed world property analysis.
2014-06-16 02:59:43 +02:00
SpaceToad
6f8466a8f4 fixed stack tooltip display in advanced UIs 2014-06-16 00:09:08 +02:00
SpaceToad
c6430035ff first attempt with AI overriding, #1877 2014-06-15 23:54:20 +02:00
SpaceToad
220ee62c10 fixed gate activation feedback 2014-06-15 21:05:53 +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
SpaceToad
b9df5af112 Merge pull request #1892 from tambry/Parameterize
Parameterize things
2014-06-15 19:48:55 +02:00
SpaceToad
ac28a810aa fixed triggers and actions transparency 2014-06-15 19:46:33 +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
19e07c11fa implemented robot station states, for #1877 2014-06-15 16:56:57 +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
SpaceToad
bc51e29746 Merge branch 'Prototik-gates' into 6.1.x 2014-06-15 12:32:23 +02:00
Prototik
c01bfe8783 Make support for sided gates 2014-06-15 14:18:32 +08:00
SpaceToad
254a533060 Allows to mark areas and path on top of specific locations.
Generalization of #1882
2014-06-15 03:28:35 +02:00
SpaceToad
44d4e4e3b9 started work on docking action, #1877 2014-06-15 02:41:00 +02:00
SpaceToad
0a9ffaf59f fixed parameter setting in gate gui 2014-06-15 00:24:10 +02:00
SpaceToad
40268062db started work on better pipe signal actions, for #1877 2014-06-15 00:19:30 +02:00
SpaceToad
31cc8b6438 removed unused texture 2014-06-15 00:17:54 +02:00
SpaceToad
2aa1530444 prepare icons for robot triggers / actions, #1877 2014-06-15 00:16:58 +02:00
SpaceToad
7a71e63861 Merge pull request #1885 from tambry/ContainerItemSensitive
Use ItemStack sensitive version of hasContainerItem()
2014-06-14 18:05:08 +02:00
SpaceToad
149e65d2c1 Merge branch '6.0.x' into 6.1.x 2014-06-14 18:02:56 +02:00
SpaceToad
e308a0a3e2 Merge pull request #1887 from tambry/PoolFixes
Replace .getAABBPool() and .getWorldVec3Pool() for 1.7.10 compatibility
2014-06-14 18:02:12 +02:00
SpaceToad
0ca64b0798 implemented a location recording, close #1882 2014-06-14 17:55:53 +02:00
Raul Tambre
eac76e9c77 Replace .getAABBPool() and .getWorldVec3Pool() 2014-06-14 18:45:06 +03:00
SpaceToad
50ce9c4856 Merge branch 'tambry-cleanup' into 6.1.x 2014-06-14 16:49:00 +02:00
SpaceToad
50d670593f Merge branch 'cleanup' of https://github.com/tambry/BuildCraft into tambry-cleanup 2014-06-14 16:48:47 +02:00
SpaceToad
71687ec20c fixed style, #1880 2014-06-14 15:34:14 +02:00
SpaceToad
4f8e82b153 Continuation on gates refactoring.
Moved some packets into RPCs.
Part of #1880.
2014-06-14 15:29:45 +02:00
Raul Tambre
d8d42a3d17 Use ItemStack sensitive version of hasContainerItem 2014-06-13 22:12:56 +03:00
Raul Tambre
1dcabf262b Code cleanup 2014-06-13 21:11:02 +03:00
SpaceToad
b1076d8556 fixed API builds 2014-06-13 13:36:02 +02:00
SpaceToad
98f7196d0f Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x 2014-06-13 13:17:25 +02:00