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

928 commits

Author SHA1 Message Date
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
CovertJaguar
ca93a6661b Fixed NBT bugs and converted Hopper to Transactors 
And I really need to fix my dev env so I can test these commits.
 2013-01-07 18:12:26 -08:00
Agarb
3fae38c1e8 Solution for issue #544 
If mining is disallow, then recipe of pump change
 2013-01-05 15:29:15 +09:00
CovertJaguar
d48c9f6dca Hopper now interates its inventory 
Instead of only attempting to move the first stack, the Hopper will now
test each stack in turn until it finds something to move. (untested)
 2013-01-04 07:08:33 -08:00
CovertJaguar
e4ef3b8108 Loosened up Power acceptance on Quarry/Refinery 
I don't know if its enough to prevent Industrial Steam Engines from
exploding, but its better than it was. Should not affect overall power
usage.
 2013-01-03 15:21:10 -08:00
SirSengir
0bb128acfd Merge pull request #525 from aznhe21/patch-pipes-refresh 
Pipes should not refresh.
 2013-01-03 05:19:44 -08:00
SirSengir
a345329843 Merge pull request #539 from Flow86/patch-gate 
Make gates and wires available for other mods in "preInitialize" phase
 2013-01-03 04:58:46 -08:00
Flow86
34ce0a9cc1 Make gates and wires available for other mods in "preInitialize" phase 2013-01-03 13:55:14 +01:00
Christian
e073bf604c Change the filler to stop it's use as a mining tool: 
1. It empties from the top down now.
2. It uses less "max power" now.
3. Entity items dropped by the filler last 20 ticks.

It still works very well (better in fact) as a clearing and building
tool, but it's not a mining tool any more.

With thanks to the Mindcrack crew for demonstrating it's obvious flaws.
 2013-01-02 22:01:03 -05:00
SirSengir
a817dab2d8 Merge pull request #530 from DeliciousJaffa/master 
Filler Flatten only reaching 128
 2013-01-01 16:10:09 -08:00
MrTJP
85644a33cf Made transactor alert inventory changes 
Eliminates some client-server sync issues (given that the TE alerts server).
Also enables things like Factorization Barrels to update their item count.
 2012-12-31 15:50:39 -05:00
SirSengir
f664ff8084 Fixed NBT data not synching when manipulating the diamond pipe gui. 2012-12-30 12:35:12 +01:00
SirSengir
e6a9ab6652 Mcp naming fix. 2012-12-30 10:08:06 +01:00
Kevin Murphy
e6009aed5c Stacked tanks no longer store different liquids 2012-12-30 01:03:03 -05:00
Christian
424329f164 Update for MCP updates with MC1.4.7 2012-12-28 15:29:35 -05:00
Jordan (DeliciousJaffaJaffa)
85a95543e4 Fix Filler Flatten 
Now goes to the full 256 instead of 128, must have been overlooked,
 2012-12-27 01:21:50 +00:00
aznhe21
e34b5b151f Override shouldRefresh. 2012-12-22 18:46:03 +09:00
tcooc
209f382aee Pipes replace blocks like grass, vines, etc. 
Pipe place sound.
 2012-12-21 16:28:37 -05:00
Octav Sandulescu
d6a0457368 Add way to query for refinery recipes 2012-12-19 15:02:00 +02:00
SirSengir
d8750a5d08 Fixed NPE when no recommended version is found. 2012-12-18 20:56:43 +01:00
SirSengir
a2d69bc4f8 Initial 1.4.6 port. 2012-12-18 20:43:22 +01:00
SirSengir
e42c71e9a3 Refactor/cleanup. 2012-12-17 23:30:54 +01:00
SirSengir
6ed78f37b2 Repackage for new Forge. 2012-12-17 23:29:42 +01:00
NeverCast
7d8efe6296 Liquid Pipes do a full update periodically for client sync 
Added config option in BuildCraftCore regarding long update period
Added to core as it may be used for other things in future too
 2012-12-15 21:47:42 +13:00
NeverCast
f23ddb476a Liquid Packets should not send before chunks on client join 2012-12-15 21:04:25 +13:00
NeverCast
3dbc451f31 Redudent null check on instanceof 2012-12-15 19:27:31 +13:00
NeverCast
8073fed1d1 Fix some NPEs on TileEngine when it has not be initialized 2012-12-15 17:32:58 +13:00
gishicrafter
93f9c25ba8 Fixed EngineIron fuel acceptance problem. 2012-12-14 20:59:49 +09:00
CovertJaguar
9c0e9205cf Power Pipes now display power stored too 
There is now a visual indicator that a pipe will soon explode.
 2012-12-14 02:15:26 -08:00
SirSengir
c1089e5e8a Added update notice. Will only display once per update and not annoy the player on each startup. 2012-12-13 20:46:20 +01:00
CovertJaguar
9fbdd4040b Some more minor opts 2012-12-12 23:10:56 -08:00
CovertJaguar
2c888525d6 Minor opt to TileEngine.fill() 2012-12-12 22:51:54 -08:00
CovertJaguar
4773280c5b More Item Pipe opt to net and cpu 
PipedItem IDs reduced to Short.MIN - Short.MAX to shave bytes off the
packet size. It could in theory be reduced to a byte and changed to a
per pipe ID, but that would require a larger rewrite.

The packet no longer send the pipe location and instead derives the pipe
location from the item location.

In total, 13 bytes were removed from the item packet size.

Also a number of cpu optimizations were performed, mainly by using more
appropriate collections and cleaning up some simple but often called
functions.
 2012-12-12 22:28:22 -08:00
pahimar
4cec777807 ACTs now play the item break sound for all entities nearby them when they break a tool 2012-12-11 14:03:00 -05:00
pahimar
6ff25b24e4 Missed the case where an item could be used up when it reaches its max durability. Also made it throw a PlayerDestroyItemEvent with the Buildcraft user when a damageable item is used up in autocrafting. 2012-12-11 13:06:51 -05:00
pahimar
b0fc220cef Merge remote-tracking branch 'origin/master' 2012-12-11 12:29:06 -05:00
pahimar
2446d7a3d6 Updated ACT to properly handle container itemstacks 2012-12-11 12:28:45 -05:00
CovertJaguar
8478177503 Added Oil/Fuel to Liquid Dictionary 2012-12-10 11:31:07 -08:00
CovertJaguar
9a465cff69 Fixed liquid junction issue 
Closes #336
 2012-12-09 13:53:31 -08:00
CovertJaguar
5886faecc4 Power pipes shouldn't check connections every tick 2012-12-09 12:28:17 -08:00
CovertJaguar
965112a4d9 ForgeDirection optimizations in the Power pipes 2012-12-09 12:00:27 -08:00
SirSengir
be3ed84657 Imports! 2012-12-09 19:23:08 +01:00
SirSengir
3751149fe0 Fixed incorrect item rendering. Still failing to display correctly since the item stack contained in EntityPassiveItem seems to be missing the NBT data client side. 2012-12-09 17:09:46 +01:00
CovertJaguar
462f7e9226 Power packet optimization 
By increasing the number of display stages to 100, I was able to easily
map internal power to display stage by sending a byte representing the
display stage rather that the amount of power in the pipe. This allows
me to reduce the packet size in half by converting from Shorts to Bytes.

Additionally, I created an alternative display list that uses a red
texture to indicate that pipe is nearing maximum capacity.
Unfortunately, this still gives no visual cue that a wooden pipe is
about to explode, becasue for some reason wooden pipes don't render the
power they contain when connected to an engine. This should probably be
rectified in the future.
 2012-12-08 16:13:13 -08:00
Octav Sandulescu
ad341592dd Moved default oil block ID to 1520 and 1521 2012-12-07 08:54:57 +02:00
CovertJaguar
f5cd8053e4 Fixed decrStackSize bug on crafting table 2012-12-06 22:25:38 -08:00
CovertJaguar
729b69592e Fixed decrStackSize issue with engines 
Closes #485
 2012-12-06 10:13:32 -08:00
Christian
d91305cdb2 Refactor the quarry algorithm: it now stores the next few planned blocks, and only searches the direct 
column above the target on each target hit. It forces the list to recompute only if it finds a block.

Behaviour is almost identical to before, but should be a lot more efficient in terms of computing resources.
 2012-12-06 08:41:49 -05:00
Christian
3b53947381 Fix power provider 2012-12-06 07:46:02 -05:00
CovertJaguar
2d7f4f6a8a Fixed Autarchic Gate exploit 
There is no reason for them to power Wooden Conductive Pipes.
 2012-12-05 15:09:26 -08:00
CovertJaguar
b4e7451ad1 Moved default IDs to safer ranges 2012-12-05 15:07:37 -08:00
gishicrafter
57d2d78b0f Use liquid block metadata for rendering 2012-12-05 00:05:40 +09:00
aznhe21
e209377ee6 Fixed wire not updating. 2012-12-03 18:51:12 +09:00
CovertJaguar
2c1b0ffda8 Fixed Facade InterModComs 
It was adding a zero size stack to the recipe list.

Also cleaned up some formatting.
 2012-12-02 19:17:00 -08:00
CovertJaguar
97caa8f3ad Pipe capacity stuff + packet tweaks 
Should completely fix addon pipes with different capacities.

Might also fix some issues people are seeing with pipes not renderering,
see #473
 2012-12-02 18:47:33 -08:00
den
02caa137ba Fixed RenderPipe crash if pipe has a higher capacity than normal. (needed for Valve Pipe (and more!)'s Industrial Pipes) 2012-12-02 19:31:11 -05:00
NeverCast
c693948c49 Removed Redudent Server side check 
Was not aware that it was only called server side so the check wasn't
required.
 2012-12-02 14:03:46 +13:00
NeverCast
b0003a082c Gate GUI is now calculated server-side 
Gate GUI gets it's state from the server
SuppressWarnings on ItemGate
failonerror for build.xml to prevent packaging bad jars
Gate GUI now uses boolean array for indicators which is updated via
progressBar
 2012-12-02 13:47:07 +13:00
SirSengir
475719d2f3 Merge pull request #464 from nevercast/issue-280 
Make RenderTank respect Block Metadata
 2012-12-01 02:57:11 -08:00
CovertJaguar
198fa9b7ed Added a null check in PipeRender 
Catches non-existant liquids, but I expect it will still crash elsewhere
if the liquid doesn't exist.
 2012-11-30 15:00:58 -08:00
NeverCast
db37c2fc6c Make RenderTank accept Block Metadata 2012-12-01 10:25:46 +13:00
CovertJaguar
dd279689a8 TileTank - Fix Formatting and fix getTanks() 
getTanks() capacity calculatios where ignoring empty tanks in the stack.
 2012-11-30 07:19:47 -08:00
CovertJaguar
79fcad34fb Int to Shorts in Item Packet 2012-11-30 06:30:00 -08:00
NeverCast
23b7c933e6 Made pipes slightly harder to break 
Configuration option added
Also updated build.xml ( Required, previous forge version didn't have
double support in Configuration )
 2012-11-30 21:14:45 +13:00
SirSengir
4b9e56deab Merge pull request #461 from tcooc/patch-9 
Fix AdvancedSlot rendering
 2012-11-29 14:47:41 -08:00
tcooc
11fbbc0a85 Fix small rendering bug when item is hovering over AdvancedSlot. 2012-11-29 17:19:48 -05:00
CovertJaguar
14e3ed13af Minor fix to last commit 
Faulty logic could potentially have resulted in odd results. I didn't
see any when I tested it, but logically it could have happened.
 2012-11-29 09:15:33 -08:00
CovertJaguar
f951f6740d Inventory Triggers are now ISided bound 
This may break some peoples factories, but in the end it will provide
you with more control.

Does not break the API, but it does add a new interface to the API. At
some point this interface should be merged with ITrigger.
 2012-11-29 09:09:40 -08:00
SirSengir
edc62249bf Merge pull request #448 from gishicrafter/patch-2 
Fixed some devices that couldn't handle meta sensitive liquids correctly.
 2012-11-29 09:03:18 -08:00
psxlover
476a03d998 Change localization to allow mapping inheritance. Now a language like es_AR can use the mappings from a parent language (es_ES) instead of duplicating them, and only specify the ones that are different from the parent. 
The child languages only need a field specifying the parent language e.g.:
language.parent=es_ES

Any mappings that are not specified in the file will be inherited from the father language.
 2012-11-29 15:45:23 +02:00
SirSengir
ad111637ac Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-11-28 22:17:07 +01:00
SirSengir
e911404459 Fixed pass-through of mouse coordinates for gui tooltips. Closes #449 2012-11-28 22:16:22 +01:00
gishicrafter
f7b77f589c Use LiquidTank 
Revert RefineryRecipe
 2012-11-29 00:30:45 +09:00
CovertJaguar
8a36fbda50 Replaced ints with shorts in liquid packet 2012-11-27 03:55:20 -08:00
CovertJaguar
4db1a27d4f Liquid Pipes network optimization 
Pipes are much smarter about whether they need to send a liquid update
packet, additionally the packets themselves now describe a delta rather
than sending a complete set of information every update.
 2012-11-26 09:51:20 -08:00
CovertJaguar
df33b905b8 Engines should have a block name 2012-11-26 05:48:58 -08:00
SirSengir
c531adea0d Merge pull request #446 from nevercast/issue-445 
Fixed issue 445
 2012-11-26 00:22:27 -08:00
psxlover
bae2be096a Use the correct function in place of updateBlockMetadata. Fixes Laser placement (#450). 
Use the correct function in place of updateBlockMetadata. Fixes Laser placement (#450).
 2012-11-26 02:06:44 +02:00
gishicrafter
df727f0bd1 Fixed some devices that couldn't handle meta sensitive liquids correctly. 2012-11-25 12:04:04 +09:00
NeverCast
8749de2f19 Fixed issue 445 2012-11-25 13:07:35 +13:00
CovertJaguar
02662975c1 Merge pull request #443 from tcooc/patch-8 
Fix trees destroying pipes.
 2012-11-24 15:16:00 -08:00
tcooc
369852639e Unnecessary import. 2012-11-24 17:17:08 -05:00
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