Checks indicators

Author: Faboslav

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.22
+
+- Fixed actual use of structure set's "is_disabled" property (it was not used at all)
+- Added small check indicators to the structure button
+
 ## 2.0.21
 
 - Fixed compatibility with "Towns and Towers"

common/src/main/java/com/faboslav/structurify/common/config/client/gui/StructuresConfigScreen.java

@@ -205,8 +205,31 @@ private static Option<Boolean> addStructure(
 		String structureId,
 		HolderLookup.RegistryLookup<Biome> biomeRegistry
 	) {
+		var name = LanguageUtil.translateId("structure", structureId);
+		var flatnessCheck = !structureData.getFlatnessCheckData().isUsingDefaultValues() || structureData.getFlatnessCheckData().isOverridingGlobalFlatnessCheck();
+		var biomeCheck = !structureData.getBiomeCheckData().isUsingDefaultValues() || structureData.getBiomeCheckData().isOverridingGlobalBiomeCheck();
+		var overlapPreventionCheck = !structureData.getOverlapCheckData().isUsingDefaultValues() || structureData.getOverlapCheckData().isExcludedFromOverlapPrevention();
+		var distanceFromWorldCenterCheck = !structureData.getDistanceFromWorldCenterCheckData().isUsingDefaultValues() || structureData.getDistanceFromWorldCenterCheckData().isOverridingGlobalDistanceFromWorldCenter();
+
+
+		if(flatnessCheck) {
+			name.append(" \u26F0");
+		}
+
+		if(biomeCheck) {
+			name.append(" \u2663");
+		}
+
+		if(overlapPreventionCheck) {
+			name.append(" \u29C9");
+		}
+
+		if(distanceFromWorldCenterCheck) {
+			name.append(" \u2316");
+		}
+
 		var structureOptionBuilder = Option.<Boolean>createBuilder()
-			.name(LanguageUtil.translateId("structure", structureId))
+			.name(name)
 			.binding(
 				true,
 				() -> !structureData.isDisabled(),
@@ -234,6 +257,35 @@ private static Option<Boolean> addStructure(
 
 		structureOptionBuilder.description(v -> {
 			var descriptionBuilder = OptionDescription.createBuilder();
+			var hasChecks = flatnessCheck || biomeCheck || overlapPreventionCheck || distanceFromWorldCenterCheck;
+
+			if(hasChecks) {
+				descriptionBuilder.text(Component.translatable("gui.structurify.structures.checks_description").append(Component.literal("\n")));
+			}
+
+			if(!structureData.getFlatnessCheckData().isUsingDefaultValues() || structureData.getFlatnessCheckData().isOverridingGlobalFlatnessCheck()) {
+				descriptionBuilder.text(Component.literal("\u26F0 - ").append(Component.translatable("gui.structurify.structures.flatness_check")));
+				hasChecks = true;
+			}
+
+			if(!structureData.getBiomeCheckData().isUsingDefaultValues() || structureData.getBiomeCheckData().isOverridingGlobalBiomeCheck()) {
+				descriptionBuilder.text(Component.literal("\u2663 - ").append(Component.translatable("gui.structurify.structures.biome_check")));
+				hasChecks = true;
+			}
+
+			if(!structureData.getOverlapCheckData().isUsingDefaultValues() || structureData.getOverlapCheckData().isExcludedFromOverlapPrevention()) {
+				descriptionBuilder.text(Component.literal("\u29C9 - ").append(Component.translatable("gui.structurify.structures.overlap_check")));
+				hasChecks = true;
+			}
+
+			if(!structureData.getDistanceFromWorldCenterCheckData().isUsingDefaultValues() || structureData.getDistanceFromWorldCenterCheckData().isOverridingGlobalDistanceFromWorldCenter()) {
+				descriptionBuilder.text(Component.literal("\u2316 - ").append(Component.translatable("gui.structurify.structures.distance_from_world_center")));
+				hasChecks = true;
+			}
+
+			if(hasChecks) {
+				descriptionBuilder.text(Component.literal("\n"));
+			}
 
 			descriptionBuilder.text(Component.translatable("gui.structurify.structures.biomes_description").append(Component.literal("\n")));
 

common/src/main/java/com/faboslav/structurify/common/mixin/structure/StructureSetMixin.java

@@ -54,10 +54,13 @@ public abstract class StructureSetMixin implements StructurifyWithStructureSet
 				return this.structurify$structures;
 			}
 
-			var updatedStructures = new ArrayList<>(structures);
+			List<StructureSet.StructureSelectionEntry> updatedStructures;
 			var structureSetData = Structurify.getConfig().getStructureSetData().get(structureSetId);
 
-			if(!structureSetData.isDisabled()) {
+			if(structureSetData.isDisabled()) {
+				updatedStructures = new ArrayList<>();
+			} else {
+				updatedStructures = new ArrayList<>(structures);
 
 				for (var structureWeight : structureSetData.getStructureWeights().entrySet()) {
 					var structureId = structureWeight.getKey();

common/src/main/resources/assets/structurify/lang/en_us.json

@@ -23,26 +23,31 @@
 	"gui.structurify.structures.structure.description": "„%s“ structure settings",
 	"gui.structurify.structures.structure_set.title": "„%s“ structure set settings",
 	"gui.structurify.structures.structure_set.description": "„%s“ structure set settings",
+	"gui.structurify.structures.checks_description": "Structure has the following checks configured:",
 	"gui.structurify.structures.biomes_description": "Structure can be found in the following biomes:",
 	"gui.structurify.structures.warning": "Bear in mind that each structure may still be enabled or disabled by individual mods and datapacks.",
 	"gui.structurify.structures.structures.structure.title": "Structure settings",
+	"gui.structurify.structures.distance_from_world_center": "Distance from world center",
 	"gui.structurify.structures.distance_from_world_center_group.title": "Distance from world center settings",
 	"gui.structurify.structures.structure.override_global_distance_from_world_center.title": "Override global settings",
 	"gui.structurify.structures.structure.override_global_distance_from_world_center.description": "Whenever to override distance from world center from global or „%s“ namespace settings with specific settings of the „%s“ structure.",
 	"gui.structurify.structures.structure.min_distance_from_world_center.title": "Min. distance (in blocks)",
 	"gui.structurify.structures.structure.min_distance_from_world_center.description": "Structure will only generate if they are farther than specified distance from the world center.",
 	"gui.structurify.structures.structure.max_distance_from_world_center.title": "Max. distance (in blocks)",
 	"gui.structurify.structures.structure.max_distance_from_world_center.description": "Structure will only generate if they are closer than specified distance from the world center.",
+	"gui.structurify.structures.overlap_check": "Overlap prevention",
 	"gui.structurify.structures.overlap_check_group.title": "Overlap prevention settings",
 	"gui.structurify.structures.structure.exclude_from_overlap_prevention.title": "Exclude from overlap prevention",
 	"gui.structurify.structures.structure.exclude_from_overlap_prevention.description": "Whenever to exclude „%s“ namespace or structure from global overlap prevention.",
+	"gui.structurify.structures.flatness_check": "Flatness check",
 	"gui.structurify.structures.flatness_check_group.title": "Flatness check settings",
 	"gui.structurify.structures.structure.override_global_flatness_check.title": "Override global settings",
 	"gui.structurify.structures.structure.override_global_flatness_check.description": "Whenever to override flatness check from global or „%s“ namespace settings with specific settings of the „%s“ structure.",
 	"gui.structurify.structures.structure.enable_flatness_check.title": "Enable",
 	"gui.structurify.structures.structure.enable_flatness_check.description": "The structure will only generate if the terrain under the structure is flat.",
 	"gui.structurify.structures.structure.allow_non_solid_blocks_in_flatness_check.title": "Allow non solid blocks",
 	"gui.structurify.structures.structure.allow_non_solid_blocks_in_flatness_check.description": "Liquid, air and other \"special\" blocks will count as solid blocks and will not fail the check.",
+	"gui.structurify.structures.biome_check": "Biome check",
 	"gui.structurify.structures.biome_check_group.title": "Biome check settings",
 	"gui.structurify.structures.structure.detail_button.tooltip": "Opens „%s“ structure settings",
 	"gui.structurify.structures.structure_set.config_button.tooltip": "Opens „%s“ structure set settings",

gradle.properties

@@ -11,7 +11,7 @@ java.version=
 mod.name=Structurify
 mod.id=structurify
 mod.group=com.faboslav.structurify
-mod.version=2.0.21
+mod.version=2.0.22
 mod.author=Faboslav
 mod.description=Configuration mod that makes configuring everything related to structures very easy and accessible, eliminating the hassle of creating multiple datapacks.
 mod.license=CC-BY-NC-ND-4.0