Commit message (Collapse) | Author | Files | Lines | ||
---|---|---|---|---|---|
2020-04-02 | Tweak attack ranges | mathiascode | 1 | -5/+5 | |
2020-03-22 | Add ambient mob sounds (#4521) | Mat | 1 | -1/+4 | |
2020-03-05 | Stabilise MoveToWorld (#4004) | Mat | 1 | -1/+3 | |
* Stabilise MoveToWorld * Fix comments and deprecate ScheduleMoveToWorld * Enhanced thread safety for m_WorldChangeInfo * Return unique_ptr from cAtomicUniquePtr::exchange * cWorld now calls entity cEntity::OnAddToWorld and cEntity::OnRemoveFromWorld. Allows broadcasting entities added to the world from the world's tick thread. This also factors out some common code from cEntity::DoMoveToWorld and cEntity::Initialize. As a consequence, cEntity::Destroy(false) (i.e. Destroying the entity without broadcasting) is impossible. This isn't used anywhere in Cuberite so it's now deprecated. * Update entity position after removing it from the world. Fixes broadcasts being sent to the wrong chunk. * Fix style * cEntity: Update LastSentPosition when sending spawn packet * Add Wno-deprecated-declarations to the lua bindings * Kill uses of ScheduleMoveToWorld | |||||
2018-09-24 | Add BurnsInDaylight to Lua API and Monsters.ini (#4295) | Muhammad Kaisar Arkhan | 1 | -2/+2 | |
* Monster.h: Export SetBurnsInDaylight This commit also adds BurnsInDaylight to check if the Monster burns in daylight or not. Closes https://github.com/cuberite/cuberite/issues/4294 * MonsterConfig.cpp: Add BurnsInDaylight Closes https://github.com/cuberite/cuberite/issues/4294 | |||||
2018-01-17 | New movement system for leashed entities (#4147) | peterbell10 | 1 | -1/+1 | |
* New movement system for leashed entities Entities are accelerated towards the leashed to entity as if by a spring. * Mobs now pathfind close to but not directly to the leashing entity. * Also minor comment changes | |||||
2017-08-24 | Use ref instead of pointer | Lukas Pioch | 1 | -1/+1 | |
2017-08-23 | Removed outdated pathfinder comment (#3955) | Safwat Halaby | 1 | -2/+1 | |
2017-08-21 | Fully implemented leashes (#3798) | Pablo Beltrán | 1 | -0/+48 | |
2017-08-13 | Replaced includes with forward declarations | Lukas Pioch | 1 | -1/+1 | |
2017-08-07 | Changed entity ownership model to use smart pointers | Tiger Wang | 1 | -4/+10 | |
2017-08-06 | Removed unneeded includes (#3902) | Lukas Pioch | 1 | -2/+0 | |
2017-08-03 | Remove double includes part 2 (#3890) | peterbell10 | 1 | -1/+0 | |
2017-08-03 | Removed unused forward declarations (#3888) | Lukas Pioch | 1 | -1/+1 | |
2017-05-28 | Fixed tracer usage in Entity physics handling. (#3720) | Mattes D | 1 | -3/+3 | |
2017-05-22 | Spawn eggs works again | Lukas Pioch | 1 | -0/+3 | |
2017-05-21 | Clang 5.0 fixes | Lukas Pioch | 1 | -1/+1 | |
- Added override keyword - Removed inherited member variables | |||||
2017-05-21 | Don't destroy monster when last target type is a player (#3721) | Pablo Beltrán | 1 | -0/+5 | |
In current Cuberite version if you are pursued by monsters you just have to disconnect and connect again to get rid of them. If no other player is in your chunk monsters will get destroyed. | |||||
2016-10-12 | Spectators added (#2852) | bibo38 | 1 | -1/+1 | |
2016-09-12 | APIDump: Reformatted the docs to include type information. | Mattes D | 1 | -1/+1 | |
Also fixed a bit of documentation in the CPP source. | |||||
2016-02-03 | cMonster::m_Target safety across worlds | LogicParrot | 1 | -3/+18 | |
2016-01-21 | Spiders now friendly at daylight, new cChunk functions | LogicParrot | 1 | -2/+2 | |
2016-01-12 | Fix mob attack interval | LogicParrot | 1 | -1/+2 | |
2016-01-12 | Tamed wolf assists owner (attack / defence) | LogicParrot | 1 | -1/+1 | |
2015-12-24 | PF - "Special blocks" handling | Safwat Halaby | 1 | -4/+4 | |
2015-12-13 | blockheight mechanism | Gargaj | 1 | -2/+2 | |
2015-12-13 | Decoupled cMonster and path recalc logic, re-implemented recalc | Safwat Halaby | 1 | -51/+7 | |
2015-11-29 | implement breeding | Gargaj | 1 | -0/+1 | |
2015-11-16 | changed mob age from char to int | Julian Laubstein | 1 | -3/+3 | |
2015-09-28 | Partial revert of #2446 | Safwat Halaby | 1 | -2/+13 | |
2015-08-22 | Fixed a position bug in the pathfinder | Tiger Wang | 1 | -11/+3 | |
2015-07-31 | Unified the doxy-comment format. | Mattes D | 1 | -7/+7 | |
2015-07-16 | Spawn baby mobs | hallucino | 1 | -0/+2 | |
2015-07-14 | Support ageable mobs | Hallucino | 1 | -1/+7 | |
Move ageable stuff in Monster directly | |||||
2015-05-28 | AI - Sane Skeleton | SafwatHalaby | 1 | -3/+6 | |
2015-05-19 | Make -Werror disabling file only | tycho | 1 | -3/+3 | |
Ad fix a load of warnings | |||||
2015-05-17 | Pathfinder - approximated paths when original destination unreachable | SafwatHalaby | 1 | -0/+7 | |
2015-05-09 | More style checking. | Mattes D | 1 | -1/+1 | |
Spaces around some operators are checked. | |||||
2015-05-06 | (duplicate) AI - Livestock escape fixed, water jumping fixed | wiseoldman95 | 1 | -0/+10 | |
2015-05-05 | AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bug | wiseoldman95 | 1 | -6/+10 | |
2015-05-04 | Entity improvements | Tiger Wang | 1 | -32/+28 | |
•Pathfinder improvements •Fixes #1217 •Fixes #1933 Merge remote-tracking branch 'SafwatHalaby/water2' into fixes | |||||
2015-05-03 | AI - Improved Mob Jumping | wiseoldman95 | 1 | -0/+1 | |
2015-05-02 | AI - Better daylight handling | wiseoldman95 | 1 | -2/+2 | |
2015-05-02 | PathFinding - Chunk querying optimization and improve cPath::IsSolid | wiseoldman95 | 1 | -1/+1 | |
2015-05-01 | A* Pathfinding and better monster AI | wiseoldman95 | 1 | -8/+12 | |
2015-01-16 | Converted Monster to std::chrono | Tycho | 1 | -5/+5 | |
2015-01-11 | Initial convertion of a_Dt to std::chrono | Tycho | 1 | -1/+1 | |
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | |||||
2014-12-18 | Added Entity Guardian | Masy98 | 1 | -1/+1 | |
2014-12-01 | MobSpawner fixes. | Howaner | 1 | -1/+1 | |
2014-11-29 | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. | Howaner | 1 | -4/+7 | |
2014-11-26 | Merge remote-tracking branch 'origin-master' into c++11 | Tiger Wang | 1 | -3/+5 | |
2014-11-15 | Mobs: Fixed crash with terrain too high. | Mattes D | 1 | -3/+5 | |
2014-10-12 | convert old style casts to fix warnings | Steven Riehl | 1 | -32/+28 | |
2014-10-05 | Removed obsolete cMonster::eType. | madmaxoft | 1 | -3/+0 | |
Has been replaced with global eMonsterType. | |||||
2014-09-27 | Fixed minor style issues. | madmaxoft | 1 | -1/+1 | |
2014-09-25 | Fixed style | Tycho | 1 | -0/+3 | |
2014-09-19 | Implemented mob spawner. | Howaner | 1 | -1/+1 | |
2014-09-17 | Added first test to show the object can be created | Tycho | 1 | -45/+9 | |
2014-09-02 | Renamed SetWalkSpeed() to SetRelativeWalkSpeed() | Howaner | 1 | -3/+3 | |
2014-09-02 | Added the new functions to APIDump. | Howaner | 1 | -2/+2 | |
2014-09-02 | Added SetCustomName() to players. | Howaner | 1 | -1/+2 | |
2014-09-01 | Added name tag | Howaner | 1 | -0/+2 | |
2014-09-01 | Added CustomName to cMonster. | Howaner | 1 | -1/+19 | |
2014-08-30 | Added SetWalkSpeed() to cMonster. | Howaner | 1 | -0/+5 | |
2014-07-24 | Removed redundant semicolons and re-added warning | archshift | 1 | -1/+1 | |
2014-07-19 | Monsters: Made IsUndead overridable by the respective mob classes | archshift | 1 | -1/+1 | |
2014-07-19 | Fixed style: spaces after commas. | madmaxoft | 1 | -1/+1 | |
2014-07-18 | Monster fixes | Tiger Wang | 1 | -1/+0 | |
* Fixes #1203 * Fixes #627 | |||||
2014-07-18 | Fixed spaces before commas. | madmaxoft | 1 | -3/+3 | |
2014-07-17 | Basic style fixes. | madmaxoft | 1 | -4/+4 | |
2014-07-17 | Normalized comments. | madmaxoft | 1 | -7/+7 | |
This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign. | |||||
2014-07-04 | Tailored death messages | Tiger Wang | 1 | -1/+1 | |
2014-06-19 | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 1 | -2/+0 | |
Changed effect map to take a pointer of the effect as a result. | |||||
2014-06-17 | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 1 | -1/+1 | |
Exported entity effect functions for ToLua and documented them in APIDesc.lua | |||||
2014-06-17 | Monster: added IsUndead(), undead-specific entity effects | archshift | 1 | -0/+6 | |
2014-04-26 | Fixed mobs that don't naturally spawn. | archshift | 1 | -0/+1 | |
2014-04-26 | Add entity invulnerable | Howaner | 1 | -1/+1 | |
2014-04-25 | Giants! | archshift | 1 | -1/+1 | |
Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning. | |||||
2014-04-17 | Added new AI rules | Tiger Wang | 1 | -2/+2 | |
+ Added new AI rules handling cacti and large heights * Fixed cIniFile not recognising comments in cIniFile::ReadFile() * Fixed users.ini not being properly generated * Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT | |||||
2014-02-24 | Fixed Formatting, added compiler warning suppressing methods, fixed comments | TheJumper | 1 | -2/+2 | |
2014-02-23 | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 1 | -0/+35 | |
2014-02-23 | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 1 | -0/+32 | |
2014-02-23 | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 1 | -10/+13 | |
2014-02-23 | Fixed Formatting, Added DropChance attributes to Monsters | TheJumper | 1 | -0/+20 | |
2014-02-22 | Changed formatting, encapsuled armor drop, introduced better static Enchantment IDs | TheJumper | 1 | -1/+7 | |
2014-02-22 | Monster.h: Added doxy-comments for drop methods | TheJumper | 1 | -0/+3 | |
2014-02-21 | Fixed Mob Drops, Add Rare and Uncommon Drops, Looting inflicts Drops | TheJumper | 1 | -0/+3 | |
2014-02-11 | Fixed #627 | Tiger Wang | 1 | -2/+0 | |
- Attack() is now called from cAggressive instead of cMonster * Monsters can no longer attack through walls * Should fix last remnants of player damage after teleporting (that both STR and bearbin contributed fixes to :P) | |||||
2014-02-03 | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 1 | -0/+1 | |
2014-01-25 | Implemented fall damage for mobs | Tiger Wang | 1 | -2/+6 | |
+ Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | |||||
2014-01-25 | Mob bugfixes | Tiger Wang | 1 | -2/+10 | |
* Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | |||||
2014-01-24 | Miscellaneous improvements | Tiger Wang | 1 | -13/+9 | |
2014-01-24 | Large reworking of mob code [SEE DESC] | Tiger Wang | 1 | -19/+49 | |
+ Implemented better pathfinding - Removed lots of unused variables, functions, etc. * Changed some variable types * Other miscellaneous fixes, and also completes the previous PRs | |||||
2013-12-20 | Sorted a few constructors to remove warnings. | madmaxoft | 1 | -1/+1 | |
2013-11-24 | Moved source to src | Alexander Harkness | 1 | -0/+0 | |
2013-11-10 | Bundled fixes [SEE DESC] | Tiger Wang | 1 | -5/+2 | |
* Fixed pickups spawning in an incorrect position from a JukeBox * Pickups make a popping sound in Prtcl1.7 * Arrows make a *what sort of sound does an arrow make anyway‽* when hitting a block, and a popping sound when fired * Mobs again have metadata * Fixed Prtcl1.7 not using valid JSON to kick a client * Minecarts and arrows again have metadata | |||||
2013-10-25 | cMonster: Improved doxycomments. | madmaxoft | 1 | -2/+2 | |
2013-10-24 | Renamed cMonster::GetSpawnRate() to GetSpawnDelay(). | madmaxoft | 1 | -2/+2 | |
2013-10-20 | Fixed memory leaks in cMobCensus, moved GetSpawnRate() to cMonster. | madmaxoft | 1 | -0/+3 | |
2013-10-20 | Moved all MobTypesManager functions to cMonster. | madmaxoft | 1 | -2/+24 | |
This removes some of the memory leaks and is more logical in structure. Also the functions are exported to Lua. | |||||
2013-10-20 | Fixed loading allowed mobs in world. | madmaxoft | 1 | -8/+8 | |
2013-10-09 | Second round of fixes | Tiger Wang | 1 | -0/+6 | |
* Implemented suggestions | |||||
2013-09-18 | Added moar mobs! | Tiger Wang | 1 | -21/+23 | |
+ Added dragons + Added golems + Added giants + Added horses + Added some missing items + Added missing spawn egg metas | |||||
2013-09-17 | Fixed undead burning | Tiger Wang | 1 | -1/+1 | |
(c'mon xoft, test ya code :P) | |||||
2013-09-16 | Exported cMonster:GetMobType() to the Lua API. | madmaxoft | 1 | -1/+3 | |
2013-09-10 | Inside cMonster::getMobFamily() : replacing Polymorphism by Map, in order to remove redundancy | mgueydan | 1 | -1/+2 | |
2013-09-08 | Implementing the MobSpawner (not used yet) that contains spawning rules | mgueydan | 1 | -1/+4 | |
2013-09-07 | Adding a getType in Monster that return an enum instead of an int or char | mgueydan | 1 | -1/+2 | |
2013-09-07 | Adding Family for monsters : Hostile/Passive/Water/Ambient | mgueydan | 1 | -0/+10 | |
2013-09-06 | Moved daylight burning directly into cMonster. | madmaxoft | 1 | -0/+7 | |
2013-09-05 | Moved daylight burning directly into cMonster. | madmaxoft | 1 | -0/+7 | |
2013-08-19 | Moved entities into the Entities subfolder. | madmaxoft | 1 | -1/+1 | |
2013-08-16 | Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX. | madmaxoft | 1 | -1/+35 | |
Also slightly improved the spawning algorithm. | |||||
2013-07-01 | Rewritten entity-on-fire management ("forever on fire" bugs) | madmaxoft@gmail.com | 1 | -2/+2 | |
Fixes FS #297 and part of FS #403. Added sizes to all entities. Moved all damage-related functions from cPawn to cEntity API change: renamed cPawn:TeleportTo() to cEntity:TeleportToCoords() git-svn-id: http://mc-server.googlecode.com/svn/trunk@1635 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-04-22 | Moved physics to the cEntity class from the derivative classes (cMonster, cPickup). Added physics override to cPlayer to disable physics calculations. Fixed bug with pitch calculations on mobs. | keyboard.osh@gmail.com | 1 | -6/+0 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1400 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-04-13 | Rewritten entities so that they are owned by individual chunks and ticked within their chunk's Tick() | madmaxoft@gmail.com | 1 | -8/+8 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1385 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2013-02-21 | Moved the Speed member into cEntity class instead of its descendants. | madmaxoft@gmail.com | 1 | -1/+0 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1222 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-12-22 | MTRand reference is now passed as a Tick() parameter so that it isn't created and destroyed over and over again. All entities will handle physics (empty callback for now) | madmaxoft@gmail.com | 1 | -8/+8 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1096 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-12-22 | Reduced most mobs' constructors to oneliners by passing parameters to superclasses | madmaxoft@gmail.com | 1 | -2/+10 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1095 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-12-21 | Added sounds to levers and mobs | luksor111@gmail.com | 1 | -0/+3 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1093 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-12-21 | Reworked the IsA() / GetClass() framework to actually be useful. Added GetParentClass(). | madmaxoft@gmail.com | 1 | -3/+2 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1090 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-12-21 | Refactored the TakeDamage API to take equipped weapon and armor into consideration (PvP untested) | madmaxoft@gmail.com | 1 | -10/+15 | |
http://forum.mc-server.org/showthread.php?tid=625 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1087 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-24 | Source files cleanup: The rest of the files renamed. | madmaxoft@gmail.com | 1 | -3/+3 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@887 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-09-23 | Source files cleanup: Mobs-related files in a separate subfolder, renamed. | madmaxoft@gmail.com | 1 | -6/+5 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@883 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-08-24 | Monster classes don't use cPackets. Chat messages are sent / broadcast without cPackets. BlockEntities don't use cPackets. | madmaxoft@gmail.com | 1 | -8/+9 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@783 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-08-19 | Almost all packets' handling is now rewritten not to use cPacket descendants elsewhere than in cClientHandle. | madmaxoft@gmail.com | 1 | -2/+2 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@761 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-06-14 | Attempt to bring sanity to newlines across systems. | cedeel@gmail.com | 1 | -101/+101 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@606 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-06-06 | Item-dropping code rewritten and centralized - now there's only one place to modify if we want to split or merge same-item drops: cWorld:SpawnItemPickups(). Also, mined blocks can now drop more items, and they recognize if they're being mined by the correct tool. | madmaxoft@gmail.com | 1 | -3/+7 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@561 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-05-25 | Merged the composable_generator branch into the trunk | madmaxoft@gmail.com | 1 | -1/+10 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-02-15 | No longer using pointers for Vector3(f/d/i) in cEntity's and cTracer | faketruth | 1 | -2/+2 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@268 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2012-02-13 | Rewritten most of the code for multithreading; still not 100%, but getting there. If this commit proves to be too problematic, we can always undo it. | madmaxoft@gmail.com | 1 | -2/+3 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@251 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2011-12-28 | - Implemented Drops from Burning animals | lapayo94@gmail.com | 1 | -6/+0 | |
- added right monster health and attack strength - refactored the Pawn/Monster/Player class a little bit - changed some namings to fit the style git-svn-id: http://mc-server.googlecode.com/svn/trunk@140 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2011-12-26 | - improved ClosestPlayerDetection (Really the closest now ;)) | lapayo94@gmail.com | 1 | -1/+1 | |
- renamed function because the old one wasn´t listing - improved some time vars so no move gets dropped when the server laggs for a few seconds git-svn-id: http://mc-server.googlecode.com/svn/trunk@124 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2011-12-26 | - Linux compatible fixes including updated makefile | mtilden@gmail.com | 1 | -0/+1 | |
- Mersenne Twister still says uint32 but it's now signed for compatibility with random uses needing negative values - Server seed is sent to clients, but needs to be able to be signed long long later on for authentic reasons - Protocol Version is required to match to ensure client compatibility, this should probably have a settings.ini check as well as store the value there git-svn-id: http://mc-server.googlecode.com/svn/trunk@121 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2011-12-25 | - Fixed Bug #99 -> Mobs no longer bother you in creative mode | lapayo94@gmail.com | 1 | -0/+3 | |
- refactored many things in the Monster system git-svn-id: http://mc-server.googlecode.com/svn/trunk@112 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2011-12-21 | - Crafting fixed in 1.0.0 | lapayo94@gmail.com | 1 | -0/+4 | |
- Server compatible with the weapons and equip again. (Some Packets were incompatible) - fixed bucket bugs (not all) - Fixed clients getting crashed by wrong Pickups - fixed nearly all mob drops. (Check wheather they are burning is missing Big Grin) - maybe some other things I can´t recall atm Big Grin git-svn-id: http://mc-server.googlecode.com/svn/trunk@94 0a769ca7-a7f5-676a-18bf-c427514a06d6 | |||||
2011-10-03 | MCServer c++ source files | faketruth | 1 | -0/+85 | |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@3 0a769ca7-a7f5-676a-18bf-c427514a06d6 |