fix: World borders now work with base presets

Author: BlueStaggo

src/main/java/mod/bluestaggo/modernerbeta/api/level/chunk/ChunkProviderNoise.java

@@ -82,7 +82,7 @@ public ChunkProviderNoise(ModernBetaChunkGenerator chunkGenerator, long seed) {
         this.islesProperties = this.getChunkSettings().getOrDefault(SettingsComponentTypes.ISLES_PROPERTIES);
         this.noiseScale = this.getChunkSettings().getOrDefault(SettingsComponentTypes.NOISE_SCALE);
         this.noiseSlide = this.getChunkSettings().getOrElse(SettingsComponentTypes.NOISE_SLIDE, NoiseSlide.DISABLED);
-        this.worldBorderLocation = this.getChunkSettings().getOrElse(SettingsComponentTypes.WORLD_BORDER, WorldBorderLocation.DEFAULT);
+        this.worldBorderLocation = this.getChunkSettings().getOrDefault(SettingsComponentTypes.WORLD_BORDER);
 
         this.worldMinY = noiseSettings.minY();
         this.worldHeight = noiseSettings.height();

src/main/java/mod/bluestaggo/modernerbeta/level/biome/injector/BiomeInjector.java

@@ -47,9 +47,10 @@ public BiomeInjector(ModernBetaChunkGenerator modernBetaChunkGenerator, ModernBe
         this.modernBetaChunkGenerator = modernBetaChunkGenerator;
         this.modernBetaBiomeSource = modernBetaBiomeSource;
 
-        ModernBetaSettings settingsBiome;
-        settingsBiome = this.modernBetaBiomeSource.getBiomeSettings()
+        ModernBetaSettings settingsBiome = this.modernBetaBiomeSource.getBiomeSettings()
             .mapPreset(modernBetaChunkGenerator.getPresetRegistry(), ModernBetaSettingsPreset::biomeSettings);
+        ModernBetaSettings settingsChunk = this.modernBetaChunkGenerator.getChunkSettings()
+            .mapPreset(modernBetaChunkGenerator.getPresetRegistry(), ModernBetaSettingsPreset::chunkSettings);
 
         boolean useOceanBiomes = settingsBiome.getOrDefault(SettingsComponentTypes.USE_OCEAN_BIOMES);
         BiomeInjectionThresholds thresholds = settingsBiome.getOrDefault(SettingsComponentTypes.BIOME_INJECTION_THRESHOLDS);
@@ -63,7 +64,7 @@ public BiomeInjector(ModernBetaChunkGenerator modernBetaChunkGenerator, ModernBe
         Predicate<BiomeInjectionContext> deepOceanPredicate = context -> 
             modernBetaBiomeSource.hasOceanBiomes() && this.atOceanDepth(context.topHeight, thresholds.deepOceanDepth());
 
-        WorldBorderLocation worldBorderLocation = modernBetaChunkGenerator.getChunkSettings().getOrDefault(SettingsComponentTypes.WORLD_BORDER);
+        WorldBorderLocation worldBorderLocation = settingsChunk.getOrDefault(SettingsComponentTypes.WORLD_BORDER);
         Predicate<BiomeInjectionContext> outOfBoundsPredicate = context ->
             !worldBorderLocation.containsPoint(context.getX(), context.getZ());
 

src/main/java/mod/bluestaggo/modernerbeta/mixin/MinecraftServerMixin.java

@@ -108,7 +108,7 @@ private static BlockPos redirectPlayerSpawnFinder(ServerLevel level, ChunkPos ch
             ChunkProviderFinite.resetPhase();
         }
 
-        WorldBorderLocation worldBorderLocation = modernBetaChunkGenerator.getChunkSettings().getOrDefault(SettingsComponentTypes.WORLD_BORDER);
+        WorldBorderLocation worldBorderLocation = chunkProvider.getChunkSettings().getOrDefault(SettingsComponentTypes.WORLD_BORDER);
         if (worldBorderLocation.enabled()) {
             WorldBorder worldBorder = level.getWorldBorder();
             int width = worldBorderLocation.width();