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

1378 commits

Author SHA1 Message Date
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
CovertJaguar
e0e66f7910 Fix formatting of PipeTransportFluid 2013-07-20 17:28:54 -07:00
CovertJaguar
897eee58dc Finished Trigger updates 2013-07-20 17:25:41 -07:00
CovertJaguar
a19470092e Trigger busy work 
Adapted old Icon framework to new API, reducing amount of busy work
tremendously.

Mostly what remains is providing unique tags for the triggers.
 2013-07-20 16:25:32 -07:00
CovertJaguar
311078d660 Limited Gate/Trigger rewrite 
Moved most of the Gate logic out of Pipe and into Gate. Expect some NPEs
on pipe.gate.

Converted the Trigger/Action API to key off of unique Strings instead of
IDs. Legacy conversion code implemented as well so it shouldn't affect
worlds.

Simplified Trigger/Action Icon functions. No more indexes.

More busy work is needed to convert the existing Triggers to the new
code.
 2013-07-20 15:58:55 -07:00
CovertJaguar
b320c1f371 Fix pipe rotation code 
Closes #1022
 2013-07-19 15:58:21 -07:00
CovertJaguar
4fd129170c Mark drips client only 
Might fix server issues *shrugs*
 2013-07-19 15:22:26 -07:00
CovertJaguar
2302eacad4 Merge pull request #1017 from viliml/patch-3 
Fix combustion engine GUI not rendering fluids properly
 2013-07-19 07:47:52 -07:00
CovertJaguar
9c35934e46 Merge pull request #1020 from viliml/patch-5 
Squashed the last texture bugs
 2013-07-19 07:47:39 -07:00
CovertJaguar
776147fe92 Merge pull request #1018 from viliml/patch-4 
Add missing case for EQUIPPED_FIRST_PERSON
 2013-07-19 07:47:02 -07:00
CovertJaguar
0ce916dcd8 Improve Pump search Algo 
Mainly just cleaned up the code and replaced the TreeSets with Deques.

Also made it so the pump will only keep the pumping the same type of
liquid it started on.  If you wish to reset it to pump any liquid hit
with a wrench and the next liquid it pumps will be the new filter.
 2013-07-19 07:09:18 -07:00
viliml
4db502dbf6 Update RenderingEntityBlocks.java 2013-07-19 15:20:09 +02:00
viliml
5b37c2e505 Update GuiFiller.java 2013-07-19 15:10:56 +02:00
viliml
cbc6e70969 Fix engine GUI not drawing the lendger "energy" icon properly 
I'm starting to see a pattern here...
 2013-07-19 15:03:49 +02:00
viliml
1b84d0c592 Add missing case for EQUIPPED_FIRST_PERSON 
It needs to be on the 1.6 branch too!
 2013-07-19 14:08:10 +02:00
viliml
a75604d371 Fix combustion engine GUI not rendering fluids properly 
Same thing as the tank, block textures aren't in terrain.png any more!
 2013-07-19 14:04:13 +02:00
CovertJaguar
108adc1a03 Fix possible exception 2013-07-18 22:19:43 -07:00
CovertJaguar
39855eed65 Add Fluid drip particles 2013-07-18 22:19:23 -07:00
CovertJaguar
bf46a1a6af Merge pull request #1013 from viliml/patch-2 
Fix tank not rendering fluids properly.
 2013-07-18 14:24:11 -07:00
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
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
a4765c766e Merge pull request #943 from dmillerw/master 
Fixed pipes rendering in hand as flat texture
 2013-07-17 11:21:32 -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
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
efcdbeb8c5 Merge mc16 into Builder 2013-07-12 16:54:26 -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
5aecd9aa87 Merge Power into mc16 2013-07-12 10:37:11 -07:00
SirSengir
f074c0ad6a Fix incorrect casts in gui code. 
Caused by removed IInventory implementations.
 2013-07-10 20:39:48 +02:00
Christian
103a8c124b First draft 1.6. Lots still to do. :( 2013-07-07 22:57:05 -04:00
SirSengir
0cd627ce0d Unused imports must die. Some formatting. 2013-07-06 09:41:47 +02: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
CovertJaguar
f83e2072d6 Merge branch 'master' into power 2013-07-04 03:22:07 -07:00
CovertJaguar
d1a39072af Removed unneeded ISpecial refs 2013-07-04 03:20:28 -07:00
CovertJaguar
392498ff74 Fix brightness issues with Quarry/Pump 2013-07-04 03:07:46 -07:00
CovertJaguar
599afc578e Cleaned up some code. 2013-07-04 00:30:15 -07:00
CovertJaguar
71c79606c0 Fix typo in javadocs 2013-07-02 08:01:09 -07:00
CovertJaguar
c3a54f2a24 Added IPowerEmitter 2013-07-02 07:56:36 -07:00
CovertJaguar
5492f83a31 Should fix Wooden Power Pipe power sources issues 2013-07-02 07:11:57 -07:00