Commit graph

2044 commits

Author SHA1 Message Date
CovertJaguar
422f9855a4 Make Wrench full 3D 2013-07-29 12:19:16 -07:00
CovertJaguar
2d50a239cc Revert "Little tweak to make 3rd person held wrench item look better"
This reverts commit 73fa5865c7.
2013-07-29 12:17:07 -07:00
CovertJaguar
665cd81b9d Merge mc16 into builder 2013-07-28 21:40:27 -07:00
CovertJaguar
b390753cc5 Merge pull request #1068 from tommy1019/patch-5
Added "smart" refinery gui
2013-07-28 18:34:15 -07:00
tommy1019
de39b79ea0 Added "smart" refinery gui
Shift-left clicking clears the filter
Right clicking sets the filter to the current fluid in the corresponding tank
2013-07-28 20:21:47 -05:00
CovertJaguar
6150ff56b1 Merge pull request #1067 from tommy1019/patch-4
Fixed Texture fighting issues with Gates/Plugs
2013-07-28 17:00:45 -07:00
tommy1019
31d1e522e8 Fixed Texture fighting issues with Gates/Plugs 2013-07-28 17:56:11 -05:00
CovertJaguar
0a81c8fca7 Fixed Refinery GUI. Thanks Tommy!
Closes #1066
Closes #1062
2013-07-28 15:34:39 -07:00
CovertJaguar
128f408d54 Merge pull request #1065 from oitsjustjose/patch-1
Little tweak to make 3rd person held wrench item look better
2013-07-28 14:30:07 -07:00
SirSengir
727fbc2259 Merge pull request #1057 from denoflionsx/master
Update Forge to last 1.5.2 version in build script.
2013-07-28 10:10:01 -07:00
oitsjustjose
73fa5865c7 Little tweak to make 3rd person held wrench item look better
Just threw in isFull3D so that way the wrench is held outward instead of sideways. Looks significantly better
2013-07-28 09:15:33 -05:00
CovertJaguar
ab64958955 Change TravItem position to primitives 2013-07-28 00:46:33 -07:00
CovertJaguar
fd3555a56a Fix injectItems
Closes #1064
2013-07-27 23:00:04 -07:00
CovertJaguar
87624d9572 Merge branch 'mc16' of https://github.com/BuildCraft/BuildCraft into mc16 2013-07-27 19:24:32 -07:00
CovertJaguar
a3565c71c6 Fix legacy Gate code on the Pipe
Why does NO ONE ever test builds on old worlds? Compatibility between MC
versions is a huge priority!
2013-07-27 19:23:50 -07:00
CovertJaguar
1d40cb2d2f Merge pull request #1061 from tommy1019/patch-2
Obsidian pipes can't pick up arrows players can't.
2013-07-27 18:51:40 -07:00
tommy1019
479ebc2f3f Obsidian pipes can't pick up arrows players can't. 2013-07-27 18:39:26 -05:00
CovertJaguar
54677904f0 Don't try to place Fluids with no block 2013-07-27 16:09:11 -07:00
CovertJaguar
5e7d6905e7 Fix typo 2013-07-27 13:52:28 -07:00
CovertJaguar
46d73fbc50 Fix AIOOB in RenderPipe
Closes #1059
2013-07-27 13:39:39 -07:00
CovertJaguar
d62148bb07 Merged EntityData and EntityPassiveItem
They have been replaced by TravelingItem. Which means yes, I broke the
various pipe hooks again.

Additionally IPipedItem and IEntityPassiveItemContribution have been
deleted. Contributions were replaced by a simple NBTCompoundTag field in
TravelingItem (which is essentially all that contributions were anyway).
2013-07-27 05:59:57 -07:00
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