Commit graph

1146 commits

Author SHA1 Message Date
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
SirSengir
8d5fd2a35b Merge pull request #640 from AartBluestoke/patch-6
math.ceil() is very slow
2013-02-18 07:46:42 -08: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
SirSengir
cf8b533e66 Merge pull request #637 from viper283/master
Override canCommandSenderUseCommand
2013-02-16 14:14:17 -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
SirSengir
4d790e9229 Typos fixed. 2013-02-14 12:45:40 +01: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
CovertJaguar
8b0312b12a Merge pull request #629 from nallar/patch-1
Update project version in /build.xml
2013-02-12 06:04:57 -08: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
Ross Allan
8559c1a3e5 Update project version in /build.xml 2013-02-09 20:31:40 +00: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
Krapht
374aa6ebc1 Merge pull request #622 from immibis/master
Fix world-breaking infinite loop in TransactorSimple
2013-02-04 23:21:59 -08: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
SirSengir
65dd923bb0 Merge pull request #611 from viper283/patch-1
Fix /buildcraft not working in singleplayer
2013-01-28 14:56:18 -08: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
91dd6785ae Merge pull request #605 from viliml/patch-10
Added a failure check
2013-01-27 03:31:20 -08:00
viliml
31372ebb53 Added a failure check by https://github.com/nallar 2013-01-27 11:15:44 +01: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
6ab8a50b64 3.4.2 build. 2013-01-26 17:28:20 +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
SirSengir
5b68af8bee Merge pull request #590 from snyke7/patch-2
Fix fuel burning mechanic in EngineIron
2013-01-23 10:25:47 -08:00
SirSengir
efb932abf0 Update README.md 2013-01-23 15:07:03 +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