1
0
Fork 0
cuberite-2a/src/Generating
12xx12 d78bcac150
Obsidian pillars, end fountain, not Ender dragon spawning (#4993)
* 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>
2021-04-08 12:18:18 +02:00
..
BioGen.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
BioGen.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
CMakeLists.txt Obsidian pillars, end fountain, not Ender dragon spawning (#4993) 2021-04-08 12:18:18 +02:00
Caves.cpp Some emplace_back replacements (#5149) 2021-03-07 16:31:43 +00:00
Caves.h Using Super. 2020-04-16 20:07:48 +00:00
ChunkDesc.cpp Fix debug macro situation (#5114) 2021-01-26 09:41:55 +00:00
ChunkDesc.h Fix debug macro situation (#5114) 2021-01-26 09:41:55 +00:00
ChunkGenerator.cpp ChunkGenerator: Changed to use cChunkCoords. 2019-09-08 20:21:49 +02:00
ChunkGenerator.h Deleted BiomeDef.h and ChunkDef.h from Globals.h (#4885) 2020-09-25 09:13:59 +00:00
CompoGen.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
CompoGen.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
CompoGenBiomal.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
CompoGenBiomal.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
ComposableGenerator.cpp Obsidian pillars, end fountain, not Ender dragon spawning (#4993) 2021-04-08 12:18:18 +02:00
ComposableGenerator.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
CompositedHeiGen.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
DistortedHeightmap.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
DistortedHeightmap.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
DungeonRoomsFinisher.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
DungeonRoomsFinisher.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
EndGen.cpp Simple end gen (#4973) 2020-10-11 15:44:57 +00:00
EndGen.h Simple end gen (#4973) 2020-10-11 15:44:57 +00:00
EnderDragonFightStructuresGen.cpp Obsidian pillars, end fountain, not Ender dragon spawning (#4993) 2021-04-08 12:18:18 +02:00
EnderDragonFightStructuresGen.h Obsidian pillars, end fountain, not Ender dragon spawning (#4993) 2021-04-08 12:18:18 +02:00
FinishGen.cpp Fix finisher generating invalid pumpkin 2021-04-01 00:02:44 +01:00
FinishGen.h zlib -> libdeflate (#5085) 2021-01-11 16:39:43 +00:00
GridStructGen.cpp Using Super. 2020-04-16 20:07:48 +00:00
GridStructGen.h Remove smart pointer macros 2017-07-21 14:41:51 +01:00
HeiGen.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
HeiGen.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
IntGen.h Deleted BiomeDef.h and ChunkDef.h from Globals.h (#4885) 2020-09-25 09:13:59 +00:00
MineShafts.cpp Using Super. 2020-04-16 20:07:48 +00:00
MineShafts.h Using Super. 2020-04-16 20:07:48 +00:00
Noise3DGenerator.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
Noise3DGenerator.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
PieceGeneratorBFSTree.cpp Some emplace_back replacements (#5149) 2021-03-07 16:31:43 +00:00
PieceGeneratorBFSTree.h Removed unneeded includes (#3902) 2017-08-06 20:57:44 +01:00
PiecePool.cpp Deal with covered switches consistently (#4161) 2018-02-04 23:07:12 +00:00
PiecePool.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
PieceStructuresGen.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
PieceStructuresGen.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
Prefab.cpp Some emplace_back replacements (#5149) 2021-03-07 16:31:43 +00:00
Prefab.h Gen: Moved PiecePool into a separate file. 2017-05-04 09:49:30 +02:00
PrefabPiecePool.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
PrefabPiecePool.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
PrefabStructure.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
PrefabStructure.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
ProtIntGen.h Enable some more clang-tidy linter checks (#4738) 2020-05-14 22:15:35 +00:00
Ravines.cpp Some emplace_back replacements (#5149) 2021-03-07 16:31:43 +00:00
Ravines.h Using Super. 2020-04-16 20:07:48 +00:00
RoughRavines.cpp Fix debug macro situation (#5114) 2021-01-26 09:41:55 +00:00
RoughRavines.h Using Super. 2020-04-16 20:07:48 +00:00
ShapeGen.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
SinglePieceStructuresGen.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
SinglePieceStructuresGen.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
StructGen.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
StructGen.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
Trees.cpp Some emplace_back replacements (#5149) 2021-03-07 16:31:43 +00:00
Trees.h Add Mushrooms to Generator and fixed up the roofed forest (#5134) 2021-03-05 14:04:48 +01:00
TwoHeights.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
TwoHeights.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
VerticalLimit.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
VerticalLimit.h Gen: Moved PiecePool into a separate file. 2017-05-04 09:49:30 +02:00
VerticalStrategy.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
VerticalStrategy.h Gen: Moved PiecePool into a separate file. 2017-05-04 09:49:30 +02:00
VillageGen.cpp shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00
VillageGen.h shared_ptr -> unique_ptr in generators 2021-03-17 23:44:42 +00:00