Commit graph

1303 commits

Author SHA1 Message Date
CovertJaguar
d61b2960a3 Minor Power API tweak
This should allow tickless systems to function properly.

And for the record, this whole "tickless" requirement is more CPU costly
than a simple update tick would be. *shakes fist at Aiden*
2013-08-14 23:34:14 -07:00
CovertJaguar
fa7faceab5 Fix pipe selection box sync
Closes #1104

Also, pipes were running server code on the client. This is bad, fixed.

And killed the dead PipeRenderStatePacket.
2013-08-14 22:58:47 -07:00
CovertJaguar
4d03135b85 Add Floodgate Recipe
Oops

Closes #1122
2013-08-14 20:52:17 -07:00
CovertJaguar
399e3d0ce9 Clean code while debug Diamond Pipe
Conclusion, any issues that people have with Diamond Pipes and AE
machines, are likely AE's fault. Cannot duplicate.

Closes #1005
2013-08-14 20:52:17 -07:00
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