feat: adapt to 1.20.61(WIP)

Author: quizhizhe

src/more_dimensions/api/dimension/CustomDimensionManager.cpp

@@ -2,6 +2,9 @@
 #include "CustomDimensionManager.h"
 
 #include "more_dimensions/MoreDimenison.h"
+#include "more_dimensions/core/dimension/CustomDimensionConfig.h"
+#include "more_dimensions/core/dimension/FakeDimensionId.h"
+#include "more_dimensions/core/dimension/VanillaDimensionId2.h"
 
 #include "snappy.h"
 
@@ -12,15 +15,14 @@
 #include "ll/api/utils/StringUtils.h"
 
 #include "mc/deps/core/math/Vec3.h"
+#include "mc/server/DedicatedServer.h"
 #include "mc/server/PropertiesSettings.h"
 #include "mc/util/BidirectionalUnorderedMap.h"
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/level/Level.h"
 #include "mc/world/level/dimension/Dimension.h"
 #include "mc/world/level/dimension/VanillaDimensions.h"
 #include "mc/world/level/storage/LevelStorage.h"
-#include "more_dimensions/core/dimension/CustomDimensionConfig.h"
-#include "more_dimensions/core/dimension/FakeDimensionId.h"
 
 
 class Scheduler;
@@ -88,28 +90,20 @@ LL_TYPE_STATIC_HOOK(
     return {dimId};
 }
 
-LL_TYPE_STATIC_HOOK(
-    VanillaDimensionsToSerializedIntHook,
-    HookPriority::Normal,
-    VanillaDimensions,
-    VanillaDimensions::toSerializedInt,
-    int,
-    DimensionType const& dim
-) {
-    if (dim <= 2) return origin(dim);
-    return dim.id;
-}
-
-LL_TYPE_STATIC_HOOK(
-    VanillaDimensionsToStringHook,
-    HookPriority::Normal,
-    VanillaDimensions,
-    VanillaDimensions::toString,
-    std::string const,
-    DimensionType const& dim
-) {
-    return VanillaDimensions::DimensionMap().mLeft.at(dim);
-}
+// inline function use patch
+// -->PropertiesSettingsisClientSideGenEnabledHook
+//
+// LL_TYPE_STATIC_HOOK(
+//     VanillaDimensionsToSerializedIntHook,
+//     HookPriority::Normal,
+//     VanillaDimensions,
+//     VanillaDimensions::toSerializedInt,
+//     int,
+//     DimensionType const& dim
+// ) {
+//     if (dim <= 2) return origin(dim);
+//     return dim.id;
+// }
 
 // 当玩家加入服务器时，生成时的维度不存在，并且维度id不是Undefined时，把玩家放到主世界
 LL_TYPE_INSTANCE_HOOK(
@@ -135,11 +129,20 @@ LL_TYPE_INSTANCE_HOOK(
 LL_AUTO_TYPE_INSTANCE_HOOK(
     PropertiesSettingsisClientSideGenEnabledHook,
     HookPriority::Normal,
-    PropertiesSettings,
-    &PropertiesSettings::isClientSideGenEnabled,
-    bool
+    DedicatedServer,
+    &DedicatedServer::runDedicatedServerLoop,
+    DedicatedServer::StartResult,
+    Core::FilePathManager&              filePathManager,
+    PropertiesSettings&                 properties,
+    LevelSettings&                      settings,
+    AllowListFile&                      userAllowList,
+    std::unique_ptr<PermissionsFile>& permissionsFile,
+    Bedrock::ActivationArguments const& args,
+    TestConfig&                         testConfig
 ) {
-    return false;
+    properties.mClientSideGenerationEnabled = false;
+    injectNaticeCode();
+    return origin(filePathManager, properties, settings, userAllowList, permissionsFile, args, testConfig);
 }
 
 // 1.21.50.10 unnecessary
@@ -154,8 +157,7 @@ using HookReg = ll::memory::HookRegistrar<
     VanillaDimensionsConverHook,
     VanillaDimensionsFromSerializedIntHook,
     VanillaDimensionsFromSerializedIntHookI,
-    VanillaDimensionsToSerializedIntHook,
-    VanillaDimensionsToStringHook,
+    // VanillaDimensionsToSerializedIntHook,
     LevelStorageloadServerPlayerDataHook,
     PropertiesSettingsisClientSideGenEnabledHook>;
 

src/more_dimensions/api/dimension/SimpleCustomDimension.cpp

@@ -11,6 +11,7 @@
 #include "mc/common/Brightness.h"
 #include "mc/common/BrightnessPair.h"
 #include "mc/deps/core/math/Color.h"
+#include "mc/deps/core/string/HashedString.h"
 #include "mc/world/level/BlockSource.h"
 #include "mc/world/level/DimensionConversionData.h"
 #include "mc/world/level/Level.h"
@@ -28,7 +29,7 @@
 #include "mc/world/level/levelgen/flat/FlatWorldGenerator.h"
 #include "mc/world/level/levelgen/structure/EndCityFeature.h"
 #include "mc/world/level/levelgen/structure/StructureFeatureRegistry.h"
-#include "mc/world/level/levelgen/structure/registry//StructureSetRegistry.h"
+#include "mc/world/level/levelgen/structure/registry/StructureSetRegistry.h"
 #include "mc/world/level/levelgen/synth/PerlinNoise.h"
 #include "mc/world/level/levelgen/synth/PerlinSimplexNoise.h"
 #include "mc/world/level/levelgen/synth/SimplexNoise.h"
@@ -37,8 +38,11 @@
 #include "mc/world/level/levelgen/v1/TheEndGenerator.h"
 #include "mc/world/level/levelgen/v1/VoidGenerator.h"
 #include "mc/world/level/levelgen/v2/ChunkGeneratorStructureState.h"
+#include "mc/world/level/storage/Experiments.h"
 #include "mc/world/level/storage/LevelData.h"
 
+#include <memory>
+
 
 namespace more_dimensions {
 
@@ -117,30 +121,30 @@ CompoundTag SimpleCustomDimension::generateNewData(uint seed, GeneratorType gene
 
 void SimpleCustomDimension::init(br::worldgen::StructureSetRegistry const& structureSetRegistry) {
     loggerMoreDim.debug(__FUNCTION__);
-    setSkylight(false);
+    mHasSkylight = false;
     Dimension::init(structureSetRegistry);
 }
 
 std::unique_ptr<WorldGenerator>
 SimpleCustomDimension::createGenerator(br::worldgen::StructureSetRegistry const& structureSetRegistry) {
     loggerMoreDim.debug(__FUNCTION__);
-    auto& level     = getLevel();
+    auto& level     = mLevel;
     auto& levelData = level.getLevelData();
-    auto  biome     = level.getBiomeRegistry().lookupByName(levelData.getBiomeOverride());
+    auto  biome     = level.getBiomeRegistry().lookupByName(levelData.mBiomeOverride);
 
     std::unique_ptr<WorldGenerator> worldGenerator;
 
     switch (generatorType) {
     case GeneratorType::Overworld: {
         worldGenerator = std::make_unique<OverworldGeneratorMultinoise>(*this, LevelSeed64{seed}, biome);
-        worldGenerator->getStructureFeatureRegistry().mGeneratorState =
+        worldGenerator->mStructureFeatureRegistry->mGeneratorState =
             br::worldgen::ChunkGeneratorStructureState::createNormal(
                 seed,
                 worldGenerator->getBiomeSource(),
                 structureSetRegistry
             );
         overworldAddStructureFeatures(
-            worldGenerator->getStructureFeatureRegistry(),
+            *worldGenerator->mStructureFeatureRegistry,
             seed,
             false,
             levelData.getBaseGameVersion()
@@ -149,45 +153,46 @@ SimpleCustomDimension::createGenerator(br::worldgen::StructureSetRegistry const&
     }
     case GeneratorType::Nether: {
         worldGenerator = std::make_unique<NetherGenerator>(*this, seed, biome);
-        worldGenerator->getStructureFeatureRegistry().mGeneratorState =
+        worldGenerator->mStructureFeatureRegistry->mGeneratorState =
             br::worldgen::ChunkGeneratorStructureState::createNormal(
                 seed,
                 worldGenerator->getBiomeSource(),
                 structureSetRegistry
             );
         netherAddStructureFeatures(
-            worldGenerator->getStructureFeatureRegistry(),
+            *worldGenerator->mStructureFeatureRegistry,
             seed,
             levelData.getBaseGameVersion(),
-            levelData.getExperiments()
+            static_cast<Experiments&>(levelData.mExperiments.get())
         );
         break;
     }
     case GeneratorType::TheEnd: {
         worldGenerator = std::make_unique<TheEndGenerator>(*this, seed, biome);
-        worldGenerator->getStructureFeatureRegistry().mGeneratorState =
+        worldGenerator->mStructureFeatureRegistry->mGeneratorState =
             br::worldgen::ChunkGeneratorStructureState::createNormal(
                 seed,
                 worldGenerator->getBiomeSource(),
                 structureSetRegistry
             );
-        worldGenerator->getStructureFeatureRegistry().mStructureFeatures->emplace_back(
-            std::make_unique<EndCityFeature>(*this, seed)
-        );
+        
+        // worldGenerator->mStructureFeatureRegistry->mStructureFeatures->emplace_back(
+        //     std::make_unique<EndCityFeature>(*this, seed)
+        // );
         break;
     }
     case GeneratorType::Flat: {
-        worldGenerator = std::make_unique<FlatWorldGenerator>(*this, seed, levelData.getFlatWorldGeneratorOptions());
-        worldGenerator->getStructureFeatureRegistry().mGeneratorState =
+        worldGenerator = std::make_unique<FlatWorldGenerator>(*this, seed, levelData.mFlatworldGeneratorOptions);
+        worldGenerator->mStructureFeatureRegistry->mGeneratorState =
             br::worldgen::ChunkGeneratorStructureState::createFlat(seed, worldGenerator->getBiomeSource(), {});
         break;
     }
     default: {
         auto generator    = std::make_unique<VoidGenerator>(*this);
         generator->mBiome = level.getBiomeRegistry().lookupByHash(VanillaBiomeNames::Ocean());
         worldGenerator    = std::move(generator);
-        worldGenerator->getStructureFeatureRegistry().mGeneratorState =
-            br::worldgen::ChunkGeneratorStructureState::createVoid(seed);
+        worldGenerator->mStructureFeatureRegistry->mGeneratorState->mLevelSeed = seed;
+        worldGenerator->mStructureFeatureRegistry->mGeneratorState->mRingsSeed = seed;
     }
     }
     //    worldGenerator->init();
@@ -196,14 +201,14 @@ SimpleCustomDimension::createGenerator(br::worldgen::StructureSetRegistry const&
 
 void SimpleCustomDimension::upgradeLevelChunk(ChunkSource& cs, LevelChunk& lc, LevelChunk& generatedChunk) {
     loggerMoreDim.debug(__FUNCTION__);
-    auto blockSource = BlockSource(getLevel(), *this, cs, false, true, false);
+    auto blockSource = BlockSource(static_cast<Level&>(mLevel), *this, cs, false, true, false);
     VanillaLevelChunkUpgrade::_upgradeLevelChunkViaMetaData(lc, generatedChunk, blockSource);
     VanillaLevelChunkUpgrade::_upgradeLevelChunkLegacy(lc, blockSource);
 }
 
 void SimpleCustomDimension::fixWallChunk(ChunkSource& cs, LevelChunk& lc) {
     loggerMoreDim.debug(__FUNCTION__);
-    auto blockSource = BlockSource(getLevel(), *this, cs, false, true, false);
+    auto blockSource = BlockSource(static_cast<Level&>(mLevel), *this, cs, false, true, false);
     VanillaLevelChunkUpgrade::fixWallChunk(lc, blockSource);
 }
 
@@ -213,20 +218,14 @@ bool SimpleCustomDimension::levelChunkNeedsUpgrade(LevelChunk const& lc) const {
 }
 void SimpleCustomDimension::_upgradeOldLimboEntity(CompoundTag& tag, ::LimboEntitiesVersion vers) {
     loggerMoreDim.debug(__FUNCTION__);
-    auto isTemplate = getLevel().getLevelData().isFromWorldTemplate();
+    auto isTemplate = mLevel.getLevelData().mIsFromLockedTemplate;
     return VanillaLevelChunkUpgrade::upgradeOldLimboEntity(tag, vers, isTemplate);
 }
 
 Vec3 SimpleCustomDimension::translatePosAcrossDimension(Vec3 const& fromPos, DimensionType fromId) const {
     loggerMoreDim.debug(__FUNCTION__);
     Vec3 topos;
-    VanillaDimensions::convertPointBetweenDimensions(
-        fromPos,
-        topos,
-        fromId,
-        mId,
-        getLevel().getDimensionConversionData()
-    );
+    VanillaDimensions::convertPointBetweenDimensions(fromPos, topos, fromId, mId, mLevel.getDimensionConversionData());
     constexpr auto clampVal = 32000000.0f - 128.0f;
 
     topos.x = std::clamp(topos.x, -clampVal, clampVal);
@@ -237,7 +236,6 @@ Vec3 SimpleCustomDimension::translatePosAcrossDimension(Vec3 const& fromPos, Dim
 
 short SimpleCustomDimension::getCloudHeight() const { return 192; }
 
-bool SimpleCustomDimension::hasPrecipitationFog() const { return true; }
 
 std::unique_ptr<ChunkSource>
 SimpleCustomDimension::_wrapStorageForVersionCompatibility(std::unique_ptr<ChunkSource> cs, ::StorageVersion /*ver*/) {

src/more_dimensions/api/dimension/SimpleCustomDimension.h

@@ -44,6 +44,5 @@ class SimpleCustomDimension : public Dimension {
 
     MORE_DIMENSIONS_API short getCloudHeight() const override;
 
-    MORE_DIMENSIONS_API bool hasPrecipitationFog() const override;
 };
 } // namespace more_dimensions

src/more_dimensions/core/dimension/CustomDimensionConfig.cpp

@@ -20,7 +20,7 @@ void setDimensionConfigPath() {
     if (!ll::service::getLevel()) {
         throw std::runtime_error("Level nullptr");
     }
-    dimensionConfigPath /= ll::string_utils::str2u8str(ll::service::getPropertiesSettings()->getLevelName());
+    dimensionConfigPath /= ll::string_utils::str2u8str(ll::service::getPropertiesSettings()->mLevelName);
     dimensionConfigPath /= u8"dimension_config.json";
 }