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

596 commits

Author SHA1 Message Date
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
CovertJaguar
625fb692b4 Merge pull request #291 from Flow86/patch-npe 
fix NPE if pipe does not exist (null pipe)
 2012-09-18 17:01:33 -07:00
CovertJaguar
c4633a4225 Merge pull request #293 from Xfel/master 
Fixed pipe connections with tile entities whose blocks don't extend BlockContainer
 2012-09-18 16:51:36 -07:00
CovertJaguar
f7d0b80093 Merge pull request #285 from Kubuxu/buckets 
Creative buckets behavior and template and blueprint in creative inventory
 2012-09-18 15:48:34 -07:00
Xfel
09d522be58 Fixed Pipes not connecting to tile entities whose blocks don't extend BlockContainer 2012-09-18 21:38:56 +03:00
FloSoft
788b449ad3 fix NPE if pipe does not exist (null pipe) 2012-09-18 18:42:48 +02:00
psxlover
1472cdd558 One (hopefully) last bug on path markers 2012-09-18 14:58:56 +03:00
psxlover
b4e3277f8b Proper fix for clearing the path markers list, and fix for connecting to path markers on a different world. 2012-09-18 14:25:52 +03:00
Kubuxu
123aba184c Makes buckets behavior like in creative mode 2012-09-16 16:24:13 +03:00
Kubuxu
4cb363db13 makes buckets unused while player creative mode 2012-09-16 15:40:41 +03:00
Kubuxu
8d4b0eddf5 Makes buckets while player creative mode 2012-09-16 14:59:36 +03:00
Kubuxu
1f9e6f6303 Update common/buildcraft/builders/ItemBptBase.java 
Shows templates and blueprints in creative inventory.
 2012-09-16 11:17:43 +03:00
CovertJaguar
0479fab15d Update common/buildcraft/builders/EventHandlerBuilders.java 
Referencing WorldClient is bad
 2012-09-15 19:28:26 -07:00
SirSengir
f1c67bc518 Merge pull request #278 from Kubuxu/patch-1 
Update common/buildcraft/transport/ItemFacade.java to facades won't be consumed in creative mode
 2012-09-15 14:09:55 -07:00
SirSengir
066e9b1cb8 Merge pull request #275 from tcooc/patch-3 
Fix #267
 2012-09-15 14:09:25 -07:00
Kubuxu
189e46221e Update common/buildcraft/transport/ItemFacade.java 
Facades won't be consumed in creative mode.
 2012-09-15 21:49:45 +03:00
tcooc
863f0184fc Fix #267 2012-09-15 13:20:14 -05:00
tcooc
fb86ea064a Partial fox for #267 
Switched to vanilla rendering
 2012-09-15 13:06:32 -05:00
FloSoft
52dd797b77 Fix #271 2012-09-15 16:22:22 +02:00
psxlover
ae0a265751 Fix builder with path. 
No crashing now after setting the builder.
Also made the builder not crash if there is only one point in the path (probably it was crashing in a prior version too).
 2012-09-15 00:09:15 +03:00
psxlover
362c95be2b Fixed path showing of builder. 2012-09-14 23:26:39 +03:00
psxlover
6ebd570eb1 Removed some useless code 2012-09-14 22:47:45 +03:00
psxlover
b1bc60ed0b Fixed PathMarkers. 
It was using EntityLaser while a recent commit changed the renderer to work on EntityPowerLaser.
Also the EntityLaser wasn't syncing the texture (another partial fix for #263)
Also both the client and the server threads were manipulating the available pathMarker list. Now only the server side tiles are added.
Finally synced the state of the pathMarkers (whether or not they are searching for a new marker to connect)
 2012-09-14 22:32:04 +03:00
CovertJaguar
2b00da5446 Added bottles as a water container. 2012-09-14 10:17:12 -07:00
SirSengir
0ce95c3134 Removed incorrect optimization for landmarks and path markers. 2012-09-14 19:04:58 +02:00
SirSengir
92195e8613 Synch powerAverage on laser entities. Partial fix for #263 2012-09-14 18:24:20 +02:00
SirSengir
151b576b49 Cleaned up a bunch of unneeded imports. Clean up your stuff before doing PRs please! 2012-09-14 14:04:36 +02:00
SirSengir
2f2dbe65b9 Merge pull request #249 from krisavi/Buildstuff 
Builders language file fix
 2012-09-14 04:57:46 -07:00
Andrew Hill
fdb3e85346 place the actual block consumed, rather than what is in the template 
in almost all cases there is no difference, but there have been reports
that mod items with inventories get the inventories duplicated. this
should fix that.
 2012-09-14 19:44:15 +10:00
Andrew Hill
2df8069c57 correctly save and restore hasPulsar() 
tested by saving and restoring a std. aut. gate.
 2012-09-14 07:37:57 +10:00
Kris Avi
92fb7e8afe Translatable areas 
Translatable Template table gui title, gates gui title, still and moving
oil (in NEI) (and added Oils to en_US.properties)
 2012-09-13 10:49:26 +03:00
Kris Avi
b264f29f88 Builders language file fix 2012-09-13 06:32:20 +03:00
tcooc
2d40f13d5b Added ClassMapping for String[] and finished bpt library fixes 2012-09-12 12:03:09 -05:00
tcooc
9ae784309e Architects create bpts properly now + some bpt library fixes 2012-09-12 01:09:11 -05:00
SirSengir
a00f6129fa Added special case handling for the vanilla furnace to squash XP exploits. 2012-09-11 22:38:16 +02:00
SirSengir
20df5fe093 Fixed renderer for pipe items using a max of two render passes. 2012-09-11 17:49:40 +02:00
tcooc
2ce657e4aa Added missing fields and imports 2012-09-10 21:29:04 -05:00
tcooc
a65b768f34 Synched Blueprint Library progress bars 2012-09-10 20:10:29 -05:00
tcooc
450ca9e59e Added Builder to creative inventory 2012-09-10 20:06:37 -05:00
Andrew Hill
9d80b9e4fb fixed wrong variable in condition. 2012-09-10 08:17:36 +10:00
SirSengir
047cb4eaed Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-09 18:59:34 +02:00
SirSengir
1131a8d661 Added AartBluestoke's PR for RoundRobin transactor. Closes #234 2012-09-09 18:59:05 +02:00
Techjar
1bf15b06cd I don't think pipe recipes should have to be in the middle row of the crafting grid. 2012-09-09 07:29:55 -03:00
SirSengir
30aef0704c End tank rendering if contained liquid does not exist. Closes #227 2012-09-09 12:14:35 +02:00
SirSengir
585095b0c2 Fixed exception in conjunction with NEI integration server side. Closes #229 2012-09-09 12:10:33 +02:00
SirSengir
d24b26d960 Fixed chunk reset related to autarchic gates. Closes #231 2012-09-09 12:06:59 +02:00
SirSengir
a47461a306 Some fixing of assembly table lasers. 2012-09-09 11:54:17 +02:00
SirSengir
8f298b4eb7 Fixed double chests not being recognized by pipes. 2012-09-09 09:59:17 +02:00
SirSengir
5303b5a5de Possible fix for rendering NPE. 2012-09-09 09:31:44 +02:00
Christian
8335cbd15e Change the quarry so all processing is in the TileEntity. The entity is 
now completely dumb and does nothing on either side.
Also, the quarry now plays the block break effect when it breaks a block
for sheer awesome :)
 2012-09-09 02:45:27 -04:00
SirSengir
37994cdbd5 Moved BuildCraftBlockUtil.java which was located in the wrong package. 2012-09-08 21:59:19 +02:00
SirSengir
10143101da Added versioning. 2012-09-08 21:46:17 +02:00
SirSengir
428d119699 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-08 21:21:31 +02:00
SirSengir
3a571db502 Moved network.v2 to network. 2012-09-08 21:21:07 +02:00
JP Sugarbroad
bacc554832 Check for nulls in stacks returned from extractItem. 2012-09-08 09:53:10 -07:00
SirSengir
6576f72cb4 Fixed issue with TransactorSided.java. 2012-09-08 17:58:53 +02:00
SirSengir
2df33ac081 Removed StackUtil.java. 2012-09-08 17:45:04 +02:00
SirSengir
1e40b70649 Removed StackUtil from TileAutoWorkbench.java. 2012-09-08 17:40:38 +02:00
SirSengir
d30717b271 Replaced StackUtil.addToRandomInventory. 2012-09-08 16:20:21 +02:00
SirSengir
5059cd9abe Fixed pipes replacing other blocks in certain instances. 2012-09-08 15:58:30 +02:00
SirSengir
5a6fcf03d2 First attempt at removing StackUtil. 2012-09-08 13:40:05 +02:00
SirSengir
9e7e30bcfc Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-08 09:49:09 +02:00
SirSengir
495ee0bd96 Fix for dupe bugs on chests. 2012-09-08 09:42:11 +02:00
JP Sugarbroad
cf28f59ed8 Gold item pipes will accelerate if their gate emits redstone. 2012-09-07 17:16:23 -07:00
SirSengir
ff16f89921 Merge pull request #217 from taralx/master 
Consume power when pulling from ISpecialInventory.
 2012-09-06 01:20:23 -07:00
JP Sugarbroad
0488ff552a Properly update neighbors for redstone signal changes. 2012-09-05 23:17:51 -07:00
JP Sugarbroad
667bad3b92 Consume energy when pulling from ISpecialInventory. Also pull multiple stacks if energy permits. 2012-09-05 22:06:44 -07:00
SirSengir
51b8e73f26 Fixed proxy naming derp. 2012-09-05 22:56:45 +02:00
SirSengir
5a9e195938 Removed unneeded import. 2012-09-05 22:30:37 +02:00
SirSengir
be58eee547 Reorganizing namespaces. 2012-09-05 22:29:38 +02:00
SirSengir
9643f4d52d Fixed subblock adding. 2012-09-05 21:23:34 +02:00
SirSengir
c82220d562 Shuffled some stuff around in creative inventory. 2012-09-04 23:12:37 +02:00