2.0.21

Author: Faboslav

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.21
+
+- Fixed compatibility with "Towns and Towers"
+
 ## 2.0.20
 
 - Ported to 26.1

common/src/main/java/com/faboslav/structurify/common/api/StructurifyChunkGenerator.java

@@ -8,6 +8,8 @@ public interface StructurifyChunkGenerator
 {
 	Map<Long, StructureSectionClaim> structurify$getStructureSectionClaims();
 
+	Map<Long, Boolean> structurify$getStructureChecks();
+
 	Map<Long, Boolean> structurify$getFlatnessChecks();
 
 	Map<Long, Boolean> structurify$getBiomeChecks();

common/src/main/java/com/faboslav/structurify/common/commands/StructurifyCommand.java

@@ -271,8 +271,6 @@ private static int getStructureList(CommandSourceStack source) {
 
 		var structureStarts = level.structureManager().startsForStructure(ChunkPosUtil.createChunkPos(commandPos), structure -> true).stream().filter(structureStart -> structureStart.getBoundingBox().inflatedBy(16).isInside(commandPos)).toList();
 
-		Structurify.getLogger().info("Found " + structureStarts.size() + " structures at " + commandPos);
-
 		if (structureStarts.isEmpty()) {
 			source.sendSuccess(() ->  Component.literal("There is no structures at ").append(getClickablePos(commandPos)).append(Component.literal(".")), !source.isPlayer());
 			return 1;

common/src/main/java/com/faboslav/structurify/common/config/data/WorldgenDataProvider.java

@@ -244,6 +244,21 @@ public static Map<String, StructureData> loadStructures() {
 				}
 			}
 
+			// Towns and Towers uses "fluid_springs" step for its structures
+			if(structureId.contains("towns_and_towers")) {
+				var flatnessCheckData = structureData.getFlatnessCheckData();
+				flatnessCheckData.defaultOverrideGlobalFlatnessCheck(false);
+				flatnessCheckData.overrideGlobalFlatnessCheck(false);
+				flatnessCheckData.defaultEnable(false);
+				flatnessCheckData.enable(false);
+
+				var biomeCheckData = structureData.getBiomeCheckData();
+				biomeCheckData.defaultOverrideGlobalBiomeCheck(false);
+				biomeCheckData.overrideGlobalBiomeCheck(false);
+				biomeCheckData.defaultEnable(false);
+				biomeCheckData.enable(false);
+			}
+
 			if(structureId.contains("aquamirae:") || (structureId.contains("minecells:") && !structureId.contains("minecells:overworld_portal"))) {
 				var overlapCheckData = structureData.getOverlapCheckData();
 				overlapCheckData.defaultExcludeFromOverlapPrevention(true);

common/src/main/java/com/faboslav/structurify/common/mixin/ChunkGeneratorMixin.java

@@ -35,6 +35,9 @@ public final class ChunkGeneratorMixin implements StructurifyChunkGenerator
 	@Unique
 	private final Map<Long, StructureSectionClaim> structurify$structureSectionClaims = new ConcurrentHashMap<>();
 
+	@Unique
+	private final Map<Long, Boolean> structurify$structureChecks = new ConcurrentHashMap<>();
+
 	@Unique
 	private final Map<Long, Boolean> structurify$flatnessChecks = new ConcurrentHashMap<>();
 
@@ -49,6 +52,11 @@ public final class ChunkGeneratorMixin implements StructurifyChunkGenerator
 		return this.structurify$structureSectionClaims;
 	}
 
+	@Unique
+	public Map<Long, Boolean> structurify$getStructureChecks() {
+		return this.structurify$structureChecks;
+	}
+
 	@Unique
 	public Map<Long, Boolean> structurify$getFlatnessChecks() {
 		return this.structurify$flatnessChecks;

common/src/main/java/com/faboslav/structurify/common/world/level/structure/checks/StructureChecker.java

@@ -6,7 +6,6 @@
 import com.faboslav.structurify.common.config.data.structure.FlatnessCheckData;
 import com.faboslav.structurify.common.config.data.structure.OverlapCheckData;
 import com.faboslav.structurify.common.util.ChunkPosUtil;
-import net.minecraft.core.BlockPos;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.LevelHeightAccessor;
@@ -40,29 +39,32 @@ public static boolean checkStructure(
 			return true;
 		}
 
-		BlockPos structureCenter = structureStart.getBoundingBox().getCenter();
-		long structureCheckId = generateStructureCheckId(structureId, structureCenter);
-		StructureCheckData structureCheckData = new StructureCheckData(structureCheckId, structureId, structure, structureStart);
+		long structureCheckId = generateStructureCheckId(structureId, structureStart.getChunkPos());
 		StructurifyChunkGenerator structurifyChunkGenerator = (StructurifyChunkGenerator) chunkGenerator;
 
-		boolean biomeCheckResult = structurifyChunkGenerator.structurify$getBiomeChecks().computeIfAbsent(structureCheckId, id -> checkBiomes(structureCheckData, biomeSource, randomState));
+		@Nullable Identifier finalStructureId = structureId;
+		return structurifyChunkGenerator.structurify$getStructureChecks().computeIfAbsent(structureCheckId, id -> {
+			StructureCheckData structureCheckData = new StructureCheckData(structureCheckId, finalStructureId, structure, structureStart);
 
-		if (!biomeCheckResult) {
-			return false;
-		}
-		boolean flatnessCheckResult = structurifyChunkGenerator.structurify$getFlatnessChecks().computeIfAbsent(structureCheckId, id -> checkFlatness(structureCheckData, chunkGenerator, heightAccessor, randomState));
+			boolean biomeCheckResult = structurifyChunkGenerator.structurify$getBiomeChecks().computeIfAbsent(structureCheckId, id2 -> checkBiomes(structureCheckData, biomeSource, randomState));
 
-		if (!flatnessCheckResult) {
-			return false;
-		}
+			if (!biomeCheckResult) {
+				return false;
+			}
 
-		boolean overlapCheckResult = structurifyChunkGenerator.structurify$getOverlapChecks().computeIfAbsent(structureCheckId, id -> checkOverlap(structureCheckData, structurifyChunkGenerator));
+			boolean flatnessCheckResult = structurifyChunkGenerator.structurify$getFlatnessChecks().computeIfAbsent(structureCheckId, id2 -> checkFlatness(structureCheckData, chunkGenerator, heightAccessor, randomState));
+			if (!flatnessCheckResult) {
+				return false;
+			}
 
-		if (!overlapCheckResult) {
-			return false;
-		}
+			boolean overlapCheckResult = structurifyChunkGenerator.structurify$getOverlapChecks().computeIfAbsent(structureCheckId, id2 -> checkOverlap(structureCheckData, structurifyChunkGenerator));
 
-		return true;
+			if (!overlapCheckResult) {
+				return false;
+			}
+
+			return true;
+		});
 	}
 
 	public static void debugCheckStructure(
@@ -78,8 +80,12 @@ public static void debugCheckStructure(
 		}
 
 		Identifier structureId = structure.structurify$getStructureIdentifier();
-		BlockPos structureCenter = structureStart.getBoundingBox().getCenter();
-		long structureCheckId = generateStructureCheckId(structureId, structureCenter);
+
+		if(structureId == null) {
+			return;
+		}
+
+		long structureCheckId = generateStructureCheckId(structureId, structureStart.getChunkPos());
 		StructureCheckData structureCheckData = new StructureCheckData(structureCheckId, structureId, structure, structureStart);
 
 		checkBiomes(structureCheckData, biomeSource, randomState);
@@ -164,14 +170,10 @@ private static boolean checkOverlap(
 		return true;
 	}
 
-	public static long generateStructureCheckId(Identifier structureId, BlockPos structureCenter) {
-		long structHash = structureId.hashCode();
-		structHash ^= (structHash >>> 33);
-		structHash *= 0xff51afd7ed558ccdL;
-		structHash ^= (structHash >>> 33);
-		structHash *= 0xc4ceb9fe1a85ec53L;
-		structHash ^= (structHash >>> 33);
+	public static long generateStructureCheckId(Identifier structureId, ChunkPos chunkPos) {
+		long structureHash = structureId.hashCode() & 0xffffffffL;
+		long chunkHash = ChunkPosUtil.getChunkPosAsLong(chunkPos);
 
-		return Long.rotateLeft(structHash, 23) ^ Long.rotateLeft(ChunkPosUtil.getChunkPosAsLong(ChunkPosUtil.createChunkPos(structureCenter.getX(), structureCenter.getZ())), 11);
+		return (structureHash << 32) ^ chunkHash;
 	}
 }

common/src/main/java/com/faboslav/structurify/common/world/level/structure/checks/StructureFlatnessCheck.java

@@ -66,7 +66,7 @@ public static boolean canDoFlatnessCheck(
 
 		var structureData = structure.structurify$getStructureData();
 
-		if(structureData == null) {
+		if (structureData == null) {
 			return false;
 		}
 

gradle.properties

@@ -11,7 +11,7 @@ java.version=
 mod.name=Structurify
 mod.id=structurify
 mod.group=com.faboslav.structurify
-mod.version=2.0.20
+mod.version=2.0.21
 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

settings.gradle.kts

@@ -12,7 +12,7 @@ pluginManagement {
 
 plugins {
 	id("dev.kikugie.stonecutter") version providers.gradleProperty("stonecutter_version").get()
-	id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+	id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 val commonVersions = providers.gradleProperty("stonecutter_enabled_common_versions").orNull?.split(",")?.map { it.trim() } ?: emptyList()