Commit graph

764 commits

Author SHA1 Message Date
tcooc
560cee32b4 Fix trees destroying pipes. 2012-11-24 17:13:43 -05:00
CovertJaguar
81ab0bcc95 Merge pull request #402 from Runetinal/master
Fix blockActivated not being called on client
2012-11-24 10:21:19 -08:00
Octav Sandulescu
87bddae480 Guard against an NPE in the refinery GUI. 2012-11-24 09:44:21 +02:00
CovertJaguar
ecc3f98024 Reduced the range of Pipe update packets
They are only used for rendering, no need to send them to people who are
beyond the render distance.
2012-11-23 20:50:31 -08:00
CovertJaguar
1817ae6936 Rewrote the Pipe Contents packet
Probably cut the packet length in half, there was a lot of unneeded
bytes.

Also removed the chunkPacket marker. This is not a high priority packet.
2012-11-23 05:54:18 -08:00
AtomicStryker
a787a37fcb Fixed config BlockIDs and ItemIDs to use Forge autoassign
Because there is only like fifteen Forge contributors making this
2012-11-21 12:50:31 +01:00
Christian
ee6d0c801d Test directional tank behaviours for RP2 pipe interaction capability. 2012-11-18 18:00:34 -05:00
SirSengir
eace433066 Removed unneeded imports - set Eclipse to display a warning to remind you. 2012-11-18 22:34:57 +01:00
Runetinal
bae8444528 Use ordinal() instead of values() 2012-11-18 14:46:52 -06:00
CovertJaguar
f5d9bfa6c9 Fixed imports & updated build.xml 2012-11-17 08:04:57 -08:00
CovertJaguar
b1b950cc3e Fixed derp 2012-11-17 02:55:51 -08:00
CovertJaguar
379fa45a46 Adjusted Lifespan of Item drops
Added a config option for the lifespan of items dropped by pipes and
machines.

Its possible I missed some drop code, it seems to be scattered all over
the place.
2012-11-17 02:44:33 -08:00
NeverCast
6bc2ae8e14 Fixed game breaking power bug 2012-11-17 16:19:35 +13:00
Christian
fb1e41f4ba Clean up print statement spam 2012-11-16 21:00:11 -05:00
Christian
dc82c9ace6 It's openContainer, not inventoryContainer. Also fix network update stuff 2012-11-16 20:24:08 -05:00
Christian
42f90b109a Probably render not network updates needed 2012-11-16 18:58:43 -05:00
SirSengir
d79959f11e Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-11-16 23:47:41 +01:00
SirSengir
b10e0822c6 MC 1.4.5 update. (MCP mappings only.) 2012-11-16 23:45:37 +01:00
CovertJaguar
94b60bfad4 Fixed liquid triggers to actually be useful
How filters were handled was completely stupid when more than one tank
was involved.

Evaulation is now done via the fill/drain functions to simulate actually
interacting with the tank.
2012-11-15 22:44:15 -08:00
Christian
3be0523c4d For latest forge 2012-11-15 06:43:55 -05:00
Christian
042067483d Fix refineries running constantly.
Power pipes dissipate stored energy if none is input.
2012-11-14 23:25:09 -05:00
Christian
15bcb22032 Fix for new Liquid API 2012-11-14 23:25:09 -05:00
SirSengir
26173cf35c Fixed accidental edit conflict. 2012-11-14 16:48:59 +01:00
SirSengir
8a6d6b0ffe Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-11-14 16:47:23 +01:00
SirSengir
0fa4fd8bee Removed several unneeded imports/variables. 2012-11-14 16:47:08 +01:00
Christian
9dbd922ada Push for liquid API changes 2012-11-14 10:29:28 -05:00
Christian
98be088256 First draft handling sided tanks 2012-11-12 21:45:31 -05:00
gishicrafter
4a485a0d98 added @override 2012-11-12 06:43:24 +09:00
Runetinal
cc561d8fb1 Fixed gateKind variable 2012-11-11 14:20:47 -06:00
gishicrafter
8466e4458f Made RefineryRecipe sortable 2012-11-11 18:52:30 +09:00
Christian
f6e784422c Fix improper references to client specific classes with new 1.4 methods 2012-11-11 00:21:45 -05:00
Christian
63180af9fd Migrate liquid API to forge 2012-11-10 21:41:22 -05:00
NeverCast
4c6b184ded BUGFIX 406: Placing signs on Facades
Simple fix to get signs showing GUI on Pipes ( And inturn, Facades )
2012-11-10 23:15:18 +13:00
Christian
c1c6ff28c0 Nerf pipe explosion. It shouldn't be destroying other blocks. 2012-11-10 02:00:54 -05:00
Christian
cbc621550d Update to 1.4.4. Remove Orientations-> use ForgeDirection instead
Made the quarry much more scalable
Power pipes now have a risk of exploding if they don't have anywhere to dump their power to
Power pipe needs some work to seize rather than exploding
2012-11-10 01:43:12 -05:00
CovertJaguar
f1d16b975e Added null check to Power pipes. 2012-11-09 11:42:36 -08:00
CovertJaguar
b4a00eeedd Cached Orientation array in power pipes for perf. 2012-11-08 23:05:02 -08:00
CovertJaguar
d267a91e69 Merge pull request #399 from tcooc/patch-7
Override new addInformation method for 1.4.2.
2012-11-08 22:30:04 -08:00
CovertJaguar
7fb3f73d5f Fixed a bug with the Quarry.
It was exposed by the recent change to the softBlocks code.
2012-11-08 21:58:19 -08:00
CovertJaguar
1e5d6e0966 Merge pull request #408 from Deatrathias/master
Using an ItemStack-sensitive version of getContainerItem for consumeItem
2012-11-08 09:45:17 -08:00
CovertJaguar
a4f1e03745 Added isAirBlock() check to softBlocks.
Closes issue #401
2012-11-08 08:33:48 -08:00
CovertJaguar
7693107e0a Added username to fake player. 2012-11-07 20:27:51 -08:00
CovertJaguar
943340a9e6 Added username to fake player. 2012-11-07 20:24:02 -08:00
Deatrathias
416916502c ItemStack-sensitive getContainer 2012-11-08 00:54:17 +01:00
Runetinal
3ec3f37c34 Fix ghost gate being created on client that was preventing blockActivated from being called on client. 2012-11-05 20:11:22 -06:00
tcooc
4d7eb2f18c Override new addInformation method for 1.4.2. 2012-11-04 17:08:22 -05:00
SirSengir
26213ba615 Merge pull request #395 from tcooc/patch-6
Markers destroy all lasers when broken.
2012-11-04 03:45:28 -08:00
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
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
Andrew Hill
12e4b94714 Quary should not use energy when 0 movement would result
Position is stored in 1/32's so if the movement is less than that, it will take the energy, then not move at all. This means that energy less than about 3.2/tick will never move the quary arm.
2012-09-04 19:31:52 +10:00
Techjar
95c0d1eacb Better fix for nether oil generation. 2012-09-03 18:50:46 -03:00
Techjar
98441500d9 Oil should only generate in the overworld. 2012-09-03 18:40:51 -03:00
Andrew Hill
7a3bbe8f14 StackUtil.itemsAdded should be >0 when doAdd is false
all current uses of tryAdding(doAdd:false) which access itemsAdded compare the result to 0.

NOTE: while this does fix the AutoCraftingTable to accept items, it exposes the infinite recursion bug where it recursivly tries to add 1 item, then recurses without changing the stack size. (i'll do a seperate PR for that bug)
2012-09-03 20:30:29 +10:00
JP Sugarbroad
304e776203 Small fixes 2012-09-02 20:33:10 -07:00
SirSengir
eac30bea26 Fixed broken version. 2012-09-02 20:01:35 +02:00
SirSengir
9d7bc305a8 Merge pull request #147 from Chicken-Bones/master
Old world tank compatibility.
2012-09-02 09:18:59 -07:00
SirSengir
a78d325cff Merge pull request #203 from tcooc/patch
Fix for markers + moved logic to server
2012-09-02 09:13:47 -07:00
SirSengir
e5a62dd1b5 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-09-01 15:16:30 +02:00
SirSengir
38b11a9221 Removed references to BuildCraftAPI.BUCKET_VOLUME. 2012-09-01 15:15:56 +02:00
tcooc
cb2cfb00ca fix for markers not receiving redstone 2012-08-31 14:48:22 -05:00
SirSengir
e5d1a950eb Merge pull request #200 from AartBluestoke/patch-7
refineries now check liquid AND volume
2012-08-31 07:10:59 -07:00
Andrew Hill
e32eef5d1a fixed derp
should check the stack has enough for the recipe, not the reverse.
2012-08-31 23:56:27 +10:00
Andrew Hill
167d0d6426 refineries now check liquid AND volume
refineries which don't check volume end up with strongly negative liquid amounts, but never run out.
2012-08-31 23:42:03 +10:00
Andrew Hill
ade53fc283 Tanks should sync to the client (set hasUpdate)
Tanks do not set hasUpdate anywhere, and so never send the client any updates: 
client side tanks don't visually change.
client de-syncs cause buckets to behave wonky (server thinks the bucket you hold is full, client thinks the bucket you hold is empty, you right click an "empty" bucket, and you place the liquid instead.

this patch resolves the first, and mostly resolves the second. it is still possible to get a visually incorrect bucket if you right click a bucket on a client-side-empty,server-side-has-liquid tank. (ie, before a sync occurs)
2012-08-31 23:25:29 +10:00
SirSengir
ef44692f1f Merge pull request #194 from Tinytimrob/master
More minor fixes
2012-08-31 01:27:07 -07:00
CovertJaguar
0073b52075 Added override tag 2012-08-30 02:58:48 -07:00
CovertJaguar
820dd20a09 Removed render distance check 2012-08-30 02:16:54 -07:00
CovertJaguar
c014124a0e Added render distance hook 2012-08-30 02:15:50 -07:00
Tinytimrob
322f305c46 Adding blueprint library and pipe wires to creative inventory 2012-08-29 23:58:42 +00:00
Tinytimrob
f2a9fc5d12 Prevent gates with damage value 0 from being shown in creative inventory twice 2012-08-29 23:30:35 +00:00
Tinytimrob
6ba900d5e3 Added configuration properties for wires, gates and facade 2012-08-29 23:26:57 +00:00
Tinytimrob
9787df588e Fix pick block function returning incorrect item ID when used on pipes 2012-08-29 20:04:51 +00:00
Tinytimrob
bfff6e7a88 Adding some missing items to the creative inventory 2012-08-29 19:41:02 +00:00
Tinytimrob
101d626c47 Added configuration properties for redstoneChipset and pipeWaterproof 2012-08-29 18:48:08 +00:00
CovertJaguar
111694b644 Removed BuildcraftAPI ref from LiquidData 2012-08-28 03:03:18 -07:00
CovertJaguar
3666f4095a update imports 2012-08-28 02:52:06 -07:00
CovertJaguar
85573e46cc Depreciated BUCKET_VOLUME + removed BP init 2012-08-28 02:51:26 -07:00
CovertJaguar
7929afd912 Moved blueprint init 2012-08-28 02:50:00 -07:00
CovertJaguar
cbc8dbb8b4 Added Bucket volume constant to Liquid Man 2012-08-28 02:46:57 -07:00
Christian
a57141bc21 Send packets for liquids and power. also assembly table but that might be wrong? 2012-08-27 22:36:00 -04:00
SirSengir
a4aec7a6c5 Merge pull request #186 from CovertJaguar/patch-6
Gauge render tweak
2012-08-27 14:26:17 -07:00