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

567 commits

Author SHA1 Message Date
tcooc
6cae6fe294 Markers destroy all lasers when broken. 
Fix potential NPE markerOrigin.lasers.
 2012-11-04 03:38:30 -05:00
CovertJaguar
1dd0746229 Fixed imports. 2012-11-03 22:44:49 -07:00
CovertJaguar
c5a2f89cfe Merge pull request #387 from tcooc/entitycollision 
Remove EntityBlock "collision".
 2012-11-03 18:18:05 -07:00
CovertJaguar
de33abb6a2 Expanding soft blocks to all plants. 2012-11-03 18:14:43 -07:00
Scott M. Barbour
6b2656d342 Fixed import BlockGrass -> BlockTallGrass 2012-11-02 12:35:20 -05:00
Scott M. Barbour
4f2d9607b6 Added BlockFlower to softBlocks 
Flowers are soft too.
 2012-11-02 10:44:32 -05:00
Scott M. Barbour
85c0dbd721 softBlocks fix: BlockGrass -> BlockTallGrass 
Quarry is not harvesting grass blocks (dirt with grass texture on top).
 2012-11-02 10:38:50 -05:00
tcooc
b889f6076d EntityBlock doesn't block left click. 2012-10-31 00:42:05 -04:00
CovertJaguar
85fee2aef7 Buildcraft should now be mostly MFFS safe. 
Depreciated the unbreakableBlock() thing in the API and added a new
function to BlockUtils that does a better job of the same thing.

The Quarry and Mining Well should be completely incapable of penetrating
a Force Field.

The Filler will terminate its current job if it detects an unbreackable
block during an operation, but its still theoretically possible to
affect blocks inside a Force Field. Some patterns are worse than others.
Preventing this completely is pretty difficult without some way to know
whether a block is inside a Force Field.
 2012-10-30 13:27:14 -07:00
CovertJaguar
675f4e6df9 Mining Wells no longer leave behine Mining Pipes. 2012-10-30 11:57:13 -07:00
CovertJaguar
fbd0fa7cda Fixes Index OOB error 2012-10-28 11:50:49 -07:00
Christian
f1f4f1bdde Remove debug spam 2012-10-28 12:30:04 -04:00
CovertJaguar
28b40f1ed0 Merge pull request #375 from tcooc/patch-5 
Fix iron pipe redstone behaviour.
 2012-10-27 22:55:50 -07:00
CovertJaguar
5130e27867 Cached Orientations arrays for perf improvements 
I was informed that a great deal of liquid calculations cpu time was
spent cloning these arrays.
 2012-10-27 22:50:03 -07:00
tcooc
0256e24215 Fix iron pipe redstone behaviour. 2012-10-27 17:19:00 -04:00
CovertJaguar
aab9ce0509 Significantly buffed Oil/Fuel 
Values may need tweaking.
 2012-10-24 23:09:01 -07:00
CovertJaguar
c7799cf3e2 Removed BC dep from FacadeManager - untested 2012-10-24 22:54:23 -07:00
Christian
485a278afe Fix rendering ItemStacks in the advanced guis 2012-10-24 22:13:39 -04:00
Christian
58c7dd3d1e Item Facades now use the IMC comms system to know about custom facade 
block types. Send your blocks through the API (FacadeManager) or 
the IMC system (use key "add-facade" and value "blockid@meta")
 2012-10-24 21:57:31 -04:00
Christian
047120b324 Fix pipe rendering for 1.4.1. Fix facades handling block ids > 2097, hopefully. Gold pipes are on by default now. 2012-10-24 01:15:33 -04:00
Christian
cd31b76e2b A couple of significant forge API changes.. No more deprecated! 2012-10-22 10:44:23 -04:00
Christian
4f60ae8705 Fix up for forge deprecations 2012-10-22 09:13:47 -04:00
Christian
b18369b0ed Fix up Advanced Assembly Workbench. It uses the vanilla crafting slots now, so will have all the same 
behaviours as them. This means it should work with things like redpower saws.
 2012-10-22 08:27:32 -04:00
Christian
8c0696b73f Update for 1.4 2012-10-21 23:58:00 -04:00
Christian
39572b281d Small fixes to Advanced workbench 2012-10-21 21:34:05 -04:00
CovertJaguar
49153e1df9 TileBuffer should not return invalid tile entities 
This might fix a crash with the Portable Hole.
 2012-10-19 10:08:18 -07:00
CovertJaguar
27396299dd Removed random println *waves at RichardG* 2012-10-19 08:57:08 -07:00
CovertJaguar
1a421bf3b4 Fixed Facades for mod blocks and cleaned up file 2012-10-18 19:48:58 -07:00
CovertJaguar
744c3d63da If the item is somehow corrupted on reversal it will be discarded instead of ignored. 2012-10-18 18:09:16 -07:00
CovertJaguar
47d2cc68de Fixed a potential CC Modification Error in item pipes 2012-10-18 18:03:17 -07:00
CovertJaguar
8a73df84e4 RS Engines no longer chain with other engines. 2012-10-18 04:59:19 -07:00
CovertJaguar
6b96ce7fd2 RS Engines can no longer power pipes. 2012-10-18 01:57:39 -07:00
Christian
bba98ed3c2 Fix AIOB exception when reading a blueprint during startup. 2012-10-17 20:58:45 -04:00
CovertJaguar
81b4078bd0 Revert "Loosened up the quarry power acceptance." 
This reverts commit 99b019c7ac.
 2012-10-16 22:23:40 -07:00
CovertJaguar
0e9b780635 Revert "Changed power request to activation energy." 
This reverts commit 7e6c979ad5.
 2012-10-16 22:23:38 -07:00
CovertJaguar
7e6c979ad5 Changed power request to activation energy. 2012-10-16 22:16:31 -07:00
CovertJaguar
99b019c7ac Loosened up the quarry power acceptance. 2012-10-16 22:15:33 -07:00
Christian
d61811616b Silently drop exceptions when searching for facades to apply 2012-10-14 00:44:48 -04:00
Christian
e4c96c89bb Remove debug code 2012-10-14 00:37:46 -04:00
Christian
36b7a92116 Small cleanups for dedicated server 2012-10-14 00:00:56 -04:00
Christian
87dc61c615 Serious automatic crafting table anyone? 2012-10-13 23:47:16 -04:00
Christian
d53b8b326c The GUI is working. Nice.. 2012-10-13 22:56:49 -04:00
Christian
c67cc7ae4f Fix wrong variable name. Does ANYONE test for compilation??? 2012-10-13 22:18:24 -04:00
Christian
d5491c5229 Initial draft of assemblyadvancedworkbench 2012-10-13 21:41:14 -04:00
Christian
39a6cbd137 Refactor: factory should *not* refer to silicon... Move assembly table to silicon module 2012-10-13 21:41:14 -04:00
CovertJaguar
98d8f5c6e0 Merge pull request #354 from taralx/patch-3 
addToRandomPipeEntry should use the correct orientation for isPipeConnected
 2012-10-13 17:13:05 -07:00
CovertJaguar
0d598b3e59 Wires and Gates are no longer consumed in Creative 
See #334
 2012-10-13 17:08:43 -07:00
CovertJaguar
36d8aba644 Creative no longer uses up Facades from Inv 
See #334
 2012-10-13 17:05:51 -07:00
CovertJaguar
4f087ed26a Merge pull request #351 from taralx/patch-2 
Convert diamond pipes to use the new pipe data sync.
 2012-10-13 16:56:01 -07:00
JP Sugarbroad
131cb81be1 addToRandomPipeEntry should use the correct orientation for isPipeConnected. 2012-10-13 16:48:57 -07:00
Christian
7d4b5d62c3 Prelude for an advanced crafting table: lasers talk to anything implementing ILaserTarget now 2012-10-13 16:20:22 -04:00
Christian
06099ffcdd Fix sync issues for pipe data, mostly. Closes #352 2012-10-13 16:19:18 -04:00
Christian
30fe5841c1 Assembly table now has a little ledger panel. Strings are updated. 2012-10-13 15:57:32 -04:00
JP Sugarbroad
2b64be0179 Convert diamond pipes to use the new pipe data sync. 2012-10-13 12:57:12 -07:00
cpw
4c05ccbde9 Merge pull request #350 from Vany/master 
Some people wants miningwell to work with hopper
 2012-10-13 12:26:23 -07:00
Christian
5fe98733e0 Fix assembly table smp derpiness, somewhat. Should close #348 2012-10-13 15:24:57 -04:00
Christian
752a5eb2bd Remove debug 2012-10-13 15:24:43 -04:00
Christian
6299c472bb Revert "Merge pull request #329 from Xhamolk/patch-2" 
This reverts commit 83d2b51931, reversing
changes made to 2cd7857d07.

Conflicts:
	common/buildcraft/transport/Pipe.java
	common/buildcraft/transport/PipeTransportItems.java
 2012-10-13 14:54:54 -04:00
Christian
e89d3525b4 Fix facades working in SMP: the items should now exist both client and dedi server side. closes #338 2012-10-13 13:41:44 -04:00
Christian
ad8b896ef7 Attempt to fix liquid pipe flows. Should close #336 2012-10-13 12:14:07 -04:00
Vany Serezhkin
30bbb8930b Update common/buildcraft/core/utils/Utils.java 
Allow Utils.addToRandomInventory() to work with hopper
 2012-10-13 19:11:09 +04:00
CovertJaguar
1e0e23fe49 Add some null checking to the pipe GUIs 
Fixes #345
 2012-10-12 17:36:08 -07:00
CovertJaguar
d351f6455e Fix NPE if setInvSlotContents() fails. 2012-10-12 17:18:14 -07:00
CovertJaguar
b33f2ef369 Merge pull request #347 from CovertJaguar/master 
Major pipe routing and net sync rework
 2012-10-12 16:15:51 -07:00
CovertJaguar
0c8ac25122 Major pipe routing and net sync rework 2012-10-12 16:05:25 -07:00
JP Sugarbroad
fe8b1d4fa6 Allow pipes to sync data to the client. 2012-10-11 14:37:29 -07:00
CovertJaguar
89b5096d06 Merge pull request #327 from psxlover/master 
Added facade collision
 2012-10-11 14:10:31 -07:00
CovertJaguar
83d2b51931 Merge pull request #329 from Xhamolk/patch-2 
Pipes connecting improperly (fix of my last PR)
 2012-10-11 14:09:21 -07:00
CovertJaguar
2cd7857d07 Merge pull request #335 from Xhamolk/patch-3 
Machines should no longer send items to Sandstone pipes
 2012-10-11 14:08:51 -07:00
RicBr
5b2c2c7fb7 Update common/buildcraft/transport/BlockGenericPipe.java 
Added missing ;
 2012-10-10 19:17:46 +02:00
CovertJaguar
cb65663589 Added missing import 2012-10-09 14:52:15 -07:00
CovertJaguar
e84a42162a Added missing import 2012-10-09 14:51:44 -07:00
CovertJaguar
a39924a5a4 Fixed RP2 wires connecting to normal pipes 2012-10-09 14:45:35 -07:00
CovertJaguar
b2ec6d6ae8 Fixes a crash, experienced while playing. 2012-10-07 14:54:41 -07:00
SirSengir
8dca5e6fda Merge pull request #320 from tcooc/itembpt-fix 
Blueprints sync in SMP
 2012-10-06 23:34:48 -07:00
Xhamolk
db09ffe65f Only route items when pipe is connected. 
Will no longer send items to a pipe that does not allow the connection.
 2012-10-05 10:01:50 -06:00
Andrew Hill
1f6003e722 fix filter shift-click 
The gui should not direct stacks moved by shift-click to the filter
area, just to the inventory area.
 2012-10-05 19:16:44 +10:00
Andrew Hill
7fcc3dcd54 fix for #301 
filler is now sided - top for pattern, all other sides for inventory.
 2012-10-05 17:01:23 +10:00
Xhamolk
342d6fe871 Routing and connection fixes 
2) Items pipes should no longer connect to ISidedInventory sides where getSizeInventorySide <= 0.
This allows third-party modders to prevent pipes connection to their machines without having to depend on BC's IPipeConnection.

3) Improved the routing mechanism for piped items. 
Now it's properly checked if the input is accepted, before trying to send it there.
 2012-10-04 17:16:26 -06:00
Xhamolk
76adffe05c Pipes connecting improperly (fix of my last PR) 
1) Pipes now properly check if IPipeConnection allows the connection.

2) Items pipes should no longer connect to ISideInventory sides where getSizeInventory <= 0.
This allows third-party modders to prevent pipes connection to their machines without having to depend on BC's IPipeConnection.

3) Improved the routing mechanism for piped items. 
Now it's properly checked if the input is accepted, before trying to send it there.

4) Fixes the bug my previous PR generated.
 2012-10-04 17:05:11 -06:00
psxlover
b77cf79b96 Added facade collision 2012-10-04 23:46:52 +03:00
Christian
5885f08fab IronEngines now accept Ice at a 1:1 ratio with water buckets, assuming your engine is hot 2012-10-02 00:09:26 -04:00
Christian
e8571a8e53 Fix up a bunch of "markBlockAsNeedsUpdate" to markBlockNeedsUpdate" and fixed engine to notify neighbours 
This fixes the engine being a bit derpy when being rotated
 2012-10-01 23:56:26 -04:00
Christian
890c4d45e9 Fix addToRandomInventory putting stuff from quarries etc into adjacent 
engines..
 2012-10-01 23:37:17 -04:00
Christian
ba1562b67f Revert broken pipe logic changes. No pipes are connecting anywhere now.. 
Revert "Update common/buildcraft/transport/PipeTransportItems.java"

This reverts commit 07cca7ad05.

Revert "Fixes pipes connecting improperly"

This reverts commit e7bd894e15.
 2012-10-01 23:24:16 -04:00
Christian
2e6c0ea475 Fix chunkloading for quarries. 2012-10-01 22:49:16 -04:00
SirSengir
6802a14545 Merge pull request #318 from psxlover/LaserFix 
Refactored lasers.
 2012-10-01 01:41:59 -07:00
tcooc
6635f23ec6 Blueprints sync in SMP 2012-09-30 22:28:51 -04:00
psxlover
6d5942bc8a Refactored lasers. 
Moved PowerLaser logic from EntityLaser.
 2012-09-30 22:42:09 +03:00
SirSengir
3658f908dd Merge pull request #302 from Xhamolk/patch-1 
Fixes pipes connecting improperly
 2012-09-30 01:15:16 -07:00
Christian
ded3f14ab9 It's 285, not 286 :( 2012-09-25 23:40:11 -04:00
Christian
425f131ded Depend on a known good version of Forge 2012-09-25 23:19:29 -04:00
Christian
bb7da60425 Update to use proper forge chunkloading API 2012-09-25 23:14:21 -04:00
Christian
8da16b8956 Add an example chunkloading capability to the quarry. Also fix some 
naming issues.
 2012-09-25 23:14:21 -04:00
Christian
78dc1708d0 More MCP updates 2012-09-25 23:14:21 -04:00
Christian
61fd692f77 Update to new MCP 2012-09-25 23:13:36 -04:00
Xhamolk
07cca7ad05 Update common/buildcraft/transport/PipeTransportItems.java 2012-09-22 12:23:42 -06:00
Xhamolk
e7bd894e15 Fixes pipes connecting improperly 
Pipes now check if IPipeConnection allows the connection.
 2012-09-22 12:15:48 -06:00
davboecki
3518db7093 Fix ItemStack merging of ItemStacks with different NBTTagCompount information. 2012-09-20 00:41:16 +02:00
psxlover
4e13b09177 Missing import from pr #283. 2012-09-19 04:29:21 +03:00