fix: fix #21

Author: quizhizhe

src/more_dimensions/api/dimension/SimpleCustomDimension.cpp

@@ -1,6 +1,6 @@
 #include "SimpleCustomDimension.h"
 
-#include "more_dimensions/MoreDimenison.h"
+#include "more_dimensions/MoreDimension.h"
 
 #include "magic_enum.hpp"
 
@@ -15,14 +15,15 @@
 #include "mc/world/level/LevelSeed64.h"
 #include "mc/world/level/biome/registry/BiomeRegistry.h"
 #include "mc/world/level/biome/source/BiomeSource.h"
-#include "mc/world/level/biome/source/FixedBiomeSource.h"
 #include "mc/world/level/chunk/vanilla_level_chunk_upgrade/VanillaLevelChunkUpgrade.h"
 #include "mc/world/level/dimension/DimensionArguments.h"
 #include "mc/world/level/dimension/DimensionHeightRange.h"
 #include "mc/world/level/dimension/NetherBrightnessRamp.h"
 #include "mc/world/level/dimension/OverworldBrightnessRamp.h"
 #include "mc/world/level/dimension/VanillaDimensions.h"
 #include "mc/world/level/levelgen/flat/FlatWorldGenerator.h"
+#include "mc/world/level/levelgen/structure/EndCityFeature.h"
+#include "mc/world/level/levelgen/structure/StructureFeature.h"
 #include "mc/world/level/levelgen/structure/StructureFeatureRegistry.h"
 #include "mc/world/level/levelgen/structure/registry/StructureSetRegistry.h"
 #include "mc/world/level/levelgen/synth/SimplexNoise.h"
@@ -34,6 +35,9 @@
 #include "mc/world/level/storage/Experiments.h"
 #include "mc/world/level/storage/LevelData.h"
 
+#include "test/mc/FixedBiomeSource.h"
+
+
 #include <memory>
 #include <windows.h>
 
@@ -48,6 +52,8 @@ static auto* overworldAddress =
     "`anonymous namespace'::unity_5c986e6b9d6571cc96912b0bfa0329e2::addStructureFeatures"_symp;
 static auto* netherAddress = "`anonymous namespace'::unity_3da1d4c9fa90b4b1becbca96840255a5::addStructureFeatures"_symp;
 
+static DWORD endcitityAddress_rva = 0x0808E70;
+
 void overworldAddStructureFeatures(
     StructureFeatureRegistry& registry,
     uint                      seed,
@@ -77,27 +83,54 @@ void netherAddStructureFeatures(
         experiments
     );
 };
+
+void createEndCityFeature(StructureFeatureRegistry* _this, Dimension& dimension, uint& seed){
+
+    HMODULE hModule       = GetModuleHandle(NULL);
+    void*   endcitityAddress = (void*)((BYTE*)hModule + endcitityAddress_rva);
+    ll::memory::addressCall<EndCityFeature&, StructureFeatureRegistry*, Dimension&, uint&>(
+        endcitityAddress,
+        _this,
+        dimension,
+        seed
+    );
+};
 } // namespace
 
 // static ll::Logger loggerMoreDim("SimpleCustomDim");
-auto& loggerMoreDim = MoreDimenison::getInstance().getSelf().getLogger();
+auto& loggerMoreDim = MoreDimension::getInstance().getSelf().getLogger();
 
 SimpleCustomDimension::SimpleCustomDimension(std::string const& name, DimensionFactoryInfo const& info)
 : Dimension(DimensionArguments(std::move(info.arguments), info.dimId, {-64, 320}, name)) {
     loggerMoreDim.debug("{} dimension name:{}", __FUNCTION__, name);
     mDefaultBrightness->sky = Brightness::MAX();
-    generatorType           = *magic_enum::enum_cast<GeneratorType>((std::string_view)info.data["generatorType"]);
-    seed                    = info.data["seed"];
+
+    // Parse generatorType with error handling
+    auto generatorTypeOpt = magic_enum::enum_cast<GeneratorType>((std::string_view)info.data["generatorType"]);
+    if (!generatorTypeOpt.has_value()) {
+        loggerMoreDim.error(
+            "Invalid generatorType '{}' for dimension '{}', defaulting to Overworld",
+            std::string{info.data["generatorType"]},
+            name
+        );
+        generatorType = GeneratorType::Overworld;
+    } else {
+        generatorType = *generatorTypeOpt;
+    }
+
+    seed = info.data["seed"];
     switch (generatorType) {
     case GeneratorType::TheEnd: {
         mSeaLevel                = 63;
         mHasWeather              = false;
         mDimensionBrightnessRamp = std::make_unique<OverworldBrightnessRamp>();
+        break;
     }
     case GeneratorType::Nether: {
         mSeaLevel                = 32;
         mHasWeather              = false;
         mDimensionBrightnessRamp = std::make_unique<NetherBrightnessRamp>();
+        break;
     }
     default:
         mSeaLevel                = 63;
@@ -175,6 +208,7 @@ SimpleCustomDimension::createGenerator(br::worldgen::StructureSetRegistry const&
         // worldGenerator->mStructureFeatureRegistry->mStructureFeatures->emplace_back(
         //     std::make_unique<EndCityFeature>(*this, seed)
         // );
+        createEndCityFeature(worldGenerator->mStructureFeatureRegistry.get(), *this, seed);
         break;
     }
     case GeneratorType::Flat: {
@@ -184,11 +218,12 @@ SimpleCustomDimension::createGenerator(br::worldgen::StructureSetRegistry const&
         break;
     }
     default: {
-        auto generator    = std::make_unique<VoidGenerator>(*this);
-        generator->mBiome = level.getBiomeRegistry().lookupByName("minecraft:ocean");
-        worldGenerator    = std::move(generator);
-        worldGenerator->mStructureFeatureRegistry->mGeneratorState->mLevelSeed = seed;
-        worldGenerator->mStructureFeatureRegistry->mGeneratorState->mRingsSeed = seed;
+        auto generator          = std::make_unique<VoidGenerator>(*this);
+        generator->mBiome       = level.getBiomeRegistry().lookupByName("minecraft:ocean");
+        generator->mBiomeSource = std::make_unique<FixedBiomeSource>(*generator->mBiome);
+        worldGenerator          = std::move(generator);
+        worldGenerator->mStructureFeatureRegistry->mGeneratorState =
+            br::worldgen::ChunkGeneratorStructureState::createFlat(seed, worldGenerator->getBiomeSource(), {});
     }
     }
     //    worldGenerator->init();

src/test/mc/FixedBiomeSource.h

@@ -28,8 +28,7 @@ class FixedBiomeSource : public ::BiomeSource {
 public:
     // prevent constructor by default
 
-    FixedBiomeSource(Biome const& biome) : mFixedBiome(biome){};
-
+    FixedBiomeSource(Biome const& biome) : mFixedBiome(biome) {};
 public:
     // virtual functions
     // NOLINTBEGIN