Commit graph

2047 commits

Author SHA1 Message Date
CovertJaguar
10daf6f202 Remove any possibility for CCMEs in Item pipes
Fixes
http://forum.feed-the-beast.com/threads/direwolf-20-1-6-4-public-beta.35476/page-18#post-500244

I should note that I still can't see how that could have happened, this
commit just made it utterly impossible.
2013-12-19 04:41:57 -08:00
CovertJaguar
c9acef05ca Improve perf of ACT by caching OreDict info 2013-12-19 03:33:22 -08:00
CovertJaguar
2936d76b95 Add a null check in dropItems() 2013-12-13 15:27:10 -08:00
CovertJaguar
35611e0bf7 ACT needs to support recipes with variable outputs
For example, ChristmasCraft Gifts that use input item NBT to determine
the output item.
2013-12-13 15:22:21 -08:00
CovertJaguar
70822c0178 Add additional support for Gate Expansions
Things left to do:
-Sync expansions on the pipe to the client
-Rewrite Assembly table to support modifying Item NBT so you can add
expansions to Gates
2013-12-10 02:02:35 -08:00
CovertJaguar
acef0b4d60 Fix Gate Rendering
Layers!
2013-12-10 01:02:21 -08:00
CovertJaguar
4a21f4ce24 Notify player of inv changes when filling 2013-12-08 21:03:29 -08:00
CovertJaguar
d7575d74ea Wrenches shouldn't stack 2013-12-08 21:02:46 -08:00
CovertJaguar
a4032762bc Merge branch 'marmot' of https://github.com/BuildCraft/BuildCraft into marmot 2013-12-08 16:57:03 -08:00
CovertJaguar
5be3a5c6a0 Fix Engine dupe
Closes #1361
2013-12-08 16:56:40 -08:00
CovertJaguar
eed53376aa Merge pull request #1359 from dgtized/extractGLcolor
Extract GL.color(int color) for unpacking hex RGB
2013-12-08 16:53:33 -08:00
Charles Comstock
ef71c35ad2 Extract GL.color(int color) for unpacking hex RGB
Centralizes all the unpacking of hex RGB values from an integer to a
single call to GL11.glColor4f.
2013-12-08 02:42:14 -06:00
CovertJaguar
0a4193b72e Some more minor optimizations 2013-12-05 18:05:32 -08:00
CovertJaguar
10015f8ffb Remove Fluid Motion Event, they cost too much CPU
And I'm told they are going away in the future.
2013-12-05 17:01:09 -08:00
CovertJaguar
7ee74d56a1 First Iteration of Gate Rewrite
GateKind enum is gone, replaced with two enums: GateMaterial and
GateLogic.

Pulsars and Timers are abstracted into GateExpansions that can be
applied to "upgrade" a gate. (Incomplete)

GateExpansions will eventually be moved to the API so that other can
define new expansions easily.

GateExpansions are not currently serialized or synced to the client.
This remains to be done.

Legacy migration support is included, but untested.

Currently only the base logic texture layer (white/black) are being
rendered. Eventually the material and expansions will each render an
additional texture layer onto the gate.
2013-12-05 13:38:00 -08:00
CovertJaguar
f41cc82eca Allow water springs to be disable independently of everything else 2013-12-05 09:56:03 -08:00
CovertJaguar
d443f279a6 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-12-03 15:48:28 -08:00
CovertJaguar
03acd96b2b Version 4.2.1 2013-12-03 15:47:57 -08:00
CovertJaguar
5f9e171de9 Merge pull request #1353 from ItsMeElConquistador/marmot
Added colorRenderCache to refinery filter slots
2013-12-03 00:13:43 -08:00
CovertJaguar
1acf4ba5b5 Cache Traveling Items
There existed a race condition where either the client could pass an
item from one pipe to another (with intact ItemStack NBT data) or a
packet could arrive from the server to inject the item into the pipe
(without NBT data). This resulted in incorrect Icons being occasionally
displayed for a moment for Items that use NBT to determine the Icon
(Forestry Bees/Trees).

To eliminate this race condition, all Traveling Items are now cached
(weakly) and ItemStacks are no longer sent as part of the Traveler
Packet. The client must instead request the ItemStack from the server.
The bonus being that the ItemStack (NBT and all) needs only be requested
when it first enters the network.

This also has the affect of further reducing bandwidth usage by Item
pipes, though it should be noted that Item pipes where already the least
bandwidth intensive pipe.

Additionally I rewrote the Item Grouping code. I'd never looked at it
before, but I figured I should make sure it properly maintains the pipe
state after grouping. What I found was 200 lines of wtf code that was
horribly outdated and broken. I replaced it with 20 lines of code that
are less dependent on implementation details of how pipes work. -.-
2013-12-02 17:45:08 -08:00
ElConquistador
76c35e28af Added colorRenderCache to refinery filter slots 2013-12-02 21:09:22 +01:00
CovertJaguar
4b80435f3d Merge Timer into Marmot 2013-12-01 22:27:42 -08:00
CovertJaguar
a6a4d46b29 Merge branch 'master' into marmot 2013-12-01 22:21:38 -08:00
CovertJaguar
802f63e858 Merge pull request #1351 from ItsMeElConquistador/master
Combustion Engine also now uses the colorRenderCache. Closes #1333
2013-12-01 22:19:00 -08:00
CovertJaguar
c802c45c93 Random Pipe API musings 2013-12-01 22:15:03 -08:00
CovertJaguar
cc0298ce5b Clean up Recipe API 2013-12-01 21:57:31 -08:00
ElConquistador
3776286e2e Combustion Engine also now uses the colorRenderCache 2013-12-01 19:48:08 +01:00
CovertJaguar
09ef987875 Merge pull request #1349 from ItsMeElConquistador/master
Added a fluid color render cache to pipes
2013-12-01 06:05:26 -08:00
ElConquistador
fb52387094 Added colorRenderCache to Tank and Refinery 2013-12-01 08:18:19 +01:00
ElConquistador
4a0d2d2478 Merge remote-tracking branch 'upstream/master' 2013-12-01 07:40:08 +01:00
CovertJaguar
b9b2f1a238 Add some API failsafes 2013-11-30 14:08:38 -08:00
CovertJaguar
1f65388c80 Another perf tweak 2013-11-30 13:57:25 -08:00
ElConquistador
5aab6ecf88 Merge remote-tracking branch 'upstream/master' 2013-11-30 18:20:03 +01:00
CovertJaguar
0dd0c6c885 Various minor performance tweaks 2013-11-30 08:49:10 -08:00
ElConquistador
6c770a90a1 Added a fluid color render cache so fluids that use colors will get properly renderered in pipes 2013-11-30 17:14:43 +01:00
Flow86
797aef5082 Merge pull request #1348 from SandGrainOne/master
Corrected method names in gold and void pipe.
2013-11-30 05:57:20 -08:00
SandGrainOne
ae67ae3a2c Corrected method names in gold and void pipe. 2013-11-30 13:41:49 +01:00
CovertJaguar
5dd82d7a95 Don't render fluid in disconnected pipes 2013-11-29 19:32:45 -08:00
CovertJaguar
0cbc63e919 Version 4.2.0 2013-11-29 17:08:49 -08:00
CovertJaguar
6d79989435 Changelog for 4.2.0 2013-11-29 12:11:38 -08:00
CovertJaguar
de8f738412 Merge branch 'ganymedes01-master
Closes #1345
2013-11-29 07:02:05 -08:00
ganymedes01
17e7cb9a11 Fix for Gates with ItemStacks with NBT data
Closes #1344
2013-11-29 06:56:52 -08:00
CovertJaguar
8fb3197276 Allow placement of Facades over Plugs 2013-11-29 06:50:07 -08:00
taelnia
3c51073653 Add call to onInventoryChanged to extraction pipes 2013-11-29 06:50:06 -08:00
CovertJaguar
1527c313cd Allow placement of Facades over Plugs 2013-11-28 03:03:37 -08:00
CovertJaguar
229063500b Merge pull request #1343 from taelnia/master
Add call to onInventoryChanged to extraction pipes
2013-11-27 06:47:08 -08:00
CovertJaguar
38a6c81ab3 Pipe Block shouldn't appear in creative 2013-11-27 06:21:53 -08:00
CovertJaguar
ff227f9de9 Fix texture fighting on tank bottom 2013-11-27 06:21:52 -08:00
taelnia
029c448712 Add call to onInventoryChanged to extraction pipes 2013-11-27 00:29:55 -05:00
Yopu
25ee549253 Added quartz gates and chipsets.
Quartz gates act like gold gates with 2 exceptions:
They can connect to all pipe wire types.
There are 3 additional gate triggers that function as timers.

The timers have a short, medium, and long mode which can be set via config.
2013-11-25 20:29:36 -05:00