Commit message (Collapse) | Author | Files | Lines | ||
---|---|---|---|---|---|
2014-05-01 | Fixed warnings in ClientHandle. | madmaxoft | 1 | -1/+1 | |
2014-04-28 | Revert "Changed the old invulnerable methods from the wither to the new." | Howaner | 1 | -8/+1 | |
This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34. | |||||
2014-04-28 | Fixed projectile source filenames, indentations | archshift | 1 | -1/+1 | |
2014-04-27 | Moved cArrowEntity out of ProjectileEntity.h | archshift | 1 | -1/+1 | |
2014-04-26 | Changed the old invulnerable methods from the wither to the new. | Howaner | 1 | -1/+8 | |
2014-04-26 | Fixes | Howaner | 1 | -1/+1 | |
2014-04-18 | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 1 | -14/+18 | |
2014-04-17 | Modified many things | daniel0916 | 1 | -2/+0 | |
2014-04-14 | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 1 | -0/+42 | |
Server works both in online and offline modes with 1.7.9. | |||||
2014-04-07 | Fixed Errors | daniel0916 | 1 | -2/+2 | |
2014-04-04 | Explicit change record size. | madmaxoft | 1 | -1/+1 | |
2014-04-04 | More Clang warning fixes in the protocols. | madmaxoft | 1 | -69/+70 | |
2014-04-04 | Fixed some Clang warnings in protocols. | madmaxoft | 1 | -1/+1 | |
2014-03-31 | Console logging supports cCompositeChat as its parameters. | madmaxoft | 1 | -22/+1 | |
2014-03-25 | Protocol: Wither metadata | andrew | 1 | -0/+8 | |
2014-03-10 | Removed unused macro | Tycho | 1 | -13/+0 | |
2014-03-09 | Adjusted style of switch/case | Jan-Fabian Humann | 1 | -15/+5 | |
2014-03-08 | Changed if-else to switch-case | Jan-Fabian Humann | 1 | -13/+11 | |
2014-03-08 | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. | Jan-Fabian Humann | 1 | -1/+22 | |
2014-03-07 | Warnings | Tycho | 1 | -1/+1 | |
2014-02-18 | Map decorators; Map clients | andrew | 1 | -0/+25 | |
2014-02-15 | Implemented cCompositeChat. | madmaxoft | 1 | -0/+38 | |
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | |||||
2014-02-13 | Implementation of in-game maps | andrew | 1 | -0/+27 | |
2014-02-04 | Improved Type safety of eBlockFace | Tycho | 1 | -2/+2 | |
May Fix #640 | |||||
2014-02-01 | added EnchantItemPacket to older Protocols | daniel0916 | 1 | -1/+4 | |
2014-01-31 | Some updates for enchanting (2) | daniel0916 | 1 | -0/+15 | |
2014-01-17 | Removed internal cEntity::GetRot() usage. | madmaxoft | 1 | -9/+9 | |
2014-01-16 | Removed obsoleted functions | Tiger Wang | 1 | -5/+5 | |
2014-01-09 | Added cClientHandle::SendPluginMessage(). | madmaxoft | 1 | -0/+14 | |
It is not yet exported in the API, though. | |||||
2013-12-22 | Implented BroadcastParticleEffect | STRWarrior | 1 | -0/+9 | |
2013-12-15 | Fixed pre 1.7 clients crashing. | STRWarrior | 1 | -2/+2 | |
2013-12-14 | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 1 | -0/+30 | |
2013-12-07 | Renamed animation function | Tiger Wang | 1 | -2/+2 | |
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | |||||
2013-11-24 | Moved source to src | Alexander Harkness | 1 | -0/+0 | |
2013-11-16 | fixed bug and added SpendExperience() | Daniel O'Brien | 1 | -3/+3 | |
2013-11-15 | finished #143 I believe | Daniel O'Brien | 1 | -1/+1 | |
2013-11-14 | cProtocol add SendExperience() and debugging | Daniel O'Brien | 1 | -0/+15 | |
2013-11-08 | cProtocol::SendWindowOpen() signature changed. | madmaxoft | 1 | -6/+6 | |
This implements #313. | |||||
2013-11-08 | Protocol 1.7: Copied Mob Metadata code from 1.2.5. | madmaxoft | 1 | -15/+1 | |
2013-11-05 | Removed the obsolete SendWholeInventory(cInventory &) function. | madmaxoft | 1 | -9/+0 | |
This won't compile because there's still a change in Protocol17x.cpp pending; the next commit will fix this. | |||||
2013-10-28 | Renamed cWindow constants to include the "wt" prefix. | madmaxoft | 1 | -1/+1 | |
2013-10-13 | Eight round of fixes | Tiger Wang | 1 | -3/+2 | |
* Changed IsA() to *long if statement* - Removed deprecated values in Entity.h - to blazes with the plugins! * Renamed villager type enumerations to be LESS SHOUTY and more vt-y + Use vtMax for World.cpp testificate spawning | |||||
2013-10-13 | Seventh round of fixes | Tiger Wang | 1 | -21/+21 | |
* Fixed arrows not critical-effecting because they were in MOBS! (derp) * Used cMonster::mtXX as per xoft's suggestions | |||||
2013-10-11 | Fourth round of fixes | Tiger Wang | 1 | -125/+143 | |
* Switchified WriteMobMetadata * Renamed Horse functions to be better | |||||
2013-10-11 | Third round of fixes | Tiger Wang | 1 | -69/+88 | |
* Split WriteMetadata into three functions for common, entity, and mob * Edited a few mob sizes to Vanilla values | |||||
2013-10-09 | Second round of fixes | Tiger Wang | 1 | -36/+62 | |
* Implemented suggestions | |||||
2013-10-08 | Initial round of fixes | Tiger Wang | 1 | -4/+4 | |
* Fixed intentional misspelling of baby! :D * Better chested horse bool name * Fixed some weird continuity issues with my recent changes not being pushed up initially * Fixed derpy hexadecimal values | |||||
2013-10-08 | Initial Metadata Commit [SEE DESC] | Tiger Wang | 1 | -28/+192 | |
+ Pigs, Minecarts, Sheep, Skeletons, Slimes, Villagers, Wolves, and Horses have metadata + Base code on taming wolves, shearing sheep, and taming horses + Sheep and horses have different colours when spawned | |||||
2013-09-19 | Fixed rounding errors in cProtocol125::SendExplosion(). | madmaxoft | 1 | -6/+9 | |
This should fix #129. | |||||
2013-09-09 | Fixed a crash on immediate re-login. | madmaxoft | 1 | -1/+1 | |
Fixes #155. | |||||
2013-08-29 | Implemented xoft's suggestions [SEE DESC] | Tiger Wang | 1 | -3/+3 | |
Rail metas are now in BlockID and exported to LUA Minecart now does a SetMass, instead of m_Mass Minecarts use SubType instead of TypeType | |||||
2013-08-28 | Fixed Minecart spawning issues | Tiger Wang | 1 | -5/+8 | |
Now you can have everything! | |||||
2013-08-19 | Moved entities into the Entities subfolder. | madmaxoft | 1 | -4/+4 | |
2013-08-18 | Added cWindow property manipulation API. | madmaxoft | 1 | -15/+15 | |
Now enchantment table and furnace properties can be set by a plugin | |||||
2013-08-16 | Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX. | madmaxoft | 1 | -0/+1 | |
Also slightly improved the spawning algorithm. | |||||
2013-07-30 | Tab completion packet is handled and sent. | madmaxoft | 1 | -0/+10 | |
This only handles the network comm and the overall design logic, the actual completion is not yet implemented, only dummy values are returned for now. | |||||
2013-07-29 | Added the "Edit Sign" packet sent to the client placing a sign. | madmaxoft | 1 | -0/+13 | |
Fixes issue #20. The 1.6.2 client wouldn't open the sign editor UI unless it receives a special packet | |||||
2013-07-29 | Changed everyting to Unix line endings. | Alexander Harkness | 1 | -1636/+1636 | |
2013-07-12 | First implementation of movement-related hunger and API | madmaxoft@gmail.com | 1 | -1/+1 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1673 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-07-08 | 1.6.2 protocol implemented, both in MCServer and in ProtoProxy | madmaxoft@gmail.com | 1 | -0/+24 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1669 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-07-07 | Improved function names for protocol packet sending; alpha-sorted the function lists | madmaxoft@gmail.com | 1 | -61/+80 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1659 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-06-18 | More TNT fixes. | madmaxoft@gmail.com | 1 | -1/+1 | |
Chain-reaction TNTs are spawned in proper coordinates (FS #390) Centralized Primed TNT entity spawning and made available to the plugins. Internal changes for better TNT performance. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1604 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-05-24 | Refactored cInventory to use cItemGrid for the actual Storage | madmaxoft@gmail.com | 1 | -2/+1 | |
This makes the API more orthogonal and is easier to use in the plugins. Also changes in the inventory are now propagated to the needed places (armor updates to BroadcastEntityEquipment etc.) even when the inventory is changed by a plugin. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1503 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-05-08 | Refactored window clicking code to use different click actions | madmaxoft@gmail.com | 1 | -1/+41 | |
First part of solving FS #371; should fix #370. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1459 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-04-28 | Fixed compilation on Linux | madmaxoft@gmail.com | 1 | -2/+2 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1434 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-04-28 | Added support for sending velocity and rotation in PACKET_SPAWN_MOB and PACKET_SPAWN_OBJECT | keyboard.osh@gmail.com | 1 | -6/+10 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1427 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-04-19 | Fixed Linux compilation, slight code cleanup | madmaxoft@gmail.com | 1 | -12/+9 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1396 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-04-18 | Initial implementation of explosions and TNT block | keyboard.osh@gmail.com | 1 | -0/+28 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1392 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-04-07 | Fixed bug in entities movement: Corrected proper flooring of double values for the relative move packet, and teleport packet. Also, made the velocity packet to be sent first than the positions packets. | keyboard.osh@gmail.com | 1 | -1/+3 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1367 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-04-04 | Fixed personal crafting grid not being tossed on inventory close. | madmaxoft@gmail.com | 1 | -2/+8 | |
FS #355, http://www.mc-server.org/support/index.php?do=details&task_id=355 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1358 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-04-02 | Added support for head yaw tracking and packet sending and fixed bug in BroadcastMovementUpdate | keyboard.osh@gmail.com | 1 | -1/+1 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1350 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-03-18 | Added support for the packet #28 (0x1C): ENTITY_VELOCITY | keyboard.osh@gmail.com | 1 | -0/+16 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1283 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-03-11 | Initial nether composition generator | madmaxoft@gmail.com | 1 | -2/+2 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1266 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-03-09 | Pickups are now being saved into Anvil. | madmaxoft@gmail.com | 1 | -2/+2 | |
Also changed cEntity rotation datatype to double git-svn-id: http://mc-server.googlecode.com/svn/trunk@1262 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-03-03 | Player can sit in minecarts (but not move them yet) | madmaxoft@gmail.com | 1 | -0/+14 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1249 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-02-21 | Moved the Speed member into cEntity class instead of its descendants. | madmaxoft@gmail.com | 1 | -5/+5 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1222 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-02-18 | Minecarts can now be placed. | madmaxoft@gmail.com | 1 | -0/+20 | |
No interaction, no physics, though. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1219 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-01-12 | Merged branch "branches/hooks" into "trunk". | madmaxoft@gmail.com | 1 | -4/+5 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-12-28 | cPickup now uses full cItem, instead of a pointer | madmaxoft@gmail.com | 1 | -3/+3 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1114 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-12-26 | Adjusted the protocol framework to support different types of falling block spawning. | madmaxoft@gmail.com | 1 | -0/+11 | |
In brief, with cProtocol, "say what you want done, not how you want me to do it". But still 1.4.6 crashes on falling block spawning. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1104 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-12-24 | Added the 1.4.6 protocol | madmaxoft@gmail.com | 1 | -5/+8 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1099 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-11-20 | Aggressive debug mode cByteBuffer validity checking. | madmaxoft@gmail.com | 1 | -1/+3 | |
Hopefully fixed the "BytesToEndOfBuffer" assert. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1057 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-11-01 | Refactored the world time. | madmaxoft@gmail.com | 1 | -2/+3 | |
Now it is stored in two values - WorldAge (only incremented, plugins cannot change) and TimeOfDay (plugins can change). Since sub-tick precision is needed in Tick(), we store it both as number of seconds (double) and number of ticks (Int64) is calculated off of that. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1022 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-10-21 | My OCD has alpha-sorted some stuff :) | madmaxoft@gmail.com | 1 | -49/+50 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@995 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-10-21 | Added jukeboxes (patch contributed by Luksor) | madmaxoft@gmail.com | 1 | -1/+11 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@994 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-10-07 | Split the name for signed and unsigned int writing in cProtocol. | madmaxoft@gmail.com | 1 | -2/+2 | |
Hopefully this fixes compilation problems with 64-bit debian ( http://forum.mc-server.org/showthread.php?tid=575 ) git-svn-id: http://mc-server.googlecode.com/svn/trunk@940 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-30 | Added falling block entities. Sand and gravel now properly fall down | faketruth | 1 | -1/+24 | |
Implemented the PACKET_SPAWN_OBJECT packet Made some things use BLOCKTYPE instead of char Android: Requests WebAdmin port when pressing the configure button git-svn-id: http://mc-server.googlecode.com/svn/trunk@915 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-29 | Beds can be slept in now (it doesn't change the time though) | faketruth | 1 | -2/+18 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@911 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-25 | Added the block dig animation packet (patch contributed by l0udPL) | madmaxoft@gmail.com | 1 | -2/+10 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@892 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-24 | Source files cleanup: The rest of the files renamed. | madmaxoft@gmail.com | 1 | -7/+7 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@887 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-23 | Source files cleanup: ChunkDataSerializer is Protocol-related | madmaxoft@gmail.com | 1 | -1/+1 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@886 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-23 | Source files cleanup: Mobs-related files in a separate subfolder, renamed. | madmaxoft@gmail.com | 1 | -1/+1 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@883 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-23 | Source files cleanup: Protocol-related files in a separate subfolder | madmaxoft@gmail.com | 1 | -10/+10 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@880 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-23 | Source files cleanup: UI files renamed | madmaxoft@gmail.com | 1 | -1/+1 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@878 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-23 | Tweaked logging. | madmaxoft@gmail.com | 1 | -7/+0 | |
Less output for UI. More output for player pos confirming (FS #245) and for player spawning git-svn-id: http://mc-server.googlecode.com/svn/trunk@875 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-20 | Refactored windows. | madmaxoft@gmail.com | 1 | -8/+19 | |
As described on the forum: http://forum.mc-server.org/showthread.php?tid=561 For now, only basic clicking works; shift-click not implemented yet. git-svn-id: http://mc-server.googlecode.com/svn/trunk@867 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-11 | Merged in a patch for sounds by l0udPL | madmaxoft@gmail.com | 1 | -0/+10 | |
http://forum.mc-server.org/showthread.php?tid=434&pid=4564#pid4564 git-svn-id: http://mc-server.googlecode.com/svn/trunk@858 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-06 | Fixed slot parsing in 1.2.5 causing weird behavior ( http://forum.mc-server.org/showthread.php?tid=551&pid=4413#pid4413 ) | madmaxoft@gmail.com | 1 | -1/+1 | |
Also added some asserts into ByteBuffer so that this won't happen again. git-svn-id: http://mc-server.googlecode.com/svn/trunk@842 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-06 | Added protocol-specific authentication, now works for both 1.2.5 and 1.3.2 | madmaxoft@gmail.com | 1 | -0/+11 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@841 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-05 | Added the possibility of reserved player slots by implementing the HandleHandshake hook! | faketruth | 1 | -3/+2 | |
More info: http://forum.mc-server.org/showthread.php?tid=555 git-svn-id: http://mc-server.googlecode.com/svn/trunk@836 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-04 | Fixed a possible race condition in cClientHandle's packet sending code; prepared for moving cSocket out of cClientHandle's ownership. | madmaxoft@gmail.com | 1 | -1/+1 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@832 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-02 | Next iteration on the 1.3.2 protocol. Still no good, but sometimes it just gets through. For your testing pleasures ;) | madmaxoft@gmail.com | 1 | -1/+2 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@819 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-08-31 | Progress on the 1.3.2 protocol. | madmaxoft@gmail.com | 1 | -61/+63 | |
Sometimes the client lets the player through, but most of the times the connection breaks for no apparent reason. git-svn-id: http://mc-server.googlecode.com/svn/trunk@812 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-08-30 | Added a basic protocol recognizer and the base for 1.3.2 protocol. | madmaxoft@gmail.com | 1 | -3/+3 | |
Also fixed a few type-related warnings. git-svn-id: http://mc-server.googlecode.com/svn/trunk@805 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-08-30 | cProtocol handles the initial handshake up to player login | madmaxoft@gmail.com | 1 | -1/+45 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@804 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-08-29 | Gotten completely rid of all cPackets. The cProtocol125 class now does all the parsing and writing by itself. | madmaxoft@gmail.com | 1 | -156/+241 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@802 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-08-28 | Moved all packet-serializing code into cProtocol125; half the packet classes aren't needed anymore. | madmaxoft@gmail.com | 1 | -303/+434 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@800 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-08-27 | Cut out all packet handling to a separate cProtocol descendant | madmaxoft@gmail.com | 1 | -0/+1104 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@796 0a769ca7-a7f5-676a-18bf-c427514a06d6 |