2.0.25 #2

Author: Faboslav

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - Fixed biome loading
 - Fixed crash related to loading of modded jigsaw structures
+- Fixed flatness check not working correctly for very small structures
 
 ## 2.0.24
 

buildSrc/src/main/kotlin/multiloader-common.gradle.kts

@@ -91,18 +91,17 @@ repositories {
 		}
 	}
 
-	exclusiveContent {
-		forRepositories(
-			maven("https://maven.isxander.dev/releases") {
-				name = "isXander Releases"
-			},
-			maven("https://maven.isxander.dev/snapshots") {
-				name = "isXander Snapshots"
-			}
-		)
-		filter {
+	maven("https://maven.isxander.dev/releases") {
+		name = "isXander Releases"
+		content {
+			includeGroupAndSubgroups("dev.isxander")
+		}
+	}
+
+	maven("https://maven.isxander.dev/snapshots") {
+		name = "isXander Snapshots"
+		content {
 			includeGroupAndSubgroups("dev.isxander")
-			includeGroupAndSubgroups("org.quiltmc.parsers")
 		}
 	}
 
@@ -114,6 +113,7 @@ repositories {
 		}
 		filter {
 			includeGroupAndSubgroups("org.quiltmc")
+			includeGroupAndSubgroups("org.quiltmc.parsers")
 		}
 	}
 
@@ -182,6 +182,29 @@ repositories {
 			includeGroupByRegex(".*")
 		}
 	}
+
+	exclusiveContent {
+		forRepository {
+			maven("https://maven.blamejared.com") {
+				name = "BlameJared"
+			}
+		}
+		filter {
+			includeGroupAndSubgroups("net.darkhax")
+			includeGroupAndSubgroups("mezz.jei")
+		}
+	}
+
+	exclusiveContent {
+		forRepository {
+			maven("https://nexus.resourcefulbees.com/repository/telepathicgrunt/") {
+				name = "TelepathicGrunt"
+			}
+		}
+		filter {
+			includeGroup("com.telepathicgrunt")
+		}
+	}
 }
 
 tasks {

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

@@ -16,7 +16,7 @@ public final class StructurePieceSampler
 	public static List<StructurePiece> getStructurePieces(StructureStart structureStart) {
 		List<StructurePiece> structurePieces = structureStart.getPieces();
 
-		if (Structurify.getConfig().getDebugData().getSamplingMode() == DebugData.SamplingMode.MINIMAL) {
+		if (Structurify.getConfig().getDebugData().isEnabled() && Structurify.getConfig().getDebugData().getSamplingMode() == DebugData.SamplingMode.MINIMAL) {
 			return structurePieces;
 		}
 
@@ -32,13 +32,13 @@ public static int[][] getStructurePieceSamples(List<StructurePiece> structurePie
 
 		int[][] pieceSamples = getStructurePieceCorners(structurePieces);
 
-		if (Structurify.getConfig().getDebugData().getSamplingMode() == DebugData.SamplingMode.MINIMAL) {
+		if (Structurify.getConfig().getDebugData().isEnabled() && Structurify.getConfig().getDebugData().getSamplingMode() == DebugData.SamplingMode.MINIMAL) {
 			return pieceSamples;
 		}
 
 		pieceSamples = mergeTouchingPositions(pieceSamples);
 
-		if (Structurify.getConfig().getDebugData().getSamplingMode() == DebugData.SamplingMode.MERGED_SAMPLES) {
+		if (Structurify.getConfig().getDebugData().isEnabled() && Structurify.getConfig().getDebugData().getSamplingMode() == DebugData.SamplingMode.MERGED_SAMPLES) {
 			return pieceSamples;
 		}
 
@@ -105,18 +105,22 @@ private static int[][] getStructurePieceCorners(List<StructurePiece> pieces) {
 	private static int[][] mergeTouchingPositions(int[][] inputPositions) {
 		Set<Long> uniqueKeys = new HashSet<>();
 		List<int[]> uniquePositions = new ArrayList<>();
+
 		for (int[] position : inputPositions) {
-			long key = ChunkPosUtil.getChunkPosAsLong( ChunkPosUtil.createChunkPos(position[0], position[1]));
+			long key = (((long) position[0]) << 32) ^ (position[1] & 0xFFFFFFFFL);
+
 			if (uniqueKeys.add(key)) {
-				uniquePositions.add(position);
+				uniquePositions.add(new int[] { position[0], position[1] });
 			}
 		}
 
 		List<int[]> mergedPositions = new ArrayList<>();
 		boolean[] visited = new boolean[uniquePositions.size()];
 
 		for (int i = 0; i < uniquePositions.size(); i++) {
-			if (visited[i]) continue;
+			if (visited[i]) {
+				continue;
+			}
 
 			List<int[]> group = new ArrayList<>();
 			Queue<Integer> queue = new ArrayDeque<>();
@@ -129,39 +133,52 @@ private static int[][] mergeTouchingPositions(int[][] inputPositions) {
 				group.add(current);
 
 				for (int j = 0; j < uniquePositions.size(); j++) {
-					if (visited[j]) continue;
+					if (visited[j]) {
+						continue;
+					}
+
 					int[] candidate = uniquePositions.get(j);
 
-					if (Math.abs(candidate[0] - current[0]) <= 1 &&
-						Math.abs(candidate[1] - current[1]) <= 1) {
+					if (Math.abs(candidate[0] - current[0]) <= 1 && Math.abs(candidate[1] - current[1]) <= 1) {
 						visited[j] = true;
 						queue.add(j);
 					}
 				}
 			}
 
-			int[] best = group.get(0);
-			double bestDistance = Double.MAX_VALUE;
+			int minX = Integer.MAX_VALUE;
+			int minZ = Integer.MAX_VALUE;
+			int maxX = Integer.MIN_VALUE;
+			int maxZ = Integer.MIN_VALUE;
+
+			for (int[] position : group) {
+				minX = Math.min(minX, position[0]);
+				minZ = Math.min(minZ, position[1]);
+				maxX = Math.max(maxX, position[0]);
+				maxZ = Math.max(maxZ, position[1]);
+			}
 
-			double avgX = group.stream().mapToInt(p -> p[0]).average().orElse(0);
-			double avgZ = group.stream().mapToInt(p -> p[1]).average().orElse(0);
+			int centerX = Math.floorDiv(minX + maxX, 2);
+			int centerZ = Math.floorDiv(minZ + maxZ, 2);
+
+			int[] best = group.get(0);
+			long bestDistance = Long.MAX_VALUE;
 
-			for (int[] pos : group) {
-				double dx = pos[0] - avgX;
-				double dz = pos[1] - avgZ;
-				double dist = dx * dx + dz * dz;
+			for (int[] position : group) {
+				long dx = position[0] - centerX;
+				long dz = position[1] - centerZ;
+				long distance = dx * dx + dz * dz;
 
-				if (dist < bestDistance ||
-					(dist == bestDistance && (pos[0] < best[0] || (pos[0] == best[0] && pos[1] < best[1])))) {
-					best = pos;
-					bestDistance = dist;
+				if (distance < bestDistance || distance == bestDistance && (position[0] < best[0] || position[0] == best[0] && position[1] < best[1])) {
+					best = position;
+					bestDistance = distance;
 				}
 			}
 
-			mergedPositions.add(best);
+			mergedPositions.add(new int[] { best[0], best[1] });
 		}
 
-		return mergedPositions.toArray(new int[mergedPositions.size()][]);
+		return mergedPositions.toArray(new int[0][]);
 	}
 
 	private static int[][] orderStructureCornersByDistance(int[][] samples, BlockPos structureCenter) {

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

@@ -14,7 +14,7 @@ public record StructureFlatnessCheckOverview(
 	int minHeight,
 	int maxHeight,
 	int flatnessCheckThreshold,
-	int nonSolidChecks,
+	int totalFlatnessChecks,
 	int failedNonSolidChecks,
 	int nonSolidFlatnessChecksThreshold,
 	boolean result
@@ -25,7 +25,7 @@ public String toString() {
 		return structureId + "\n" +
 			   "Pieces: " + structurePieces.size() + " (area: " + structureArea + ")\n" +
 			   "Height threshold: " + flatnessCheckThreshold + " (min Y: " + minHeight + ", max Y: " + maxHeight + ", diff: " + (maxHeight - minHeight) +")\n" +
-			   "Non solid checks: " + nonSolidChecks + "\n" +
+			   "Total checks: " + totalFlatnessChecks + "\n" +
 			   "Failed checks: " + failedNonSolidChecks + "/" + nonSolidFlatnessChecksThreshold + "\n" +
 			   "Result: " + (result ? "success":"fail");
 	}