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

1306 commits

Author SHA1 Message Date
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
CovertJaguar
c3d1df0c4e Merge Power into Builder 2013-07-02 06:56:03 -07:00
CovertJaguar
55c4abac12 Merge branch 'master' into power 2013-07-02 06:50:45 -07:00
CovertJaguar
9489bbb508 Merge branch 'master' into SandGrainOne-FilteredBuffer 2013-07-02 06:45:26 -07:00
CovertJaguar
4d547c89f4 Moved everything again. 
Fleshed out Schematic classes.
Quarry works in this build.
 2013-07-02 06:42:34 -07:00
CovertJaguar
499b6f342d Re-add update function 
Some weirdness occurs with some applications without it unfortunately.
 2013-07-01 15:53:33 -07:00
CovertJaguar
9daec45638 Fixed perdition issues 2013-07-01 15:26:57 -07:00
CovertJaguar
af89a9470b Power API Take 3 2013-07-01 14:21:51 -07:00
CovertJaguar
3a8c0f95c8 Significant rework of API 
Moved everything not needed out of API package.
Rewrote BlockHandler and BlockSchematic to be more NBT dependant.
 2013-07-01 05:40:51 -07:00
CovertJaguar
9262324160 Fix pipe plug select box + fill/drain 
It should now be possible to add plugs to adjacent pipes without
breaking either pipe.
 2013-07-01 00:44:38 -07:00
CovertJaguar
3cdcf094db Added color modifier support to Facades 2013-06-30 23:21:55 -07:00
CovertJaguar
670c2684e7 Fix Iron Engine heat issues 2013-06-30 17:52:57 -07:00
CovertJaguar
4a1469a055 Convert TileQuarry and EntityRobot to new API 
Note this breaks the builder.
 2013-06-30 17:49:20 -07:00
CovertJaguar
705798b744 Fix Iron Engine heat issues 2013-06-30 17:44:47 -07:00
CovertJaguar
6cdf94b109 First iteration of BlueprintBuilder 
Some significant hurdles remain to be overcome in regard to how the
BlueprintBuilder interacts with EntityRobot.

Also, rotation and builder positioning is a massive headache that still
needs to be tackled.
 2013-06-30 06:09:44 -07:00
CovertJaguar
2e4f27ba6a Merged Power into Builder 2013-06-30 00:48:33 -07:00
CovertJaguar
fd73836a67 Add Blueprint and Serialization 
Also renabled the Builder for testing purposes.
 2013-06-30 00:46:15 -07:00
CovertJaguar
88b98d044b Cleaned up buffer code a bit. 
Just headers and stuff, and moved one of the slots out of the container
because it might be useful for other stuff.
 2013-06-29 18:59:04 -07:00
SandGrainOne
370c33ee70 Adding FilteredBuffer 2013-06-29 19:03:36 +02:00
CovertJaguar
b1041e19d6 Some minor bits 2013-06-29 03:22:55 -07:00
CovertJaguar
593d889468 Fixed Legacy code 2013-06-29 02:21:54 -07:00
CovertJaguar
f92576ed36 Forgot a minor bit the alt impl 2013-06-29 01:37:41 -07:00
CovertJaguar
b25b08c827 Engine rewrite 
Killed Engine class, merged into TileEngine and subclasses.
Converted to Forge rotation API.
Split heat from stored energy and set proper temp bounds.
Rewrote IronEngineCoolant API, changed to degree based temp reductions
(its 0.0025 times the previous values). Added support for solid coolants
(they have to melt into a liquid coolant, like Ice to Water).
There is a commented out alternative implementation for constant power
output instead of pulsed.
 2013-06-29 01:33:21 -07:00
Krapht
8867512f38 Removed crafting/Creative inventory for Blueprints, Architect table and blueprint library 2013-06-28 20:36:02 +02:00
SirSengir
365d9a27d6 Fix determination of crafting equivalency. 
Items can be registered with multiple ore ids in the OreDictionary. A direct comparison of the ore ids may fail in that case.
 2013-06-28 20:05:48 +02:00
CovertJaguar
f9374eb0e5 Fixed Wooden Item and Liquid Pipes 2013-06-27 14:33:33 -07:00
CovertJaguar
c8db1dcb19 Merge branch 'master' into power 2013-06-27 13:49:31 -07:00
CovertJaguar
12de71213a Convert Pipe Icon Prov to enum 
And fixed a issue with the PowerProvider casting objects to TileEntities
that aren't TileEntities. Fixed by adding a getWorldObj() function to
IPowerReceptor.
 2013-06-27 13:10:01 -07:00
CovertJaguar
42181dbc7f Remove min check on receive 
The check broke pipes
 2013-06-26 08:50:25 -07:00
CovertJaguar
1d7e160d2f Some cleanup 2013-06-26 08:35:34 -07:00
CovertJaguar
080a4d6ca4 Added bounds checks for set 2013-06-26 08:22:19 -07:00
CovertJaguar
fe6d2e6b3a Add some Javadocs 2013-06-26 08:02:05 -07:00
CovertJaguar
2b5dc5c9ff Minor stuff 2013-06-26 07:29:32 -07:00
CovertJaguar
b92c81f638 Changes for KL and cpw 
Added set/add for KL

Added perdition calculator for cpw
 2013-06-26 07:26:07 -07:00
CovertJaguar
91a3ac95c6 Don't need to pass receptor, already have it 2013-06-25 20:54:21 -07:00
CovertJaguar
2d281c56d1 Opts 2013-06-25 20:25:03 -07:00
CovertJaguar
73aa6260a6 Removed update return value, meaningless, unused 2013-06-25 20:21:01 -07:00
CovertJaguar
475d6cd2f5 Make receptor public 2013-06-25 20:08:22 -07:00
CovertJaguar
013fe4ecb4 Possible Tickless compatible system PowerProvider 
doWork() callback is now handled in receiveEnergy() as well as in the
tick update. So you can respond more effectively even if you don't want
to tick.
 2013-06-25 19:46:07 -07:00
viliml
1d0a902217 Update BlockQuarry.java 
Fixes https://github.com/BuildCraft/BuildCraft/issues/972
 2013-06-25 19:31:28 +03:00
CovertJaguar
4f6ba954cd Better connection rules 2013-06-25 05:23:41 -07:00
CovertJaguar
8d1b33b268 Pipes won't connect to a receptor with no provider 
And a tweak to powerRequest()
 2013-06-25 01:29:11 -07:00
CovertJaguar
1f8c9f78ee Power API rewrite 
PowerFrameWork is gone.
PowerProvider is final.
Can have multiple PowerProviders (one for each block side).
PowerProviders can either accept power from pipes or they can't, defined
in constructor.
Removed a bunch of excess code that just cluttered the API.
 2013-06-25 01:00:24 -07:00
CovertJaguar
ee02561cd0 Adjust pump for new default 2013-06-24 21:22:45 -07:00
CovertJaguar
b223fd4440 Increased default power perdition to 1 MJ/t 2013-06-24 21:15:49 -07:00
CovertJaguar
8b6546a8bd Fixed Power Request Trigger 
Its now restricted to Wooden Power pipes.

Before:
The trigger was useless because it was triggering off the powerQuery
array which was always true so long as there was any device on the
network requesting power. This made it rather useless for scaling
production to demand.

After:
It now triggers whenever the Wooden Power Pipe's internal power buffer
drops below a certain point. This however required a modification of the
wooden pipe's internals because it was getting stuck in the "Off" state
due to how it handled transferring power from the buffer to the pipe
network.

Anyway, it works now and is somewhat useful.

Note: The Wooden Power Pipe's internal buffer stores 1500 MJ, this was
true even before this commit.
 2013-06-24 21:02:48 -07:00
CovertJaguar
5f58280e5f Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-06-24 18:15:06 -07:00
CovertJaguar
c50847c196 Added two new Power Pipe Triggers 
Requests Energy: Activated when the pipe has an active power request.
Use to allow your network to respond to demand dynamically.

Energy Overloaded: Activated when the pipe turns red, in case anyone
wants to know when that happens.
 2013-06-24 18:13:54 -07:00
Christian
22b202fb25 Fix single energy pulse 2013-06-24 20:22:31 -04:00
CovertJaguar
318eb5c4a7 Crafting generally ignores NBT, we should too 
Let the recipe decide.
 2013-06-24 06:13:15 -07:00
CovertJaguar
fb374cf7fc Increased Mining Well cost per block 
Its now the same as the quarry, 60 MJ per block.

Also tweaked power provider settings on the Mining Well and Quarry to
prevent smaller engines from being unable to overcome the maintenance
drain.
 2013-06-24 05:43:27 -07:00
CovertJaguar
0882dadce3 Fixed a bug that was causing pipes to leak excess 
This is an interesting commit, it not only fixes the RS Cells
(@King_Lemming) it also makes it so the network can respond to demand as
needed by shutting down overheating engines, since the pipes won't
accept power now unless something is requesting it.
 2013-06-21 17:28:22 -07:00
CovertJaguar
cdebf25a03 Cleaned up engine power display 2013-06-21 17:13:54 -07:00
CovertJaguar
fc0df8e84f Removed a bit of unneeded code in the Wood PPipe 
@King_Lemming this will break compat with RS Cells because you're doing
it wrong. Don't use powerRequest() like that and don't ignore the return
of receiveEnergy().

PS. It was already broken because the cell was just throwing power away
because it was ignoring the return of receiveEnergy().
 2013-06-21 16:44:07 -07:00
CovertJaguar
951292da37 Reduce Oil chance in deserts, etc... 
Blame this one on myst's flatlands.
 2013-06-21 04:31:17 -07:00
CovertJaguar
1e3d704fd4 ACT can handle damagable items correctly now 
Note it still can't (and probably won't ever be able to) handle
wildcarded subtypes like different colored wool.
 2013-06-21 03:14:28 -07:00
CovertJaguar
821605b71d Fix for Refinery not accepting power 2013-06-19 21:23:43 -07:00
CovertJaguar
d4c5452a1c Added Power throughput tooltip to power pipes 2013-06-19 17:48:24 -07:00
Player
4f740be088 Assembly Table: prevent planning recipies multiple times 2013-06-19 10:28:48 +02:00
Player
50efde2217 Assembly Table: use currentRequiredEnergy to scale the progress bar 2013-06-18 23:31:29 +02:00
CovertJaguar
32bab2251e Mining Well should break pipes when invalidated 2013-06-18 03:14:19 -07:00
Dylan Miller
d9da8bddc5 Fixed pipes rendering in hand as flat texture 2013-06-16 14:20:25 -07:00
Player
0c6ad8f247 fix last commit, wrong texture sheet 2013-06-16 22:01:21 +02:00
Player
1e0d1eb750 Add fallback to the missing icon while rendering pipes in the inventory 2013-06-16 21:51:20 +02:00
CovertJaguar
a0f57c57ca Wooden Power Pipes now add power to themselves... 
...instead of their neighbor. The result being that they are constrained
by the new limits and that they actually render the power flow in
themselves.

Wooden Pipes are set with a input cap of 32 MJ/t, buffed from the
previous effective limit of 29 MJ/t.

Note that this also effectively adds a 32 MJ/t pipe that can be used for
limiting flows.
 2013-06-15 16:27:43 -07:00
CovertJaguar
40b8c72ada Added rotation helper 2013-06-14 23:19:56 -07:00
CovertJaguar
633b650110 We don't need x,y,z to get a handler 2013-06-14 22:52:52 -07:00
CovertJaguar
03c308a599 Javadoc work 2013-06-14 22:39:54 -07:00
CovertJaguar
e178aad28d Added Handler registration 
I do not think we should provide a block interface, better to keep the
API self contained and separated from the actual block implementations.
 2013-06-14 22:25:25 -07:00
CovertJaguar
1dda771c18 Removed Schematic orientation 
The block already stores that info in meta or NBT anyway. A separate
field isn't really needed.
 2013-06-14 22:06:29 -07:00
CovertJaguar
a5e2be13af Initial commit of a possible Builder API 2013-06-14 22:02:37 -07:00
Player
e18031d223 fix AssemblyTable processing client-side 2013-06-14 19:32:49 +02:00
Alex Binnie
91430f4279 Changed Assembly Table Recipe packets to NBT 2013-06-14 17:45:48 +01:00