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

2252 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpaceToad
197c5b7edf Implemented icons for pulsar and single pulsar, close #1391 2014-01-04 15:43:44 +01:00
CovertJaguar
5d9a9fa4e0 Add some stat tracking ability to the Power API 2014-01-03 16:47:30 -08:00
CovertJaguar
7fc7f25661 Bump Power API version 2014-01-03 01:32:19 -08:00
CovertJaguar
bb527bb48c Merge branch 'marmot' into builder 
Conflicts:
	common/buildcraft/BuildCraftCore.java
 2014-01-03 01:21:50 -08:00
CovertJaguar
ee71e86409 Merge branch 'nightly' into marmot 2014-01-03 01:19:52 -08:00
CovertJaguar
6c73c1a070 Convert Power API to use Double instead of Float 
Closes #1288
 2014-01-03 01:17:19 -08:00
CovertJaguar
da35a13f45 Fix derpy Filler Pattern selection 
Closes #1394
 2014-01-02 05:16:09 -08:00
CovertJaguar
3b0a047570 Finalize Gate Rework 
-Added Integration Table Recipes
-Finished and tested Integration Table
-Re-added all Gate recipes
-Clean up Pipe Wires, Chipsets, etc...

Changes:
-Gate Logic Swap recipes moved from Workbench to Integration Table.
-Pipe Wires condensed into a single Item
-Pipe Wires are now distributed evenly between the gates: Red with the
Basic Gate, Blue with Iron, Yellow with Gold, and Green with Diamond.
Recipes adjusted to match.

As of this commit, Gates should be both craftable and usable again. The
Integration Table is also ready to be used. Gate Expansions are
completely implemented and usable.

Enjoy!
 2014-01-02 04:58:08 -08:00
CovertJaguar
0c057f28d1 Flesh out remaining Integration Table details 
No recipes defined yet, so no idea if it actually works.
 2013-12-29 03:05:21 -08:00
CovertJaguar
173aabf91d Implement Integration Table logic 2013-12-28 23:01:15 -08:00
CovertJaguar
edf8f17a6f Add Integration Table Recipe API 2013-12-28 01:24:18 -08:00
CovertJaguar
4356c1098b Refactor Laser Tables to share common ancestor 2013-12-28 01:11:03 -08:00
CovertJaguar
fedb4d5a42 Merge branch 'nightly' into marmot 2013-12-28 00:43:25 -08:00
CovertJaguar
d77ee030c2 Modify Pipe RayTrace to better reflect EyeHeight 2013-12-28 00:41:05 -08:00
CovertJaguar
5150d01672 Add Redstone Fader Exp + major cleanup 2013-12-27 08:40:44 -08:00
CovertJaguar
1ad0a6bc02 Merge pull request #1378 from Speiger/nightly 
Added gate changing on FluidPipes
 2013-12-25 16:34:26 -08:00
Speiger Bär
d3a178375e Added gate changing on FluidPipes 2013-12-26 01:14:26 +01:00
CovertJaguar
4e3f4c1e94 Rewrite Timer Trigger so it actually works... 
...and add Clock Timer Gate Expansion.
 2013-12-24 00:22:17 -08:00
CovertJaguar
b3aa1aaafd Missed a line 2013-12-23 23:29:36 -08:00
CovertJaguar
d9f655d52b Merge branch 'marmot' into builder 
Conflicts:
	common/buildcraft/BuildCraftCore.java
	common/buildcraft/builders/TileBuilder.java
 2013-12-23 23:28:19 -08:00
CovertJaguar
f353d04feb Merge branch 'nightly' into marmot 2013-12-23 17:07:14 -08:00
CovertJaguar
46612e4e3c Desert Oil Biome should decorate 
Closes #1374
 2013-12-23 17:02:03 -08:00
CovertJaguar
f67d1a29b8 InventoryIterator should support Double Chests 
Closes #1363
 2013-12-23 16:58:46 -08:00
CovertJaguar
b64a8977c6 Modify Trigger API slightly to support Expansions 
Unfortunately, this will break existing mods. But its a simple fix, just
implement the ITileTrigger interface.
 2013-12-23 16:49:04 -08:00
CovertJaguar
1cb20ea59d Kill Gate Icon Provider, and cleanup unused icons 2013-12-21 19:49:20 -08:00
CovertJaguar
a0c2e5807c Serialize and Sync Gate Expansions 
Expansions are synced in a similar manner to fluid ids. A packet is sent
on login with a String<->Byte mapping for each Expansion. The Pipe uses
this lookup table construct the Gate on the client side.

Remaining Todo List:
-Add Integration Table for adding Expansions to Gates
-Add Deconstruction Table for dismantling Gates
-Adapt Clock Timer Expansion to new framework
-Add Redstone Fader Expansion (name not final)
 2013-12-21 19:11:51 -08:00
CovertJaguar
88c320a56b Move Pipe API into transport for now 2013-12-20 17:01:05 -08:00
CovertJaguar
c1cd0fa02b Remove IPipe, cleanup IPipeTile 2013-12-20 16:55:47 -08:00
CovertJaguar
0c438361e5 Code clean up 2013-12-20 16:27:01 -08:00
CovertJaguar
2aa52ef61b Merge pull request #1371 from MomoNasty/patch-1 
fix the logo not showing up in the modlist
 2013-12-20 14:20:09 -08:00
MomoNasty
c730d2f41f fix the logo not showing up in the modlist 2013-12-20 06:11:34 -05:00
CovertJaguar
ae3a89bfe9 Clean up Fluid Update Packet 
It was sending a ton of unused bytes, whoever did the Liquid->Fluid API
update left a bunch of old metadata related stuff in.

Also checking for valid fluids is necessary because its possible for
FluidStack.getFluid() to return null.
 2013-12-19 20:36:58 -08:00
CovertJaguar
547c5d28ea Slow Item Pipe max speed so the code can keep up 2013-12-19 05:36:29 -08:00
CovertJaguar
986f407af6 Merge nightly into marmot 2013-12-19 05:35:40 -08:00
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