Commit graph

850 commits

Author SHA1 Message Date
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
CovertJaguar
eef6145766 Merge pull request #497 from narc0tiq/oil-shift
Move default oil block ID to 1520 and 1521
2012-12-07 09:05:02 -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
SirSengir
40eb640386 Changes for 3.2.2 build. 2012-12-06 21:17:44 +01: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
SirSengir
7b6b21a40d Merge pull request #486 from gishicrafter/patch-3
Use  liquid block metadata for rendering refinery and pipe
2012-12-04 08:38:22 -08:00
gishicrafter
57d2d78b0f Use liquid block metadata for rendering 2012-12-05 00:05:40 +09:00
CovertJaguar
aa450f1545 Merge pull request #481 from aznhe21/patch-wires
Wires turned off will be turned on!
2012-12-03 07:09:35 -08: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
CovertJaguar
3088a588f7 Merge pull request #476 from denoflionsx/master
Fixes RenderPipe crash if custom pipe has a higher capacity than 250.
2012-12-02 17:18:09 -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
CovertJaguar
09957806ca Merge pull request #474 from nevercast/patch-gates
Gate GUI is now calculated server-side
2012-12-01 17:06:10 -08: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
CovertJaguar
d2f262b899 Merge pull request #462 from nevercast/patch-pipe-break
Made pipes slightly harder to break
2012-11-30 06:20:26 -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
SirSengir
68544e1f9f Changes for 3.2.1 build. 2012-11-29 18:35:48 +01: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
SirSengir
7599501135 Merge pull request #458 from psxlover/localization
Change localization to allow mapping inheritance.
2012-11-29 07:13:52 -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
9e39d1fcdc Merge pull request #452 from helinus/patch-1
Quick build.xml update to Minecraft 1.4.5
2012-11-26 05:51:28 -08:00
CovertJaguar
df33b905b8 Engines should have a block name 2012-11-26 05:48:58 -08:00
helinus
40eacd08e0 Update build.xml to Minecraft 1.4.5
Update MCP and Forge versions to work with MC 1.4.5
2012-11-26 13:40:12 +01:00
SirSengir
c531adea0d Merge pull request #446 from nevercast/issue-445
Fixed issue 445
2012-11-26 00:22:27 -08:00
SirSengir
79172e20be Merge pull request #451 from psxlover/LaserPlacement
Use the correct function in place of updateBlockMetadata. Fixes Laser placement (#450).
2012-11-26 00:21:26 -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