Commit graph

1597 commits

Author SHA1 Message Date
CovertJaguar
5357467349 Merge pull request #1012 from viliml/patch-1
Fix typo.
2013-07-18 14:23:49 -07:00
CovertJaguar
16c261c478 Merge pull request #1014 from tomason/npe-combustion
fix NPE when using combustion engine with empty tank
2013-07-18 14:23:11 -07:00
CovertJaguar
0af5268c6b Merge pull request #1016 from tomason/pump-fix
Pump fix
2013-07-18 14:22:46 -07:00
tomason
ec5f7edf7f fix array indexes 2013-07-18 19:29:24 +02:00
tomason
db1ff2e5c7 Lava is now lava 2013-07-18 19:23:24 +02:00
viliml
d61aacde16 Fix tank not rendering fluids properly.
Before every fluid in the tank was pink(no texture) because the texture path has changed in 1.6.
2013-07-18 15:44:14 +02:00
viliml
d9a06ceba0 Fix typo.
In case another mod adds a fuel fluid, and it's loaded before BC, without this fix the fuel buckets would place oil blocks.
2013-07-18 15:26:16 +02:00
tomason
fa577e2c1b fix NPE when using combustion engine with empty tank 2013-07-18 11:56:08 +02:00
CovertJaguar
e3e9404b8a GuiRefinery code cleanup 2013-07-17 16:25:25 -07:00
CovertJaguar
9cb75de1df PipeLogic Smash 2013-07-17 16:24:57 -07:00
CovertJaguar
1860ebc300 Rewrite Iron/Wood logic into helper classes 2013-07-17 16:12:01 -07:00
CovertJaguar
4dbd28a0dc Wooden Power pipe needs no logic 2013-07-17 15:16:21 -07:00
CovertJaguar
f5c601b570 Fix net code 2013-07-17 13:43:44 -07:00
CovertJaguar
21920e1556 Fix liquid textures 2013-07-17 13:43:34 -07:00
CovertJaguar
13534ddae6 Some clean-up of the refinery code 2013-07-17 11:55:54 -07:00
CovertJaguar
e49bddc867 Fix issues with PR #1011
See https://github.com/BuildCraft/BuildCraft/issues/1011
2013-07-17 11:51:16 -07:00
CovertJaguar
de2f39f4cb Merge pull request #1011 from samoht-2401/mc16
Get things running / New 1.6 ressource directory
2013-07-17 11:16:00 -07:00
samoht-2401
9e6e198794 Get things running / New 1.6 ressource directory
Modified some little things in order to be able to compile.
The new ressource organization is added too.
2013-07-17 18:54:04 +02:00
Flow86
23ad66a3ed Merge pull request #1009 from samoht-2401/mc16
Better rendering
2013-07-17 05:43:37 -07:00
samoht-2401
088f862574 Better rendering 2013-07-17 14:40:30 +02:00
Flow86
c66c7aead5 Merge pull request #1007 from AartBluestoke/master
Allow for more advanced delivery conditions
2013-07-17 04:18:29 -07:00
Andrew Hill
05313f8872 Allow for more advanced delivery conditions
This doesn't control items passing between pipes, only a condition for a
PipedItem to prevent itself exiting the network in specific places.

This modification allows BC to have more advanced sinking conditions
(eg: the discussion about coloured pipes/items)

Logistics pipes currently modifies something via reflection to prevent
it's liquid packets from being sunk to standard IInventories.
2013-07-17 16:56:03 +10:00
CovertJaguar
8a3d837e94 Remove Proxy.getBuildCraftBase()
It was only used by the blueprint code, and will be replaced eventually
anyway.
2013-07-16 14:54:47 -07:00
CovertJaguar
29eb8776a4 Merge pull request #1006 from adamros/mc16
Clean up inventory code, chat message changes
2013-07-16 14:34:13 -07:00
CovertJaguar
61a0e89c4d Smash PipeLogic hard
PipeLogic is now only used by Iron and Wooden pipes. All other pipes use
the empty PipeLogic() class.

Pipe connections are now handled by the new PipeConnectionBans class.
2013-07-16 14:13:57 -07:00
CovertJaguar
80a249e810 An attempt to make pipes movable 2013-07-16 12:58:31 -07:00
Adam Rosadzinski
81886bc8d7 Clean up inventory code, chat message changes
Remove support for non-existing ISidedInventory from Forge
Fixed sending chat message to player - 1.6 changes
2013-07-16 15:40:35 +02:00
CovertJaguar
0b5d898469 Catch uncaught IOException 2013-07-16 04:27:13 -07:00
CovertJaguar
bb4b5062bc Refinery fixes + StreamPayload
Added a alternative payload system for update packets that uses data
streams instead of arrays. Note: It is not compatible with
@TileNetworkData so you will have to handle all the data yourself.

Also added a TankManager class to contain commonly needed code for
tanks: Serialization, TankInfo, Network Data, etc...

The Refinery still needs a fair bit of work, but its mostly limited to
the GUI filter code. That needs a complete rewrite of some kind since
Fluids aren't items and can't be rendered as such.
2013-07-16 03:50:45 -07:00
CovertJaguar
d6200ab9a5 Horizon Pattern shouldn't block if no stack 2013-07-15 13:06:37 -07:00
CovertJaguar
33422087a3 Clean up Iron Engine APIs 2013-07-14 12:09:54 -07:00
CovertJaguar
b44d60f4fe Revert Builder changes
I don't know how these got merged, but they shouldn't have been.
2013-07-14 11:58:43 -07:00
CovertJaguar
eecc8ebf36 Fix current language 2013-07-12 19:06:13 -07:00
CovertJaguar
d607eaae9b Merge branch 'mc16' into builder 2013-07-12 18:46:10 -07:00
CovertJaguar
4dd867d606 Fix getWorld() function 2013-07-12 17:40:06 -07:00
CovertJaguar
425515504d Make Oil burn again 2013-07-12 17:10:52 -07:00
CovertJaguar
8992fc3569 Don't delete Forge dir during setup 2013-07-12 17:04:53 -07:00
CovertJaguar
efcdbeb8c5 Merge mc16 into Builder 2013-07-12 16:54:26 -07:00
CovertJaguar
96ac7f6bf4 Rename pipes appropriately 2013-07-12 16:44:54 -07:00
CovertJaguar
62a75524c8 Tweak Pipe Fluid renderer 2013-07-12 16:41:06 -07:00
CovertJaguar
a3e30d57cc More update work
Fluids are mostly converted, including rendering and registration. Added
Fuel Block.
2013-07-12 16:38:03 -07:00
CovertJaguar
1d11beaa6b More update work 2013-07-12 14:21:44 -07:00
CovertJaguar
175138eab8 Update build.xml 2013-07-12 10:45:26 -07:00
CovertJaguar
5aecd9aa87 Merge Power into mc16 2013-07-12 10:37:11 -07:00
Christian
103a8c124b First draft 1.6. Lots still to do. :( 2013-07-07 22:57:05 -04:00
Christian
10452d4964 Merge branch 'power' 2013-07-05 14:32:47 -04:00
Christian
190e6a2935 Merge branch 'master' into power 2013-07-05 14:32:26 -04:00
Christian
1e0fa98484 Fix facade rotation. It works again with new meta system. 2013-07-05 13:50:50 -04:00
CovertJaguar
d0a7a64505 Exploding Engines should kill themselves
Added because someone decided turning off explosions was a good idea.
2013-07-04 03:37:36 -07:00
CovertJaguar
93409516b1 Merge branch 'power' into builder 2013-07-04 03:22:41 -07:00