🐛 Fix cube rotations in 1.21.6+ allowing rotation values outside the -45..45 degree range

Author: SnaveSutit

src/formats/blueprint/index.ts

@@ -146,6 +146,23 @@ export interface IBlueprintFormatJSON {
 	collections?: ICollectionJSON[]
 }
 
+export function fixCubeRotation(cube: Cube) {
+	const maxRotation = Math.max(...cube.rotation)
+	const minRotation = Math.min(...cube.rotation)
+	if (maxRotation <= 45 && minRotation >= -45) {
+		console.log('Cube rotation is fine, no need to fix', cube.rotation)
+		return
+	}
+	// Use the rotation with the largest absolute value
+	const rotation = Math.abs(maxRotation) >= Math.abs(minRotation) ? maxRotation : minRotation
+	const axis = cube.rotation.indexOf(rotation)
+
+	const previousSelected = Project!.selected_elements
+	Project!.selected_elements = [cube]
+	rotateOnAxis(() => rotation, axis, true)
+	Project!.selected_elements = previousSelected
+}
+
 //region > Convert
 export function convertToBlueprint() {
 	// Convert the current project to a Blueprint
@@ -278,6 +295,13 @@ export const BLUEPRINT_FORMAT = registerModelFormat(
 					component: ProjectTitleSvelte,
 					props: { pluginMode: project.pluginMode },
 				})
+
+				for (const cube of Cube.all) {
+					cube.setUVMode(false)
+					fixCubeRotation(cube)
+				}
+
+				Canvas.updateAll()
 			})
 		},
 

src/interface/dialog/blueprintSettings.ts

@@ -3,7 +3,7 @@ import { updateAllCubeOutlines } from 'src/mods/cube'
 import { SUPPORTED_MINECRAFT_VERSIONS } from 'src/systems/global'
 import BlueprintSettingsDialogSvelteComponent from '../../components/blueprintSettingsDialog.svelte'
 import { PACKAGE } from '../../constants'
-import { updateRotationLock } from '../../formats/blueprint'
+import { updateRotationConstraints } from '../../formats/blueprint'
 import { defaultValues, type ExportMode } from '../../formats/blueprint/settings'
 import { sanitizeStorageKey } from '../../util/minecraftUtil'
 import { Valuable } from '../../util/stores'
@@ -134,7 +134,7 @@ export function openBlueprintSettingsDialog() {
 		preventKeybinds: true,
 		onConfirm() {
 			setSettings(settings)
-			updateRotationLock()
+			updateRotationConstraints()
 			updateAllCubeOutlines()
 			Canvas.updateAll()
 		},

src/systems/util.ts

@@ -102,7 +102,11 @@ export function isCubeValid(cube: Cube): '1.21.6+' | 'valid' | 'invalid' {
 		totalRotation === cube.rotation[1] ||
 		totalRotation === cube.rotation[2]
 
-	if (isSingleAxisRotation && projectTargetVersionIsAtLeast('1.21.6')) return '1.21.6+'
+	if (isSingleAxisRotation && projectTargetVersionIsAtLeast('1.21.6')) {
+		// Rotation values still need to be within -45 and 45 degrees
+		if (totalRotation <= 45 && totalRotation >= -45) return '1.21.6+'
+		else return 'invalid'
+	}
 
 	const isRotationInAllowedSteps =
 		totalRotation === -45 ||