Commit graph

731 commits

Author SHA1 Message Date
Krapht
1b4f9fb431 Added a helper for merging stacks 2013-01-26 03:24:37 +01:00
SirSengir
35e3532f3d Created BC tab for creative inventory. (Yes, finally.) 2013-01-23 21:04:36 +01:00
snyke7
1afcf370b5 Fix fuel burning mechanic in EngineIron
Old implementation was not as intended I think. For example, lava as fuel should have outputted 20000 MJ, but actually outputted 20980 MJ.
This was because burnTime's value went 20,19,...2,1,0,20 - so that it had actually outputted 21 MJ for each amount of fuel.
Also, when the last amount of fuel was burned, burnTime would be 20 but fuel would be null, and so would currentFuel so that the last cycle was skipped.
So the actual output of some fuel was:
powerPerCycle * ((amount - 1) * (totalBurnTime/1000 + 1) + 1).
There probably are better ways to fix it but this is what seemed best to me.
2013-01-21 14:27:38 +01:00
Christian
d7e06e07a3 Update rendering to use the vanilla renderitem- 3d items in pipes :)
Fixed for recent MCP update in forge as well. Refreshed the TileEntityPickupFX code
from the vanilla source. Easier to diff against that source too now.
2013-01-20 20:53:01 -05:00
CovertJaguar
03a14b6444 Merge pull request #584 from viliml/patch-6
Fix typo
2013-01-20 17:27:56 -08:00
CovertJaguar
304fc8cb97 Updated World Gen to the Event based system
Hopefully I did this correctly.

@ScottKillen could you take a look, I'm sure you have more experiance
than I.
2013-01-17 23:37:37 -08:00
pahimar
2936174e53 Temporarily neutered the world destruction potention of Builders until a proper fix is implemented 2013-01-17 12:37:05 -05:00
viliml
2377075577 Fix typo 2013-01-17 13:29:05 +01:00
SirSengir
8d6231d3e3 Merge pull request #578 from aznhe21/patch-pipes-useable
Close the GUI when pipes destroyed
2013-01-17 01:21:34 -08:00
CovertJaguar
8dfa54d930 Merge pull request #579 from psxlover/EngineGui
Fix #577 energy and heat on combustion engines reseting.
2013-01-16 18:09:05 -08:00
CovertJaguar
9c8953a830 Fixed Quarries breaking Bedrock
Closes #519
2013-01-16 18:04:09 -08:00
bculkin2442
71c84fc6b1 Part two of proper fix for issue #563
Implement ILiquidTank getTank properly
2013-01-16 19:49:54 -05:00
bculkin2442
96f1aed0a2 Part 1 of proper fix for issue #563
Implement ILiquidTank getTank properly.
2013-01-16 19:46:10 -05:00
psxlover
9504405b0f Fix energy and heat on combustion engines reseting after 65535 and 6553.5 respectively. It was caused because the messages were sending only one byte at a time while max heat (100000) needs 3 bytes to be sent (a short is 2 bytes so each message can send 2 bytes instead of one). 2013-01-17 00:48:45 +02:00
aznhe21
70adf53368 Close the GUI when pipes destroyed 2013-01-17 00:47:53 +09:00
SirSengir
10ef5530ea Removed unneeded check. 2013-01-16 16:27:06 +01:00
SirSengir
dc6fcac971 Added infinite water springs at bedrock level. 2013-01-16 16:18:21 +01:00
CovertJaguar
74c531ad2e Fixed headers in new files
Oops.
2013-01-14 17:19:07 -08:00
CovertJaguar
e63402b0fa Added Emerald Item/Liquid Pipes
Also new texture for the Laser Crafting Table and fixed a bug with
Wooden Item Pipes not diplaying items that are being pumped.

Emerald Pipes are advanced versions of the Wooden Pipes. The Item Pipe
posseses a filter that pulls items from inventories in a blocking Round
Robin fashion. The Liquid Pipe has capacity and flow rate equal to a
golden pipe.

Note: ISpecial and ISelective Inventory interaction with the Emerald
Item Pipes is untested, there seems to be nothing decent to test with in
Buildcraft.
2013-01-14 17:05:49 -08:00
Krapht
b4cb75d2d4 Merge pull request #575 from Dacktar13/patch-1
to allow use of the pipe creation method
2013-01-14 02:30:01 -08:00
SirSengir
e99dd51f12 Wooden pipe and redstone engine recipes now use the ore dictionary. 2013-01-13 19:52:48 +01:00
Dacktar13
add849a67d to allow use of the pipe creation method 2013-01-13 18:02:41 +00:00
SirSengir
644b173be2 Merge pull request #567 from davboecki/patch-itemload
Fix item drop on world load.
2013-01-11 05:35:14 -08:00
davboecki
451e09afd8 Remove static modifier from contributions inside EntityPassiveItem. 2013-01-11 13:54:37 +01:00
davboecki
cbfbfb07b2 Added missing delay. 2013-01-11 13:35:30 +01:00
davboecki
3a0d50f0bb Fix Item drops on worldLoad. 2013-01-11 00:18:59 +01:00
SirSengir
bc2e7bacda Merge pull request #559 from KingLemming/master
Pipe Connection fixes
2013-01-10 03:03:37 -08:00
SirSengir
27e8d4c877 Merge pull request #557 from Shukaro/master
Fixed NPE crash with Factorization Barrels
2013-01-10 03:01:13 -08:00
Agaricus
d640951f2d Log coordinates of invalid pipes
Based on Maeyanie's fix for the old BC2 Bukkit port:
7dac7f9c2a
Add more feedback to the 'invalid pipe' loading errors.
2013-01-09 19:35:06 -08:00
King Lemming
b46d1c33cc Adjustments to Pipe Connection method to allow for proper sided checks (for correct liquid pipe support). Liquid pipes now query vs the correct side rather than UNKNOWN.
Signed-off-by: King Lemming <kinglemming@gmail.com>
2013-01-09 19:12:56 -05:00
Ross Swartz
148ee72092 Fixed crash with Factorization Barrels. 2013-01-09 12:38:22 -05:00
CovertJaguar
513388f6e3 Backs of Engines are now solid 2013-01-09 08:40:38 -08:00
CovertJaguar
f03c00fba3 Transactors now obey getInventoryStackLimit() 2013-01-09 08:17:43 -08:00
Christian
c95063ebd3 Fix wrench to pass sneak-clicks to blocks 2013-01-09 08:35:16 -05:00
CovertJaguar
371189814b Minor Stuff 2013-01-08 18:12:30 -08:00
CovertJaguar
389d74b0ba Fixed last commit
Closes #550
2013-01-07 23:00:17 -08:00
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