Commit graph

1766 commits

Author SHA1 Message Date
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
SirSengir
01c4767727 Merge branch 'master' of github.com:BuildCraft/BuildCraft 2013-06-27 17:36:04 +02:00
SirSengir
3601df84df Changes for 3.7.1 build. 2013-06-27 17:35:40 +02:00
Christian
b17655da52 Fix output dir grrr 2013-06-26 17:05:11 -04:00
Christian
93c296326f Tweaks 2013-06-26 16:59:18 -04:00
Christian
804ef7458b Allow longer name building 2013-06-26 16:56:34 -04: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
5cc052fdbb Merge pull request #973 from viliml/patch-4
Update BlockQuarry.java
2013-06-25 20:39:33 -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
d7fb14b8a8 *cough* oops 2013-06-24 21:52:41 -07:00
CovertJaguar
0e08788461 Don't delete dirs we need later
Hopefully this will get rid of my folder corruption issues.
2013-06-24 21:44:33 -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
Krapht
dd1ead907d Update README.md 2013-06-23 01:39:35 +02:00
Krapht
a86a10872e Update README.md 2013-06-23 02:38:49 +03:00
Krapht
881d577249 Update README.md
Added quarry flickering to frequently reported
2013-06-23 02:38:23 +03: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
SirSengir
f85015a61c Changes for 3.7.0 build. 2013-06-21 13:55:25 +02: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
Krapht
9b97246535 Update README.md
Added instruction to check if issue has been reported already
Added Frequently reported section
2013-06-19 12:28:41 +03:00
Player
4f740be088 Assembly Table: prevent planning recipies multiple times 2013-06-19 10:28:48 +02:00
SirSengir
acae574f26 Merge pull request #950 from PizzAna/master
Added git dependencity to README.md
2013-06-19 01:00:41 -07:00
PizzAna
ae899f58ba Added git to build dependencies 2013-06-19 10:23:39 +03: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