❗ Remove advanced folders

Animated-Java · Jan 11, 2025 · 85a9db4 · 85a9db4
1 parent 91dd41b
commit 85a9db4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 69 deletions.
diff --git a/src/blueprintSettings.ts b/src/blueprintSettings.ts
@@ -17,11 +17,7 @@ export const defaultValues = {
 	display_item: 'minecraft:white_dye',
 	custom_model_data_offset: 0,
 	enable_advanced_resource_pack_settings: false,
-	enable_advanced_resource_pack_folders: false,
 	resource_pack: '',
-	display_item_path: '',
-	model_folder: '',
-	texture_folder: '',
 	// Data Pack Settings
 	enable_advanced_data_pack_settings: false,
 	data_pack: '',

diff --git a/src/components/blueprintSettingsDialog.svelte b/src/components/blueprintSettingsDialog.svelte
@@ -53,11 +53,7 @@
 	export let displayItem: Valuable<string>
 	export let customModelDataOffset: Valuable<number>
 	export let enableAdvancedResourcePackSettings: Valuable<boolean>
-	export let enableAdvancedResourcePackFolders: Valuable<boolean>
 	export let resourcePack: Valuable<string>
-	export let displayItemPath: Valuable<string>
-	export let modelFolder: Valuable<string>
-	export let textureFolder: Valuable<string>
 	// Data Pack Settings
 	// export let enableAdvancedDataPackSettings: Valuable<boolean>
 	export let dataPack: Valuable<string>
@@ -631,53 +627,13 @@
 			{/if}
 
 			{#if $resourcePackExportMode === 'raw'}
-				<Checkbox
-					label={translate(
-						'dialog.blueprint_settings.enable_advanced_resource_pack_folders.title',
-					)}
-					bind:checked={enableAdvancedResourcePackFolders}
-					defaultValue={defaultValues.enable_advanced_resource_pack_folders}
+				<FolderSelect
+					label={translate('dialog.blueprint_settings.resource_pack.title')}
+					tooltip={translate('dialog.blueprint_settings.resource_pack.description')}
+					bind:value={resourcePack}
+					defaultValue={defaultValues.resource_pack}
+					valueChecker={resourcePackFolderChecker}
 				/>
-
-				{#if $enableAdvancedResourcePackFolders}
-					<p class="warning">
-						{translate('dialog.blueprint_settings.advanced_settings_warning')}
-					</p>
-
-					<FileSelect
-						label={translate('dialog.blueprint_settings.display_item_path.title')}
-						tooltip={translate(
-							'dialog.blueprint_settings.display_item_path.description',
-						)}
-						bind:value={displayItemPath}
-						defaultValue={defaultValues.display_item_path}
-						valueChecker={advancedResourcePackFileChecker}
-					/>
-
-					<FolderSelect
-						label={translate('dialog.blueprint_settings.model_folder.title')}
-						tooltip={translate('dialog.blueprint_settings.model_folder.description')}
-						bind:value={modelFolder}
-						defaultValue={defaultValues.model_folder}
-						valueChecker={advancedResourcePackFolderChecker}
-					/>
-
-					<FolderSelect
-						label={translate('dialog.blueprint_settings.texture_folder.title')}
-						tooltip={translate('dialog.blueprint_settings.texture_folder.description')}
-						bind:value={textureFolder}
-						defaultValue={defaultValues.texture_folder}
-						valueChecker={advancedResourcePackFolderChecker}
-					/>
-				{:else}
-					<FolderSelect
-						label={translate('dialog.blueprint_settings.resource_pack.title')}
-						tooltip={translate('dialog.blueprint_settings.resource_pack.description')}
-						bind:value={resourcePack}
-						defaultValue={defaultValues.resource_pack}
-						valueChecker={resourcePackFolderChecker}
-					/>
-				{/if}
 			{:else if $resourcePackExportMode === 'zip'}
 				<FileSelect
 					label={translate('dialog.blueprint_settings.resource_pack_zip.title')}

diff --git a/src/interface/dialog/blueprintSettings.ts b/src/interface/dialog/blueprintSettings.ts
@@ -48,13 +48,7 @@ function getSettings() {
 		enableAdvancedResourcePackSettings: new Valuable(
 			Project!.animated_java.enable_advanced_resource_pack_settings
 		),
-		enableAdvancedResourcePackFolders: new Valuable(
-			Project!.animated_java.enable_advanced_resource_pack_folders
-		),
 		resourcePack: new Valuable(Project!.animated_java.resource_pack),
-		displayItemPath: new Valuable(Project!.animated_java.display_item_path),
-		modelFolder: new Valuable(Project!.animated_java.model_folder),
-		textureFolder: new Valuable(Project!.animated_java.texture_folder),
 		// Data Pack Settings
 		enableAdvancedDataPackSettings: new Valuable(
 			Project!.animated_java.enable_advanced_data_pack_settings
@@ -97,12 +91,7 @@ function setSettings(settings: ReturnType<typeof getSettings>) {
 	Project.animated_java.custom_model_data_offset = settings.customModelDataOffset.get()
 	Project.animated_java.enable_advanced_resource_pack_settings =
 		settings.enableAdvancedResourcePackSettings.get()
-	Project.animated_java.enable_advanced_resource_pack_folders =
-		settings.enableAdvancedResourcePackFolders.get()
 	Project.animated_java.resource_pack = settings.resourcePack.get()
-	Project.animated_java.display_item_path = settings.displayItemPath.get()
-	Project.animated_java.model_folder = settings.modelFolder.get()
-	Project.animated_java.texture_folder = settings.textureFolder.get()
 	// Data Pack Settings
 	Project.animated_java.enable_advanced_data_pack_settings =
 		settings.enableAdvancedDataPackSettings.get()

diff --git a/src/systems/exporter.ts b/src/systems/exporter.ts
@@ -37,10 +37,6 @@ export function getExportPaths() {
 			'assets/minecraft/models/item/',
 			aj.display_item.split(':').at(-1)! + '.json'
 		)
-	} else if (aj.enable_advanced_resource_pack_folders) {
-		modelExportFolder = aj.model_folder
-		textureExportFolder = aj.texture_folder
-		displayItemPath = aj.display_item_path
 	} else {
 		modelExportFolder = PathModule.join(
 			resourcePackFolder,