summaryrefslogtreecommitdiffstats
path: root/src/Generating/ComposableGenerator.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* ForestRocks: use make_unique to constructTiger Wang2021-04-121-1/+1
|
* Fixed generator for the Mega Taiga biome (#5129)12xx122021-04-121-1/+6
| | | * Fixed generator for small foliage.
* fixed build (#5181)12xx122021-04-081-3/+2
|
* Obsidian pillars, end fountain, not Ender dragon spawning (#4993)12xx122021-04-081-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added generator for obsidian pillars and central fountain which then is used for the exit portal * checkstyle * checkstyle the second * fixed clang removed magic number added Clamp * make the pillars configurable * fixed clang added warning if there was a unknown value if the tower should have a cage or not * forgot to cancel on unkwon value * fixed clang this time maybe * added new generator to generator test * fixed test * added prefab generation for end fountain * fixed checkstyle and updated the prefab * added ender dragon spawning made the fountain positioning dynamic removed fountain placement functions * added enderdragon stuff to testing * pls compile * added changes suggested by @peterbell10 * fixed clang * added debug for further research on the ARM build * ok - it wasn't my tower placement * checking in setup * readded the fountain schematic * removed finisher * readded generator * removed generator trigger - kept ini file access * using cChunkDef function to calculate abs pos of endercrystal * yes, I know it's unused... * commented everything in the ComposableGenerator.cpp - so only the new class in compiled in but not called at all * don't compile in the new generator at all (removed from CMakeLists.txt) * readded the new generator * readded the new generator * removed debug output * made the towers generate acrocc chunk borders * fixed bad merge * fixed clang * fixed clang * generate the dragon 20 blocks above terrain * trying to fixed weird undefined reference * maybe this fixes the weird behaviour * takes chunk width as parameter now * added new comments with info to generated structures removed ender dragon spawning removed chunkwidth from parameter * fixed linker * maybe fixed linking. tried with gc and clang * fixed ender crystal * fixed test * updated output strings * fixed build * fixed up test * fixed test compile * fixed test - cant get the tests to show up * removed the semicolon * maybe this is the fix? * at this point i have no idea - in MVSC it works * removed the ender dragon Co-authored-by: 12xx12 <12xx12100@gmail.com>
* shared_ptr -> unique_ptr in generatorsTiger Wang2021-03-181-68/+64
|
* Some emplace_back replacements (#5149)12xx122021-03-071-34/+34
| | | * replace push_back with emplace_back when a new object was created in the function call
* zlib -> libdeflate (#5085)Tiger Wang2021-01-111-35/+4
| | | | | | + Use libdeflate + Use std::byte * Fix passing temporary to string_view + Emulate make_unique_for_overwrite
* Fix flower and foliage generation (#4723)mBornand2020-11-141-1/+2
| | | | | | | | | | | | | | | | | | | * fix flower generation - remove wrong mushroom and flower generation + add "tiny" mushrooms in Mushrooms biomes + add "tiny" mushrooms in Mega Taiga and variants + add tulip generation for plains biomes * Turn numbers into constants - Remove duplication of grass generation - Remove fern in inappropriate biomes * added roofed forest flowers to ini file * fixed crash with biMesaPlateuM + Use empty() + Emplace directly + Avoid a string copy in BiomeName + Alias BiomeIndex to avoid multiple casts Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
* Adding Generator For Single Piece Structures (#4830)12xx122020-09-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * the beginning of a magnificent work - added basic files and classes without functionality * fixed checkstyle * added imports * moved imports * - Adding SinglePieceStructureGen - Adding a cPrefabChestStructure to generate Chests with contents - Added the options and calls to the ComposableGenerator * moved Globals to .h file * removed the chest thingy from the code (for now) * Update SinglePieceStructureGen.cpp * readded whitespace * renamed to SinglePieceStructuresGen for consistency added new classes to test * fixed small things (mostly style and cleanup) removed loottables * added small changes suggested by madmaxoft * small change to documentation * added check for allowed biomes * check only the biome of the origin position * fixed error on IsBiomeAllowed * added new cubesets * updated structures for with sponging * updated biome names * updated metadata to prevent crashing removed debug output * updated structures with sponging * added sponging to deserterWell to make it disappear in sand * small change in meta * rename DesertTemple -> DesertPyramid * minor style changes Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Alexander Harkness <me@bearbin.net>
* Enable some more clang-tidy linter checks (#4738)peterbell102020-05-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid inefficient AString -> c_str() -> AString round trip * Avoid redundant string init expressions * Avoid unnecessary return, continue, etc. * Add .clang-format to help with clang-tidy fix-its * Avoid unnecessary passing by value * Avoid unnecessary local copying * Avoid copying in range-for loops * Avoid over-complicated boolean expressions * Some violations missed by my local clang-tidy * Allow unnecessary continue statements * Add brackets * Another expression missed locally * Move BindingsProcessor call into clang-tidy.sh and add space * Fix pushd not found error * Different grouping of CheckBlockInteractionRate
* ChunkGenerator: Changed to use cChunkCoords.Mattes D2019-09-081-3/+3
|
* ShapeGen, HeiGen: Changed to use cChunkCoords.Mattes D2019-09-081-1/+1
|
* BiomeGen: Changed to use cChunkCoords params.Mattes D2019-09-081-2/+2
|
* Moved the generator defaults to ComposableGenerator.Mattes D2019-09-061-10/+105
|
* Separated chunk generator from world / plugin interfaces.Mattes D2019-09-061-44/+40
| | | | The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests.
* Generate cacti and sugarcane with different heights (#4137)Cocosushi62018-05-031-1/+3
| | | | | When generating foliage, create cacti with height in the interval [1; MaxCactusHeight] and sugarcane with height in [1; MaxSugarcaneHeight] (with MaxCactusHeight and MaxSugarcaneHeight declared in world.ini) Fixes #4135
* Dead bushes will generate in mega mega taigas (#3571)Bond-0092017-02-151-0/+1
|
* Implemented OverworldClumpFlowersNiLSPACE2016-08-141-0/+5
|
* Bulk clearing of whitespaceLogicParrot2016-02-051-10/+10
|
* PieceStructures generator: Fixed wrong merge conflict resolution.Mattes D2015-12-171-4/+4
| | | | | Also improved reporting messages. Ref.: http://forum.mc-server.org/showthread.php?tid=2256
* Added PieceStructures generator.Mattes D2015-12-011-83/+95
|
* OrePockets finisher is now configurable.Mattes D2015-11-251-2/+6
|
* Added OrePockets and DirtPockets finish gens.Mattes D2015-11-251-109/+15
|
* Fix old style casts and implicit conversionsMatti Hänninen2015-08-121-7/+13
|
* Generate biomes when pregenerating heights through CompositedHeiGen.Mattes D2015-06-231-1/+1
| | | | Fixes #2283.
* Added basic support for loading village prefabs from files.Mattes D2015-06-201-1/+3
|
* Fixed a lot of warningstycho2015-05-191-2/+2
|
* Fixed typo in NetherForts initializationSTRWarrior2015-04-191-1/+1
| | | | The S in NetherForts was missing
* Added GlowStone finisherSTRWarrior2015-04-191-0/+4
|
* Replaced cFinishGenPtr with std::make_sharedSTRWarrior2015-03-011-1/+1
|
* Made the minimum vine level configurableSTRWarrior2015-02-281-1/+2
|
* Implemented a vines finisher that creates vines in jungle biomesSTRWarrior2015-02-281-0/+4
|
* forgot initializerp-mcgowan2014-12-031-1/+5
|
* Added better soulsand rimsSTRWarrior2014-12-011-0/+4
| | | | As a finisher called SoulsandRims
* Gen refactor: Implemented CompositedHeiGen.Mattes D2014-11-131-3/+10
| | | | This fixes crashes in the Village generator due to the missing generator.
* Generator: Shape initial refactoring.Mattes D2014-11-121-49/+50
| | | | The code compiles, but several structure generators are broken, crash on start.
* Added BiomalNoise3D shape generator.Mattes D2014-11-101-0/+4
|
* Merged IniFile into main MCS sources.Mattes D2014-10-231-1/+1
|
* En masse NULL -> nullptr replaceTiger Wang2014-10-231-3/+3
|
* ComposableGenerator: Removed nullptr initializers.Mattes D2014-10-221-3/+3
|
* Generator: Rewritten to use SharedPtrs.Mattes D2014-10-191-78/+45
|
* Fixes #1503 - No gravel is being generatedwin32re2014-10-041-1/+1
|
* Added Granite, Diorite and Andesite to the NaturalPatches generator.STRWarrior2014-09-281-0/+27
|
* BiomeMultiCache is not used for simple generators.Mattes D2014-09-051-21/+22
|
* Fixed style.Mattes D2014-09-051-2/+2
|
* adapting formatDayBr3ak2014-09-031-2/+4
|
* adding config file entry #381DayBr3ak2014-09-021-1/+10
|
* adding the multicache behaviorDayBr3ak2014-09-021-1/+1
|
* DungeonRooms: Added a height probability distribution function.Mattes D2014-08-271-4/+5
|
* Added initial dungeon rooms finisher.Mattes D2014-08-261-0/+8
|
* Bunch of tweaks:STRWarrior2014-08-101-7/+7
| | | | | | Renamed Quarts to Quartz Using const_iterator instead of iterator Used CheckBasicStyle script to find style errors
* Added NaturalPatches generatorSTRWarrior2014-08-101-0/+22
| | | | It generates gravel and dirt.
* Added NetherOreNests.STRWarrior2014-08-101-0/+15
| | | | It generates Nether Quarts.
* Changed cStructGenOreNests to take a list of ores + the block to replace.STRWarrior2014-08-101-1/+51
|
* PreSimulator: Added configurations.STRWarrior2014-07-301-1/+6
| | | | You can now choose if it should pregenerate something or not
* Merge pull request #1061 from mc-server/portalsMattes D2014-07-291-15/+1
|\ | | | | Portals and others
| * Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * \ Merge branch 'master' into portalsTiger Wang2014-07-181-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * \ \ Merge branch 'master' into portalsTiger Wang2014-06-211-14/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * \ \ \ Merge branch 'master' into portalsTiger Wang2014-06-101-3/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-0/+19
| |\ \ \ \ \
| * | | | | | Implemented end and nether portalsTiger Wang2014-05-311-15/+1
| | | | | | |
* | | | | | | Merge pull request #1254 from mc-server/SingleTopBlockFinisherMattes D2014-07-291-2/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
| * | | | | | | Some finishing touchesSTRWarrior2014-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed whitespace fixed dead bush comment
| * | | | | | | Forgot Mesa Plateau biome.STRWarrior2014-07-281-0/+1
| | | | | | | |
| * | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlockSTRWarrior2014-07-281-2/+29
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Now accepts a vector of biomes and a vector of allowed blocks.
* | | | | | | RoughRavines: Made floor and ceiling settings-adjustable.madmaxoft2014-07-271-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges.
* | | | | | | RoughRavines: More settings - size, width, roughnessmadmaxoft2014-07-271-4/+14
| | | | | | |
* | | | | | | RoughRavines: Initial generator implementation.madmaxoft2014-07-271-3/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values.
* | | | | | Merged branch 'origin/Foliage'.madmaxoft2014-07-211-0/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Renamed cFinishGenFoliage to cFinishGenTallGrassSTRWarrior2014-07-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better grass density Added double tall grass.
| * | | | | First attempt for a new foliage finisherSTRWarrior2014-07-201-0/+4
| | |_|_|/ | |/| | |
* | | | | Basic style fixes.madmaxoft2014-07-171-3/+3
| | | | |
* | | | | Normalized comments.madmaxoft2014-07-171-2/+2
|/ / / / | | | | | | | | | | | | | | | | 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.
* | | | Added a TestRails generator.madmaxoft2014-06-211-0/+5
| | | | | | | | | | | | | | | | This is for debugging purposes only.
* | | | Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-14/+22
| |_|/ |/| |
* | | Added RainbowRoads finisher generator.madmaxoft2014-06-071-3/+11
| |/ |/|
* | Added an initial version of the underwater base generator.madmaxoft2014-05-311-0/+8
| |
* | Villages have min and max density setting.madmaxoft2014-05-221-4/+6
| | | | | | | | | | | | Also made roads use 3+9 scheme, instead of 3+5, for the house connectors. Fixes #1020.
* | Changed village generator defaults to more reasonable values.madmaxoft2014-05-151-2/+2
| |
* | VillageGen rewritten using BFSPieceGenerator.madmaxoft2014-05-151-0/+9
|/ | | | Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params.
* NetherFortGen: Added several more prefabs.madmaxoft2014-03-281-1/+1
| | | | Also extended the defauls MaxDepth value to 12.
* Initial NetherFortGen import.madmaxoft2014-03-281-1/+16
| | | | Simple fortresses of 2 different rooms will generate.
* A working POCPiece generator.madmaxoft2014-03-091-0/+5
|
* Unified StructureGens and FinisherGens.madmaxoft2014-03-011-86/+71
| | | | Now they are all Finishers. Fixes #398.
* Alpha-sorted the finishers.madmaxoft2014-01-181-4/+4
|
* Merged branch 'NetherFinish'.madmaxoft2014-01-181-3/+7
|\
| * Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo'sSTRWarrior2014-01-181-2/+2
| |
| * Added cFinishGenNetherSprinkleFoliage.STRWarrior2014-01-101-2/+6
| |
* | Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-101-5/+6
| | | | | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* | Fixed generator adding values to ini file.madmaxoft2014-01-101-1/+2
| |
* | Composition generator creating moved to a separate function.madmaxoft2014-01-091-61/+77
| | | | | | | | Also it forces the defaults into the INI file.
* | Height generator creating moved info HeiGen.cpp.madmaxoft2014-01-091-53/+1
|/ | | | The generator also explicitly sets the default back into the INI file.
* Moved BiomeGen creation from INI file data to BioGen.cpp.madmaxoft2013-11-281-48/+1
| | | | This way it can be shared between MCServer and BiomeVisualiser.
* Fixed the remaining derpsAlexander Harkness2013-11-271-1/+1
|
* Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-261-1/+1
|
* Further attempts to fix compileTiger Wang2013-11-251-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-1/+1
|
* Moved source to srcAlexander Harkness2013-11-241-0/+501
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 23:00:57 +0100