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

1023 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
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