Commit graph

1559 commits

Author SHA1 Message Date
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
Krapht
7e98d5e61e Merge pull request #860 from mcrobin4002/patch-1
And remove the builder from the creative tab
2013-05-18 09:37:04 -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
Flow86
ee7b15ed8f Merge pull request #850 from viliml/patch-2
Made oil flammable and prone to explode(like real oil)
2013-05-13 12:42:21 -07: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
SirSengir
d0a7b7b304 Changes for 3.5.3 build. 2013-05-12 13:44:24 +02: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
SirSengir
ea4de9895d Merge pull request #837 from immibis/isided
Vanilla ISidedInventory support
2013-05-11 01:51:32 -07: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
Krapht
08b91614af Merge pull request #834 from Pharabus/master
Made AutoWorkBench and hopper accept all items
2013-05-08 07:36:34 -07: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