Commit graph

1423 commits

Author SHA1 Message Date
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
263b0068b9 Moved GuiIcons and Triggers to subfolders
Cleaned up icons for items and textures
2013-03-09 17:47:40 +01:00
Christian
0ee0382060 Split sheets for krapht 2013-03-09 10:50:45 -05: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
SirSengir
36fa2068bf Merge pull request #647 from AartBluestoke/upstreamMaster
correction to the previous commit
2013-02-20 07:27:41 -08: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
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