Commit graph

1717 commits

Author SHA1 Message Date
CovertJaguar
d9636a7455 Fix shift-left clicking Lapis pipes
Unfortunately I need to fix a Forge bug to make them swing properly.
2013-07-27 00:07:33 -07:00
CovertJaguar
474d422bb6 Merge pull request #1058 from tommy1019/patch-1
Shift-right click on lapis pipe scrolls backwards.
2013-07-26 23:03:25 -07:00
tommy1019
339675aee8 Shift-right click on lapis pipe scrolls backwards. 2013-07-26 23:44:03 -05:00
CovertJaguar
71bd0a92fd Merge pull request #1055 from viliml/patch-2
Temporary solution to fluids eating other fluids
2013-07-26 20:51:25 -07:00
CovertJaguar
2abeb62d78 Merge pull request #1056 from FyberOptic/mc16
Assembly Table isInvalid() Crash Fix
2013-07-26 20:47:27 -07:00
denoflions
f6e7617ee9 Update Forge to last 1.5.2 version in build script. 2013-07-26 21:35:28 -04:00
FyberOptic
bffa773344 Assembly Table isInvalid() Crash Fix
Solution for #1054.  Avoids crash from name conflict with .isInvalid()
between ILaserTarget interface and TileEntity class, in relation to
TileAssemblyTable and TileAdvancedCraftingTable.
2013-07-26 13:02:12 -04:00
viliml
c057307f33 Temporary solution to fluids eating other fluids
This will work for BC, untill the Forge devs decide what would be the best universal approach. For now this is a solution to prevent the issue for Oil and Fuel, using the rule "first fluid wins".
2013-07-26 14:20:05 +02:00
CovertJaguar
0909ed9875 Update lang file with new blocks 2013-07-25 00:19:45 -07:00
CovertJaguar
9fcf4044e0 Added direction triggers to Iron and Daizuli Pipes
Someone made these nice icons and never used them!
2013-07-24 17:59:13 -07:00
CovertJaguar
50d9a1814a Added Daizuli Pipe
The Daizuli Pipe is similar to a Iron Pipe, except it only routes
matching colored itemstacks that have been painted by a Lapis Pipe.

The color can be set via Gate Action or via shift-click with a Wrench.
2013-07-24 14:39:07 -07:00
CovertJaguar
1745d270d8 Internalized IPipedItem
May delete eventually depending on feedback.
2013-07-24 13:14:32 -07:00
CovertJaguar
fe1af19227 Clean up and consolidate Pipe API interfaces
Note: injectItem() takes the opposite side that entityEntering() used
to.
2013-07-24 13:07:09 -07:00
CovertJaguar
f457df7ced Add Flood Gate Texture
Provided by laz2727, many thanks!
2013-07-24 05:16:50 -07:00
CovertJaguar
2bd4e6ef84 Fix pipe renderer using wrong texture for center 2013-07-24 05:12:13 -07:00
CovertJaguar
1f5ee1225e Desync Pump/FloodGate from world tick
Having all the pumps/floodgates rebuild their queues on the same tick is
probably a bad idea.
2013-07-24 01:41:10 -07:00
CovertJaguar
47cc3032c5 Swap out FML events 2013-07-24 01:23:23 -07:00
CovertJaguar
28c3b15c58 Use Generics to reduce annoying casts in Pipe 2013-07-24 01:17:55 -07:00
CovertJaguar
1f80338819 Fix Fluid Sandstone Pipe
Closes #1026
2013-07-24 01:02:07 -07:00
CovertJaguar
9150c673a5 Tweak Pump 2013-07-24 00:30:31 -07:00
CovertJaguar
3f21c33427 Fix Painted Item rendering with some items 2013-07-24 00:30:13 -07:00
CovertJaguar
05c9cb18f0 Some more Flood Gate tweaks 2013-07-24 00:12:12 -07:00
CovertJaguar
e66ed0d900 Add Lapis Pipe Actions
Icons provided by tommy__123__, many thanks!
2013-07-23 23:27:36 -07:00
CovertJaguar
83431cebf0 Added Lapis Item Pipe
This pipe paints passing items pretty colors.

TODO:
Add support to Diamond Pipe for painted items.
Add actions to set the Pipe color.

NOTES:
This required way more changes to the Pipe code that it should have.
2013-07-23 21:48:51 -07:00
CovertJaguar
f43e12e9b2 Fix render state from sending too many bytes 2013-07-23 17:37:42 -07:00
CovertJaguar
35501234d8 Restore pump throttle, oops. 2013-07-22 22:53:15 -07:00
CovertJaguar
337a94848f Added Flood Gate + Pump tweaks
The Flood Gate still needs a texture, but functionally it all there.

All you have to do is pump in a fluid and it will place it in the world.
2013-07-22 22:50:53 -07:00
CovertJaguar
a8f43acfbd Don't render tank sides where stacked 2013-07-22 22:50:52 -07:00
CovertJaguar
e581841eaa Fix Pipe connections with Iron Engine 2013-07-22 22:50:52 -07:00
CovertJaguar
07372587cf Fix Tank net sync 2013-07-22 22:50:51 -07:00
CovertJaguar
6e1788fb0c Add block disables to BCFactory
Now if you set the blockId to 0 or -1 in the config, the block will not
be loaded.
2013-07-22 22:50:50 -07:00
CovertJaguar
e523988ea2 Merge pull request #1042 from AartBluestoke/language_update
Liquid -> Fluid
2013-07-22 19:07:07 -07:00
Andrew Hill
45964dde3a Liquid -> Fluid 2013-07-23 12:02:16 +10:00
CovertJaguar
fe9dc15423 Bump forge dependancy 2013-07-22 16:45:41 -07:00
CovertJaguar
a14ac77ec3 Add new Fluid blocks to softBlocks 2013-07-22 16:41:58 -07:00
CovertJaguar
8995ff79bf Clean up some Gate code 2013-07-22 14:14:36 -07:00
CovertJaguar
5353a47aec Merge pull request #1037 from viliml/patch-1
Update Pipe.java
2013-07-22 14:02:12 -07:00
viliml
440b342165 Update Pipe.java
Fixes https://github.com/BuildCraft/BuildCraft/issues/1035 .
resetGate() set's the gate to null which causes a NPE.
2013-07-22 21:00:37 +02:00
CovertJaguar
cc24ad490c Merge pull request #1032 from viliml/patch-1
Convert strings to chat messages in quarry messages
2013-07-21 13:21:00 -07:00
viliml
32adf8a309 Convert strings to chat messages
Fixes https://github.com/BuildCraft/BuildCraft/issues/1027
2013-07-21 14:39:56 +02:00
CovertJaguar
502af8f9ae Add sanity check to hasPlug() 2013-07-20 22:52:42 -07:00
CovertJaguar
937fb12900 And Jack'O'Lanterns too 2013-07-20 19:36:35 -07:00
CovertJaguar
488a83f9e4 Ban Redstone Lamps from Facades 2013-07-20 19:35:14 -07:00
CovertJaguar
4d8799019e Simplify trigger registration 2013-07-20 18:45:58 -07:00
CovertJaguar
66bc9914ae Fix Gate GUI 2013-07-20 18:06:17 -07:00
CovertJaguar
e0e66f7910 Fix formatting of PipeTransportFluid 2013-07-20 17:28:54 -07:00
CovertJaguar
897eee58dc Finished Trigger updates 2013-07-20 17:25:41 -07:00
CovertJaguar
a19470092e Trigger busy work
Adapted old Icon framework to new API, reducing amount of busy work
tremendously.

Mostly what remains is providing unique tags for the triggers.
2013-07-20 16:25:32 -07:00
CovertJaguar
311078d660 Limited Gate/Trigger rewrite
Moved most of the Gate logic out of Pipe and into Gate. Expect some NPEs
on pipe.gate.

Converted the Trigger/Action API to key off of unique Strings instead of
IDs. Legacy conversion code implemented as well so it shouldn't affect
worlds.

Simplified Trigger/Action Icon functions. No more indexes.

More busy work is needed to convert the existing Triggers to the new
code.
2013-07-20 15:58:55 -07:00
CovertJaguar
b320c1f371 Fix pipe rotation code
Closes #1022
2013-07-19 15:58:21 -07:00