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

795 commits

Author SHA1 Message Date
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
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