Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1758 commits 1 branch 0 tags 19 MiB
Commit graph

1349 commits

Author SHA1 Message Date
CovertJaguar
e705cec237 Merge pull request #1112 from ItsMeElConquistador/master 
Fix pipe rendering (issue #1111)
 2013-08-14 14:26:08 -07:00
CovertJaguar
7522478dd3 Merge pull request #1118 from SandGrainOne/master 
isActive method can give NullPointerException
 2013-08-14 02:23:50 -07:00
Flow86
60cb434da3 fixes #1120 again 
<CovertJaguar> though personally it would be better to make the hook return the value to adjust it by
 2013-08-14 10:31:45 +02:00
Flow86
91b2550956 Update PipeTransportPower.java 
fixes #1120
 2013-08-14 10:20:12 +02:00
SandGrainOne
a70cabb598 isActive method could give NullPointerException 
A pump with an empty "block list" would cause NullPointerException if
isActive was called.
 2013-08-13 20:22:55 +02:00
ElConquistador
a36f245e70 Fix pipe rendering (issue #1111) 2013-08-11 20:19:50 +02:00
CovertJaguar
95cbf27ba7 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-08-09 01:41:42 -07:00
CovertJaguar
ae59a6cc88 Change how pump handles water. 
Added config "consumeWater" which defaults to false. If false, pumps will not remove water source blocks if it detects more than 9 blocks of water in the area.

This should significantly reduce chunk rerenders and search cost (search terminates after 9 blocks). Essentially making a water pump nearly as computer friendly as an Aqueous Accumulator.
 2013-08-09 01:36:01 -07:00
CovertJaguar
0ae4035dab Reduce redundant code in pipe world renderer 2013-08-09 01:30:03 -07:00
CovertJaguar
c1e6c5d498 Fix AWB dupe 
And make it less likely to happen again in the future.

Also cleaned up some fluid stuff.
 2013-08-08 17:30:30 -07:00
CovertJaguar
2023ccb79a SST Tracker should use total time 
Closed #1107
 2013-08-08 17:26:28 -07:00
CovertJaguar
81b2c7043a Merge mc16 into master 2013-08-07 14:54:17 -07:00
CovertJaguar
a53a724b41 Revert STT changes 
They were broken if you have more than one world.
 2013-08-07 14:42:55 -07:00
SirSengir
358b58321a Fix missing default perdition calculator. 2013-08-07 16:05:04 +02:00
CovertJaguar
d6b8fd6f15 Oops that wasn't supposed to make it in 2013-08-07 02:01:46 -07:00
CovertJaguar
9472dea734 Revert "An attempt to improve PowerHandler cpu usage" 
This reverts commit e85d99b047.
 2013-08-06 22:48:07 -07:00
CovertJaguar
e85d99b047 An attempt to improve PowerHandler cpu usage 2013-08-06 21:50:42 -07:00
CovertJaguar
fc3e3d19cb Some performance improvements related to STT 2013-08-06 21:22:44 -07:00
CovertJaguar
91a84f2062 Changed IPipeConnection to return three states 
And fix engines connecting to pipes. This is why I shouldn't code at 5
AM.
 2013-08-06 14:47:45 -07:00
CovertJaguar
447b914fb5 Rework Pipe connection rules (again) 2013-08-06 04:58:35 -07:00
CovertJaguar
671caa458d Fix Utils.checkPipeConnections() 2013-08-06 03:55:08 -07:00
CovertJaguar
defc41f5d1 More stuff for Soaryn 2013-08-04 17:16:40 -07:00
CovertJaguar
66481d5b62 Fix Soaryn's broken stuff 2013-08-04 16:02:53 -07:00
CovertJaguar
ee1a89f1c3 Add NPE check 
Fixes #1090
 2013-08-04 16:02:31 -07:00
CovertJaguar
15acae3c54 Merge pull request #1093 from viliml/patch-3 
Update BuildCraftEnergy.java
 2013-08-04 15:45:06 -07:00
viliml
321d8d1f2b Update BuildCraftEnergy.java 
Fixes https://github.com/BuildCraft/BuildCraft/issues/1091.
 2013-08-04 22:23:23 +02:00
Emil Lauridsen
3b90e2ed35 Add missing imports 2013-08-04 16:33:38 +02:00
Soaryn
c62c33c11e Fixed spacing 2013-08-03 22:42:06 -04:00
Soaryn
fff440836b Adds Missed call for color 2013-08-03 22:22:24 -04:00
Soaryn
1dd3c3a58f Adds Missed call for color 2013-08-03 22:11:41 -04:00
Soaryn
89980dceb2 Adds FluidStack color to pipes Render 2013-08-03 22:02:40 -04:00
Soaryn
cb8a139f01 Adds FluidStack color to tank Render 2013-08-03 21:43:15 -04:00
Soaryn
fee9c44fe7 Adds FluidStack color to refinery Render 2013-08-03 21:42:29 -04:00
Soaryn
333e38d5b2 Adds color to Refinery Fluids 
Note, this needs a FluidStack to be complete. This only covers basic Fluid Colors
 2013-08-03 21:40:57 -04:00
Soaryn
95fa107860 Adds colorFluid Helper to FluidRenderer 2013-08-03 21:38:57 -04:00
CovertJaguar
b0f72a94ab Add container null check 2013-08-01 00:13:52 -07:00
CovertJaguar
67a9f6389e Forgot some bits 2013-08-01 00:00:23 -07:00
CovertJaguar
f3602d2205 Let Items decide if they like an Inventory 2013-07-31 23:57:09 -07:00
CovertJaguar
5b45375870 Typo boo! 2013-07-31 23:23:31 -07:00
CovertJaguar
3985e58970 endReached should control further processing 2013-07-31 23:22:01 -07:00
CovertJaguar
617d06c3b0 Flood Gate now shuts off on redstone signal 2013-07-31 15:42:00 -07:00
CovertJaguar
ddd2c0f3a1 Fix pump output 2013-07-31 15:41:35 -07:00
CovertJaguar
4c056e989c Power spikes mess with Request triggers 2013-07-31 14:28:22 -07:00
CovertJaguar
10d9d2bb10 Fix some minor isAir checks that were missed 2013-07-31 14:10:53 -07:00
CovertJaguar
a2d30930de Fix Iron Fluid Pipe rotation 2013-07-31 03:23:17 -07:00
SirSengir
658718e3ac Remove SideOnly in PacketPayload 
SideOnly should only ever be a last resort.
 2013-07-31 11:58:39 +02:00
CovertJaguar
d120512934 Some minor Pipe content render improvements 2013-07-31 01:56:53 -07:00
CovertJaguar
cf87c4229d Added disconnects to the version check 2013-07-29 20:35:42 -07:00
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
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
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
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
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
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
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
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
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
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
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