Merge branch '1.21.1/dev' into 1.21.1/main

Author: MichaelHillcox

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Java CI - Build on Push
 
 on:
   push:
-    branches: [ main, dev, "1.*" ]
+    branches: [ main, dev, "1.**" ]
   workflow_dispatch:
     inputs:
       skip_maven_publish:

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2101.1.12]
+
+### Added
+* Added support for a user defined minimum `y` level to start the surface block scanning from. This allows the scanning to start from a `y` level other than the worlds lowest point.
+
 ## [2101.1.11]
 
 ### Added

common/src/main/java/dev/ftb/mods/ftbchunks/client/FTBChunksClientConfig.java

@@ -7,6 +7,7 @@
 import dev.ftb.mods.ftbchunks.client.map.MapMode;
 import dev.ftb.mods.ftbchunks.client.minimap.MinimapComponentConfig;
 import dev.ftb.mods.ftbchunks.client.minimap.components.*;
+import dev.ftb.mods.ftblibrary.config.Tristate;
 import dev.ftb.mods.ftblibrary.config.manager.ConfigManager;
 import dev.ftb.mods.ftblibrary.snbt.config.*;
 import net.minecraft.resources.ResourceLocation;
@@ -40,6 +41,8 @@ public interface FTBChunksClientConfig {
     IntValue WATER_VISIBILITY = APPEARANCE.addInt("water_visibility", 220, 0, 255).excluded().comment("Advanced option. Water visibility");
     IntValue GRASS_DARKNESS = APPEARANCE.addInt("grass_darkness", 50, 0, 255).excluded().comment("Advanced option. Grass darkness");
     IntValue FOLIAGE_DARKNESS = APPEARANCE.addInt("foliage_darkness", 50, 0, 255).excluded().comment("Advanced option. Foliage darkness");
+    BooleanValue USE_CUSTOM_MIN_Y_LEVEL = APPEARANCE.addBoolean("use_custom_min_y_level", false).excluded().comment("Advanced option. Use custom minimum Y level to scan when rendering map");
+    IntValue CUSTOM_MIN_Y_LEVEL = APPEARANCE.addInt("custom_min_y_level", 0, Short.MIN_VALUE, Short.MAX_VALUE).excluded().comment("Advanced option. Custom minimum Y level to scan when rendering map, used if use_custom_min_y_level is true");
 
     SNBTConfig WAYPOINTS = CONFIG.addGroup("waypoints", 1);
     BooleanValue IN_WORLD_WAYPOINTS = WAYPOINTS.addBoolean("in_world_waypoints", true).comment("Show waypoints in world");

common/src/main/java/dev/ftb/mods/ftbchunks/util/HeightUtils.java

@@ -1,6 +1,7 @@
 package dev.ftb.mods.ftbchunks.util;
 
 import dev.ftb.mods.ftbchunks.client.FTBChunksClient;
+import dev.ftb.mods.ftbchunks.client.FTBChunksClientConfig;
 import dev.ftb.mods.ftbchunks.core.BlockStateFTBC;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
@@ -39,7 +40,10 @@ public static int getHeight(Level level, @Nullable ChunkAccess chunkAccess, Bloc
 			return UNKNOWN;
 		}
 
-		int bottomY = chunkAccess.getMinBuildHeight();
+		int bottomY = FTBChunksClientConfig.USE_CUSTOM_MIN_Y_LEVEL.get()
+            ? FTBChunksClientConfig.CUSTOM_MIN_Y_LEVEL.get()
+            : chunkAccess.getMinBuildHeight();
+
 		int topY = pos.getY();
 		boolean hasCeiling = level.dimensionType().hasCeiling();
 		int currentWaterY = UNKNOWN;

gradle.properties

@@ -8,7 +8,7 @@ readable_name=FTB Chunks
 maven_group=dev.ftb.mods
 mod_author=FTB Team
 
-mod_version=2101.1.11
+mod_version=2101.1.12
 minecraft_version=1.21.1
 
 # Deps