From 804b6956a5e80dcb0b0f4926fcbe430dd8afeeea Mon Sep 17 00:00:00 2001 From: SnaveSutit Date: Sun, 19 Jan 2025 16:40:43 -0500 Subject: [PATCH 01/56] =?UTF-8?q?=F0=9F=9A=A7=20Major=20source=20reorganiz?= =?UTF-8?q?ation,=20and=20new=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/impulse_command_block.png | Bin 0 -> 21623 bytes src/assets/mc-build-base.tmLanguage.json | 942 ++++++++++++++++++ src/assets/mcfunction.tmLanguage.json | 686 +++++++++++++ src/assets/papermc.svg | 1 + src/blueprintFormat.ts | 2 + src/blueprintSettings.ts | 20 +- src/components/blueprintSettingsDialog.svelte | 881 ---------------- .../dialogItems/dialogItemUtil.d.ts | 5 - .../dialogItems/numberSlider.svelte | 85 -- src/index.ts | 8 +- src/interface/animatedJavaBarItem.ts | 142 ++- src/interface/changelogDialog.ts | 2 +- src/interface/dialog/about.ts | 2 +- src/interface/dialog/animationProperties.ts | 2 +- src/interface/dialog/blueprintSettings.ts | 128 --- src/interface/dialog/boneConfig.ts | 2 +- src/interface/dialog/changelog.ts | 2 +- src/interface/dialog/exportProgress.ts | 2 +- src/interface/dialog/locatorConfig.ts | 2 +- src/interface/dialog/textDisplayConfig.ts | 2 +- src/interface/dialog/unexpectedError.ts | 2 +- .../dialog/vanillaBlockDisplayConfig.ts | 2 +- .../dialog/vanillaItemDisplayConfig.ts | 2 +- src/interface/dialog/variantConfig.ts | 2 +- src/interface/importAJModelLoader.ts | 6 +- src/interface/index.ts | 1 - src/interface/keyframeEasings.ts | 2 +- src/interface/panel/customKeyframe.ts | 2 +- src/interface/panel/textDisplayElement.ts | 2 +- .../panel/vanillaBlockDisplayElement.ts | 2 +- .../panel/vanillaItemDisplayElement.ts | 2 +- src/interface/panel/variants.ts | 2 +- src/interface/popup/animatedJavaLoading.ts | 2 +- src/interface/popup/blueprintLoading.ts | 2 +- src/interface/popup/incompatabilityPopup.ts | 2 +- src/interface/popup/installed.ts | 2 +- src/lang/en.yml | 83 ++ src/mods/formatIconMod.ts | 2 +- src/mods/index.ts | 1 + src/mods/pluginsDialogMod.ts | 2 +- src/mods/prismMod.ts | 351 +++++++ src/mods/projectSettingsActionOverride.ts | 2 +- src/svelte/about.svelte | 209 ++++ .../animatedJavaLoadingPopup.svelte | 0 .../animationProperties.svelte | 10 +- .../blueprintLoadingPopup.svelte | 0 src/svelte/blueprintSettings/index.ts | 109 ++ .../blueprintSettings/pages/datapack.svelte | 217 ++++ .../blueprintSettings/pages/general.svelte | 211 ++++ .../blueprintSettings/pages/plugin.svelte | 45 + .../pages/resourcepack.svelte | 157 +++ .../requiredAsteriskInform.svelte | 12 + .../boneConfigDialog.svelte | 14 +- .../changelogDialog.svelte | 0 .../dialogItems/baseDialogItem.svelte | 34 +- .../components/dialogItems/checkbox.svelte | 2 +- .../components/dialogItems/codeInput.svelte | 2 +- .../components/dialogItems/collection.svelte | 2 +- .../components/dialogItems/colorPicker.svelte | 4 +- .../dialogItems/dialogItemUtil.d.ts | 10 + .../components/dialogItems/fileSelect.svelte | 2 +- .../dialogItems/folderSelect.svelte | 2 +- .../components/dialogItems/lineInput.svelte | 2 +- .../dialogItems/numberSlider.svelte | 76 ++ .../dialogItems/sectionHeader.svelte | 0 .../components/dialogItems/select.svelte | 9 +- .../components/dialogItems/vector2d.svelte | 16 +- .../components/dialogItems/vector3d.svelte | 16 +- .../baseSidebarDialogItem.svelte | 112 +++ .../sidebarDialogItems/boxSelect.svelte | 89 ++ .../sidebarDialogItems/checkbox.svelte | 31 + .../sidebarDialogItems/codeBox.svelte | 136 +++ .../sidebarDialogItems/fileSelect.svelte | 92 ++ .../sidebarDialogItems/folderSelect.svelte | 92 ++ .../sidebarDialogItems/lineEdit.svelte | 90 ++ .../sidebarDialogItems/numberSlider.svelte | 141 +++ .../sidebarDialogItems/optionSelect.svelte | 46 + .../requiredAsteriskInform.svelte | 12 + .../sidebarDialogItems/vector2d.svelte | 168 ++++ .../customKeyframePanel.svelte | 0 .../exportProgressDialog.svelte | 0 src/{components => svelte}/formatPage.svelte | 0 src/{components => svelte}/icon.svelte | 0 .../importAJModelLoaderDialog.svelte | 0 .../incompatabilityPopup.svelte | 0 .../incompatiblePluginNotice.svelte | 0 .../installedPopup.svelte | 0 .../keyframeEasings.svelte | 0 .../commandsKeyframePanel.svelte | 97 ++ .../variantKeyframePanel.svelte | 0 .../locatorConfigDialog.svelte | 25 +- .../dialogItems => svelte}/multiSelect.svelte | 0 .../projectTitle.svelte | 0 .../textDisplayConfigDialog.svelte | 14 +- .../textDisplayElementPanel.svelte | 0 .../unexpectedErrorDialog.svelte | 0 .../vanillaBlockDisplayConfigDialog.svelte | 14 +- .../vanillaBlockDisplayElementPanel.svelte | 0 .../vanillaItemDisplayConfigDialog.svelte | 14 +- .../vanillaItemDisplayElementPanel.svelte | 0 .../variantConfigDialog.svelte | 6 +- .../variantsPanel.svelte | 0 src/systems/ajmeta.ts | 48 + src/systems/datapackCompiler/index.ts | 221 ++-- src/systems/datapackCompiler/objectives.ts | 7 + src/systems/datapackCompiler/tags.ts | 503 ++++++++-- src/systems/datapackCompiler/tellraw.ts | 201 ++++ src/systems/exporter.ts | 2 +- src/systems/minecraft/itemModelManager.ts | 4 +- src/systems/resourcepackCompiler/1.20.4.ts | 28 +- src/systems/resourcepackCompiler/1.21.2.ts | 32 +- src/systems/resourcepackCompiler/1.21.4.ts | 17 +- src/util/fileUtil.ts | 8 + src/util/minecraftUtil.ts | 33 +- src/util/misc.ts | 10 + src/util/moddingTools.ts | 14 +- src/util/stores.ts | 13 + src/util/svelteDialog.ts | 134 ++- src/util/translation.ts | 32 +- tools/plugins/packagerPlugin.ts | 3 +- 120 files changed, 5441 insertions(+), 1601 deletions(-) create mode 100644 src/assets/impulse_command_block.png create mode 100644 src/assets/mc-build-base.tmLanguage.json create mode 100644 src/assets/mcfunction.tmLanguage.json create mode 100644 src/assets/papermc.svg delete mode 100644 src/components/blueprintSettingsDialog.svelte delete mode 100644 src/components/dialogItems/dialogItemUtil.d.ts delete mode 100644 src/components/dialogItems/numberSlider.svelte delete mode 100644 src/interface/dialog/blueprintSettings.ts create mode 100644 src/mods/prismMod.ts create mode 100644 src/svelte/about.svelte rename src/{components => svelte}/animatedJavaLoadingPopup.svelte (100%) rename src/{components => svelte}/animationProperties.svelte (88%) rename src/{components => svelte}/blueprintLoadingPopup.svelte (100%) create mode 100644 src/svelte/blueprintSettings/index.ts create mode 100644 src/svelte/blueprintSettings/pages/datapack.svelte create mode 100644 src/svelte/blueprintSettings/pages/general.svelte create mode 100644 src/svelte/blueprintSettings/pages/plugin.svelte create mode 100644 src/svelte/blueprintSettings/pages/resourcepack.svelte create mode 100644 src/svelte/blueprintSettings/requiredAsteriskInform.svelte rename src/{components => svelte}/boneConfigDialog.svelte (95%) rename src/{components => svelte}/changelogDialog.svelte (100%) rename src/{ => svelte}/components/dialogItems/baseDialogItem.svelte (74%) rename src/{ => svelte}/components/dialogItems/checkbox.svelte (94%) rename src/{ => svelte}/components/dialogItems/codeInput.svelte (96%) rename src/{ => svelte}/components/dialogItems/collection.svelte (99%) rename src/{ => svelte}/components/dialogItems/colorPicker.svelte (90%) create mode 100644 src/svelte/components/dialogItems/dialogItemUtil.d.ts rename src/{ => svelte}/components/dialogItems/fileSelect.svelte (97%) rename src/{ => svelte}/components/dialogItems/folderSelect.svelte (97%) rename src/{ => svelte}/components/dialogItems/lineInput.svelte (96%) create mode 100644 src/svelte/components/dialogItems/numberSlider.svelte rename src/{ => svelte}/components/dialogItems/sectionHeader.svelte (100%) rename src/{ => svelte}/components/dialogItems/select.svelte (81%) rename src/{ => svelte}/components/dialogItems/vector2d.svelte (91%) rename src/{ => svelte}/components/dialogItems/vector3d.svelte (92%) create mode 100644 src/svelte/components/sidebarDialogItems/baseSidebarDialogItem.svelte create mode 100644 src/svelte/components/sidebarDialogItems/boxSelect.svelte create mode 100644 src/svelte/components/sidebarDialogItems/checkbox.svelte create mode 100644 src/svelte/components/sidebarDialogItems/codeBox.svelte create mode 100644 src/svelte/components/sidebarDialogItems/fileSelect.svelte create mode 100644 src/svelte/components/sidebarDialogItems/folderSelect.svelte create mode 100644 src/svelte/components/sidebarDialogItems/lineEdit.svelte create mode 100644 src/svelte/components/sidebarDialogItems/numberSlider.svelte create mode 100644 src/svelte/components/sidebarDialogItems/optionSelect.svelte create mode 100644 src/svelte/components/sidebarDialogItems/requiredAsteriskInform.svelte create mode 100644 src/svelte/components/sidebarDialogItems/vector2d.svelte rename src/{components => svelte}/customKeyframePanel.svelte (100%) rename src/{components => svelte}/exportProgressDialog.svelte (100%) rename src/{components => svelte}/formatPage.svelte (100%) rename src/{components => svelte}/icon.svelte (100%) rename src/{components => svelte}/importAJModelLoaderDialog.svelte (100%) rename src/{components => svelte}/incompatabilityPopup.svelte (100%) rename src/{components => svelte}/incompatiblePluginNotice.svelte (100%) rename src/{components => svelte}/installedPopup.svelte (100%) rename src/{components => svelte}/keyframeEasings.svelte (100%) create mode 100644 src/svelte/keyframePanels/commandsKeyframePanel.svelte rename src/{components => svelte}/keyframePanels/variantKeyframePanel.svelte (100%) rename src/{components => svelte}/locatorConfigDialog.svelte (78%) rename src/{components/dialogItems => svelte}/multiSelect.svelte (100%) rename src/{components => svelte}/projectTitle.svelte (100%) rename src/{components => svelte}/textDisplayConfigDialog.svelte (93%) rename src/{components => svelte}/textDisplayElementPanel.svelte (100%) rename src/{components => svelte}/unexpectedErrorDialog.svelte (100%) rename src/{components => svelte}/vanillaBlockDisplayConfigDialog.svelte (94%) rename src/{components => svelte}/vanillaBlockDisplayElementPanel.svelte (100%) rename src/{components => svelte}/vanillaItemDisplayConfigDialog.svelte (94%) rename src/{components => svelte}/vanillaItemDisplayElementPanel.svelte (100%) rename src/{components => svelte}/variantConfigDialog.svelte (97%) rename src/{components => svelte}/variantsPanel.svelte (100%) create mode 100644 src/systems/ajmeta.ts create mode 100644 src/systems/datapackCompiler/objectives.ts create mode 100644 src/systems/datapackCompiler/tellraw.ts diff --git a/src/assets/impulse_command_block.png b/src/assets/impulse_command_block.png new file mode 100644 index 0000000000000000000000000000000000000000..6553b9c7015265e04a00b7c25b7cc329c10d5da7 GIT binary patch literal 21623 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 literal 0 HcmV?d00001 diff --git a/src/assets/mc-build-base.tmLanguage.json b/src/assets/mc-build-base.tmLanguage.json new file mode 100644 index 00000000..59ac65e5 --- /dev/null +++ b/src/assets/mc-build-base.tmLanguage.json @@ -0,0 +1,942 @@ +{ + "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json", + "name": "mc-build", + "scopeName": "source.mc-build", + "patterns": [ + { + "include": "#folder_context" + } + ], + "repository": { + "folder_context": { + "patterns": [ + { + "include": "#comment" + }, + { + "include": "#import" + }, + { + "include": "#multiline_js" + }, + { + "include": "#dir_definition" + }, + { + "include": "#clock_definition" + }, + { + "include": "#function_definition" + }, + + { + "include": "#advancement_definition" + }, + { + "include": "#enchantment_definition" + }, + { + "include": "#item_modifier_definition" + }, + { + "include": "#loot_table_definition" + }, + { + "include": "#predicate_definition" + }, + { + "include": "#recipe_definition" + }, + { + "include": "#chat_type_definition" + }, + { + "include": "#damage_type_definition" + }, + { + "include": "#dimension_definition" + }, + { + "include": "#dimension_type_definition" + }, + { + "include": "#worldgen_definition" + }, + + { + "include": "#tag_definition" + }, + + { + "include": "#folder_context.compile_if_else" + }, + { + "include": "#folder_context.compile_repeat" + } + ] + }, + "function_context": { + "patterns": [ + { + "include": "#inline_js" + }, + { + "include": "#multiline_js" + }, + { + "include": "#special_function_call" + }, + { + "include": "#function_context.compile_if_else" + }, + { + "include": "#function_context.compile_repeat" + }, + { + "include": "#tick/load_block" + }, + { + "include": "#schedule_block" + }, + { + "include": "#function_block" + }, + { + "include": "#execute" + }, + { + "include": "#execute_if_function" + }, + { + "include": "#multiline_command" + }, + { + "include": "source.injected-mcfunction" + } + ] + }, + "import": { + "match": "^[ \t]*(import)\\s*(.+)$", + "name": "entity.name.function", + "captures": { + "1": { + "name": "keyword.control" + }, + "2": { + "name": "string" + } + } + }, + + "macro_argument_embed": { + "match": "(\\$)\\((\\w+)\\)", + "captures": { + "1": { + "name": "keyword.control" + }, + "2": { + "name": "variable.name" + } + } + }, + + "dir_definition": { + "name": "meta.dir_definition", + "begin": "^[ \t]*(dir) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.dir" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#folder_context" + } + ] + }, + "function_definition": { + "name": "meta.function_definition", + "begin": "^[ \t]*(function) (.+?)(?: (tick|load))? ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + }, + "3": { + "name": "keyword.other" + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#function_context" + } + ] + }, + + "tick/load_block": { + "name": "meta.tick/load_block", + "begin": "^[ \t]*(tick|load) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#function_context" + } + ] + }, + + "comment": { + "match": "^[ \t]*(#.+)$", + "captures": { + "1": { + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "name": "comment.line" + }, + + "inline_js": { + "match": "<%(.+)%>", + "name": "meta.inline_js", + "captures": { + "0": { + "name": "keyword.operator" + }, + "1": { + "patterns": [ + { + "include": "source.js" + } + ] + } + } + }, + "multiline_js": { + "begin": "<%%", + "end": "%%>", + "name": "meta.multiline_js", + "captures": { + "0": { + "name": "keyword.operator" + } + }, + "patterns": [ + { + "include": "source.js" + } + ] + }, + + "folder_context.compile_repeat": { + "begin": "^[ \t]*(REPEAT) ?\\((.+?)\\)( ?(as) (\\w+)) ?{$", + "end": "^[ \t]*}$", + "beginCaptures": { + "1": { + "name": "keyword.control" + }, + "2": { + "patterns": [ + { + "match": "-?(\\d+) ?(,) ?-?(\\d+)", + "captures": { + "1": { + "name": "constant.numeric" + }, + "2": { + "name": "keyword.operator" + }, + "3": { + "name": "constant.numeric" + } + } + }, + { + "match": "(-?[\\d\\.]+) ?(,) ?(-?[\\d\\.]+) ?(,) ?(-?[\\d\\.]+)", + "captures": { + "1": { + "name": "constant.numeric" + }, + "2": { + "name": "keyword.operator" + }, + "3": { + "name": "constant.numeric" + }, + "4": { + "name": "keyword.operator" + }, + "5": { + "name": "constant.numeric" + } + } + }, + { + "include": "source.js" + } + ] + }, + "4": { + "name": "entity.name" + }, + "5": { + "name": "string.other" + } + }, + "name": "folder_context.compile_repeat", + "patterns": [ + { + "include": "#folder_context" + } + ] + }, + "function_context.compile_repeat": { + "begin": "^[ \t]*(REPEAT) ?\\((.+?)\\)( ?(as) (\\w+)) ?{$", + "end": "^[ \t]*}$", + "beginCaptures": { + "1": { + "name": "keyword.control" + }, + "2": { + "patterns": [ + { + "match": "-?(\\d+) ?(,) ?-?(\\d+)", + "captures": { + "1": { + "name": "constant.numeric" + }, + "2": { + "name": "keyword.operator" + }, + "3": { + "name": "constant.numeric" + } + } + }, + { + "match": "(-?[\\d\\.]+) ?(,) ?(-?[\\d\\.]+) ?(,) ?(-?[\\d\\.]+)", + "captures": { + "1": { + "name": "constant.numeric" + }, + "2": { + "name": "keyword.operator" + }, + "3": { + "name": "constant.numeric" + }, + "4": { + "name": "keyword.operator" + }, + "5": { + "name": "constant.numeric" + } + } + }, + { + "include": "source.js" + } + ] + }, + "4": { + "name": "entity.name" + }, + "5": { + "name": "string.other" + } + }, + "name": "function_context.compile_repeat", + "patterns": [ + { + "include": "#function_context" + } + ] + }, + + "folder_context.compile_if_else": { + "name": "meta.folder_context.compile_if_else.if", + "begin": "^[ \t]*(IF) ?(.+) ?{$", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "patterns": [ + { + "include": "source.js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#folder_context.compile_if_else.else" + }, + { + "include": "#folder_context" + } + ] + }, + "folder_context.compile_if_else.else": { + "name": "meta.folder_context.compile_if_else.else", + "begin": "^[ \t]*} ?(ELSE IF ?(.+) ?{|ELSE ?{|)$", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "patterns": [ + { + "include": "source.js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#folder_context.compile_if_else.else" + }, + { + "include": "#folder_context" + } + ] + }, + + "function_context.compile_if_else": { + "name": "meta.function_context.compile_if_else.if", + "begin": "^[ \t]*(IF) ?(.+) ?{$", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "patterns": [ + { + "include": "source.js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#function_context.compile_if_else.else" + }, + { + "include": "#function_context" + } + ] + }, + "function_context.compile_if_else.else": { + "name": "meta.function_context.compile_if_else.else", + "begin": "^[ \t]*} ?(ELSE IF ?(.+) ?{|ELSE ?{|)$", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "patterns": [ + { + "include": "source.js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#function_context.compile_if_else.else" + }, + { + "include": "#function_context" + } + ] + }, + + "advancement_definition": { + "begin": "^[ \t]*(advancement) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "enchantment_definition": { + "begin": "^[ \t]*(enchantment) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "item_modifier_definition": { + "begin": "^[ \t]*(item_modifier) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "loot_table_definition": { + "begin": "^[ \t]*(loot_table) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "predicate_definition": { + "begin": "^[ \t]*(predicate) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "recipe_definition": { + "begin": "^[ \t]*(recipe) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "chat_type_definition": { + "begin": "^[ \t]*(chat_type) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "damage_type_definition": { + "begin": "^[ \t]*(damage_type) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "dimension_definition": { + "begin": "^[ \t]*(dimension) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "dimension_type_definition": { + "begin": "^[ \t]*(dimension_type) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + "worldgen_definition": { + "begin": "^[ \t]*(worldgen) (biome|configured_carver|configured_feature|density_function|noise|noise_settings|placed_feature|processor_list|structure|structure_set|template_pool|world_preset|flat_level_generator_preset) (.+?) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name" + }, + "3": { + "name": "entity.name.function" + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "source.json" + } + ] + }, + + "tag_definition": { + "name": "meta.tag_definition", + "begin": "^[ \t]*(tag) ([a-z]+) (.+?)( replace)? ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name" + }, + "3": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + }, + "4": { + "name": "keyword.other" + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "match": "^[ \t]*(.+?)(:[a-z0-9_]+)?( replace)?$", + "captures": { + "1": { + "name": "entity.name.function" + }, + "2": { + "name": "entity.name.function" + }, + "3": { + "name": "keyword.other" + } + }, + "patterns": [ + { + "include": "#inline_js" + } + ] + } + ] + }, + + "clock_definition": { + "name": "meta.clock_definition", + "begin": "^[ \t]*(clock) (.+?) (\\d+(?:t|s|d)) ?{", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + }, + "3": { + "name": "constant.numeric" + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#function_context" + } + ] + }, + + "schedule_block": { + "name": "schedule_block", + "begin": "^[ \t]*(\\$?)(schedule)( [^ \n\t]+)(?: (replace|append))? ?{", + "beginCaptures": { + "1": { + "name": "markup.italic" + }, + "2": { + "name": "keyword.control.function" + }, + "3": { + "name": "constant.numeric", + "patterns": [ + { + "include": "#macro_argument_embed" + } + ] + }, + "4": { + "name": "keyword.other" + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#function_context" + } + ] + }, + + "function_block": { + "name": "meta.function_block", + "begin": "(block( [a-z0-9_]+)?)? ?{(?:$| ({.+|with .+)$)", + "beginCaptures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + }, + "3": { + "patterns": [ + { + "include": "source.injected-mcfunction" + } + ] + } + }, + "end": "^[ \t]*}$", + "patterns": [ + { + "include": "#function_context" + } + ] + }, + + "execute": { + "name": "meta.execute", + "begin": "((?: |^[ \t]*)(\\$?)(execute\\b)|(\\belse (\\$?)execute\\b)|(else))", + "beginCaptures": { + "1": { + "name": "keyword.control" + }, + "2": { + "name": "markup.italic" + }, + "5": { + "name": "markup.italic" + } + }, + "end": "(?: |^[ \t]*)(\\$?)(run\\b)", + "endCaptures": { + "1": { + "name": "markup.italic" + }, + "2": { + "name": "keyword.control" + } + }, + "patterns": [ + { + "include": "#execute" + }, + { + "include": "#execute_if_function" + }, + { + "include": "source.injected-mcfunction" + } + ] + }, + + "execute_if_function": { + "name": "execute_if_function", + "begin": "(if|unless) (function) ?{$", + "beginCaptures": { + "1": { + "name": "entity.name" + }, + "2": { + "name": "entity.name" + } + }, + "end": "^[ \t]*}", + "patterns": [ + { + "include": "#function_context" + } + ] + }, + + "special_function_call": { + "name": "meta.special_function_call", + "match": "^[ \t]*(function) (#?)(?:(\\*|\\.?\\./)(.+?(?: |$))|(\\^)(\\d+))", + "captures": { + "1": { + "name": "keyword.control.function" + }, + "2": { + "name": "entity.name.function" + }, + "3": { + "name": "keyword.operator" + }, + "4": { + "name": "entity.name.function", + "patterns": [ + { + "include": "#inline_js" + } + ] + }, + "5": { + "name": "keyword.operator" + }, + "6": { + "name": "constant.numeric" + } + } + } + } +} diff --git a/src/assets/mcfunction.tmLanguage.json b/src/assets/mcfunction.tmLanguage.json new file mode 100644 index 00000000..1be0dcc1 --- /dev/null +++ b/src/assets/mcfunction.tmLanguage.json @@ -0,0 +1,686 @@ +{ + "name": "Syntax Mcfunction", + "scopeName": "source.injected-mcfunction", + "uuid": "a339b5ad-d627-4019-a062-1fec13f43274", + "patterns": [ + { + "include": "#root" + } + ], + "repository": { + "root": { + "patterns": [ + { + "include": "#inline-js" + }, + { + "include": "#literals" + }, + { + "include": "#comments" + }, + { + "include": "#names" + }, + { + "include": "#comments_inline" + }, + { + "include": "#subcommands" + }, + { + "include": "#property" + }, + { + "include": "#operators" + }, + { + "include": "#selectors" + } + ] + }, + "comments": { + "patterns": [ + { + "applyEndPatternLast": 1, + "begin": "^\\s*(#[>!#])(.+)$", + "beginCaptures": { + "1": { + "name": "comment.block.mcfunction" + }, + "2": { + "name": "markup.bold.mcfunction" + } + }, + "captures": { + "0": { + "name": "comment.block.mcfunction" + } + }, + "end": "^(?!#)", + "name": "meta.comments", + "patterns": [ + { + "include": "#comments_block" + } + ] + }, + { + "captures": { + "0": { + "name": "comment.line.mcfunction" + } + }, + "match": "$#(?!<%).*$", + "name": "meta.comments" + } + ] + }, + "comments_inline": { + "patterns": [ + { + "captures": { + "0": { + "name": "comment.line.mcfunction" + } + }, + "match": "#.*$", + "name": "meta.comments" + } + ] + }, + "comments_block": { + "patterns": [ + { + "applyEndPatternLast": 1, + "begin": "^\\s*#[>!]", + "captures": { + "0": { + "name": "comment.block.mcfunction" + } + }, + "end": "$", + "name": "meta.comments_block", + "patterns": [ + { + "include": "#comments_block_emphasized" + } + ] + }, + { + "applyEndPatternLast": 1, + "begin": "^\\s*#", + "captures": { + "0": { + "name": "comment.block.mcfunction" + } + }, + "end": "$", + "name": "meta.comments_block", + "patterns": [ + { + "include": "#comments_block_normal" + } + ] + } + ] + }, + "comments_block_emphasized": { + "patterns": [ + { + "include": "#comments_block_special" + }, + { + "captures": { + "0": { + "name": "markup.bold.mcfunction" + } + }, + "match": "\\S+", + "name": "meta.comments_block_emphasized" + } + ] + }, + "comments_block_normal": { + "patterns": [ + { + "include": "#comments_block_special" + }, + { + "captures": { + "0": { + "name": "comment.block.mcfunction" + } + }, + "match": "\\S+", + "name": "meta.comments_block_normal" + }, + { + "include": "#whitespace" + } + ] + }, + "comments_block_special": { + "patterns": [ + { + "captures": { + "0": { + "name": "markup.heading.mcfunction" + } + }, + "match": "@\\S+", + "name": "meta.comments_block_special" + }, + { + "include": "#resource-name" + }, + { + "captures": { + "0": { + "name": "variable.other.mcfunction" + } + }, + "match": "[#%$][A-Za-z0-9_.#%$]+", + "name": "meta.comments_block_special" + } + ] + }, + "literals": { + "patterns": [ + { + "captures": { + "0": { + "name": "literal.mcfunction" + } + }, + "match": "\\.\\.", + "name": "meta.literals" + }, + { + "captures": { + "0": { + "name": "constant.numeric.boolean.mcfunction" + } + }, + "match": "(true|false|True|False)", + "name": "meta.literals" + }, + { + "captures": { + "0": { + "name": "variable.uuid.mcfunction" + } + }, + "match": "\\b[0-9a-fA-F]+(?:-[0-9a-fA-F]+){4}\\b", + "name": "meta.names" + }, + { + "captures": { + "0": { + "name": "constant.numeric.float.mcfunction" + } + }, + "match": "[+-]?\\d*\\.?\\d+([eE]?[+-]?\\d+)?[df]?\\b", + "name": "meta.literals" + }, + { + "captures": { + "0": { + "name": "constant.numeric.integer.mcfunction" + } + }, + "match": "[+-]?\\d+(b|B|L|l)\\b", + "name": "meta.literals" + }, + { + "captures": { + "0": { + "name": "constant.numeric.integer.mcfunction" + } + }, + "match": "[+-]?\\d+\\b", + "name": "meta.literals" + }, + { + "applyEndPatternLast": 1, + "begin": "\"", + "captures": { + "0": { + "name": "string.quoted.double.mcfunction" + } + }, + "end": "(\"|$)", + "name": "meta.literals", + "patterns": [ + { + "include": "#inline-js" + }, + { + "include": "#literals_string-double" + } + ] + }, + { + "applyEndPatternLast": 1, + "begin": "'", + "captures": { + "0": { + "name": "string.quoted.single.mcfunction" + } + }, + "end": "('|$)", + "name": "meta.literals", + "patterns": [ + { + "include": "#inline-js" + }, + { + "include": "#literals_string-single" + } + ] + } + ] + }, + "subcommands": { + "patterns": [ + { + "captures": { + "0": { + "name": "entity.name.class.mcfunction" + } + }, + "match": "[A-Za-z_]+", + "name": "meta.literals" + } + ] + }, + "literals_string-double": { + "patterns": [ + { + "captures": { + "0": { + "name": "constant.character.escape.mcfunction" + } + }, + "match": "\\\\.", + "name": "meta.literals_string-double" + }, + { + "include": "#macro-name" + }, + { + "captures": { + "0": { + "name": "string.quoted.double.mcfunction" + } + }, + "match": "[^\\\\\"]", + "name": "meta.literals_string-double" + } + ] + }, + "literals_string-single": { + "patterns": [ + { + "captures": { + "0": { + "name": "constant.character.escape.mcfunction" + } + }, + "match": "\\\\.", + "name": "meta.literals_string-single" + }, + { + "include": "#inline-js" + }, + { + "include": "#macro-name" + }, + { + "captures": { + "0": { + "name": "string.quoted.single.mcfunction" + } + }, + "match": "[^\\\\']", + "name": "meta.literals_string-single" + } + ] + }, + "names": { + "patterns": [ + { + "captures": { + "1": { + "name": "whitespace.mcfunction" + }, + "2": { + "name": "keyword.control.flow.mcfunction" + } + }, + "match": "^(\\s*)([a-z_]+)(?=\\s)", + "name": "meta.names" + }, + { + "captures": { + "1": { + "name": "whitespace.mcfunction" + }, + "2": { + "name": "markup.italic.mcfunction" + }, + "3": { + "name": "whitespace.mcfunction" + }, + "4": { + "name": "keyword.control.flow.mcfunction" + } + }, + "match": "^(\\s*)(\\$)( ?)([a-z_]*)", + "name": "meta.names" + }, + { + "captures": { + "1": { + "name": "entity.name.mcfunction" + }, + "2": { + "name": "whitespace.mcfunction" + }, + "3": { + "name": "keyword.control.flow.mcfunction" + } + }, + "match": "(run)(\\s+)([a-z_]+)", + "name": "meta.names" + }, + { + "include": "#resource-name" + }, + { + "captures": { + "0": { + "name": "entity.name.mcfunction" + } + }, + "match": "[A-Za-z]+(?=\\W)", + "name": "meta.names" + }, + { + "captures": { + "0": { + "name": "string.unquoted.mcfunction" + } + }, + "match": "[A-Za-z_][A-Za-z0-9_.#%$]*", + "name": "meta.names" + }, + { + "include": "#macro-name" + }, + { + "include": "#inline-js" + }, + { + "captures": { + "0": { + "name": "variable.other.mcfunction" + } + }, + "match": "([#%$]|((?<=\\s)\\.))[A-Za-z0-9_.#%$\\-]+", + "name": "meta.names" + } + ] + }, + "macro-name": { + "patterns": [ + { + "captures": { + "1": { + "name": "punctuation.definition.template-expression.begin.mcfunction" + }, + "2": { + "name": "variable.other.mcfunction" + }, + "3": { + "name": "punctuation.definition.template-expression.end.mcfunction" + } + }, + "match": "(\\$\\()([A-Za-z0-9_]*)(\\))", + "name": "meta.macro-name" + } + ] + }, + "operators": { + "patterns": [ + { + "captures": { + "0": { + "name": "keyword.operator.mcfunction" + } + }, + "match": "[\\-~%^?!+*<>\\\\/|&=.:,;]", + "name": "meta.operators" + } + ] + }, + "property": { + "patterns": [ + { + "applyEndPatternLast": 1, + "begin": "\\{", + "captures": { + "0": { + "name": "punctuation.mcfunction" + } + }, + "end": "\\}", + "name": "meta.property.curly", + "patterns": [ + { + "include": "#inline-js" + }, + { + "include": "#resource-name" + }, + { + "include": "#literals" + }, + { + "include": "#property_key" + }, + { + "include": "#operators" + }, + { + "include": "#property_value" + }, + { + "include": "$self" + } + ] + }, + { + "applyEndPatternLast": 1, + "begin": "\\[", + "captures": { + "0": { + "name": "variable.other.mcfunction" + } + }, + "end": "\\]", + "name": "meta.property.square", + "patterns": [ + { + "include": "#inline-js" + }, + { + "include": "#resource-name" + }, + { + "include": "#literals" + }, + { + "include": "#property_key" + }, + { + "include": "#operators" + }, + { + "include": "#property_value" + }, + { + "include": "$self" + } + ] + }, + { + "applyEndPatternLast": 1, + "begin": "\\(", + "captures": { + "0": { + "name": "punctuation.mcfunction" + } + }, + "end": "\\)", + "name": "meta.property.paren", + "patterns": [ + { + "include": "#inline-js" + }, + { + "include": "#resource-name" + }, + { + "include": "#literals" + }, + { + "include": "#property_key" + }, + { + "include": "#operators" + }, + { + "include": "#property_value" + }, + { + "include": "$self" + } + ] + } + ] + }, + "property_key": { + "patterns": [ + { + "captures": { + "0": { + "name": "entity.name.type.mcfunction" + } + }, + "match": "#?[a-z_][a-z_\\.\\-]*\\:[a-z0-9_\\.\\-/]+(?=\\s*\\=)", + "name": "meta.property_key" + }, + { + "captures": { + "0": { + "name": "entity.name.type.mcfunction" + } + }, + "match": "#?[a-z_][a-z0-9_\\.\\-/]+", + "name": "meta.property_key" + }, + { + "captures": { + "0": { + "name": "entity.name.type.mcfunction" + } + }, + "match": "[A-Za-z_]+[A-Za-z_\\-\\+]*", + "name": "meta.property_key" + } + ] + }, + "property_value": { + "patterns": [ + { + "captures": { + "0": { + "name": "entity.name.tag.mcfunction" + } + }, + "match": "#?[a-z_][a-z_\\.\\-]*\\:[a-z0-9_\\.\\-/]+", + "name": "meta.property_value" + }, + { + "captures": { + "0": { + "name": "entity.name.tag.mcfunction" + } + }, + "match": "#?[a-z_][a-z0-9_\\.\\-/]+", + "name": "meta.property_value" + } + ] + }, + "resource-name": { + "patterns": [ + { + "captures": { + "0": { + "name": "entity.name.function.mcfunction" + } + }, + "match": "#?[a-z_][a-z\\_\\.\\-]*:((<%)(.+?)(%>))?[a-z0-9_\\.\\/\\-]+", + "name": "meta.resource-name" + }, + { + "captures": { + "0": { + "name": "entity.name.function.mcfunction" + } + }, + "match": "#?[a-z0-9_\\.\\-]+\\/[a-z0-9_\\.\\-\\/]+", + "name": "meta.resource-name" + } + ] + }, + "selectors": { + "patterns": [ + { + "captures": { + "0": { + "name": "support.class.mcfunction" + } + }, + "match": "@[a-z]+", + "name": "meta.selectors" + } + ] + }, + "inline-js": { + "patterns": [ + { + "captures": { + "1": { + "name": "punctuation.definition.template-expression.begin.lang-mc" + }, + "2": { + "name": "inline-js", + "patterns": [ + { + "include": "source.js" + } + ] + }, + "3": { + "name": "punctuation.definition.template-expression.end.lang-mc" + } + }, + "match": "(<%)(.+?)(%>)", + "name": "meta.inline-js" + } + ] + } + } +} \ No newline at end of file diff --git a/src/assets/papermc.svg b/src/assets/papermc.svg new file mode 100644 index 00000000..6b44eda9 --- /dev/null +++ b/src/assets/papermc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/blueprintFormat.ts b/src/blueprintFormat.ts index 24515ee3..3d61621f 100644 --- a/src/blueprintFormat.ts +++ b/src/blueprintFormat.ts @@ -3,6 +3,8 @@ import FormatPageSvelte from './components/formatPage.svelte' import ProjectTitleSvelte from './components/projectTitle.svelte' import { PACKAGE } from './constants' import { BillboardMode, BoneConfig, LocatorConfig } from './nodeConfigs' +import FormatPageSvelte from './svelte/formatPage.svelte' +import ProjectTitleSvelte from './svelte/projectTitle.svelte' import { process } from './systems/modelDataFixerUpper' import { events } from './util/events' import { injectSvelteCompomponent } from './util/injectSvelteComponent' diff --git a/src/blueprintSettings.ts b/src/blueprintSettings.ts index f9f4e5e6..7a57c670 100644 --- a/src/blueprintSettings.ts +++ b/src/blueprintSettings.ts @@ -1,23 +1,27 @@ import { MinecraftVersion } from './systems/global' import { Valuable } from './util/stores' -export type ExportMode = 'raw' | 'zip' | 'none' +export type ExportMode = 'folder' | 'zip' | 'none' +export type ExportEnvironment = 'vanilla' | 'plugin' +export type DataPackAnimationSystem = 'functions' | 'storage' export const defaultValues = { - export_namespace: 'blueprint', + id: 'animated_java:new_blueprint', + tag_prefix: `aj.new_blueprint`, + auto_generate_tag_prefix: true, show_bounding_box: false, auto_bounding_box: true, bounding_box: [48, 48], // Export Settings - enable_plugin_mode: false, - resource_pack_export_mode: 'raw' as ExportMode, - data_pack_export_mode: 'raw' as ExportMode, + environment: 'vanilla' as ExportEnvironment, + resource_pack_export_mode: 'folder' as ExportMode, + data_pack_export_mode: 'folder' as ExportMode, target_minecraft_versions: ['1.21.4'] as MinecraftVersion[], // Resource Pack Settings - display_item: 'minecraft:white_dye', custom_model_data_offset: 0, enable_advanced_resource_pack_settings: false, resource_pack: '', + display_item: 'minecraft:white_dye', // Data Pack Settings enable_advanced_data_pack_settings: false, data_pack: '', @@ -26,11 +30,11 @@ export const defaultValues = { ticking_commands: '', interpolation_duration: 1, teleportation_duration: 1, - use_storage_for_animation: false, + animation_system: 'functions' as DataPackAnimationSystem, show_function_errors: true, show_outdated_warning: true, // Plugin Settings - baked_animations: true, + bake_animations: false, json_file: '', } diff --git a/src/components/blueprintSettingsDialog.svelte b/src/components/blueprintSettingsDialog.svelte deleted file mode 100644 index 9cc9fda1..00000000 --- a/src/components/blueprintSettingsDialog.svelte +++ /dev/null @@ -1,881 +0,0 @@ - - - - -
- -
- - - - - - - - - {#if !$autoBoundingBox} - - {/if} - - - - - - - - {#if $enablePluginMode} - - - - - - {:else} - - - - - {#if $resourcePackExportMode !== 'none'} - - - - - - - {#if $enableAdvancedResourcePackSettings} -

- {translate('dialog.blueprint_settings.advanced_settings_warning')} -

- - - {/if} - - {#if $resourcePackExportMode === 'raw'} - - {:else if $resourcePackExportMode === 'zip'} - - {/if} - {/if} - - {#if $dataPackExportMode !== 'none'} - - - {#if $dataPackExportMode === 'raw'} - - {:else if $dataPackExportMode === 'zip'} - - {/if} - - - - - - - - - - - - - - - - - {/if} - {/if} -
- -{#if showSupportMePopup} -
-
-
- ❤️ - Animated Java? - - - close - -
- - - -
-
-
-{/if} - - diff --git a/src/components/dialogItems/dialogItemUtil.d.ts b/src/components/dialogItems/dialogItemUtil.d.ts deleted file mode 100644 index 4ff027dc..00000000 --- a/src/components/dialogItems/dialogItemUtil.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -type DialogItemValueChecker = - | ((value: Value) => { type: string; message: string }) - | undefined - -type CollectionItem = { icon?: string; name: string; value: string } diff --git a/src/components/dialogItems/numberSlider.svelte b/src/components/dialogItems/numberSlider.svelte deleted file mode 100644 index 9195d5f7..00000000 --- a/src/components/dialogItems/numberSlider.svelte +++ /dev/null @@ -1,85 +0,0 @@ - - - -
- -
- -
- code -
-
-
- diff --git a/src/index.ts b/src/index.ts index db3e1408..c65e7e5c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,7 +25,12 @@ import './systems/minecraft/registryManager' import { MINECRAFT_REGISTRY } from './systems/minecraft/registryManager' import resourcepackCompiler from './systems/resourcepackCompiler' import { openExportProgressDialog } from './interface/dialog/exportProgress' -import { isDataPackPath, isResourcePackPath, parseResourcePackPath } from './util/minecraftUtil' +import { + isDataPackPath, + isResourcePackPath, + parseResourceLocation, + parseResourcePackPath, +} from './util/minecraftUtil' import { blueprintSettingErrors } from './blueprintSettings' import { openUnexpectedErrorDialog } from './interface/dialog/unexpectedError' import { BLUEPRINT_CODEC, BLUEPRINT_FORMAT } from './blueprintFormat' @@ -50,6 +55,7 @@ import { checkForIncompatabilities } from './interface/popup/incompatabilityPopu globalThis.AnimatedJava = { API: { parseResourcePackPath, + parseResourceLocation, datapackCompiler, resourcepackCompiler, Variant, diff --git a/src/interface/animatedJavaBarItem.ts b/src/interface/animatedJavaBarItem.ts index b09d3aa2..b782382c 100644 --- a/src/interface/animatedJavaBarItem.ts +++ b/src/interface/animatedJavaBarItem.ts @@ -6,7 +6,7 @@ import { exportProject } from '../systems/exporter' import { createAction, createBarMenu } from '../util/moddingTools' import { translate } from '../util/translation' import { openAboutDialog } from './dialog/about' -import { openBlueprintSettingsDialog } from './dialog/blueprintSettings' +import { openBlueprintSettingsDialog } from '../svelte/blueprintSettings' import { openChangelogDialog } from './changelogDialog' function createIconImg() { @@ -35,61 +35,53 @@ MENU.label.innerHTML = 'Animated Java' MENU.label.prepend(createIconImg()) BLOCKBENCH_MENU_BAR.appendChild(MENU.label) -MenuBar.addAction( - createAction(`${PACKAGE.name}:about`, { - icon: 'info', - category: 'animated_java', - name: translate('action.open_about.name'), - click() { - openAboutDialog() - }, - }), - MENU.id -) +export const OPEN_ABOUT_ACTION = createAction(`${PACKAGE.name}:about`, { + icon: 'info', + category: 'animated_java', + name: translate('action.open_about.name'), + click() { + openAboutDialog() + }, + menu_path: MENU.id, +}) -MenuBar.addAction( - createAction(`${PACKAGE.name}:documentation`, { - icon: 'find_in_page', - category: 'animated_java', - name: translate('action.open_documentation.name'), - click() { - Blockbench.openLink('https://animated-java.dev/docs') - }, - }), - MENU.id -) +export const OPEN_DOCUMENTATION_ACTION = createAction(`${PACKAGE.name}:documentation`, { + icon: 'find_in_page', + category: 'animated_java', + name: translate('action.open_documentation.name'), + click() { + Blockbench.openLink('https://animated-java.dev/docs') + }, + menu_path: MENU.id, +}) -MenuBar.addAction( - createAction(`${PACKAGE.name}:changelog`, { - icon: 'history', - category: 'animated_java', - name: translate('action.open_changelog.name'), - click() { - openChangelogDialog() - }, - }), - MENU.id -) +export const OPEN_CHANGELOG_ACTION = createAction(`${PACKAGE.name}:changelog`, { + icon: 'history', + category: 'animated_java', + name: translate('action.open_changelog.name'), + click() { + openChangelogDialog() + }, + menu_path: MENU.id, +}) MENU.structure.push(new MenuSeparator()) -MenuBar.addAction( - createAction(`${PACKAGE.name}:blueprint_settings`, { - icon: 'settings', - category: 'animated_java', - name: translate('action.open_blueprint_settings.name'), - condition() { - return Format === BLUEPRINT_FORMAT - }, - click() { - openBlueprintSettingsDialog() - }, - }), - MENU.id -) +export const OPEN_BLUEPRINT_SETTINGS_ACTION = createAction(`${PACKAGE.name}:blueprint_settings`, { + icon: 'settings', + category: 'animated_java', + name: translate('action.open_blueprint_settings.name'), + condition() { + return Format === BLUEPRINT_FORMAT + }, + click() { + openBlueprintSettingsDialog() + }, + menu_path: MENU.id, +}) MenuBar.menus[MENU_ID].structure.push({ - id: 'animated_java:extract-open', + id: `${PACKAGE.name}:extract-open`, name: translate('action.extract.name'), icon: 'fa-trash-can', searchable: false, @@ -99,32 +91,28 @@ MenuBar.menus[MENU_ID].structure.push({ }, }) -MenuBar.addAction( - createAction(`${PACKAGE.name}:extract`, { - icon: 'fa-trash-can', - category: 'animated_java', - name: translate('action.extract.confirm'), - condition() { - return Format === BLUEPRINT_FORMAT - }, - click() { - void cleanupExportedFiles() - }, - }), - MENU_ID + '.animated_java:extract-open' -) +export const EXTRACT_ACTION = createAction(`${PACKAGE.name}:extract`, { + icon: 'fa-trash-can', + category: `${PACKAGE.name}`, + name: translate('action.extract.confirm'), + condition() { + return Format === BLUEPRINT_FORMAT + }, + click() { + void cleanupExportedFiles() + }, + menu_path: MENU_ID + `.${PACKAGE.name}:extract-open`, +}) -MenuBar.addAction( - createAction(`${PACKAGE.name}:export`, { - icon: 'insert_drive_file', - category: 'animated_java', - name: translate('action.export.name'), - condition() { - return Format === BLUEPRINT_FORMAT - }, - click() { - void exportProject() - }, - }), - MENU.id -) +export const EXPORT_ACTION = createAction(`${PACKAGE.name}:export`, { + icon: 'insert_drive_file', + category: 'animated_java', + name: translate('action.export.name'), + condition() { + return Format === BLUEPRINT_FORMAT + }, + click() { + void exportProject() + }, + menu_path: MENU.id, +}) diff --git a/src/interface/changelogDialog.ts b/src/interface/changelogDialog.ts index d3070fd7..25cb8ccc 100644 --- a/src/interface/changelogDialog.ts +++ b/src/interface/changelogDialog.ts @@ -1,4 +1,4 @@ -import ChangelogDialog from '../components/changelogDialog.svelte' +import ChangelogDialog from '../svelte/changelogDialog.svelte' import { PACKAGE } from '../constants' import { SvelteDialog } from '../util/svelteDialog' import { translate } from '../util/translation' diff --git a/src/interface/dialog/about.ts b/src/interface/dialog/about.ts index 050186e3..1c5d4830 100644 --- a/src/interface/dialog/about.ts +++ b/src/interface/dialog/about.ts @@ -1,5 +1,5 @@ import { PACKAGE } from '../../constants' -import AboutSvelte from '../../components/about.svelte' +import AboutSvelte from '../../svelte/about.svelte' import { SvelteDialog } from '../../util/svelteDialog' import { translate } from '../../util/translation' diff --git a/src/interface/dialog/animationProperties.ts b/src/interface/dialog/animationProperties.ts index c867ecf3..8b61331e 100644 --- a/src/interface/dialog/animationProperties.ts +++ b/src/interface/dialog/animationProperties.ts @@ -1,4 +1,4 @@ -import AniamtionPropertiesSvelteComponent from '../../components/animationProperties.svelte' +import AniamtionPropertiesSvelteComponent from '../../svelte/animationProperties.svelte' import { PACKAGE } from '../../constants' import { Valuable } from '../../util/stores' import { SvelteDialog } from '../../util/svelteDialog' diff --git a/src/interface/dialog/blueprintSettings.ts b/src/interface/dialog/blueprintSettings.ts deleted file mode 100644 index ba5fad0a..00000000 --- a/src/interface/dialog/blueprintSettings.ts +++ /dev/null @@ -1,128 +0,0 @@ -import { updateBoundingBox } from '../../blueprintFormat' -import { defaultValues, ExportMode } from '../../blueprintSettings' -import BlueprintSettingsDialogSvelteComponent from '../../components/blueprintSettingsDialog.svelte' -import { PACKAGE } from '../../constants' -import { MinecraftVersion } from '../../systems/global' -import { sanitizePathName } from '../../util/minecraftUtil' -import { Valuable } from '../../util/stores' -import { SvelteDialog } from '../../util/svelteDialog' -import { translate } from '../../util/translation' - -function getSettings() { - return { - blueprintName: new Valuable(Project!.name, value => { - if (!value) { - return 'My Blueprint' - } - return value - }), - textureSizeX: new Valuable(Project!.texture_width), - textureSizeY: new Valuable(Project!.texture_height), - showBoundingBox: new Valuable(Project!.animated_java.show_bounding_box), - autoBoundingBox: new Valuable(Project!.animated_java.auto_bounding_box), - boundingBoxX: new Valuable(Project!.animated_java.bounding_box[0]), - boundingBoxY: new Valuable(Project!.animated_java.bounding_box[1]), - // Export Settings - enablePluginMode: new Valuable(Project!.animated_java.enable_plugin_mode), - exportNamespace: new Valuable(Project!.animated_java.export_namespace, value => { - if (!value) { - return defaultValues.export_namespace - } - return sanitizePathName(value) - }), - resourcePackExportMode: new Valuable( - Project!.animated_java.resource_pack_export_mode as string - ), - dataPackExportMode: new Valuable(Project!.animated_java.data_pack_export_mode as string), - targetMinecraftVersions: new Valuable(Project!.animated_java.target_minecraft_versions), - // Resource Pack Settings - displayItem: new Valuable(Project!.animated_java.display_item, value => { - if (!value) { - return defaultValues.display_item - } - return value - }), - customModelDataOffset: new Valuable(Project!.animated_java.custom_model_data_offset), - enableAdvancedResourcePackSettings: new Valuable( - Project!.animated_java.enable_advanced_resource_pack_settings - ), - resourcePack: new Valuable(Project!.animated_java.resource_pack), - // Data Pack Settings - enableAdvancedDataPackSettings: new Valuable( - Project!.animated_java.enable_advanced_data_pack_settings - ), - dataPack: new Valuable(Project!.animated_java.data_pack), - summonCommands: new Valuable(Project!.animated_java.summon_commands), - removeCommands: new Valuable(Project!.animated_java.remove_commands), - tickingCommands: new Valuable(Project!.animated_java.ticking_commands), - interpolationDuration: new Valuable(Project!.animated_java.interpolation_duration), - teleportationDuration: new Valuable(Project!.animated_java.teleportation_duration), - useStorageForAnimation: new Valuable(Project!.animated_java.use_storage_for_animation), - showFunctionErrors: new Valuable(Project!.animated_java.show_function_errors), - showOutdatedWarning: new Valuable(Project!.animated_java.show_outdated_warning), - // Plugin Settings - bakedAnimations: new Valuable(Project!.animated_java.baked_animations), - jsonFile: new Valuable(Project!.animated_java.json_file), - } -} - -function setSettings(settings: ReturnType) { - if (!Project) return - Project.name = settings.blueprintName.get() - - setProjectResolution(settings.textureSizeX.get(), settings.textureSizeY.get(), true) - - Project.animated_java.show_bounding_box = settings.showBoundingBox.get() - Project.animated_java.auto_bounding_box = settings.autoBoundingBox.get() - Project.animated_java.bounding_box = [settings.boundingBoxX.get(), settings.boundingBoxY.get()] - - // Export Settings - Project.animated_java.enable_plugin_mode = settings.enablePluginMode.get() - Project.pluginMode.set(settings.enablePluginMode.get()) // Required to update the project title. - Project.animated_java.export_namespace = settings.exportNamespace.get() - Project.animated_java.resource_pack_export_mode = - settings.resourcePackExportMode.get() as ExportMode - Project.animated_java.data_pack_export_mode = settings.dataPackExportMode.get() as ExportMode - Project.animated_java.target_minecraft_versions = - settings.targetMinecraftVersions.get() as MinecraftVersion[] - // Resource Pack Settings - Project.animated_java.display_item = settings.displayItem.get() - Project.animated_java.custom_model_data_offset = settings.customModelDataOffset.get() - Project.animated_java.enable_advanced_resource_pack_settings = - settings.enableAdvancedResourcePackSettings.get() - Project.animated_java.resource_pack = settings.resourcePack.get() - // Data Pack Settings - Project.animated_java.enable_advanced_data_pack_settings = - settings.enableAdvancedDataPackSettings.get() - Project.animated_java.data_pack = settings.dataPack.get() - Project.animated_java.summon_commands = settings.summonCommands.get() - Project.animated_java.remove_commands = settings.removeCommands.get() - Project.animated_java.ticking_commands = settings.tickingCommands.get() - Project.animated_java.interpolation_duration = settings.interpolationDuration.get() - Project.animated_java.teleportation_duration = settings.teleportationDuration.get() - Project.animated_java.use_storage_for_animation = settings.useStorageForAnimation.get() - Project.animated_java.show_function_errors = settings.showFunctionErrors.get() - Project.animated_java.show_outdated_warning = settings.showOutdatedWarning.get() - // Plugin Settings - Project.animated_java.baked_animations = settings.bakedAnimations.get() - Project.animated_java.json_file = settings.jsonFile.get() - console.log('Successfully saved project settings', Project) -} - -export function openBlueprintSettingsDialog() { - if (!Project) return - - const settings = getSettings() - return new SvelteDialog({ - id: `${PACKAGE.name}:blueprintSettingsDialog`, - title: translate('dialog.blueprint_settings.title'), - width: 700, - component: BlueprintSettingsDialogSvelteComponent, - props: settings, - preventKeybinds: true, - onConfirm() { - setSettings(settings) - updateBoundingBox() - }, - }).show() -} diff --git a/src/interface/dialog/boneConfig.ts b/src/interface/dialog/boneConfig.ts index 94dacfa5..2755b89a 100644 --- a/src/interface/dialog/boneConfig.ts +++ b/src/interface/dialog/boneConfig.ts @@ -1,6 +1,6 @@ import { BLUEPRINT_FORMAT } from '../../blueprintFormat' import { BoneConfig } from '../../nodeConfigs' -import BoneConfigDialogSvelteComponent from '../../components/boneConfigDialog.svelte' +import BoneConfigDialogSvelteComponent from '../../svelte/boneConfigDialog.svelte' import { PACKAGE } from '../../constants' import { createAction } from '../../util/moddingTools' import { Valuable } from '../../util/stores' diff --git a/src/interface/dialog/changelog.ts b/src/interface/dialog/changelog.ts index de6aa3b6..308c67d8 100644 --- a/src/interface/dialog/changelog.ts +++ b/src/interface/dialog/changelog.ts @@ -1,4 +1,4 @@ -import ChangelogDialog from '../../components/changelogDialog.svelte' +import ChangelogDialog from '../../svelte/changelogDialog.svelte' import { PACKAGE } from '../../constants' import { SvelteDialog } from '../../util/svelteDialog' import { translate } from '../../util/translation' diff --git a/src/interface/dialog/exportProgress.ts b/src/interface/dialog/exportProgress.ts index 38fa54da..38db18d4 100644 --- a/src/interface/dialog/exportProgress.ts +++ b/src/interface/dialog/exportProgress.ts @@ -1,4 +1,4 @@ -import ExportProgressDialogSvelteComponent from '../../components/exportProgressDialog.svelte' +import ExportProgressDialogSvelteComponent from '../../svelte/exportProgressDialog.svelte' import { PACKAGE } from '../../constants' import { Valuable } from '../../util/stores' import { SvelteDialog } from '../../util/svelteDialog' diff --git a/src/interface/dialog/locatorConfig.ts b/src/interface/dialog/locatorConfig.ts index 5e75e6a2..1f56446e 100644 --- a/src/interface/dialog/locatorConfig.ts +++ b/src/interface/dialog/locatorConfig.ts @@ -1,5 +1,5 @@ import { BLUEPRINT_FORMAT } from '../../blueprintFormat' -import LocatorConfigDialog from '../../components/locatorConfigDialog.svelte' +import LocatorConfigDialog from '../../svelte/locatorConfigDialog.svelte' import { PACKAGE } from '../../constants' import { LocatorConfig } from '../../nodeConfigs' import { createAction } from '../../util/moddingTools' diff --git a/src/interface/dialog/textDisplayConfig.ts b/src/interface/dialog/textDisplayConfig.ts index 2042ed9e..e6e30698 100644 --- a/src/interface/dialog/textDisplayConfig.ts +++ b/src/interface/dialog/textDisplayConfig.ts @@ -6,7 +6,7 @@ import { Valuable } from '../../util/stores' import { SvelteDialog } from '../../util/svelteDialog' import { translate } from '../../util/translation' import { Variant } from '../../variants' -import TextDisplayConfigDialog from '../../components/textDisplayConfigDialog.svelte' +import TextDisplayConfigDialog from '../../svelte/textDisplayConfigDialog.svelte' import { TextDisplay } from '../../outliner/textDisplay' export function openBoneConfigDialog(bone: TextDisplay) { diff --git a/src/interface/dialog/unexpectedError.ts b/src/interface/dialog/unexpectedError.ts index c15aa402..e913f432 100644 --- a/src/interface/dialog/unexpectedError.ts +++ b/src/interface/dialog/unexpectedError.ts @@ -1,4 +1,4 @@ -import UnexpectedErrorDialog from '../../components/unexpectedErrorDialog.svelte' +import UnexpectedErrorDialog from '../../svelte/unexpectedErrorDialog.svelte' import { PACKAGE } from '../../constants' import { SvelteDialog } from '../../util/svelteDialog' import { translate } from '../../util/translation' diff --git a/src/interface/dialog/vanillaBlockDisplayConfig.ts b/src/interface/dialog/vanillaBlockDisplayConfig.ts index c1773a56..a8d99350 100644 --- a/src/interface/dialog/vanillaBlockDisplayConfig.ts +++ b/src/interface/dialog/vanillaBlockDisplayConfig.ts @@ -7,7 +7,7 @@ import { SvelteDialog } from '../../util/svelteDialog' import { translate } from '../../util/translation' import { Variant } from '../../variants' import { VanillaBlockDisplay } from '../../outliner/vanillaBlockDisplay' -import VanillaBlockDisplayConfigDialog from '../../components/vanillaBlockDisplayConfigDialog.svelte' +import VanillaBlockDisplayConfigDialog from '../../svelte/vanillaBlockDisplayConfigDialog.svelte' export function openVanillaBlockDisplayConfigDialog(display: VanillaBlockDisplay) { // Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the bone instead of the actual BoneConfig object diff --git a/src/interface/dialog/vanillaItemDisplayConfig.ts b/src/interface/dialog/vanillaItemDisplayConfig.ts index 1cf0ae90..d75fc0c5 100644 --- a/src/interface/dialog/vanillaItemDisplayConfig.ts +++ b/src/interface/dialog/vanillaItemDisplayConfig.ts @@ -7,7 +7,7 @@ import { SvelteDialog } from '../../util/svelteDialog' import { translate } from '../../util/translation' import { Variant } from '../../variants' import { VanillaItemDisplay } from '../../outliner/vanillaItemDisplay' -import VanillaItemDisplayConfigDialog from '../../components/vanillaItemDisplayConfigDialog.svelte' +import VanillaItemDisplayConfigDialog from '../../svelte/vanillaItemDisplayConfigDialog.svelte' export function openVanillaItemDisplayConfigDialog(display: VanillaItemDisplay) { // Blockbench's JSON stringifier doesn't handle custom toJSON functions, so I'm storing the config JSON in the bone instead of the actual BoneConfig object diff --git a/src/interface/dialog/variantConfig.ts b/src/interface/dialog/variantConfig.ts index afcec7dd..f5a6b4a0 100644 --- a/src/interface/dialog/variantConfig.ts +++ b/src/interface/dialog/variantConfig.ts @@ -1,4 +1,4 @@ -import VariantConfigDialogSvelteComponent from '../../components/variantConfigDialog.svelte' +import VariantConfigDialogSvelteComponent from '../../svelte/variantConfigDialog.svelte' import { PACKAGE } from '../../constants' import { events } from '../../util/events' import { Valuable } from '../../util/stores' diff --git a/src/interface/importAJModelLoader.ts b/src/interface/importAJModelLoader.ts index a0d31fb6..e3537e4f 100644 --- a/src/interface/importAJModelLoader.ts +++ b/src/interface/importAJModelLoader.ts @@ -1,13 +1,13 @@ import { SvelteComponentDev } from 'svelte/internal' -import { BLUEPRINT_CODEC, IBlueprintFormatJSON } from '../blueprintFormat' -import ImportAjModelLoaderDialog from '../components/importAJModelLoaderDialog.svelte' +import ImportAjModelLoaderDialog from '../svelte/importAJModelLoaderDialog.svelte' import { PACKAGE } from '../constants' -import * as ModelDatFixerUpper from '../systems/modelDataFixerUpper' import { injectSvelteCompomponent } from '../util/injectSvelteComponent' import { sanitizePathName } from '../util/minecraftUtil' import { createModelLoader } from '../util/moddingTools' import { translate } from '../util/translation' import { openUnexpectedErrorDialog } from './dialog/unexpectedError' +import * as ModelDatFixerUpper from '../systems/modelDataFixerUpper' +import { BLUEPRINT_CODEC, IBlueprintFormatJSON } from '../blueprintFormat' let activeComponent: SvelteComponentDev | null = null diff --git a/src/interface/index.ts b/src/interface/index.ts index ddad7aca..a6494698 100644 --- a/src/interface/index.ts +++ b/src/interface/index.ts @@ -1,6 +1,5 @@ import './dialog/about' import './dialog/animationProperties' -import './dialog/blueprintSettings' import './dialog/boneConfig' import './dialog/changelog' import './dialog/exportProgress' diff --git a/src/interface/keyframeEasings.ts b/src/interface/keyframeEasings.ts index 787d916b..be77e659 100644 --- a/src/interface/keyframeEasings.ts +++ b/src/interface/keyframeEasings.ts @@ -1,4 +1,4 @@ -import KeyframeEasingsSvelte from '../components/keyframeEasings.svelte' +import KeyframeEasingsSvelte from '../svelte/keyframeEasings.svelte' import { injectSvelteCompomponentMod } from '../util/injectSvelteComponent' injectSvelteCompomponentMod({ diff --git a/src/interface/panel/customKeyframe.ts b/src/interface/panel/customKeyframe.ts index df918b17..f2f087b9 100644 --- a/src/interface/panel/customKeyframe.ts +++ b/src/interface/panel/customKeyframe.ts @@ -1,6 +1,6 @@ import type { SvelteComponentDev } from 'svelte/internal' import { isCurrentFormat } from '../../blueprintFormat' -import CustomKeyframePanelSvelteComponent from '../../components/customKeyframePanel.svelte' +import CustomKeyframePanelSvelteComponent from '../../svelte/customKeyframePanel.svelte' import { CUSTOM_CHANNELS } from '../../mods/customKeyframesMod' import { events } from '../../util/events' import { injectSvelteCompomponent } from '../../util/injectSvelteComponent' diff --git a/src/interface/panel/textDisplayElement.ts b/src/interface/panel/textDisplayElement.ts index dc42a04c..325a315d 100644 --- a/src/interface/panel/textDisplayElement.ts +++ b/src/interface/panel/textDisplayElement.ts @@ -1,5 +1,5 @@ import { isCurrentFormat } from '../../blueprintFormat' -import TextDisplayElementPanel from '../../components/textDisplayElementPanel.svelte' +import TextDisplayElementPanel from '../../svelte/textDisplayElementPanel.svelte' import { PACKAGE } from '../../constants' import { Alignment, TextDisplay } from '../../outliner/textDisplay' import { injectSvelteCompomponentMod } from '../../util/injectSvelteComponent' diff --git a/src/interface/panel/vanillaBlockDisplayElement.ts b/src/interface/panel/vanillaBlockDisplayElement.ts index f55ba202..427dbb7b 100644 --- a/src/interface/panel/vanillaBlockDisplayElement.ts +++ b/src/interface/panel/vanillaBlockDisplayElement.ts @@ -1,4 +1,4 @@ -import VanillaBlockDisplayElementPanel from '../../components/vanillaBlockDisplayElementPanel.svelte' +import VanillaBlockDisplayElementPanel from '../../svelte/vanillaBlockDisplayElementPanel.svelte' import { injectSvelteCompomponentMod } from '../../util/injectSvelteComponent' injectSvelteCompomponentMod({ diff --git a/src/interface/panel/vanillaItemDisplayElement.ts b/src/interface/panel/vanillaItemDisplayElement.ts index 2b1dfee7..664acdd0 100644 --- a/src/interface/panel/vanillaItemDisplayElement.ts +++ b/src/interface/panel/vanillaItemDisplayElement.ts @@ -1,5 +1,5 @@ import { isCurrentFormat } from '../../blueprintFormat' -import VanillaItemDisplayElementPanel from '../../components/vanillaItemDisplayElementPanel.svelte' +import VanillaItemDisplayElementPanel from '../../svelte/vanillaItemDisplayElementPanel.svelte' import { PACKAGE } from '../../constants' import { ItemDisplayMode, VanillaItemDisplay } from '../../outliner/vanillaItemDisplay' import { events } from '../../util/events' diff --git a/src/interface/panel/variants.ts b/src/interface/panel/variants.ts index 26ca68ff..9f4731b8 100644 --- a/src/interface/panel/variants.ts +++ b/src/interface/panel/variants.ts @@ -1,5 +1,5 @@ import { isCurrentFormat } from '../../blueprintFormat' -import VariantsPanel from '../../components/variantsPanel.svelte' +import VariantsPanel from '../../svelte/variantsPanel.svelte' import { PACKAGE } from '../../constants' import { createAction, createMenu } from '../../util/moddingTools' import { SveltePanel } from '../../util/sveltePanel' diff --git a/src/interface/popup/animatedJavaLoading.ts b/src/interface/popup/animatedJavaLoading.ts index ec808005..8503ebbd 100644 --- a/src/interface/popup/animatedJavaLoading.ts +++ b/src/interface/popup/animatedJavaLoading.ts @@ -1,5 +1,5 @@ import { SvelteComponentDev } from 'svelte/internal' -import AnimatedJavaLoadingPopup from '../../components/animatedJavaLoadingPopup.svelte' +import AnimatedJavaLoadingPopup from '../../svelte/animatedJavaLoadingPopup.svelte' import { injectSvelteCompomponent } from '../../util/injectSvelteComponent' import { Valuable } from '../../util/stores' diff --git a/src/interface/popup/blueprintLoading.ts b/src/interface/popup/blueprintLoading.ts index 9ae44be5..6c4d9a04 100644 --- a/src/interface/popup/blueprintLoading.ts +++ b/src/interface/popup/blueprintLoading.ts @@ -1,4 +1,4 @@ -import BlueprintLoadingPopup from '../../components/blueprintLoadingPopup.svelte' +import BlueprintLoadingPopup from '../../svelte/blueprintLoadingPopup.svelte' import { PACKAGE } from '../../constants' import { Valuable } from '../../util/stores' import { SvelteDialog } from '../../util/svelteDialog' diff --git a/src/interface/popup/incompatabilityPopup.ts b/src/interface/popup/incompatabilityPopup.ts index 65032eee..a03861cf 100644 --- a/src/interface/popup/incompatabilityPopup.ts +++ b/src/interface/popup/incompatabilityPopup.ts @@ -1,4 +1,4 @@ -import IncompatabilityPopup from '../../components/incompatabilityPopup.svelte' +import IncompatabilityPopup from '../../svelte/incompatabilityPopup.svelte' import { PACKAGE } from '../../constants' import { SvelteDialog } from '../../util/svelteDialog' import { translate } from '../../util/translation' diff --git a/src/interface/popup/installed.ts b/src/interface/popup/installed.ts index 9ea89d25..1e2141fe 100644 --- a/src/interface/popup/installed.ts +++ b/src/interface/popup/installed.ts @@ -1,4 +1,4 @@ -import InstalledPopup from '../../components/installedPopup.svelte' +import InstalledPopup from '../../svelte/installedPopup.svelte' import { PACKAGE } from '../../constants' import { SvelteDialog } from '../../util/svelteDialog' import { translate } from '../../util/translation' diff --git a/src/lang/en.yml b/src/lang/en.yml index 2d7a9cee..b3ddd821 100644 --- a/src/lang/en.yml +++ b/src/lang/en.yml @@ -1,3 +1,86 @@ +# ---------------------------------------- +# NEW TRANSLATIONS +# ---------------------------------------- +dialog: + error: + # Generic Errors + function_file.no_leading_slash: Commands inside of function files cannot start with a leading slash! + no_folder_selected: No folder selected! + folder_does_not_exist: The selected folder does not exist! + not_a_folder: The selected path is not a folder! + no_file_selected: No file selected! + file_does_not_exist: The selected file does not exist! + not_a_file: The selected path is not a file! + not_a_zip_file: The selected file is not a `.zip` file! + + placeholder: + select_a_folder: Select a folder... + select_a_file: Select a file... + + blueprint_settings: + title: Blueprint Settings + general: + plugin: + + resourcepack: + error: + missing_assets_folder: The selected Resource Pack is missing an assets folder! + + datapack: + error: + missing_pack_mcmeta: The selected folder is missing a pack.mcmeta file! + warning: + missing_data_folder: The selected Data Pack is missing a data folder! + + export_mode.folder: + label: Export to Folder + description: Export the generated Data Pack to a folder. + export_mode.zip: + label: Export to Zip + description: Export the generated Data Pack to a `.zip` file. + export_mode.none: + label: Do Not Export + description: Do not export the generated Data Pack. + + export_folder.label: Export Folder + export_folder.description: Choose the folder to export the Data Pack into. + + export_zip.label: Export Zip + export_zip.description: Choose the `.zip` file to export the Data Pack into. + + on_summon_commands.label: On-Summon Commands + on_summon_commands.description: |- + Commands that will be run as the root entity when the model is summoned. + This input is treated as a function file, and supports [MC-Build](https://mcbuild.dev/) syntax. + + on_tick_commands.label: On-Tick Commands + on_tick_commands.description: |- + Commands that will be run as the root entity every tick. + This input is treated as a function file, and supports [MC-Build](https://mcbuild.dev/) syntax. + + interpolation_duration.label: Interpolation Duration + interpolation_duration.description: |- + How much time it takes for the model to transition from one frame to the next. Higher values will cause animations to lose precision. + Usually you want this to have a value of 1 or 2. + + teleportation_duration.label: Teleport Duration + teleportation_duration.description: |- + How much time over which the model will visually interpolate between it's old position to it's new position when teleported. + + animation_system.label: Animation System + animation_system.description: |- + Choose the animation system to use for the project. + animation_system.functions: + label: Function-based + description: Fast and simple, but creates a lot of function files. + animation_system.storage: + label: Storage-based + description: 42% Slower than function-based, but creates far fewer function files. + +# ---------------------------------------- +# OLD TRANSLATIONS +# ---------------------------------------- + ### Actions animated_java.action.open_blueprint_settings.name: Blueprint Settings animated_java.action.open_documentation.name: Documentation diff --git a/src/mods/formatIconMod.ts b/src/mods/formatIconMod.ts index 4a855724..9d845a32 100644 --- a/src/mods/formatIconMod.ts +++ b/src/mods/formatIconMod.ts @@ -1,4 +1,4 @@ -import Icon from '../components/icon.svelte' +import Icon from '../svelte/icon.svelte' import { PACKAGE } from '../constants' import { injectSvelteCompomponent } from '../util/injectSvelteComponent' import { createBlockbenchMod } from '../util/moddingTools' diff --git a/src/mods/index.ts b/src/mods/index.ts index 7776807d..c6aaa7f3 100644 --- a/src/mods/index.ts +++ b/src/mods/index.ts @@ -29,3 +29,4 @@ import './showDefaultPoseMod' import './variantPreviewCubeFaceMod' import './cameraNameMod' import './pluginsDialogMod' +import './prismMod' diff --git a/src/mods/pluginsDialogMod.ts b/src/mods/pluginsDialogMod.ts index 36d841c9..0958900e 100644 --- a/src/mods/pluginsDialogMod.ts +++ b/src/mods/pluginsDialogMod.ts @@ -1,4 +1,4 @@ -import IncompatiblePluginNotice from '../components/incompatiblePluginNotice.svelte' +import IncompatiblePluginNotice from '../svelte/incompatiblePluginNotice.svelte' import { PACKAGE } from '../constants' import { injectSvelteCompomponentMod } from '../util/injectSvelteComponent' import { createBlockbenchMod } from '../util/moddingTools' diff --git a/src/mods/prismMod.ts b/src/mods/prismMod.ts new file mode 100644 index 00000000..6cb920eb --- /dev/null +++ b/src/mods/prismMod.ts @@ -0,0 +1,351 @@ +Prism.languages.clike = { + comment: [ + { + pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/, + lookbehind: true, + greedy: true, + }, + { + pattern: /(^|[^\\:])\/\/.*/, + lookbehind: true, + greedy: true, + }, + ], + string: { + pattern: /(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/, + greedy: true, + }, + 'class-name': { + pattern: + /(\b(?:class|extends|implements|instanceof|interface|new|trait)\s+|\bcatch\s+\()[\w.\\]+/i, + lookbehind: true, + inside: { + punctuation: /[.\\]/, + }, + }, + keyword: + /\b(?:break|catch|continue|do|else|finally|for|function|if|in|instanceof|new|null|return|throw|try|while)\b/, + boolean: /\b(?:false|true)\b/, + function: /\b\w+(?=\()/, + number: /\b0x[\da-f]+\b|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i, + operator: /[<>]=?|[!=]=?=?|--?|\+\+?|&&?|\|\|?|[?*/~^%]/, + punctuation: /[{}[\];(),.:]/, +} + +Prism.languages.javascript = Prism.languages.extend('clike', { + 'class-name': [ + // @ts-expect-error + Prism.languages.clike['class-name'], + { + pattern: + /(^|[^$\w\xA0-\uFFFF])(?!\s)[_$A-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\.(?:constructor|prototype))/, + lookbehind: true, + }, + ], + keyword: [ + { + pattern: /((?:^|\})\s*)catch\b/, + lookbehind: true, + }, + { + pattern: + /(^|[^.]|\.\.\.\s*)\b(?:as|assert(?=\s*\{)|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/, + lookbehind: true, + }, + ], + // Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444) + function: + /#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*(?:\.\s*(?:apply|bind|call)\s*)?\()/, + number: { + pattern: RegExp( + /(^|[^\w$])/.source + + '(?:' + + // constant + (/NaN|Infinity/.source + + '|' + + // binary integer + /0[bB][01]+(?:_[01]+)*n?/.source + + '|' + + // octal integer + /0[oO][0-7]+(?:_[0-7]+)*n?/.source + + '|' + + // hexadecimal integer + /0[xX][\dA-Fa-f]+(?:_[\dA-Fa-f]+)*n?/.source + + '|' + + // decimal bigint + /\d+(?:_\d+)*n/.source + + '|' + + // decimal number (integer or float) but no bigint + /(?:\d+(?:_\d+)*(?:\.(?:\d+(?:_\d+)*)?)?|\.\d+(?:_\d+)*)(?:[Ee][+-]?\d+(?:_\d+)*)?/ + .source) + + ')' + + /(?![\w$])/.source + ), + lookbehind: true, + }, + operator: + /--|\+\+|\*\*=?|=>|&&=?|\|\|=?|[!=]==|<<=?|>>>?=?|[-+*/%&|^!=<>]=?|\.{3}|\?\?=?|\?\.?|[~:]/, +}) + +// @ts-expect-error +Prism.languages.javascript['class-name'][0].pattern = + /(\b(?:class|extends|implements|instanceof|interface|new)\s+)[\w.\\]+/ + +Prism.languages.insertBefore('javascript', 'keyword', { + regex: { + pattern: RegExp( + // lookbehind + /((?:^|[^$\w\xA0-\uFFFF."'\])\s]|\b(?:return|yield))\s*)/.source + + // Regex pattern: + // There are 2 regex patterns here. The RegExp set notation proposal added support for nested character + // classes if the `v` flag is present. Unfortunately, nested CCs are both context-free and incompatible + // with the only syntax, so we have to define 2 different regex patterns. + /\//.source + + '(?:' + + /(?:\[(?:[^\]\\\r\n]|\\.)*\]|\\.|[^/\\[\r\n])+\/[dgimyus]{0,7}/.source + + '|' + + // `v` flag syntax. This supports 3 levels of nested character classes. + /(?:\[(?:[^[\]\\\r\n]|\\.|\[(?:[^[\]\\\r\n]|\\.|\[(?:[^[\]\\\r\n]|\\.)*\])*\])*\]|\\.|[^/\\[\r\n])+\/[dgimyus]{0,7}v[dgimyus]{0,7}/ + .source + + ')' + + // lookahead + /(?=(?:\s|\/\*(?:[^*]|\*(?!\/))*\*\/)*(?:$|[\r\n,.;:})\]]|\/\/))/.source + ), + lookbehind: true, + greedy: true, + inside: { + 'regex-source': { + pattern: /^(\/)[\s\S]+(?=\/[a-z]*$)/, + lookbehind: true, + alias: 'language-regex', + inside: Prism.languages.regex, + }, + 'regex-delimiter': /^\/|\/$/, + 'regex-flags': /^[a-z]+$/, + }, + }, + // This must be declared before keyword because we use "function" inside the look-forward + 'function-variable': { + pattern: + /#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*[=:]\s*(?:async\s*)?(?:\bfunction\b|(?:\((?:[^()]|\([^()]*\))*\)|(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)\s*=>))/, + alias: 'function', + }, + parameter: [ + { + pattern: + /(function(?:\s+(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*)?\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\))/, + lookbehind: true, + inside: Prism.languages.javascript, + }, + { + pattern: + /(^|[^$\w\xA0-\uFFFF])(?!\s)[_$a-z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*=>)/i, + lookbehind: true, + inside: Prism.languages.javascript, + }, + { + pattern: /(\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*=>)/, + lookbehind: true, + inside: Prism.languages.javascript, + }, + { + pattern: + /((?:\b|\s|^)(?!(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)(?![$\w\xA0-\uFFFF]))(?:(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*\s*)\(\s*|\]\s*\(\s*)(?!\s)(?:[^()\s]|\s+(?![\s)])|\([^()]*\))+(?=\s*\)\s*\{)/, + lookbehind: true, + inside: Prism.languages.javascript, + }, + ], + constant: /\b[A-Z](?:[A-Z_]|\dx?)*\b/, +}) + +Prism.languages.insertBefore('javascript', 'string', { + hashbang: { + pattern: /^#!.*/, + greedy: true, + alias: 'comment', + }, + 'template-string': { + pattern: /`(?:\\[\s\S]|\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}|(?!\$\{)[^\\`])*`/, + greedy: true, + inside: { + 'template-punctuation': { + pattern: /^`|`$/, + alias: 'string', + }, + interpolation: { + pattern: /((?:^|[^\\])(?:\\{2})*)\$\{(?:[^{}]|\{(?:[^{}]|\{[^}]*\})*\})+\}/, + lookbehind: true, + inside: { + 'interpolation-punctuation': { + pattern: /^\$\{|\}$/, + alias: 'punctuation', + }, + rest: Prism.languages.javascript, + }, + }, + string: /[\s\S]+/, + }, + }, + 'string-property': { + pattern: /((?:^|[,{])[ \t]*)(["'])(?:\\(?:\r\n|[\s\S])|(?!\2)[^\\\r\n])*\2(?=\s*:)/m, + lookbehind: true, + greedy: true, + alias: 'property', + }, +}) + +Prism.languages.insertBefore('javascript', 'operator', { + 'literal-property': { + pattern: + /((?:^|[,{])[ \t]*)(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?=\s*:)/m, + lookbehind: true, + alias: 'property', + }, +}) + +Prism.languages['mcfunction'] = { + comment: { + pattern: /^#.*/m, + greedy: true, + }, + string: { + pattern: /"(?:\\.|[^\\"])*"/, + greedy: true, + }, + number: { + pattern: /\b\d+(?:\.\d+)?(?:[eE][+-]?\d+)?\b/, + greedy: true, + }, + boolean: { + pattern: /\b(?:true|false)\b/, + greedy: true, + }, + uuid: { + pattern: /\b[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\b/, + greedy: true, + }, + selector: { + pattern: /@[a-z]/, + greedy: true, + }, + keyword: { + pattern: + /\b(?:execute|run|if|unless|function|schedule|tag|advancement|enchantment|item_modifier|loot_table|predicate|recipe|chat_type|damage_type|dimension|dimension_type|worldgen|block|tick|load|clock|REPEAT|IF|ELSE)\b/, + greedy: true, + }, + operator: { + pattern: /[~%^?!+*<>\\/|&=.:,;-]/, + greedy: true, + }, + 'macro-indicator': { + pattern: /^[ \t]*\$/, + alias: ['italic', 'operator'], + }, + property: { + pattern: /[a-z_][a-z0-9_]*\s*:/, + greedy: true, + }, + function: { + pattern: /\b[a-z_][a-z0-9_]*\b/, + greedy: true, + }, +} + +Prism.languages['mc-build'] = { + comment: { + pattern: /^[ \t]*#.*/m, + greedy: true, + }, + 'inline-js': { + pattern: /<%[^%]+%>/, + inside: { + keyword: /<%|%>/, + js: { + pattern: /.+/, + inside: Prism.languages.javascript, + }, + }, + }, + 'multiline-js': { + pattern: /<%%[\s\S]*?%%>/, + inside: { + keyword: /<%%|%%>/, + js: { + pattern: /[\s\S]+/, + inside: Prism.languages.javascript, + }, + }, + }, + 'schedule-block': { + pattern: /^[ \t]*\$?schedule\s+(\d+(t|s|d))(?:\s+(replace|append))?\s*{[\s\S]*?^[ \t]*}$/m, + inside: { + operator: /\$(?=schedule)/, + keyword: /^[ \t]*\$?schedule/, + constant: /(\d+(t|s|d))/, + 'keyword-other': { + pattern: /\b(replace|append)\b/, + alias: 'keyword', + }, + content: { + pattern: /{[\s\S]*}/, + get inside() { + return Prism.languages['mc-build'] + }, + }, + }, + }, + 'function-block': { + pattern: /block\s*[a-z0-9_]*\s*{(?:$|({.+|with .+)$)/m, + inside: { + keyword: /^block/, + entity: /[a-z0-9_]+/, + content: { + pattern: /{[\s\S]*}/, + get inside() { + return Prism.languages['mc-build'] + }, + }, + }, + }, + execute: { + pattern: + /((?: |^[ \t]*)(\$?execute\b)|(\belse \$?execute\b)|else)[\s\S]*?(?: |^[ \t]*)(\$?run\b)/m, + inside: { + keyword: /(\$?execute\b|\belse \$?execute\b|else|\$?run\b)/, + operator: /\$/, + content: { + pattern: /[\s\S]+/, + get inside() { + return Prism.languages['mc-build'] + }, + }, + }, + }, + 'execute-if-function': { + pattern: /(if|unless)\s+function\s*{[\s\S]*?^[ \t]*}$/m, + inside: { + keyword: /(if|unless)/, + entity: /function/, + content: { + pattern: /{[\s\S]*}/, + get inside() { + return Prism.languages['mc-build'] + }, + }, + }, + }, + 'special-function-call': { + pattern: /^[ \t]*function\s+#?(?:\*|\.?\.\/).+?(?: |$)/m, + inside: { + keyword: /^function/, + entity: /#?(?:\*|\.?\.\/).+?(?: |$)/, + content: { + pattern: /.+/, + get inside() { + return Prism.languages['mc-build'] + }, + }, + }, + }, + ...Prism.languages['mcfunction'], +} diff --git a/src/mods/projectSettingsActionOverride.ts b/src/mods/projectSettingsActionOverride.ts index 2cdd50d8..d14a47c9 100644 --- a/src/mods/projectSettingsActionOverride.ts +++ b/src/mods/projectSettingsActionOverride.ts @@ -1,6 +1,6 @@ import PACKAGE from '../../package.json' import { BLUEPRINT_FORMAT } from '../blueprintFormat' -import { openBlueprintSettingsDialog } from '../interface/dialog/blueprintSettings' +import { openBlueprintSettingsDialog } from '../svelte/blueprintSettings' import { createBlockbenchMod } from '../util/moddingTools' createBlockbenchMod( diff --git a/src/svelte/about.svelte b/src/svelte/about.svelte new file mode 100644 index 00000000..7d3c8bbc --- /dev/null +++ b/src/svelte/about.svelte @@ -0,0 +1,209 @@ + + +
+
+ + +
+

Animated Java

+

{PACKAGE.display_version}

+
+
+ +
+ + + + + + + + + + + + + + + + + + +
+ +

Created by Titus Evans (SnaveSutit)

+

+ {PACKAGE.description} +

+ +

Special Thanks to

+
+
+

Ian Senne (FetchBot)

+

For always being there to help.

+
+
+

Jesse Spicer (Dominexis)

+

For making quaternions and matrices make sense.

+
+
+

Jannis Petersen

+

For creating an amazing tool and community.

+
+
+

Ewan Howell

+

For keeping me sane as I dig through Blockbench source code.

+
+
+

Boxic

+

For throwing absurd amounts of money at me.

+
+
+

Flubberschnub

+

For showing off the power of AJ with his boss fights.

+
+
+ +

Ko-fi Supporters

+
+ {#each PACKAGE.subscription_supporters.sort() as special} +

{special}

+ {/each} +
+ +

Cool People who helped make AJ what it is today

+
+ {#each PACKAGE.special_thanks.sort() as special} +

{special}

+ {/each} +
+
+ + diff --git a/src/components/animatedJavaLoadingPopup.svelte b/src/svelte/animatedJavaLoadingPopup.svelte similarity index 100% rename from src/components/animatedJavaLoadingPopup.svelte rename to src/svelte/animatedJavaLoadingPopup.svelte diff --git a/src/components/animationProperties.svelte b/src/svelte/animationProperties.svelte similarity index 88% rename from src/components/animationProperties.svelte rename to src/svelte/animationProperties.svelte index 35fe7b57..65016624 100644 --- a/src/components/animationProperties.svelte +++ b/src/svelte/animationProperties.svelte @@ -1,14 +1,14 @@ + + + +{#if $datapackExportMode !== 'none'} + {#if $datapackExportMode === 'folder'} + + {:else} + + {/if} + + + + + + + + + + +{/if} diff --git a/src/svelte/blueprintSettings/pages/general.svelte b/src/svelte/blueprintSettings/pages/general.svelte new file mode 100644 index 00000000..0e297903 --- /dev/null +++ b/src/svelte/blueprintSettings/pages/general.svelte @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + diff --git a/src/svelte/blueprintSettings/pages/plugin.svelte b/src/svelte/blueprintSettings/pages/plugin.svelte new file mode 100644 index 00000000..b2af133a --- /dev/null +++ b/src/svelte/blueprintSettings/pages/plugin.svelte @@ -0,0 +1,45 @@ + + + diff --git a/src/svelte/blueprintSettings/pages/resourcepack.svelte b/src/svelte/blueprintSettings/pages/resourcepack.svelte new file mode 100644 index 00000000..1eafec49 --- /dev/null +++ b/src/svelte/blueprintSettings/pages/resourcepack.svelte @@ -0,0 +1,157 @@ + + + + +{#if $resourcePackExportMode !== 'none'} + {#if $resourcePackExportMode === 'folder'} + + {:else if $resourcePackExportMode === 'zip'} + + {/if} +{/if} + + + +{#if compareVersions('1.21.4', $targetMinecraftVersion)} + +{/if} + + diff --git a/src/svelte/blueprintSettings/requiredAsteriskInform.svelte b/src/svelte/blueprintSettings/requiredAsteriskInform.svelte new file mode 100644 index 00000000..59025adf --- /dev/null +++ b/src/svelte/blueprintSettings/requiredAsteriskInform.svelte @@ -0,0 +1,12 @@ +
* = Required
+ + diff --git a/src/components/boneConfigDialog.svelte b/src/svelte/boneConfigDialog.svelte similarity index 95% rename from src/components/boneConfigDialog.svelte rename to src/svelte/boneConfigDialog.svelte index 38cfef2e..bb93544a 100644 --- a/src/components/boneConfigDialog.svelte +++ b/src/svelte/boneConfigDialog.svelte @@ -1,9 +1,9 @@
-
-
+
+
+ {#if tooltip} + + + {:else} +