* 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>
* When the cause of destruction was world-induced (CanBeAt check failed) there is no tool. Pass the nullptr directly to ConvertToPickups and let it handle it.
* Fixes#4795
- Remove unused a_Digger parameter to ConvertToPickups.
This is only overridden false in Vines and Snow. It is called when a CanBeAt check fails, to determine whether DropBlockAsPickups is called. However, Vines and Snow already drop nothing without the right tool, so this function is superfluous.
* upgraded to new C++ for loops and fixed errors
* readded delete instruction
* now using unique ptr
* added test for text only (that was causing an error for me)
* using unique ptr constructor
* added move constructor and deleted copy constructor
* fixed deconstuctor
http prefixes are constexpr and std::string_view
* fixed whitespace
Co-authored-by: 12xx12 <12xx12100@gmail.com>
* cBlockInfo: further cleanup
+ Use switch statements instead of lookup in dynamically initialised arrays
- Remove some deprecated bindings
* Update Stubs removing references to BlockInfoArray
Construct paths relative to the Cuberite sources with PROJECT_SOURCE_DIR, instead of wherever the first CMakeLists.txt file happened to be with CMAKE_SOURCE_DIR.
In Android's case, the latter was in a folder called android/ but that's not the root of the source tree, so any file path built off that root was wrong. This caused file-specific warnings exclusions to fail to apply.
* BlockHandler initialisation is a constant expression
If we can't make it all namespaces, this is the next best I guess.
+ Tag handlers constexpr, const as needed
+ Inherit constructors
* Privatise handler functions
* More constexpr
Co-authored-by: Alexander Harkness <me@bearbin.net>
* 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>
Closes#4708
This updates jsoncpp, mbedtls, TCLAP and SQLiteCpp to their latest stable release. A few additional changes were needed:
* jsoncpp deprecated Reader, FastWriter and StyledWriter which I've replaced
with some helper functions in JsonUtils.cpp
* SQLiteCpp changed how it builds with external sqlite libraries, now expecting
them to be installed. The simplest path was to remove sqlite from cuberite's
submodule and just use SQLiteCpp's internal version.
The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change)
The BlockInfo.h file was removed from Globals.h (main change)
The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics)
The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor)
Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header.
That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified.
eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values
This finally restores my ability to compile on Windows and Linux from the same source folder (on a network drive).
LibEvent broke this long ago by writing a config file into the source folder, rather than build folder. Now it's finally fixed.
Closes#1244
Initially I was just going to add the cChunkData to cSetChunkData but profiling revealed
that the copying wasn't even the biggest slowdown. Much more time was being spent in
cChunk::CreateBlockEntities and cChunk::WakeUpSimulators than was in memcpy so I've made
those significantly faster as well.
Optimisations performed:
* cSetChunkData now stores blocks in a cChunkData object
* cChunkData objects can now perform moves even if they are using different pools
* cChunk::CreateBlockEntities now iterates in the correct order and only over present chunk sections
* Similarly for cChunk::WakeUpSimulators
* cSetChunkData::CalculateHeightMap now shortcuts to the highest present chunk section before checking blocks directly
Fixes#4040
* The TCP connection is now shutdown after OnBodyFinished
* Any open connections are closed when cNetworkSingleton::Terminate() is called.
* Removed ownership cycles in cUrlClientRequest
* Added a check to the test to ensure there are no leaks.
* Fixes a number of "<function>: not all control paths return a value" warnings on MSVC.
* Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults.
* Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message()