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

1491 commits

Author SHA1 Message Date
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
Alex Binnie
d62a0d440c Facades now store both block id and meta in nbt 2013-06-14 17:09:11 +01:00
Alex Binnie
8933df795a Support for facades with metadata >= 16 by using NBT 2013-06-14 00:18:11 +01:00
CovertJaguar
7a320cbba0 Added progress bar to ACT 2013-06-13 15:09:55 -07:00
CovertJaguar
4ac9a0fc45 Fixed ACT support for OreDict/Wildcards 
Also gave StackHelper a proper static accessor, one that should be
compatible with Krapht's Tests.
 2013-06-13 14:35:54 -07:00
CovertJaguar
782995b035 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-06-13 13:51:25 -07:00
CovertJaguar
77b92a8ce9 Added Oil Burn config 2013-06-13 13:50:51 -07:00
SirSengir
c2465a7cf8 Don't get the oreID twice if it isn't needed. 2013-06-13 18:08:25 +02:00
CovertJaguar
7b818ec45c Wrong header (oops) 2013-06-12 21:41:25 -07:00
CovertJaguar
69736013e6 Minor rework of ACT (Laser) 
Split inventory into input/output sections.

Added support for retrieving ingredients from neighboring inventories.
Yes, this means crafting chains are possible.

Various other minor tweaks to when it requests power, how it decides it
has everything it needs to craft, etc...
 2013-06-12 21:39:55 -07:00
CovertJaguar
fd548a4954 Add removal support to Transactors 
Can only remove 1 item at a time, but that's almost always sufficient.

Also added a bunch of helper functions in InvUtils (moving items between
inventories, counting items, etc..).
 2013-06-12 21:36:56 -07:00
CovertJaguar
d585770ce3 Limit Filler slots to 1 item 2013-06-12 21:34:07 -07:00
CovertJaguar
ad2ead2e89 Added Quartz Pipes 
Item and Power.

Item Pipe won't connect to Stone or Cobblestone and has half the
friction of Stone.

Power Pipe takes the place of Gold (64 MJ/t) and bumps Gold and Diamond
up to 256 MJ/t and 1024 MJ/t respectively. Expanding the upper tier
power distribution capacity.

Various textures adjusted to keep pipes distinct.
 2013-06-12 19:26:46 -07:00
CovertJaguar
61fe020b89 Proving once again that I cant spell 2013-06-12 14:56:48 -07:00
SirSengir
400cde7d78 Made TileAssemblyTable aware of OreDictionary. 2013-06-12 19:40:52 +02:00
CovertJaguar
da4ec07112 Better error 2013-06-12 08:56:27 -07:00
CovertJaguar
bb9ac3e1ca Lets not break ABO 2013-06-12 08:52:44 -07:00
CovertJaguar
a949418fab Fix potential Engine NPE 
If somehow you get an engine with an invalid metadata value, it would
crash.
 2013-06-12 08:26:52 -07:00
CovertJaguar
e996f64660 Some minor optimizations 2013-06-12 07:47:28 -07:00
CovertJaguar
5760844dae Added Horizon Filler Pattern 
This pattern is basically the old Flatten pattern that would clear all
the way to the sky.

Recipe
GGG
GGG
BBB

Flatten got a matching recipe:
GGG
BBB
BBB
 2013-06-12 06:43:15 -07:00
CovertJaguar
d17a384a2f Add pipe uncrafting recipes 
Closes #677
 2013-06-12 06:14:23 -07:00
CovertJaguar
69df314c36 A better attempt 2013-06-12 06:13:21 -07:00
CovertJaguar
7336dfd882 Attempt to prevent pipes from tossing excess 
This NEEDS extensive testing. I only have a vague idea how this code
works.

The original code was just tossing any power beyond what it could
handle, with no throttle on how much it was requesting from its
neighbors.

I think its working, more or less, but you'd probably have to hook it to
some TE Cells or something to know for sure.
 2013-06-12 03:36:22 -07:00
CovertJaguar
ff0e36a784 Immibis' Filler changes 
Closes #838
 2013-06-12 02:45:56 -07:00
CovertJaguar
8f7292ec06 Power Pipe rework 
Explosions are gone, loss over distance is gone.

Added two new Power pipes, Cobble and Diamond.

All pipes have much smaller max throughput:
Cobble = 8 MJ/t
Stone = 16 MJ/t
Gold = 64 MJ/t
Diamond = 256 MJ/t

The power display will turn red if a pipe has hit its max capacity. You
can use smaller pipes to throttle certain parts of your power net.

Machines are more lossy now to make up for the lossless pipes. Expect
low power draws even when idle.

Also added on/off Gate action support to lasers and ACTs.
 2013-06-12 02:35:15 -07:00
CovertJaguar
6dd4287945 Iron Engines now accept liquids via right click. 2013-06-11 23:02:47 -07:00
CovertJaguar
9891f99f25 Make Flatten less stupid 
It now processes in columns, greatly increasing the performance.

It is no longer halted entirely by anything it can't break. In other
words, you can use it to fill over bedrock.

Changed how the clear portion works, it no longer clears all the way to
sky, instead it only clears IN the box.
 2013-06-11 21:29:08 -07:00
CovertJaguar
d9702f43c5 Fix Laser brightness (again) 2013-06-11 21:26:01 -07:00
CovertJaguar
96b11465ed And because I can't spell 2013-06-11 20:30:11 -07:00
CovertJaguar
9f72d8b5f1 Merge pull request #933 from DelusionalLogic/master 
Fix gate texture update
 2013-06-11 20:21:42 -07:00
CovertJaguar
e430d4c8dc Make Markers less derpy 2013-06-11 20:19:58 -07:00
CovertJaguar
3b113b9f2e More tweaks 2013-06-11 15:44:51 -07:00
CovertJaguar
bbc5881fd0 More Oil gen rebalancing 
Reduced the chances of spawning wells.
 2013-06-11 14:54:15 -07:00
DelusionalLogic
d663104a0b Turns out you indent with tabs 2013-06-11 23:12:27 +02:00
Jesper Jensen
eaae07352b Optimized pulser disable slightly 2013-06-11 23:10:06 +02:00
Jesper Jensen
d9b3fd1842 Fixed gate pulser texture update 2013-06-11 23:01:17 +02:00
SandGrainOne
a1340f864c Fix for duplication bug. 
It was possible to get the item in a phantom slot with the new inventory
management features. This prevents for example the item double click
feature (make stack) to take items from the ghosted inventory.
 2013-06-11 23:00:08 +02:00
CovertJaguar
8854353da3 Fix ACT eating Minium Stones 
Closes #931
 2013-06-11 12:41:28 -07:00
CovertJaguar
b34c96cc06 Fix Filler pipe interaction 2013-06-11 00:58:58 -07:00
CovertJaguar
2b0588fe5f Fixed minor GUI issue with AWB 2013-06-10 17:12:02 -07:00
Christian
e6c0361f4f Add support for rotated log textures. To change a facade, put it in your crafting grid- it'll turn around.. 
Works with any mod logs using render 31 as well..
 2013-06-10 20:02:38 -04:00
CovertJaguar
3ea39c78bb NPEs must die! 
Closes #927
 2013-06-10 14:16:41 -07:00
CovertJaguar
8d5e520c96 Randomize potential oil biome spawns on worldseed 
Also reduced Oil Ocean Biome chances again.

Previously it was using the same noise field for all seeds. Now it
randomly offsets the noise field based on the world seed. Its not truly
random, but at least you won't be able to travel to the same coordinates
in every world and find an Oil Biome.
 2013-06-10 13:52:14 -07:00
CovertJaguar
f404eccb3d Fix possible NPE in Wrench 2013-06-10 11:40:05 -07:00
CovertJaguar
8a9314a8f6 Fix critical dupe bug in AWB 
Closes #895
 2013-06-10 03:37:44 -07:00
CovertJaguar
f19ab165ef Oil Tweaks 
Fix Oil being consumed by Fire.
Reduce Oil Biome oil spawn bonus: 40x -> 30x.
Nerf Ocean Oil Field spawns a bit.
Fix Oil on Water, Closes #919
 2013-06-10 03:27:58 -07:00
Christian
0bb43992d7 Attempt to workaround trigger api change for backward compatibility 2013-06-08 13:37:41 -04:00
Krapht
5662741cd2 Remove old double-chest detection code and use the vanilla approach. Fixes #914 2013-06-07 02:17:31 +02:00
Player
f04af071b8 Fix pump not passing through air blocks 2013-06-01 02:11:38 +02:00
CovertJaguar
fa3d0bb7b6 Smarter space check for buffer. 2013-05-29 09:49:53 -07:00
CovertJaguar
e43cf0a2b6 Add legacy migration to AWB 
This should prevent wiping of the crafting grid on upgrade.
 2013-05-28 23:16:56 -07:00
CovertJaguar
02e2fadcf4 Tweaks and code cleanup 2013-05-28 22:54:59 -07:00
CovertJaguar
8a6022962c Name crafting fake players just in case 2013-05-28 20:21:22 -07:00
CovertJaguar
f581682158 Added some comments 2013-05-28 19:00:24 -07:00
CovertJaguar
2451b6925f Complete reimagining of the ACT 
Renamed "Auto Workbench" to reduce confusion with the "Advanced Crafting
Table".

Once again I barrowed liberally from Railcraft. This time from the
Rolling Machine. You will recognize the new GUI.

Auto Workbenches are 100% compatible with vanilla Hoppers, or whatever
you want to use to interface with it. It no longer implements
ISpecialInventory at all. Even RP2 would work with it now.

Implemented the same "Sample Output" vs "Real Output" design that the
Rolling Machine uses. If there are enough items to craft multiple times,
it will craft automatically. But if there are only enough items for one
craft job, you must click the sample output slot to start the process.
Separating the display from the output helps reduce the complexity of
the code by a large factor.

Banned all items that can't stack or that have containers from being
used in the Auto Workbench. Supporting these types of items is the major
reason the previous version was so buggy. The Advanced Crafting Table
does a much better job with that kind of thing, use it instead.

Crafting now has a time cost. It take 256 ticks to craft an item. Unlike
the Rolling Machine, it DOES NOT require power.

Removed ability to pull from adjacent inventories. Its laggy, complex,
and unnecessary now. If you need more capacity, use a Hopper or Chute.
 2013-05-28 18:50:03 -07:00
CovertJaguar
95114cf79a Added BiomeDictionary support to Oil gen 
Can't believe I didn't see this thing sooner.
 2013-05-28 05:11:05 -07:00
CovertJaguar
7e8bcadbb2 Added BiomeDictionary support to Oil gen 2013-05-28 04:53:19 -07:00
CovertJaguar
56567d73af Made Inv Iterator subclasses private 2013-05-28 04:52:58 -07:00
CovertJaguar
e3420842fe Transactor Optimization 
It was an O(n^2) operation to insert an item. Now its just O(n). The
functions for checking to see if a stack is valid in a slot are
expensive and should never be called more than once per slot, let alone
n^2 times (where n is the length of the inventory).

Additionally, by wrapping inventory in a slot iterator, I was able to
eliminate the need to handle FSided and VSided differently from
IInventory.
 2013-05-27 20:06:27 -07:00
CovertJaguar
0a18ae34ff Adjusted Shift code to support Phantom slots 
Yes, this also was stolen from Railcraft. Its also much more robust than
the code BC was using.
 2013-05-27 18:08:17 -07:00
CovertJaguar
6d6e05044c Transactors should obey isValid() for partials 2013-05-27 16:37:51 -07:00
CovertJaguar
6169b8b9b5 Clean up var names in Laser Table 2013-05-27 15:56:16 -07:00
CovertJaguar
a989d00223 Various fixes to the Laser Crafting Table 
It no longer eats Golden Tickets or dupes items, yay!
 2013-05-27 15:52:27 -07:00
CovertJaguar
f1fcd6a0db Added RC's Phantom Slot System 
And replaced BC's Advanced Slot System in Advanced Crafting Tables,
Emerald Pipes and Diamond Pipes.

The advantages of the Phantom Slot System is that it uses the same
Mojang code for net sync that normal Slots do. This results in much
simpler code and the slots can be treated just like any other inventory
slot instead of all the special case code that Advanced Slot does.

The Advanced Slot System is still used in several places (Assembly
Tables, Refineries, etc...), Gates but in these cases the Slot often
contains non-ItemStacks. So I'm not going to touch them for the moment.

Additionally, I cleaned up the names of some of the classes in the
Silicon package.
 2013-05-27 14:19:51 -07:00
Krapht
3d460705ea Fixed combustion engines not dropping its inventory when broken 2013-05-25 10:15:44 +02:00
Krapht
3f7dc90e04 Made Combustion engines only accept Liquid containers and Ice 2013-05-25 09:09:50 +02:00
Krapht
2606aaccf9 Made the stirling engine accept only fuel-type items 2013-05-25 08:58:08 +02:00
Krapht
47cbc9fab0 Removed isStackValidForSlot from TileBuildCraft and moved it to subclasses. Fixes #878 2013-05-25 08:52:07 +02:00
Christian
9a68dcc304 Fix canonical liquid if there isn't one. gah! 2013-05-24 22:57:53 -04:00
CovertJaguar
a70eacc7fc Make addToRandomInventory type safe 
Better, Faster, Stronger

Closes #877
 2013-05-24 19:40:42 -07:00
Flow86
3cf2ff96d0 fix to addToRandomInventory not providing the correct side 
fixed some space/tabs things (exactly eclipse did it for me...)
fixes #875
 2013-05-23 14:13:08 +02:00
CovertJaguar
3e2a232f47 Pipe Chunk Boundary Optimization 
Liquid and Power pipes will no longer query unloaded chunks for
neighbors. Item pipes however will continue to do in order to prevent
item spewing.
 2013-05-22 12:10:57 -07:00
CovertJaguar
91e7edc256 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-05-22 12:06:53 -07:00
CovertJaguar
b142a11917 Better Error for Pipe Render 2013-05-22 11:57:57 -07:00
Flow86
fb3cac293d fix smp-crash on pipe with facade removal 
fixes #871
 2013-05-22 09:07:51 +02:00
Flow86
a237829c3a cleaned up format and var names as requested by @CovertJaguar at #872 2013-05-22 08:11:05 +02:00
viliml
41cb9b04bd Add ISpecialInventory support to gate triggers 
Fixes https://github.com/BuildCraft/BuildCraft/issues/356
 2013-05-21 19:52:57 +03:00
Flow86
514260078d Merge pull request #868 from target-san/master 
Pipe wires persistence between runs: update
 2013-05-21 03:23:15 -07:00
target-san
3570f10d41 Added persistence for redstone broadcast. Now it should be possible to create two-gate loops based on redstone signal, though I doubt someone would use this 2013-05-21 08:08:05 +03:00
target-san
098cc8e66d Modified pipe persistence. Only pipe gates can actually broadcast wire signal. And redstone broadcast is generated from only from triggers and only on gates - so no sense to store it 2013-05-21 07:46:54 +03:00
SirSengir
46c0d7deaa Removed old, commented out code. 2013-05-19 23:33:54 +02:00
CovertJaguar
a5bb01d2cb Comment out unused portions of Simplex Lib 2013-05-19 12:27:07 -07:00
CovertJaguar
f32507da07 Some minor optimizations 2013-05-19 03:45:36 -07:00
CovertJaguar
50e08beb82 Merged Oil into Master 2013-05-19 02:54:31 -07:00
CovertJaguar
3cf74d7986 Merge branch 'master' of https://github.com/BuildCraft/BuildCraft 2013-05-19 02:48:02 -07:00
Krapht
104885f934 Disable grass facades 2013-05-19 09:25:38 +02:00
SirSengir
43c904ed02 Merge pull request #857 from immibis/nether-pump 
pumping.controlList again.
 2013-05-18 10:21:38 -07:00
robin
41622ab83e And remove the builder from the creative tab 
Complete the last commit
(#6653aaa3893da023f350a48bb6fddeba3008e2e9)
 2013-05-18 19:25:03 +03:00
CovertJaguar
03b583ce74 Biomes complete 
Add Ocean Oil Field and Desert Oil Field biomes. Rare chance of
spawning. I only found a single Ocean Oil Field within 4k blocks of
spawn. But if you find one, you will never run out of Oil, ever.

These two biomes have a 40x multiplier on oil spawn chance.

They can be disabled by setting the biome Id in the config to -1.
 2013-05-18 07:37:08 -07:00
SirSengir
05ae8e7994 Organize imports. 2013-05-18 16:17:58 +02:00
SirSengir
6653aaa389 Disable crafting recipe for the builder. 2013-05-18 16:15:56 +02:00
CovertJaguar
7b47ac8743 Update less Oil during gen so we don't crash 
The game doesn't really like generating 50 oil wells at once
 2013-05-18 07:01:37 -07:00
CovertJaguar
279d729d03 Moved OilPopulate to the worldgen package 2013-05-18 05:44:53 -07:00
immibis
a14a627627 Removed explosions, pumps will just ignore disallowed liquids. 2013-05-18 11:33:57 +12:00
CovertJaguar
f83341ece8 Ditched Chunk Spanning Algo 
The chunk spanning gen code turned out to be unnecessary. The real
problem was that the Lake gen code was poorly balanced. That's fixed
now.

I've also added some code to prevent Wells and Lake from spawning on
overly rough terrain. No more wells on the edges of cliff faces for
example. I had to rebalance the spawn chances though. Of note is the
fact that I increased the chance multiplier for surface deposit biomes
from 1.5 to 4.  Distribution balance may need some more work.

Additionally, I've started work on an Oil Field biome, a rare biome that
spawns massive amounts of Oil. Its currently disabled, but the ground
work is there. Next step is creating a suitably sparse Simplex noise
field for the biome replacer.
 2013-05-17 10:49:41 -07:00
immibis
2a643d4c45 Added missing class. 2013-05-17 20:03:37 +12:00
CovertJaguar
c5a5d037c9 More improvements 
Height is "fixed", but there is still an issue with lakes generate in an
L shape consistently.
 2013-05-17 00:12:35 -07:00
CovertJaguar
9e117c0b31 Make Oil physics somewhere between Water and Lava 2013-05-16 19:31:22 -07:00
immibis
645b3a35e6 Added pumping.controlList option. 
Also fixed BlockIndex hashcode (massively speeding up pump searches) and added a timeout for pump searches.
 2013-05-17 10:48:55 +12:00
CovertJaguar
50df601134 Simplification 
Still some kind of bug with the groundLevel var. Many wells are 2-3
times taller than they should be.
 2013-05-16 09:52:20 -07:00
CovertJaguar
ee16c288aa An attempt to create a chunk spanning gen algo 
This is mostly just a proof of concept, Oil doesn't really need it.
 2013-05-16 08:20:50 -07:00
Flow86
8e2613d60a Merge pull request #849 from target-san/master 
Pipe wires persistence between runs
 2013-05-16 04:04:03 -07:00
CovertJaguar
2705e74ad0 Fixed Typo 2013-05-16 01:59:21 -07:00
CovertJaguar
dd6fc63de8 Some cosmetic fixes for the last commit 
Damn tabs!
 2013-05-15 04:30:31 -07:00
CovertJaguar
0d392a1b6e Major Backport of Button code 
I recently did a major overhaul of Railcraft's button code for some
upcoming features. Figured I backport it to Buildcraft as well.

Texture information was abstracted into an easily swapped object.
Multi-Buttons can now have different textures for each state.
Added tool tip support for all buttons (with mouse over delay!).
Added textures and states for a "Lock" Multi-Button.
Greatly reduced code duplication.
 2013-05-15 04:17:26 -07:00
CovertJaguar
8721cb9719 This is how you make Oil Burn 
@viliml seriously test your PRs, BlockFluid intercepts the fire methods

I also made Oil burn forever like Netherrack.
 2013-05-13 18:54:04 -07:00
Krapht
232494a662 I think buildcraft has enough explosions already. ref #850 2013-05-13 22:08:53 +02:00
viliml
0de81a36ea Make still oil flammable and prone to explode(like real oil) 2013-05-13 20:43:50 +02:00
viliml
8d98cba857 Make flowing oil flammable and prone to explode(like real oil) 2013-05-13 20:42:15 +02:00
target-san
a8c3d9400b Added NBT persistence for pipe wires and redstone broadcast. Allows logic circuits with memory 2013-05-13 09:18:32 +03:00
Player
5617b67ef4 Prevent client crash from invalid pipe items. 2013-05-12 10:22:35 +02:00
SirSengir
722a3837bf 3.5.2 build changes. Removed SidedInventoryAdapter.java to cut down on helper classes. 2013-05-12 08:19:28 +02:00
Player
eb836c3ad0 Actually only use the slots for the side we're extracting from... 2013-05-12 04:57:03 +02:00
CovertJaguar
d2711c7427 Merge pull request #841 from KingLemming/master 
Updated Liquid Pipe Connection Logic
 2013-05-11 19:45:38 -07:00
Player
cdc86c0591 Fix inventory size calculating being 1 too low 2013-05-12 03:58:39 +02:00
King Lemming
092e40fb8f Fixed Liquid Pipe Connections for updated Pipe Connection logic. 
Signed-off-by: King Lemming <kinglemming@gmail.com>
 2013-05-11 14:34:05 -04:00
CovertJaguar
6e76d4bec5 Filler Flatten no longer stopped by flowers 
Closes #769
 2013-05-11 03:19:26 -07:00
SirSengir
fa38e293e5 Rewrote vanilla inventory handling to use dedicated classes. 2013-05-11 11:40:46 +02:00
SirSengir
02c3b19ea9 Removed unused SurroundingInventory.java. 2013-05-11 11:06:42 +02:00
SirSengir
15c16d433c Removed unused InventoryUtil.java. 2013-05-11 11:04:58 +02:00
SirSengir
afdaa18868 Minor cleanups to ISidedInventory handling. No special casing for vanilla furnace required anymore. 2013-05-11 11:03:38 +02:00
immibis
88f336c799 Call isStackValidForSlot when inserting. 2013-05-11 16:55:41 +12:00
immibis
cede00e162 Vanilla ISidedInventory support for wooden pipes. 2013-05-11 16:44:34 +12:00
Krapht
a40e7c5365 Merge branch 'BCPlug' 2013-05-09 16:25:41 +02:00
CovertJaguar
f578aa0e2c Possible fix for Power Pipe load issues 
Closes #829
Closes #717
 2013-05-09 05:11:42 -07:00
Krapht
cd08b69662 Added additional render component to plug, finally removed old code 2013-05-08 20:24:40 +02:00
Andrew Meehan
b1064b659f uodated tilehopper to return true rather than attempting to scan the inventory attached 2013-05-08 10:33:06 -04:00
Andrew Meehan
d559946562 implimented isStackValidForSlot to return true if valid to allow for automation inserst (mainly Applied Energistics) 
Signed-off-by: Andrew Meehan <andrew@meehan.me.uk>
 2013-05-08 10:18:29 -04:00
Krapht
a9636aa119 Make pipes not connect if either has a plug, fixed issue with pipes not recalculating its connections on plug placement 2013-05-07 21:32:54 +02:00
Krapht
fdd5648a05 Added add/remove of plugs, fixed plug render sync issue, fix renderer, prevent render of gate on plugged sides 2013-05-07 20:48:19 +02:00
Krapht
b39802f210 Added recipe for plug 2013-05-07 19:09:22 +02:00
Krapht
b1ed48da37 Added plug item and item renderer 2013-05-07 19:03:03 +02:00
Krapht
6a6ba168c7 Added initial rendering for plugs 2013-05-07 18:35:27 +02:00
Krapht
2324400ea0 Save/Load + netsync for plugs 2013-05-07 18:23:10 +02:00
viliml
25c5439637 Lower engine heat 10 times 
I don't think a temperature of 10000°C or 0°C doesn't make sense. This way it will at least always be under the melting point of iron and above the freezing point of water.
 2013-05-07 18:57:01 +03:00
Player
1bc52bc16f add equals to BlockIndex 2013-05-06 15:21:17 +02:00
Player
fddf865298 optimize TilePump.initializePumpFromPosition by using a HashSet instead of a TreeSet for markedBlocks 2013-05-06 14:47:10 +02:00
Flow86
6687d8baf8 add isPipeRegistered for mods to check if pipe-id already taken. 2013-05-06 14:10:48 +02:00
CovertJaguar
e1d88a7d8f Added config option to disable Oil Springs 
And made the code ID Resolver compatible.
 2013-05-05 06:41:29 -07:00
CovertJaguar
842e520b60 Pipes with missing info are now deleted 
Closes #782
 2013-05-04 20:25:04 -07:00
CovertJaguar
4ee70e100b Merge pull request #825 from viliml/patch-2 
Add LiquidMotionEvents to waterproof pipes
 2013-05-04 13:56:17 -07:00
SirSengir
8f15b6371c Reduced Forge requirement. Last one for 1.5.1 should be fine. 2013-05-04 19:34:26 +02:00
viliml
95323927fe Add LiquidMotionEvents to waterproof pipes 
Why would it exist if it was never to be used?
 2013-05-04 18:07:45 +03:00
CovertJaguar
f35d63ecb4 Fire is now a soft block. 2013-05-04 00:16:33 -07:00
CovertJaguar
4d601e976e More Oil improvements and tweaks 
Added a 50% bonus to well gen in biomes that spawn Lakes.

Added Taiga to biomes that spawn Oil Lakes (waves at Canada and
Siberia).
 2013-05-03 13:56:41 -07:00
SirSengir
c01fd677b6 Bumped required Forge version. 2013-05-03 16:24:32 +02:00
SirSengir
ab614d64a7 Updated mappings for Forge 7.8/MC 1.5.2. 2013-05-03 16:18:09 +02:00
CovertJaguar
234d17b700 Null check getTanks() 2013-05-02 19:18:19 -07:00
CovertJaguar
7b9994bd86 Minor bugfix for Oil Lakes 2013-05-02 15:00:30 -07:00
CovertJaguar
bd6024a53f More improvements to Oil Gen 
Oil Lakes can no longer only spawn in sand. Added IMC calls for Lakes
and excluded Biomes.
"oil-lake-biome" and "oil-gen-exclude", both take the BiomeID as an
argument.

Increased specular highlights on Oil texture, you shouldn't have to jump
in the pool to tell the difference between lighting glitches and oil
anymore.

Oil Lakes now have 50% chance of being 2 blocks deep. Improved gen to
prevent floating trees, etc.

Oil Wells should no longer gen in mod added trees.
 2013-05-02 04:19:33 -07:00
CovertJaguar
0b44d97359 Fixed a couple bugs from the Oil commit 2013-05-02 02:59:30 -07:00
CovertJaguar
52ffd07bb3 Some minor improvements to the Engine Renderer 
Note: it still needs to be rewritten to use a single texture sheet.
 2013-05-01 18:14:34 -07:00
CovertJaguar
d2e7279498 Reduced Oil Spring respawn chance 2013-05-01 18:01:32 -07:00
CovertJaguar
e980637f7e Minor Engine opt 2013-05-01 17:35:37 -07:00
CovertJaguar
4361db859c Fix toLowerCase() calls for Turkish 2013-05-01 17:30:39 -07:00
CovertJaguar
c2ddf66ec7 Fixed Wood Engine lockups 
Closes #784
 2013-05-01 14:26:42 -07:00
CovertJaguar
c61daa06a5 Added Oil Springs 
Spawns an infinite Oil Spring at bedrock under 25% of large Oil Wells.
This Spring slowly produced more oil over time.

More balance testing needed, but I need to fix that damn Redstone Engine
bug first.
 2013-05-01 13:31:18 -07:00
CovertJaguar
b185cf7954 Fixed Tank liquid rendering 2013-04-30 18:24:11 -07:00
SirSengir
bb5a9fcf31 Merge pull request #795 from davboecki/master 
Add Pipe Content ItemStack NBT sync.
 2013-04-30 08:30:38 -07:00
viliml
f1d4ed242a Fixes https://github.com/BuildCraft/BuildCraft/issues/753 
LOL what a derp...
 2013-04-30 12:05:58 +03:00
CovertJaguar
62f374e40d Fixed last PR and removed unneeded Textures 2013-04-29 12:11:25 -07:00
CovertJaguar
437a870ab0 Merge pull request #791 from viliml/master 
Added default textures for the refinery and hopper
 2013-04-29 12:03:13 -07:00
CovertJaguar
7766374c11 Reduced unneeded Engine textures. 2013-04-29 12:02:41 -07:00
Krapht
7bbfa6a20c Fixed gate rendering. Fixes #810 2013-04-29 18:13:40 +02:00
CovertJaguar
4c37a6c7fb Revert AutoWorkBench changes 
Please continue the rewrite, but on the "crafting" branch for the
moment.
 2013-04-28 10:45:40 -07:00
Krapht
c39ad7242e Merge pull request #801 from davboecki/patch_3 
Fix AutoCraftingTable not respecting the doRemove flag.
 2013-04-28 07:34:32 -07:00
davboecki
b97355aa9f Fix AutoCraftingTable not respecting the doRemove flag. 2013-04-28 15:31:59 +02:00
Krapht
12e2d072af Made arePipesConnected protected 2013-04-28 14:14:38 +02:00
Alex
9abd1d2ec9 Removed NBT check 
The NBT check was not needed as vanilla workbenches don't care about NBT
 2013-04-27 21:21:31 -03:00
Alex
d752d87b15 Some general fixes. 
Sorry, CovertJaguar, I still have some more fixes and maybe more later.

For now, these changes fix this:
AW works with items with NBT data
AW now works better with items that have a container.
Also some cleanups.

AW meaning auto workbench
 2013-04-27 21:04:13 -03:00
CovertJaguar
0fd8cd9f70 Merge pull request #793 from Need4Speed402/patch-1 
some fix
 2013-04-27 16:57:32 -07:00
CovertJaguar
6596bb06fe Modernized Refinery Renderer 
Also fixed tex bind issues, closes #792.

Additionally, I added a generic liquid display list renderer since there
really doesn't need to be one for each block.
 2013-04-27 16:51:53 -07:00
davboecki
0c88fbda6a Add PipeContent NBT sync. 2013-04-28 00:24:52 +02:00
Alex
f0120931be Update TileAutoWorkbench.java 2013-04-27 16:07:27 -03:00
Alex
ec3d44db6f Update TileAutoWorkbench.java 2013-04-27 15:29:55 -03:00
Alex
145f70c16f pre compute fix 
blah blah blah this is a good fix so merge it
 2013-04-27 15:21:39 -03:00
CovertJaguar
a0eab6d603 Merge pull request #786 from Need4Speed402/master 
Rewritten Auto workbenches - Crowd source testing time!
 2013-04-27 10:27:04 -07:00
viliml
e11dd74310 Ooopsy 
Forgot an import
 2013-04-27 13:28:25 +03:00
viliml
fd3d32be60 Made the hopper use the new default textures 
Hope it works...
 2013-04-27 13:26:53 +03:00
viliml
1924771c5d Made the refinery use the new default textures 
Hope it works...
 2013-04-27 13:22:41 +03:00
CovertJaguar
53314b2107 Added Small MultiButton 2013-04-26 18:47:36 -07:00
Alex
22f6d690af Update ContainerAutoWorkbench.java 2013-04-26 21:04:30 -03:00
Alex
903dd33568 Update TileAutoWorkbench.java 2013-04-26 21:03:53 -03:00
Alex
bda4de6024 Update BlockAutoWorkbench.java 2013-04-26 21:03:24 -03:00
Alex
0a032da93f Update Utils.java 2013-04-26 21:02:58 -03:00
CovertJaguar
8985ec9402 Added proper blending to liquid rendering. 2013-04-22 20:22:19 -07:00
CovertJaguar
fd51e6524c More Fluid updates from MC 2013-04-21 17:33:01 -07:00
CovertJaguar
a1da3627ea Update Flow code from MC (with names!) 
I don't see anything that can account for the lag though.
 2013-04-21 17:22:31 -07:00
CovertJaguar
2a46bf1954 Added RC's button templates 
Feel free to use/rewrite/delete as you see fit.
 2013-04-21 14:06:37 -07:00
SirSengir
1eb2bd12a7 Merge pull request #742 from Need4Speed402/patch-1 
TranslatorSimple changed to support compatibility.
 2013-04-21 12:29:55 -07:00
Krapht
e639b31f3b Updated the forge version to .662. Updated Core dependency to require forge .662 2013-04-21 16:20:12 +02:00
Krapht
ff110f6068 Fixed naming 2013-04-21 15:43:23 +02:00
viliml
86809bb32b Made engines use the new default icons 2013-04-21 13:45:22 +03:00
Sergey
0af1d07e39 Update TileMarker.java 
Fix NPE on destroying tilemarker.
 2013-04-21 17:46:57 +08:00
CovertJaguar
4c23a494aa Wrenches can now rotate many more blocks. 
Implemented new Forge Rotation API.
 2013-04-18 14:41:21 -07:00
Krapht
497ff6af0a Change WireMatrix to use BitSet to determine if wire is present. Saves 3 bytes per packet 2013-04-17 19:35:00 +02:00
Krapht
62a2242012 Change ConnectionMatrix to use a BitSet internally to represent the connections. Saves 25 bytes per packet 2013-04-17 19:29:32 +02:00
Krapht
f6d75da8da Added BitSet codec 2013-04-17 18:46:03 +02:00
Krapht
83dfaf02d3 Remove inheratance from ConnectionMatrix. Save 6 bytes per packet 2013-04-17 18:14:46 +02:00
CovertJaguar
f9354ed275 Add Item registration 2013-04-17 03:50:32 -07:00
CovertJaguar
c64809a300 Don't register our own blocks, ... 
...let FML do that.
 2013-04-17 03:38:14 -07:00
Krapht
df09099ca6 Merge branch 'PipeConnectionRefactor' 
Conflicts:
	common/buildcraft/transport/TileGenericPipe.java
 2013-04-17 08:23:53 +02:00
CovertJaguar
97ce3ff98a Merge pull request #655 from kouteiheika/master 
Bulletproof the Box class against accidental world corruption and bugs.

-Don't really understand, but merged anyway.
 2013-04-16 23:10:13 -07:00
Krapht
5705eb7ed7 Fixed pipe Icons not being properly refreshed when switching texture packs. Closes #740 2013-04-16 07:57:39 +02:00
Krapht
b528468f99 Make sure to include up to, and including, meta 15 for facade generation (black wool) 2013-04-16 00:34:21 +02:00
Flow86
26a90d96e4 fix transport connects 
remove general check on transport class
 2013-04-15 10:15:09 +02:00
Flow86
44ca72ae3b add ForgeDirection to logic too 2013-04-15 09:46:52 +02:00
Flow86
aad0e4f394 fix Pipe connection generation 2013-04-15 09:36:49 +02:00
Krapht
cb231cd5e6 Removed the config option to always connect pipes. Refactored pipe connections 2013-04-14 18:24:02 +02:00
CovertJaguar
5ce65d4b47 Missed one 2013-04-14 02:22:44 -07:00
CovertJaguar
c87e2eaa87 Fixed bad texture binds 
See previous commit.
 2013-04-14 02:20:04 -07:00
CovertJaguar
77a3f3ceaf Fixed bad texture bind 
Binding textures by directly accessing the render engine seems to cause random effects. One instance I encountered when using that method was texture binds would fail for other TESRs that used bindTextureByName().
 2013-04-14 02:14:28 -07:00
Alex
fc39665aff Changed to support compatibility. 
This change was made to buildcraft would work better when a IInventory returned false when calling func_102007_a function. Now continues to check other slots. (Maybe you're using func_102007_a to return true if you want items to only go into a specific slot and not out.)
 2013-04-13 16:31:43 -03:00
SirSengir
4b82788976 Patch up potential NPE in ExtractionHandler. Closes #741 2013-04-13 18:37:12 +02:00
SirSengir
a21dfb7b5e Fixed liquid icon check to actually catch that edge case. (h/t Player) 2013-04-12 21:50:11 +02:00
SirSengir
7511a1f767 Added handling for LiquidStacks which do not have an icon set. Closes #739 2013-04-12 20:17:21 +02:00
Krapht
b624b5dd9f Fixed Icon API for Actions/Triggers 2013-04-11 19:28:34 +02:00
Flow86
08f0216be7 Merge pull request #737 from dmillerw/master 
Simple change to make BlockUtils consider isAirBlock when creating an ItemStack for a block.
 2013-04-10 23:35:59 -07:00
Flow86
5f9666a8b4 Merge pull request #729 from AlgorithmX2/master 
Facade shouldPassSneakingClickToBlock
 2013-04-10 23:34:43 -07:00
Christian
e3a2546beb Fix rendertank. Also add support for vanilla sided inventories. 2013-04-10 23:35:51 -04:00
Christian
e80d50e767 Fix for MCP names update 
Fix liquid render breaking texture binds
 2013-04-10 22:11:35 -04:00
Dylan Miller
4e74b295eb Forgot a closing parenthesis 2013-04-09 23:43:36 -07:00
Dylan Miller
24185aabce Made BlockUtils obay isAirBlock when creating an ItemStack 2013-04-09 23:40:34 -07:00
CovertJaguar
027a7006ff Emerald Pipes should remember their state better 2013-04-08 16:29:42 -07:00
AlgorithmX2
3230bcac51 Minor patch to allow other mo blocks to remove facades the same was as BC Pipes. 2013-04-07 15:05:01 -05:00
Flow86
b64de23421 fix Pipe Renderer 
closes #723
 2013-04-05 13:57:44 +02:00
CovertJaguar
a420e7bcfb Moved Texture Bind outside the loop 2013-04-04 19:26:48 -07:00
Flow86
da25a18c98 Update ItemGate.java 
fix broken language
 2013-04-04 19:26:18 +03:00
Krapht
57073f71a0 Throw exception if an action/trigger does not return an IIconProvider 2013-04-03 20:09:42 +02:00
Krapht
d79c4326cf Fixed serverside reference to Icon 2013-04-03 18:24:18 +02:00
Flow86
5aed4d1261 fix Engine translation/name not working 2013-04-03 09:08:07 +02:00
Flow86
ac3db7f7bd fix loosing information on chunk save/load 2013-04-03 08:56:01 +02:00
Flow86
09581d100b dont use Math.round 
merges and closes #696
 2013-04-02 12:51:44 +02:00
Flow86
1ad6209d42 Players engine corrections to target a specific amount of energy in the engine before throttling 2013-04-02 09:17:17 +02:00
Krapht
8f40131c37 Import cleanup, added warning supressions 2013-04-01 16:21:12 +02:00
SirSengir
fa6393b95b Added NPE check to prevent a crash when certain config options are unused. 2013-04-01 10:55:51 +02:00
Krapht
cb8602439f Fix breaking fx for submod pipes 2013-04-01 01:31:33 +02:00
Krapht
2095731772 Clarified javadocs Closes #609 2013-03-31 19:34:05 +02:00
Krapht
8cb7ff17a0 Remove debug output 2013-03-31 19:23:08 +02:00
Krapht
8401fc600c Make idle TileLasers more cpu friendly. Closes #617 
*Will only search for work every 5s (up from 0.5s)
*Will bleed 0.1MJ / tick while searching, so unless it gets
additional power it will eventually fully stop searching
 2013-03-31 19:18:44 +02:00
Krapht
e84f6cf790 Removed debug output 2013-03-30 22:06:11 +01:00
Christian
99bae591d5 Revert experimental pipe flow changes 2013-03-29 22:59:04 -04:00
Christian
738d5ede52 Fix oil, fuel, quarry and pump 2013-03-29 22:55:53 -04:00
Christian
4a5d5b219d Fix filler GUI and world rendering 2013-03-29 21:45:07 -04:00
Christian
05c235da6f Fix lasers 2013-03-29 21:24:49 -04:00
Christian
5441e821ad Fix trigger/action rendering 2013-03-29 20:47:12 -04:00
Christian
e6633ae6ff Fix up engineiron to use the new tank persistence methods 2013-03-29 18:17:49 -04:00
Christian
b341914b84 Fix up for liquidstack immutability 2013-03-29 15:40:27 -04:00
Christian
53a8db85e8 Fix up the rendering of gui engines. Closes #708 2013-03-29 12:43:29 -04:00
Krapht
d4a396e94a Fixed the hit effects and delete the old fuel png 2013-03-28 23:12:36 +01:00
Krapht
d9db8bb0f5 * Fixed the breaking texture, good work CJ =) 2013-03-28 22:22:18 +01:00
CovertJaguar
4545cf90e2 Fixed block particle effects 
They now use the correct texture (in theory).
 2013-03-28 14:06:55 -07:00
Krapht
dbc76521a2 Use the striped pipe as the breaked block texture, for now 2013-03-28 21:40:21 +01:00
Krapht
50030fd815 Merge branch 'patch-4' of git://github.com/TarzanBuzzyMan/BuildCraft into fixxy 2013-03-28 17:01:46 +01:00
Krapht
6d93b645e2 Fir merge error 2013-03-28 16:44:03 +01:00
Krapht
aecc8f0d3a Merge branch 'IPowerReceptorChange' into mc1.5 
Conflicts:
	common/buildcraft/transport/TileGenericPipe.java
 2013-03-28 16:41:17 +01:00
Christian
28f93b9dcc Printline die! 2013-03-28 07:47:06 -04:00
Christian
04be016691 Merge branch 'master' into mc1.5 
Conflicts:
	common/buildcraft/transport/EnergyPulser.java
 2013-03-28 07:46:50 -04:00
Christian
eb8d6cace2 Fix some minor logic derps in the energy pulser. Much better behaviour now. 2013-03-28 07:45:49 -04:00
Flow86
a4e7e74d5e Merge pull request #666 from Flow86/patch-powerRequest 
Fix bug in power distribution (Generic and Wooden Pipe)
 2013-03-28 04:29:18 -07:00
Flow86
4a8f1654c5 Merge remote-tracking branch 'remotes/origin/patch-powerRequest' into patch-renderPipe 
closes #666
 2013-03-28 12:27:57 +01:00
Flow86
cf4ecc45fb fix power pipes rendering 2013-03-28 12:16:34 +01:00
Flow86
673ccb6b42 fix render refinery 2013-03-28 12:08:53 +01:00
Flow86
bff16e6c96 fix rendering of liquids in pipes 2013-03-28 12:00:51 +01:00
Flow86
e01ea820a0 null pointer check in rendertank 2013-03-28 11:58:56 +01:00
TarzanBuzzyMan
254c671cec Update BlockOilStill.java 
Strip off unnecessary code after Krapht's Forge PR merge.
 2013-03-28 23:19:19 +13:00
TarzanBuzzyMan
6642d4fac1 Update BlockOilFlowing.java 
Strip off unnecessary code after Krapht's Forge PR merge.
 2013-03-28 23:15:37 +13:00
Flow86
4d92a9b918 fix RenderTank 2013-03-28 10:00:05 +01:00
Flow86
f9b6980993 fix commit by TarzanBuzzyMan 2013-03-28 09:56:12 +01:00
Flow86
25755d57bc Merge remote-tracking branch 'remotes/patch-oil/patch-3' into patch-renderTank 2013-03-28 09:53:48 +01:00
Krapht
22d15a4c91 Fixed bad parameter name in IPowerReceptor. Fixed call to powerRequest calling with getOpposite in PipeTransportPower 2013-03-28 09:30:26 +01:00
Krapht
35d8a2c6bf Merge branch 'mc1.5' into IPowerReceptorChange 2013-03-28 09:24:24 +01:00
Christian
263ca23171 Fix logic inversion derp 2013-03-27 23:31:24 -04:00
Christian
ca0c865f2a Merge branch 'master' into mc1.5 and fix bug 
Conflicts:
	common/buildcraft/BuildCraftTransport.java
	common/buildcraft/transport/Pipe.java
 2013-03-27 23:30:30 -04:00
Christian
276cacdef6 Add in a few tweaks to autarchic gates - stacks of items if 8 pulses are set, and a "single edge" trigger mode. 2013-03-27 23:15:12 -04:00
Krapht
4438947cab Made the IPowerReceptor direction aware 2013-03-27 21:49:30 +01:00
Krapht
5703c85549 Replace BCAction and BCTrigger arrays with IAction and ITrigger arrays. Good catch AartBluestoke 2013-03-27 17:17:18 +01:00
Krapht
bd91c3ad21 Mark Builder API as deprecated 2013-03-27 17:00:44 +01:00
TarzanBuzzyMan
15430f4277 Update BlockOilFlowing.java 
Missed an @SideOnly
 2013-03-28 00:01:15 +13:00
TarzanBuzzyMan
38072c8aa7 Update BlockOilStill.java 
Missed an @SideOnly
 2013-03-28 00:00:06 +13:00
TarzanBuzzyMan
6e07805fce Update BlockOilStill.java 
I forgot something
 2013-03-27 23:54:53 +13:00
TarzanBuzzyMan
9baae232e3 Update BlockOilStill.java 
Fix quick bug that Flow86 pointed out.
 2013-03-27 23:48:56 +13:00
Krapht
005d0bc4e1 Fix marker's rendering 2013-03-25 17:56:14 +01:00
Krapht
86d69f4078 Extracted method dropFacadeItem to avoid code duplication 2013-03-23 23:09:10 +01:00
Krapht
ada2bad7b0 Merge branch 'patch-676' of git://github.com/Flow86/BuildCraft into Flow86-patch-676 2013-03-23 22:35:26 +01:00
Krapht
e7d18f8d82 Merge branch 'mc1.5' of git://github.com/Techjar/BuildCraft into Techjar-mc1.5 2013-03-23 22:32:44 +01:00
CovertJaguar
05f8b556c4 More API fixes 2013-03-23 11:34:10 -07:00
CovertJaguar
a5d5d1a436 Fixed blueprint softblock error 2013-03-23 11:00:31 -07:00
Krapht
e35e0f2240 A custom BC built from source at an arbitrary time is versionless. Versions are decided on release. 2013-03-23 18:06:10 +01:00
CovertJaguar
e9c0d29032 More API Pruning 2013-03-23 02:31:14 -07:00
CovertJaguar
da3aa8374b Mass Cleaning & Updating 2013-03-23 02:21:06 -07:00
CovertJaguar
6cfabf56af Merged Trigger APIs 2013-03-23 02:16:17 -07:00
Krapht
7260d9445d Organizing imports 2013-03-23 09:40:22 +01:00
Krapht
b0fb4b3d8f Merge branch 'mc1.5' of github.com:BuildCraft/BuildCraft into mc1.5 2013-03-22 23:01:00 +01:00
Krapht
d888cb7b8d Fixed tank rendering in inventory 
partially fixed the BlockMarker
fixed the template item icons
fixed the oil bucket icon
Added texture for pipeWaterproofing and moved it to the BC tab
 2013-03-22 23:00:02 +01:00
Krapht
dd0122d622 Fixed the derp reverse of lit/dark gate textures 2013-03-22 22:04:00 +01:00
Krapht
eb6f7832b8 Update forge to 604 
Revert Sengir's build.xml
Fix Icon registration in Core to use the Item atlas
 2013-03-22 21:52:35 +01:00
Krapht
8192c8d792 Update names for forge build 604 2013-03-22 20:36:01 +01:00
Vilim Lendvaj
43227c6b3e Update to MC1.5.1 
It's a 100% compiling, 100% working and 95% textured build for 1.5.1,
MCForge build .600
 2013-03-22 19:46:33 +01:00
TarzanBuzzyMan
7280fa7165 Updated for obfuscations 
The field 94425 that I duplicated is a private field, and the names that someone has put as the deobfuscation name of the real one is a pile of crap so I will leave it as that till I or someone else can come up with a better one.
 2013-03-22 19:45:10 +13:00
CovertJaguar
2e9dbaa0f7 Break soft blocks before filling 
Closes #693
 2013-03-21 23:26:52 -07:00
aznhe21
2e7368150e Fix mining wells not put two or more stacks in pipe 2013-03-22 04:06:01 +09:00
Krapht
c352bc53ad Fix ledger Icons 2013-03-21 00:24:41 +01:00
Krapht
d23562f1e3 Uncaps method name (sorry Flow) 2013-03-21 00:22:07 +01:00
Krapht
3507cb1b0f Fix Engine model texture binding 2013-03-19 23:00:47 +01:00
Techjar
afc4a84cd3 Spaces are now tabs >_> 2013-03-18 23:05:15 -04:00
Techjar
d2598ef011 Trigger block update when placing/removing a facade 2013-03-18 18:48:04 -04:00
Flow86
fef297d6d4 Merge remote-tracking branch 'remotes/upstream/mc1.5' into patch-648 
Conflicts:
	common/buildcraft/transport/BlockGenericPipe.java
 2013-03-18 09:59:16 +01:00
Flow86
602f5b8b22 #676: adds a generic interface for pipe(tiles) to allow them to be solid on a side, a facade always overwrites it 2013-03-18 09:48:24 +01:00
TarzanBuzzyMan
6dea7dfaff Update BlockOilFlowing.java 
Updated to use 1.5 texture system for liquid.

Checked that it will compile but untested code. The 2 methods works for my own liquid in test environment.

Do not merge if you have already updated the oil so that it textures.

Still needs the actual texture/animation files
 2013-03-18 11:56:01 +13:00
TarzanBuzzyMan
e784f614d3 Update BuildCraftCore.java 
Put config.hasChanged() on config.save() to fall in line with lex's merge on Forge.
 2013-03-18 11:05:45 +13:00
Krapht
7672b7fc24 Underp 2013-03-16 18:48:48 +01:00
Krapht
0f672972fe Started fix on actions/triggers, untested 
Removed Action and Trigger from API
Moved IIconProvider to API
Renamed Action -> BCAction
Renamed Trigger -> BCTrigger
 2013-03-16 09:21:48 +01:00
Krapht
c5ebbbdf48 Fixed Pipes, Gates, Wires and several items 
Actions and Triggers remain
 2013-03-16 00:47:08 +01:00
Christian
145e5df557 Delete getTextureFile from everything. It's gone. 2013-03-15 15:08:55 -04:00
CovertJaguar
e2e47f0f81 Tweaked Hopper fill speed 2013-03-14 08:40:41 -07:00
Krapht
ac7ab97353 Facade items render the block part correctly, pipes still messed up 
Pipe render state defaults to dirty to trigger a sync when placing a pipe
 2013-03-13 23:27:36 +01:00
Christian
4ed51b5522 A bunch of fixups. The code *runs*, but there's a lot of gfx issues to fix up. 2013-03-12 15:43:39 -04:00
Flow86
3b082dfddb fixes #648 2013-03-12 09:53:10 +01:00
SirSengir
28754ac6da Fixed rename. 2013-03-10 17:38:16 +01:00
Krapht
52b7ce7d36 Fixed Action/Trigger textures 2013-03-09 19:43:33 +01:00
Krapht
04726b05c1 Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update 2013-03-09 17:51:18 +01:00
Krapht
ffa806418d Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update 2013-03-09 15:28:00 +01:00
Krapht
90f776be7a Fix derp 2013-03-09 15:05:08 +01:00
Krapht
9cdd23f03d Migrated gates 
Minor renaming
 2013-03-09 14:46:03 +01:00
Krapht
365a0c0a47 Renamed pipe related textures 
Ported Pipe textures (Pipe "api" changed for submods)
Ported Wire textures
Updated pipe sync to accomodate Icons
Updated all pipes to new "api"
Nerfed Herobrine
 2013-03-09 02:26:11 +01:00
Christian
df26c32121 Huge amount of fixes. Still a LOT to go. 2013-03-07 00:31:35 -05:00
Christian
7089244846 Merge branch 'master' into mc1.5 2013-03-06 18:23:28 -05:00
Christian
e06e30dc87 First draft. Still lots to do. 2013-03-06 18:22:17 -05:00
FloSoft
324242bfea TileGenericPipe.java: 
- fixes not calling powerRequest of IPowerReceptor-Pipe

PipePowerWood.java:
- fixes exploding pipes directly behind of a wooden pipe if no power-consumer exists, instead it will only extract the power amount which is requested by the consumers
 2013-03-05 18:02:49 +01:00
Krapht
69ac580b3f Made the ACT respect ISidedInventory 2013-03-04 20:57:25 +01:00
Christian
55660989e4 Fix dupe bug on TileAssemblyAdvancedWorkbench 
Closes #634
 2013-02-26 14:24:15 -05:00
kouteiheika
1ec990d0c8 Bulletproof the Box class against accidental world corruption and bugs. 
In some rare cases the Box's initialize() may be supplied with
coordinates equal to INT_MAX while theoretically being initialized.
Normally this would be harmless, as with every coordinate being
INT_MAX the resulting box's dimensions are zero, however anywhere
where one of the coordinates is actually used in a loop with a
"i <= coord" condition the loop counter will overflow and bad things
will happen, e.g. in FillerFlattener.iteratePattern, where
I encountered this bug, an array will overflow and take down the
whole game with it resulting in a corrupted world. (As broken INT_MAX
coordinates will get saved in NBT tags.)
 2013-02-23 17:07:44 +01:00
SirSengir
c15f011a02 Merge pull request #652 from AartBluestoke/patch-6 
Update common/buildcraft/transport/PipeTransportItems.java
 2013-02-22 00:19:47 -08:00
Player
86897df6ec (hopefully) fix quarry target search 2013-02-21 22:20:37 +01:00
Andrew Hill
8354db8e21 Update common/buildcraft/transport/PipeTransportItems.java 
LogisticsPipes would like to be able to handle reversed items ourselves. (in some cases we want to buffer, and try to eject once the associated machine/inventory has space)
 2013-02-21 20:57:13 +10:00
Player
d609f9662f .. for real 2013-02-21 03:55:13 +01:00
Player
d10cd4bc4a fix previous commit 2013-02-21 03:53:01 +01:00
Player
f1a7ebf484 Merge branch 'master' of github.com:BuildCraft/BuildCraft 2013-02-21 00:28:49 +01:00
Player
99c8402df1 use a better algorithm when grouping items in transport pipes 2013-02-21 00:26:59 +01:00
SirSengir
6431318a8d Merge pull request #649 from AartBluestoke/upstreamMaster 
another null check needed
 2013-02-20 08:11:05 -08:00
Player
7146463b21 Merge branch 'master' of github.com:BuildCraft/BuildCraft 2013-02-20 16:54:30 +01:00
Player
81db6ee4c5 fix transport pipe explosions not destroying the pipe 2013-02-20 16:53:37 +01:00
Andrew Hill
131f2459ed another null check needed 
the crafting helper is not used anywhere other than the 3 places that
have null checks. (this was the third location)
 2013-02-21 01:50:51 +10:00
Andrew Hill
a48e184ddb correction to the previous commit 
please --squash this or the previous ones.
(and i'll try not to write up commits using the web interface, even for
simple things in the future)
 2013-02-21 01:04:11 +10:00
SirSengir
041e4afcf6 Merge pull request #646 from AartBluestoke/upstreamMaster 
check for null recipe
 2013-02-19 23:22:29 -08:00
Andrew Hill
d16e44fb81 check for null recipe 2013-02-20 11:04:35 +10:00
SirSengir
c211af80ee Merge pull request #641 from AartBluestoke/upstreamMaster 
cache the IRecipe
 2013-02-19 04:53:45 -08:00
Andrew Hill
6d700c4adc move CraftingHelper. 2013-02-19 10:04:30 +10:00
Andrew Hill
7d23bda09f add a method to get the recipe. 2013-02-18 16:11:01 +10:00
Andrew Hill
1730feed03 cache the IRecipe 
act's should not re-search for their recipe, when the last recipe found
is still able to be used.

CraftingHelper.findMatchinRecipe() is identical to
vanilla.CraftingManager.findMatchingRecipe, except it returns the
IRecipe, rather than just the result.
 2013-02-18 14:41:00 +10:00
Andrew Hill
2e2e1d8ce8 math.ceil() is very slow 
see http://imgur.com/nT62QYQ
math.ceil is almost 100% of the cpu cost of pipePowerWood and transport.pipeTransportPower
(full nps from 
https://www.dropbox.com/s/01ywgc8lnyr2es2/1361111585024.nps?dl=1
several hundred k items extracted from ex-dim barrels, sent to a set of act's, crafted to blocks, and then sent back to barrels.

sendStack->queueRoutedItem() is to do with logistics HUD display, and is being worked on lag-wise also.)
 2013-02-18 12:26:25 +10:00
SirSengir
fefd3df7e2 Merge pull request #633 from nallar/master 
Improve quarry performance, updated build.xml. Correctly this time.
 2013-02-16 14:14:47 -08:00
Ross Allan
814b450719 Improve quarry performance. 
Reduce getBlockId calls in canChangeBlock/isSoftBlock to one, add canChangeBlock/isSoftBlock with blockID parameter to allow for only a single getBlockId call per block checked for the visit list.
Use heightmaps when building visit list to increase performance when checking a mostly empty quarry

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
 2013-02-15 21:52:10 +00:00
viper283
8eb7af5741 Override canCommandSenderUseCommand 
This allows users to use the /Buildcraft command without needing to
enable cheats in the world creation menu
 2013-02-15 19:34:24 +00:00
CovertJaguar
28639f46cc Merge pull request #636 from powercrystals/master 
Additional transactor fix for getInventoryStackLimit
 2013-02-13 23:00:20 -08:00
powercrystals
016ad7082b Update common/buildcraft/core/inventory/TransactorSimple.java 
Fix getPartialSlot for inventories with a getInventoryStackLimit less than the item's max stack size
 2013-02-13 19:21:59 -05:00
Player
bf22970fba Add better Pipe selection checking, open the gate GUI only if it has been clicked 2013-02-11 18:39:28 +01:00
sfPlayer1
e5c1af707f adv. assembly workbench: Match vanilla getStackInSlot behavior 
The vanilla implementation checks for out of bound access and returns null in that case.
This fixes the following incompatibility: http://pastie.org/private/mn2yefhc5yddahbkxgcqw
 2013-02-08 14:03:43 +01:00
immibis
b4d9b73a99 Removed any possibility of TransactorSimple entering an infinite loop when getPartialSlot and addToSlot disagree. 2013-02-05 19:33:04 +13:00
CovertJaguar
78745179ce Marked vines as a soft block 2013-02-01 06:15:28 -08:00
CovertJaguar
47541f7478 Better solution to the last commit 
Don't even register the decorator if we aren't going to modify the
world.
 2013-01-31 23:10:14 -08:00
CovertJaguar
2dab4b0a8b Added config check to prevent crashes 
Fixes part of #618
 2013-01-31 23:03:35 -08:00
Christian
ff05f75e12 Buff the autarchic gates - they always pulse at a single, fast rate, about 
10% faster than a top speed RS engine. This means they're usefully responsive
in a gate network environment
 2013-01-30 20:57:35 -05:00
Krapht
78be7c1b7d Fix potential NPE in RenderTank when liquid no longer exist. Closes #614 2013-01-29 17:28:42 +01:00
viper283
7f4b9b3927 Fix /buildcraft not working in singleplayer 2013-01-28 22:39:16 +00:00
Krapht
06b938d007 Enabled glass facades 
Closes #606
 2013-01-28 22:02:09 +01:00
Krapht
9d20450f81 Remove redundant loop 
Closes #608
Closes #566
 2013-01-28 20:01:13 +01:00
CovertJaguar
2bd1e96e11 Fix Tanks filling and added safety check on load 2013-01-28 04:26:04 -08:00
CovertJaguar
1c6cb011c8 Update Forge req 2013-01-27 12:25:56 -08:00
CovertJaguar
573630b601 Fixed last commit cause the PR was lazy 2013-01-26 16:10:37 -08:00
CovertJaguar
79274a36ec Merge pull request #581 from bculkin2442/master 
Proper PR for issue #563 - dont make me fix it next time
 2013-01-26 16:08:06 -08:00
CovertJaguar
581c95e14d Registered Pipe items with FML 
This will cause the mismatched id warning to display once for existing
worlds. It should be ignored.
 2013-01-26 16:00:23 -08:00
pahimar
9ddd728711 BC Version check now threaded, will attempt the check 3 times, waiting 10s between failed attempts 2013-01-26 15:15:46 -05:00
Krapht
129a437d4e Added onBlockPlacedBy() wrapper to BlockGenericPipe and Pipe 2013-01-26 17:58:06 +01:00
SirSengir
5659043223 Sanity checked for itemstacks returned from extract. (NPE check) Fixes #601 2013-01-26 10:04:18 +01:00
Krapht
1b4f9fb431 Added a helper for merging stacks 2013-01-26 03:24:37 +01:00
SirSengir
35e3532f3d Created BC tab for creative inventory. (Yes, finally.) 2013-01-23 21:04:36 +01:00
snyke7
1afcf370b5 Fix fuel burning mechanic in EngineIron 
Old implementation was not as intended I think. For example, lava as fuel should have outputted 20000 MJ, but actually outputted 20980 MJ.
This was because burnTime's value went 20,19,...2,1,0,20 - so that it had actually outputted 21 MJ for each amount of fuel.
Also, when the last amount of fuel was burned, burnTime would be 20 but fuel would be null, and so would currentFuel so that the last cycle was skipped.
So the actual output of some fuel was:
powerPerCycle * ((amount - 1) * (totalBurnTime/1000 + 1) + 1).
There probably are better ways to fix it but this is what seemed best to me.
 2013-01-21 14:27:38 +01:00
Christian
d7e06e07a3 Update rendering to use the vanilla renderitem- 3d items in pipes :) 
Fixed for recent MCP update in forge as well. Refreshed the TileEntityPickupFX code
from the vanilla source. Easier to diff against that source too now.
 2013-01-20 20:53:01 -05:00
CovertJaguar
03a14b6444 Merge pull request #584 from viliml/patch-6 
Fix typo
 2013-01-20 17:27:56 -08:00
CovertJaguar
304fc8cb97 Updated World Gen to the Event based system 
Hopefully I did this correctly.

@ScottKillen could you take a look, I'm sure you have more experiance
than I.
 2013-01-17 23:37:37 -08:00
pahimar
2936174e53 Temporarily neutered the world destruction potention of Builders until a proper fix is implemented 2013-01-17 12:37:05 -05:00
viliml
2377075577 Fix typo 2013-01-17 13:29:05 +01:00
SirSengir
8d6231d3e3 Merge pull request #578 from aznhe21/patch-pipes-useable 
Close the GUI when pipes destroyed
 2013-01-17 01:21:34 -08:00
CovertJaguar
8dfa54d930 Merge pull request #579 from psxlover/EngineGui 
Fix #577 energy and heat on combustion engines reseting.
 2013-01-16 18:09:05 -08:00
CovertJaguar
9c8953a830 Fixed Quarries breaking Bedrock 
Closes #519
 2013-01-16 18:04:09 -08:00
bculkin2442
71c84fc6b1 Part two of proper fix for issue #563 
Implement ILiquidTank getTank properly
 2013-01-16 19:49:54 -05:00
bculkin2442
96f1aed0a2 Part 1 of proper fix for issue #563 
Implement ILiquidTank getTank properly.
 2013-01-16 19:46:10 -05:00
psxlover
9504405b0f Fix energy and heat on combustion engines reseting after 65535 and 6553.5 respectively. It was caused because the messages were sending only one byte at a time while max heat (100000) needs 3 bytes to be sent (a short is 2 bytes so each message can send 2 bytes instead of one). 2013-01-17 00:48:45 +02:00
aznhe21
70adf53368 Close the GUI when pipes destroyed 2013-01-17 00:47:53 +09:00
SirSengir
10ef5530ea Removed unneeded check. 2013-01-16 16:27:06 +01:00
SirSengir
dc6fcac971 Added infinite water springs at bedrock level. 2013-01-16 16:18:21 +01:00
CovertJaguar
74c531ad2e Fixed headers in new files 
Oops.
 2013-01-14 17:19:07 -08:00
CovertJaguar
e63402b0fa Added Emerald Item/Liquid Pipes 
Also new texture for the Laser Crafting Table and fixed a bug with
Wooden Item Pipes not diplaying items that are being pumped.

Emerald Pipes are advanced versions of the Wooden Pipes. The Item Pipe
posseses a filter that pulls items from inventories in a blocking Round
Robin fashion. The Liquid Pipe has capacity and flow rate equal to a
golden pipe.

Note: ISpecial and ISelective Inventory interaction with the Emerald
Item Pipes is untested, there seems to be nothing decent to test with in
Buildcraft.
 2013-01-14 17:05:49 -08:00
Krapht
b4cb75d2d4 Merge pull request #575 from Dacktar13/patch-1 
to allow use of the pipe creation method
 2013-01-14 02:30:01 -08:00
SirSengir
e99dd51f12 Wooden pipe and redstone engine recipes now use the ore dictionary. 2013-01-13 19:52:48 +01:00
Dacktar13
add849a67d to allow use of the pipe creation method 2013-01-13 18:02:41 +00:00
SirSengir
644b173be2 Merge pull request #567 from davboecki/patch-itemload 
Fix item drop on world load.
 2013-01-11 05:35:14 -08:00
davboecki
451e09afd8 Remove static modifier from contributions inside EntityPassiveItem. 2013-01-11 13:54:37 +01:00
davboecki
cbfbfb07b2 Added missing delay. 2013-01-11 13:35:30 +01:00
davboecki
3a0d50f0bb Fix Item drops on worldLoad. 2013-01-11 00:18:59 +01:00
SirSengir
bc2e7bacda Merge pull request #559 from KingLemming/master 
Pipe Connection fixes
 2013-01-10 03:03:37 -08:00
SirSengir
27e8d4c877 Merge pull request #557 from Shukaro/master 
Fixed NPE crash with Factorization Barrels
 2013-01-10 03:01:13 -08:00
Agaricus
d640951f2d Log coordinates of invalid pipes 
Based on Maeyanie's fix for the old BC2 Bukkit port:
7dac7f9c2a
Add more feedback to the 'invalid pipe' loading errors.
 2013-01-09 19:35:06 -08:00
King Lemming
b46d1c33cc Adjustments to Pipe Connection method to allow for proper sided checks (for correct liquid pipe support). Liquid pipes now query vs the correct side rather than UNKNOWN. 
Signed-off-by: King Lemming <kinglemming@gmail.com>
 2013-01-09 19:12:56 -05:00
Ross Swartz
148ee72092 Fixed crash with Factorization Barrels. 2013-01-09 12:38:22 -05:00
CovertJaguar
513388f6e3 Backs of Engines are now solid 2013-01-09 08:40:38 -08:00
CovertJaguar
f03c00fba3 Transactors now obey getInventoryStackLimit() 2013-01-09 08:17:43 -08:00
Christian
c95063ebd3 Fix wrench to pass sneak-clicks to blocks 2013-01-09 08:35:16 -05:00
CovertJaguar
371189814b Minor Stuff 2013-01-08 18:12:30 -08:00
CovertJaguar
389d74b0ba Fixed last commit 
Closes #550
 2013-01-07 23:00:17 -08:00
CovertJaguar
ca93a6661b Fixed NBT bugs and converted Hopper to Transactors 
And I really need to fix my dev env so I can test these commits.
 2013-01-07 18:12:26 -08:00
Agarb
3fae38c1e8 Solution for issue #544 
If mining is disallow, then recipe of pump change
 2013-01-05 15:29:15 +09:00
CovertJaguar
d48c9f6dca Hopper now interates its inventory 
Instead of only attempting to move the first stack, the Hopper will now
test each stack in turn until it finds something to move. (untested)
 2013-01-04 07:08:33 -08:00
CovertJaguar
e4ef3b8108 Loosened up Power acceptance on Quarry/Refinery 
I don't know if its enough to prevent Industrial Steam Engines from
exploding, but its better than it was. Should not affect overall power
usage.
 2013-01-03 15:21:10 -08:00