+
+Contributions are always welcome, but please consult @SnaveSutit before starting to avoid duplicates or misalignment of goals. I don't want you to waste all that time and effort on a PR that gets refused!
+
+
+ Thank you! ❤️
+
+
+
+
+
💻 Setting up the Development Environment
+
+### 🛠️ Prerequisites
+
+- #### Required
+
+ - [Node.js](https://nodejs.org/en/)
+ - [Yarn](https://classic.yarnpkg.com/lang/en/docs/install/#windows-stable)
+ - [Git](https://git-scm.com/)
+
+- #### Recommended
+
+ - [VSCode](https://code.visualstudio.com/)
+ > (or any other code editor, but this project has configurations for VSCode)
+ - [Blockbench](https://www.blockbench.net/)
+ > The repository includes [Envbench](https://github.com/SnaveSutit/envbench) to create and manage a dev instance of Blockbench, So installing Blockbench separately is not strictly required.
+ - [SnaveSutit's Blockbench Types](https://github.com/SnaveSutit/blockbench-types)
+ > Bleeding edge types for Blockbench plugins. Install via `yarn add -D https://github.com/SnaveSutit/blockbench-types.git`
+ - [GitButler](https://gitbutler.com/)
+ > A Git client for simultaneous branches on top of your existing workflow.
+
+## 🖇️ Cloning the Repository
+
+1. Clone the repository via git
+
+ > [How do I clone a repository?](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository)
+
+2. Run `yarn install` to install dependencies.
+
+3. Open up `src/blockbenchTypes.d.ts` and replace the first line with the following:
+
+ ```ts
+ ///
+ ```
+
+ > By default this references my local fork of the Blockbench types to quickly add / adjust types as needed. So you need to adjust this to the official Blockbench types, or your own fork, if you're not me.
+
+4. Run `yarn dev` to start the development environment, which will watch for changes and recompile the plugin.
+
+5. Open a new terminal, or click `Split` if you're in VSCode's terminal, and run `yarn start` to start the development instance of Blockbench.
+
+6. That's it! You're ready to start developing.
+
+> [!IMPORTANT]
+> Note that whenever you make changes, reloading just the plugins won't be enough, you must fully reload Blockbench for the plugin to function as expected.
+> You can use CTRL + SHIFT + R
+> to reload Blockbench, or run `Blockbench.reload()` in the dev-tools console.
+
+## 💬 Adding Localizations
+
+1. Follow the instructions for [Cloning the Repository](#🖇️-cloning-the-repository).
+
+2. Duplicate `src/lang/en.yml` and rename it to match the language you're translating to. (e.g. `fr.yml` for French).
+
+ > See [this page](https://github.com/JannisX11/blockbench/tree/master/lang) for the list of languages Blockbench supports.
+
+3. Start Translating! Make sure to check your changes in Blockbench to ensure they work correctly.
+
+ > [!IMPORTANT]
+ > You will see strings that have curly brackets surrounding a number (`{0}`) in them, these are placeholders that indicate where variables should inserted into a string. Make sure to keep them in your translations!
+
+4. Once you're done translating, open a pull request with your changes.
diff --git a/README.md b/README.md
index be731cc3..d4af7cd0 100644
--- a/README.md
+++ b/README.md
@@ -1,80 +1,111 @@
-
-
Animated Java
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- A Blockbench plugin that makes complex animation a breeze in Minecraft: Java Edition.
+ Effortlessly craft complex animations in Minecraft: Java Edition
-
-
diff --git a/src/global.d.ts b/src/global.d.ts
index e3c0641c..4b4f444d 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -1,4 +1,5 @@
-///
+////
+///
declare module '*.png' {
const value: string
@@ -47,3 +48,8 @@ declare module '*.molang' {
declare module 'fflate/browser' {
export * from 'fflate'
}
+
+/**
+ * Display entity billboard mode
+ */
+type BillboardMode = 'fixed' | 'vertical' | 'horizontal' | 'center'
diff --git a/src/index.ts b/src/index.ts
index db3e1408..67668fbb 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,55 +1,63 @@
import { PACKAGE } from './constants'
-import { events } from './util/events'
import './util/translation'
// Blueprint Format
-import './blueprintFormat'
+import './blockbench-additions/model-formats/ajblueprint'
// Interface
-import './interface'
+import './ui'
// Blockbench Mods
-import './mods'
-// Outliner
-import './outliner/textDisplay'
-import './outliner/vanillaItemDisplay'
-import './outliner/vanillaBlockDisplay'
+import './blockbench-mods'
+// Blockbench Additions
+import './blockbench-additions'
// Compilers
-import datapackCompiler from './systems/datapackCompiler'
+import datapackCompiler from './systems/datapack-compiler'
// Minecraft Systems
-import './systems/minecraft/versionManager'
-import './systems/minecraft/registryManager'
-import './systems/minecraft/blockstateManager'
-import './systems/minecraft/assetManager'
-import './systems/minecraft/fontManager'
+import './systems/minecraft-temp/assetManager'
+import './systems/minecraft-temp/blockstateManager'
+import './systems/minecraft-temp/fontManager'
+import './systems/minecraft-temp/registryManager'
+import './systems/minecraft-temp/versionManager'
// Misc imports
-import { Variant } from './variants'
-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 { BLUEPRINT_CODEC, BLUEPRINT_FORMAT } from './blockbench-additions/model-formats/ajblueprint'
+import {
+ BlockDisplay,
+ debugBlockState,
+ debugBlocks,
+} from './blockbench-additions/outliner-elements/blockDisplay'
+import { TextDisplay } from './blockbench-additions/outliner-elements/textDisplay'
import { blueprintSettingErrors } from './blueprintSettings'
-import { openUnexpectedErrorDialog } from './interface/dialog/unexpectedError'
-import { BLUEPRINT_CODEC, BLUEPRINT_FORMAT } from './blueprintFormat'
-import { TextDisplay } from './outliner/textDisplay'
-import { getLatestVersionClientDownloadUrl } from './systems/minecraft/assetManager'
-import { getVanillaFont } from './systems/minecraft/fontManager'
-import * as assetManager from './systems/minecraft/assetManager'
-import * as itemModelManager from './systems/minecraft/itemModelManager'
-import * as blockModelManager from './systems/minecraft/blockModelManager'
-import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
-import { VanillaBlockDisplay, debugBlockState, debugBlocks } from './outliner/vanillaBlockDisplay'
-import { BLOCKSTATE_REGISTRY } from './systems/minecraft/blockstateManager'
-import { exportProject } from './systems/exporter'
-import { openBlueprintLoadingDialog } from './interface/popup/blueprintLoading'
-import { openInstallPopup } from './interface/popup/installed'
import { cleanupExportedFiles } from './systems/cleaner'
-import mcbFiles from './systems/datapackCompiler/mcbFiles'
-import { openChangelogDialog } from './interface/changelogDialog'
-import { checkForIncompatabilities } from './interface/popup/incompatabilityPopup'
+import mcbFiles from './systems/datapack-compiler/versions'
+import { exportProject } from './systems/exporter'
+import * as assetManager from './systems/minecraft-temp/assetManager'
+import { getLatestVersionClientDownloadUrl } from './systems/minecraft-temp/assetManager'
+import * as blockModelManager from './systems/minecraft-temp/blockModelManager'
+import { BLOCKSTATE_REGISTRY } from './systems/minecraft-temp/blockstateManager'
+import { getVanillaFont } from './systems/minecraft-temp/fontManager'
+import * as itemModelManager from './systems/minecraft-temp/itemModelManager'
+import './systems/minecraft-temp/registryManager'
+import { MINECRAFT_REGISTRY } from './systems/minecraft-temp/registryManager'
+import resourcepackCompiler from './systems/resourcepack-compiler'
+import { openChangelogDialog } from './ui/dialogs/changelog'
+import { openExportProgressDialog } from './ui/dialogs/export-progress'
+import { openUnexpectedErrorDialog } from './ui/dialogs/unexpected-error'
+import { checkForIncompatabilities } from './ui/popups/incompatability'
+import { openInstallPopup } from './ui/popups/installed'
+import {
+ isDataPackPath,
+ isResourcePackPath,
+ parseResourceLocation,
+ parseResourcePackPath,
+} from './util/minecraftUtil'
+import { Variant } from './variants'
+
+import { ItemDisplay } from './blockbench-additions/outliner-elements/itemDisplay'
+import registerPlugin from './plugin'
+import { createBlockbenchMod } from './util/moddingTools'
-// @ts-ignore
-globalThis.AnimatedJava = {
+const PLUGIN_API = {
API: {
parseResourcePackPath,
+ parseResourceLocation,
datapackCompiler,
resourcepackCompiler,
Variant,
@@ -67,13 +75,12 @@ globalThis.AnimatedJava = {
assetManager,
itemModelManager,
blockModelManager,
- VanillaItemDisplay,
- VanillaBlockDisplay,
+ ItemDisplay,
+ BlockDisplay,
debugBlocks,
debugBlockState,
BLOCKSTATE_REGISTRY,
exportProject,
- openBlueprintLoadingDialog,
openInstallPopup,
removeCubesAssociatedWithTexture(texture: Texture) {
const cubes = Cube.all.filter(cube =>
@@ -91,6 +98,23 @@ globalThis.AnimatedJava = {
},
}
+declare global {
+ // eslint-disable-next-line @typescript-eslint/naming-convention, no-var
+ var AnimatedJava: typeof PLUGIN_API
+}
+
+createBlockbenchMod(
+ `${PACKAGE.name}:global/api`,
+ undefined,
+ () => {
+ globalThis.AnimatedJava = PLUGIN_API
+ },
+ () => {
+ // @ts-expect-error: AnimatedJava type is not optional, but we want to delete it when uninstalling
+ delete globalThis.AnimatedJava
+ }
+)
+
requestAnimationFrame(() => {
if (checkForIncompatabilities()) return
@@ -101,38 +125,4 @@ requestAnimationFrame(() => {
}
})
-// Uninstall events
-events.EXTRACT_MODS.subscribe(() => {
- // @ts-ignore
- globalThis.AnimatedJava = undefined
-})
-
-BBPlugin.register(PACKAGE.name, {
- title: PACKAGE.title,
- author: PACKAGE.author.name,
- description: PACKAGE.description,
- icon: 'icon.svg',
- variant: 'desktop',
- version: PACKAGE.version,
- min_version: PACKAGE.min_blockbench_version,
- tags: ['Minecraft: Java Edition', 'Animation', 'Display Entities'],
- await_loading: true,
- onload() {
- events.LOAD.dispatch()
- },
- onunload() {
- events.UNLOAD.dispatch()
- },
- oninstall() {
- events.INSTALL.dispatch()
- openInstallPopup()
- },
- onuninstall() {
- events.UNINSTALL.dispatch()
- Blockbench.showMessageBox({
- title: 'Animated Java has Been Uninstalled!',
- message: 'In order to fully uninstall Animated Java, please restart Blockbench.',
- buttons: ['OK'],
- })
- },
-})
+registerPlugin()
diff --git a/src/interface/animatedJavaBarItem.ts b/src/interface/animatedJavaBarItem.ts
deleted file mode 100644
index b09d3aa2..00000000
--- a/src/interface/animatedJavaBarItem.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import AnimatedJavaIcon from '../assets/animated_java_icon.svg'
-import { BLUEPRINT_FORMAT } from '../blueprintFormat'
-import { PACKAGE } from '../constants'
-import { cleanupExportedFiles } from '../systems/cleaner'
-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 { openChangelogDialog } from './changelogDialog'
-
-function createIconImg() {
- const IMG = document.createElement('img')
- Object.assign(IMG, {
- src: AnimatedJavaIcon,
- width: 16,
- height: 16,
- })
- Object.assign(IMG.style, {
- position: 'relative',
- top: '2px',
- borderRadius: '2px',
- marginRight: '6px',
- boxShadow: '1px 1px 1px #000000aa',
- })
- return IMG
-}
-const MENU_ID = `${PACKAGE.name}:menu` as `animated_java:menu`
-const BLOCKBENCH_MENU_BAR = document.querySelector('#menu_bar') as HTMLDivElement
-export const MENU = createBarMenu(MENU_ID, [], () => Format === BLUEPRINT_FORMAT) as BarMenu & {
- label: HTMLDivElement
-}
-MENU.label.style.display = 'inline-block'
-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
-)
-
-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
-)
-
-MenuBar.addAction(
- createAction(`${PACKAGE.name}:changelog`, {
- icon: 'history',
- category: 'animated_java',
- name: translate('action.open_changelog.name'),
- click() {
- openChangelogDialog()
- },
- }),
- 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
-)
-
-MenuBar.menus[MENU_ID].structure.push({
- id: 'animated_java:extract-open',
- name: translate('action.extract.name'),
- icon: 'fa-trash-can',
- searchable: false,
- children: [],
- condition() {
- return Format === BLUEPRINT_FORMAT
- },
-})
-
-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'
-)
-
-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
-)
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
deleted file mode 100644
index 94dacfa5..00000000
--- a/src/interface/dialog/boneConfig.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import { BLUEPRINT_FORMAT } from '../../blueprintFormat'
-import { BoneConfig } from '../../nodeConfigs'
-import BoneConfigDialogSvelteComponent from '../../components/boneConfigDialog.svelte'
-import { PACKAGE } from '../../constants'
-import { createAction } from '../../util/moddingTools'
-import { Valuable } from '../../util/stores'
-import { SvelteDialog } from '../../util/svelteDialog'
-import { translate } from '../../util/translation'
-import { Variant } from '../../variants'
-
-// TODO: These should probably be part of the BoneConfig class
-function propagateInheritanceUp(group: Group, config: BoneConfig, variant?: string): void {
- // Recurse to the topmost parent that doesn't have inherit_settings enabled, then inherit down from there
- if (group.parent instanceof Group) {
- const parentConfig = variant
- ? group.parent.configs.variants[variant]
- : group.parent.configs.default
- if (parentConfig) {
- const parentBoneConfig = BoneConfig.fromJSON(parentConfig)
- if (parentConfig.inherit_settings) {
- propagateInheritanceUp(group.parent, parentBoneConfig, variant)
- }
- config.inheritFrom(parentBoneConfig)
- if (variant) group.configs.variants[variant] = config.toJSON()
- else group.configs.default = config.toJSON()
- }
- }
-}
-
-function propagateInheritanceDown(group: Group, config: BoneConfig, variant?: string) {
- for (const child of group.children) {
- if (!(child instanceof Group)) continue
- const childConfig = variant ? child.configs.variants[variant] : child.configs.default
- if (childConfig && childConfig.inherit_settings) {
- const childBoneConfig = BoneConfig.fromJSON(childConfig)
- childBoneConfig.inheritFrom(config)
- if (variant) child.configs.variants[variant] = childBoneConfig.toJSON()
- else child.configs.default = childBoneConfig.toJSON()
- propagateInheritanceDown(child, childBoneConfig, variant)
- }
- }
-}
-
-export function openBoneConfigDialog(bone: Group) {
- // 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
- let boneConfigJSON = (bone.configs.default ??= new BoneConfig().toJSON())
- let parentConfigJSON =
- bone.parent instanceof Group
- ? (bone.parent.configs.default ??= new BoneConfig().toJSON())
- : undefined
-
- if (Variant.selected && !Variant.selected.isDefault) {
- // Get the variant's config, or create a new one if it doesn't exist
- boneConfigJSON = bone.configs.variants[Variant.selected.uuid] ??= new BoneConfig().toJSON()
- parentConfigJSON =
- bone.parent instanceof Group
- ? (bone.parent.configs.variants[Variant.selected.uuid] ??=
- new BoneConfig().toJSON())
- : undefined
- }
-
- const parentConfig = parentConfigJSON
- ? BoneConfig.fromJSON(parentConfigJSON)
- : BoneConfig.getDefault()
-
- const oldConfig = BoneConfig.fromJSON(boneConfigJSON)
-
- const customName = new Valuable(oldConfig.customName)
- const customNameVisible = new Valuable(oldConfig.customNameVisible)
- const billboard = new Valuable(oldConfig.billboard as string)
- const overrideBrightness = new Valuable(oldConfig.overrideBrightness)
- const brightnessOverride = new Valuable(oldConfig.brightnessOverride)
- const enchanted = new Valuable(oldConfig.enchanted)
- const glowing = new Valuable(oldConfig.glowing)
- const overrideGlowColor = new Valuable(oldConfig.overrideGlowColor)
- const glowColor = new Valuable(oldConfig.glowColor)
- const inheritSettings = new Valuable(oldConfig.inheritSettings)
- const invisible = new Valuable(oldConfig.invisible)
- const nbt = new Valuable(oldConfig.nbt)
- const shadowRadius = new Valuable(oldConfig.shadowRadius)
- const shadowStrength = new Valuable(oldConfig.shadowStrength)
- const useNBT = new Valuable(oldConfig.useNBT)
-
- new SvelteDialog({
- id: `${PACKAGE.name}:boneConfig`,
- title: translate('dialog.bone_config.title'),
- width: 400,
- component: BoneConfigDialogSvelteComponent,
- props: {
- variant: Variant.selected!,
- customName,
- customNameVisible,
- billboard,
- overrideBrightness,
- brightnessOverride,
- enchanted,
- glowing,
- overrideGlowColor,
- glowColor,
- inheritSettings,
- invisible,
- nbt,
- shadowRadius,
- shadowStrength,
- useNBT,
- },
- preventKeybinds: true,
- onConfirm() {
- const newConfig = new BoneConfig()
-
- newConfig.customName = customName.get()
- newConfig.customNameVisible = customNameVisible.get()
- newConfig.billboard = billboard.get() as any
- newConfig.overrideBrightness = overrideBrightness.get()
- newConfig.brightnessOverride = brightnessOverride.get()
- newConfig.enchanted = enchanted.get()
- newConfig.glowing = glowing.get()
- newConfig.overrideGlowColor = overrideGlowColor.get()
- newConfig.glowColor = glowColor.get()
- newConfig.inheritSettings = inheritSettings.get()
- newConfig.invisible = invisible.get()
- newConfig.nbt = nbt.get()
- newConfig.shadowRadius = shadowRadius.get()
- newConfig.shadowStrength = shadowStrength.get()
- newConfig.useNBT = useNBT.get()
-
- // Remove properties that are the same as the parent's
- newConfig.customName === parentConfig.customName && (newConfig.customName = undefined)
- newConfig.customNameVisible === parentConfig.customNameVisible &&
- (newConfig.customNameVisible = undefined)
- newConfig.billboard === parentConfig.billboard && (newConfig.billboard = undefined)
- newConfig.overrideBrightness === parentConfig.overrideBrightness &&
- (newConfig.overrideBrightness = undefined)
- newConfig.brightnessOverride === parentConfig.brightnessOverride &&
- (newConfig.brightnessOverride = undefined)
- newConfig.enchanted === parentConfig.enchanted && (newConfig.enchanted = undefined)
- newConfig.glowing === parentConfig.glowing && (newConfig.glowing = undefined)
- newConfig.overrideGlowColor === parentConfig.overrideGlowColor &&
- (newConfig.overrideGlowColor = undefined)
- newConfig.glowColor === parentConfig.glowColor && (newConfig.glowColor = undefined)
- newConfig.invisible === parentConfig.invisible && (newConfig.invisible = undefined)
- newConfig.nbt === parentConfig.nbt && (newConfig.nbt = undefined)
- newConfig.shadowRadius === parentConfig.shadowRadius &&
- (newConfig.shadowRadius = undefined)
- newConfig.shadowStrength === parentConfig.shadowStrength &&
- (newConfig.shadowStrength = undefined)
- newConfig.useNBT === parentConfig.useNBT && (newConfig.useNBT = undefined)
-
- if (newConfig.checkIfEqual(BoneConfig.fromJSON(bone.configs.default))) {
- // Don't save the variant config if it's the same as the default
- delete bone.configs.variants[Variant.selected!.uuid]
- return
- }
-
- if (Variant.selected && !Variant.selected.isDefault) {
- if (newConfig.inheritSettings) {
- propagateInheritanceUp(bone, newConfig, Variant.selected.uuid)
- }
- bone.configs.variants[Variant.selected.uuid] = newConfig.toJSON()
- propagateInheritanceDown(bone, newConfig, Variant.selected.uuid)
- } else {
- if (newConfig.inheritSettings) {
- propagateInheritanceUp(bone, newConfig)
- }
- bone.configs.default = newConfig.toJSON()
- propagateInheritanceDown(bone, newConfig)
- }
- },
- }).show()
-}
-
-export const BONE_CONFIG_ACTION = createAction(`${PACKAGE.name}:bone_config`, {
- icon: 'settings',
- name: translate('action.open_bone_config.name'),
- condition: () => Format === BLUEPRINT_FORMAT,
- click: () => {
- if (!Group.first_selected) return
- openBoneConfigDialog(Group.first_selected)
- },
-})
diff --git a/src/interface/dialog/changelog.ts b/src/interface/dialog/changelog.ts
deleted file mode 100644
index de6aa3b6..00000000
--- a/src/interface/dialog/changelog.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import ChangelogDialog from '../../components/changelogDialog.svelte'
-import { PACKAGE } from '../../constants'
-import { SvelteDialog } from '../../util/svelteDialog'
-import { translate } from '../../util/translation'
-
-export const DIALOG_ID = `${PACKAGE.name}:animationPropertiesDialog`
-
-export function openChangelogDialog() {
- new SvelteDialog({
- id: DIALOG_ID,
- title: translate('dialog.changelog_dialog.title'),
- width: 600,
- component: ChangelogDialog,
- props: {},
- buttons: ['OK!'],
- preventKeybinds: true,
- }).show()
-}
diff --git a/src/interface/dialog/textDisplayConfig.ts b/src/interface/dialog/textDisplayConfig.ts
deleted file mode 100644
index 2042ed9e..00000000
--- a/src/interface/dialog/textDisplayConfig.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { isCurrentFormat } from '../../blueprintFormat'
-import { TextDisplayConfig } from '../../nodeConfigs'
-import { PACKAGE } from '../../constants'
-import { createAction } from '../../util/moddingTools'
-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 { TextDisplay } from '../../outliner/textDisplay'
-
-export function openBoneConfigDialog(bone: TextDisplay) {
- // 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
- const oldConfig = TextDisplayConfig.fromJSON((bone.config ??= new TextDisplayConfig().toJSON()))
-
- const billboard = new Valuable(oldConfig.billboard as string)
- const overrideBrightness = new Valuable(oldConfig.overrideBrightness)
- const brightnessOverride = new Valuable(oldConfig.brightnessOverride)
- const glowing = new Valuable(oldConfig.glowing)
- const overrideGlowColor = new Valuable(oldConfig.overrideGlowColor)
- const glowColor = new Valuable(oldConfig.glowColor)
- const invisible = new Valuable(oldConfig.invisible)
- const nbt = new Valuable(oldConfig.nbt)
- const shadowRadius = new Valuable(oldConfig.shadowRadius)
- const shadowStrength = new Valuable(oldConfig.shadowStrength)
- const useNBT = new Valuable(oldConfig.useNBT)
-
- new SvelteDialog({
- id: `${PACKAGE.name}:textDisplayConfigDialog`,
- title: translate('dialog.text_display_config.title'),
- width: 400,
- component: TextDisplayConfigDialog,
- props: {
- variant: Variant.selected,
- billboard,
- overrideBrightness,
- brightnessOverride,
- glowing,
- overrideGlowColor,
- glowColor,
- invisible,
- nbt,
- shadowRadius,
- shadowStrength,
- useNBT,
- },
- preventKeybinds: true,
- onConfirm() {
- const newConfig = new TextDisplayConfig()
-
- newConfig.billboard = billboard.get() as any
- newConfig.overrideBrightness = overrideBrightness.get()
- newConfig.brightnessOverride = brightnessOverride.get()
- newConfig.glowing = glowing.get()
- newConfig.overrideGlowColor = overrideGlowColor.get()
- newConfig.glowColor = glowColor.get()
- newConfig.invisible = invisible.get()
- newConfig.nbt = nbt.get()
- newConfig.shadowRadius = shadowRadius.get()
- newConfig.shadowStrength = shadowStrength.get()
- newConfig.useNBT = useNBT.get()
-
- const defaultConfig = TextDisplayConfig.getDefault()
-
- newConfig.billboard === defaultConfig.billboard && (newConfig.billboard = undefined)
- newConfig.overrideBrightness === defaultConfig.overrideBrightness &&
- (newConfig.overrideBrightness = undefined)
- newConfig.brightnessOverride === defaultConfig.brightnessOverride &&
- (newConfig.brightnessOverride = undefined)
- newConfig.glowing === defaultConfig.glowing && (newConfig.glowing = undefined)
- newConfig.overrideGlowColor === defaultConfig.overrideGlowColor &&
- (newConfig.overrideGlowColor = undefined)
- newConfig.glowColor === defaultConfig.glowColor && (newConfig.glowColor = undefined)
- newConfig.invisible === defaultConfig.invisible && (newConfig.invisible = undefined)
- newConfig.nbt === defaultConfig.nbt && (newConfig.nbt = undefined)
- newConfig.shadowRadius === defaultConfig.shadowRadius &&
- (newConfig.shadowRadius = undefined)
- newConfig.shadowStrength === defaultConfig.shadowStrength &&
- (newConfig.shadowStrength = undefined)
- newConfig.useNBT === defaultConfig.useNBT && (newConfig.useNBT = undefined)
-
- bone.config = newConfig.toJSON()
- },
- }).show()
-}
-
-export const TEXT_DISPLAY_CONFIG_ACTION = createAction(`${PACKAGE.name}:text_display_config`, {
- icon: 'settings',
- name: translate('action.open_text_display_config.name'),
- condition: () => isCurrentFormat(),
- click: () => {
- if (TextDisplay.selected.length === 0) return
- openBoneConfigDialog(TextDisplay.selected[0])
- },
-})
diff --git a/src/interface/dialog/unexpectedError.ts b/src/interface/dialog/unexpectedError.ts
deleted file mode 100644
index c15aa402..00000000
--- a/src/interface/dialog/unexpectedError.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import UnexpectedErrorDialog from '../../components/unexpectedErrorDialog.svelte'
-import { PACKAGE } from '../../constants'
-import { SvelteDialog } from '../../util/svelteDialog'
-import { translate } from '../../util/translation'
-
-export function openUnexpectedErrorDialog(error: Error) {
- new SvelteDialog({
- id: `${PACKAGE.name}:unexpectedError`,
- title: translate('dialog.unexpected_error.title'),
- width: 600,
- component: UnexpectedErrorDialog,
- props: {
- error,
- },
- preventKeybinds: true,
- buttons: [translate('dialog.unexpected_error.close_button')],
- }).show()
-}
diff --git a/src/interface/dialog/vanillaItemDisplayConfig.ts b/src/interface/dialog/vanillaItemDisplayConfig.ts
deleted file mode 100644
index 1cf0ae90..00000000
--- a/src/interface/dialog/vanillaItemDisplayConfig.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { isCurrentFormat } from '../../blueprintFormat'
-import { BoneConfig } from '../../nodeConfigs'
-import { PACKAGE } from '../../constants'
-import { createAction } from '../../util/moddingTools'
-import { Valuable } from '../../util/stores'
-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'
-
-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
- const oldConfig = BoneConfig.fromJSON((display.config ??= new BoneConfig().toJSON()))
-
- const customName = new Valuable(oldConfig.customName)
- const customNameVisible = new Valuable(oldConfig.customNameVisible)
- const billboard = new Valuable(oldConfig.billboard as string)
- const overrideBrightness = new Valuable(oldConfig.overrideBrightness)
- const brightnessOverride = new Valuable(oldConfig.brightnessOverride)
- const glowing = new Valuable(oldConfig.glowing)
- const overrideGlowColor = new Valuable(oldConfig.overrideGlowColor)
- const glowColor = new Valuable(oldConfig.glowColor)
- const invisible = new Valuable(oldConfig.invisible)
- const nbt = new Valuable(oldConfig.nbt)
- const shadowRadius = new Valuable(oldConfig.shadowRadius)
- const shadowStrength = new Valuable(oldConfig.shadowStrength)
- const useNBT = new Valuable(oldConfig.useNBT)
-
- new SvelteDialog({
- id: `${PACKAGE.name}:vanillaItemDisplayConfigDialog`,
- title: translate('dialog.vanilla_item_display_config.title'),
- width: 400,
- component: VanillaItemDisplayConfigDialog,
- props: {
- variant: Variant.selected,
- customName,
- customNameVisible,
- billboard,
- overrideBrightness,
- brightnessOverride,
- glowing,
- overrideGlowColor,
- glowColor,
- invisible,
- nbt,
- shadowRadius,
- shadowStrength,
- useNBT,
- },
- preventKeybinds: true,
- onConfirm() {
- const newConfig = new BoneConfig()
-
- newConfig.customName = customName.get()
- newConfig.customNameVisible = customNameVisible.get()
- newConfig.billboard = billboard.get() as any
- newConfig.overrideBrightness = overrideBrightness.get()
- newConfig.brightnessOverride = brightnessOverride.get()
- newConfig.glowing = glowing.get()
- newConfig.overrideGlowColor = overrideGlowColor.get()
- newConfig.glowColor = glowColor.get()
- newConfig.invisible = invisible.get()
- newConfig.nbt = nbt.get()
- newConfig.shadowRadius = shadowRadius.get()
- newConfig.shadowStrength = shadowStrength.get()
- newConfig.useNBT = useNBT.get()
-
- const defaultConfig = BoneConfig.getDefault()
-
- newConfig.customName === defaultConfig.customName && (newConfig.customName = undefined)
- newConfig.customNameVisible === defaultConfig.customNameVisible &&
- (newConfig.customNameVisible = undefined)
- newConfig.billboard === defaultConfig.billboard && (newConfig.billboard = undefined)
- newConfig.overrideBrightness === defaultConfig.overrideBrightness &&
- (newConfig.overrideBrightness = undefined)
- newConfig.brightnessOverride === defaultConfig.brightnessOverride &&
- (newConfig.brightnessOverride = undefined)
- newConfig.glowing === defaultConfig.glowing && (newConfig.glowing = undefined)
- newConfig.overrideGlowColor === defaultConfig.overrideGlowColor &&
- (newConfig.overrideGlowColor = undefined)
- newConfig.glowColor === defaultConfig.glowColor && (newConfig.glowColor = undefined)
- newConfig.invisible === defaultConfig.invisible && (newConfig.invisible = undefined)
- newConfig.nbt === defaultConfig.nbt && (newConfig.nbt = undefined)
- newConfig.shadowRadius === defaultConfig.shadowRadius &&
- (newConfig.shadowRadius = undefined)
- newConfig.shadowStrength === defaultConfig.shadowStrength &&
- (newConfig.shadowStrength = undefined)
- newConfig.useNBT === defaultConfig.useNBT && (newConfig.useNBT = undefined)
-
- display.config = newConfig.toJSON()
- },
- }).show()
-}
-
-export const VANILLA_ITEM_DISPLAY_CONFIG_ACTION = createAction(
- `${PACKAGE.name}:open_vanilla_item_display_config`,
- {
- icon: 'settings',
- name: translate('action.open_vanilla_item_display_config.name'),
- condition: () => isCurrentFormat(),
- click: () => {
- if (VanillaItemDisplay.selected.length === 0) return
- openVanillaItemDisplayConfigDialog(VanillaItemDisplay.selected[0])
- },
- }
-)
diff --git a/src/interface/index.ts b/src/interface/index.ts
deleted file mode 100644
index ddad7aca..00000000
--- a/src/interface/index.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import './dialog/about'
-import './dialog/animationProperties'
-import './dialog/blueprintSettings'
-import './dialog/boneConfig'
-import './dialog/changelog'
-import './dialog/exportProgress'
-import './dialog/locatorConfig'
-import './dialog/textDisplayConfig'
-import './dialog/unexpectedError'
-import './dialog/vanillaBlockDisplayConfig'
-import './dialog/vanillaItemDisplayConfig'
-import './dialog/variantConfig'
-
-import './panel/customKeyframe'
-import './panel/textDisplayElement'
-import './panel/vanillaBlockDisplayElement'
-import './panel/vanillaItemDisplayElement'
-import './panel/variants'
-
-import './popup/animatedJavaLoading'
-import './popup/blueprintLoading'
-import './popup/incompatabilityPopup'
-import './popup/installed'
-
-import './importAJModelLoader'
-import './animatedJavaBarItem'
-import './keyframeEasings'
diff --git a/src/interface/panel/vanillaBlockDisplayElement.ts b/src/interface/panel/vanillaBlockDisplayElement.ts
deleted file mode 100644
index f55ba202..00000000
--- a/src/interface/panel/vanillaBlockDisplayElement.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import VanillaBlockDisplayElementPanel from '../../components/vanillaBlockDisplayElementPanel.svelte'
-import { injectSvelteCompomponentMod } from '../../util/injectSvelteComponent'
-
-injectSvelteCompomponentMod({
- component: VanillaBlockDisplayElementPanel,
- props: {},
- elementSelector() {
- return document.querySelector('#panel_element')
- },
-})
diff --git a/src/lang/en.yml b/src/lang/en.yml
index 2d7a9cee..e4b4e4a4 100644
--- a/src/lang/en.yml
+++ b/src/lang/en.yml
@@ -1,3 +1,150 @@
+# ----------------------------------------
+# 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:
+
+ export:
+ target_minecraft_version:
+ label: Target Minecraft Version
+ description: |-
+ Choose the version of Minecraft you are exporting this project for. If your exact version is not listed, choose the next oldest version. For example, if you are using Minecraft `1.21.3`, choose `1.21.2`.
+ tag_prefix:
+ label: Tag Prefix
+ description: The prefix to use for all tags in the exported Data Pack.
+ auto_generate_tag_prefix:
+ label: Auto-Generate Tag Prefix
+ description: Automatically generate a tag prefix based on the BlueprintID.
+
+ 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.
+
+config:
+ common:
+ label: Common
+ description: Properties common to all nodes.
+ options:
+ billboard: Billboard
+ overrideBrightness: Override Brightness
+ brightness: Brightness
+ glowing: Glowing
+ overrideGlowColor: Override Glow Color
+ glowColor: Glow Color
+ invisible: Invisible
+ shadowRadius: Shadow Radius
+ shadowStrength: Shadow Strength
+
+ animated_java:text_display:
+ label: Text Display
+ description: Properties specific to Text Displays.
+ options:
+ alignment: Alignment
+ backgroundColor: Background Color
+ lineWidth: Line Width
+ seeThrough: See Through
+ shadow: Shadow
+ textComponent: Text Component
+
+ animated_java:item_display:
+ label: Item Display
+ description: Properties specific to Item Displays.
+
+ animated_java:block_display:
+ label: Block Display
+ description: Properties specific to Block Displays.
+
+panel:
+ display:
+ title: Display
+ linked.tooltip: Linked - This display option will be inherited from the parent node.
+ unlinked.tooltip: Unlinked - This display option is unique to this node.
+ set_all_linked.tooltip: Set All Linked - Set all display options to inherit the display properties from the parent node.
+ set_all_unlinked.tooltip: Set All Unlinked - Set all display options to be unique to this node.
+ reset_all.tooltip: Reset All - Reset all display options to their default values.
+
+node:
+ structure.title: |-
+ Structure - (Animated Java)
+ A Group will become a Structure if it doesn't have Cube children.
+ Structures will not create an entity in-game, but can be used to organize your model, and effect the animation.
+ item_display.title: Item Display
+ block_display.title: Block Display
+ text_display.title: Text Display
+
+# ----------------------------------------
+# OLD TRANSLATIONS
+# ----------------------------------------
+
### Actions
animated_java.action.open_blueprint_settings.name: Blueprint Settings
animated_java.action.open_documentation.name: Documentation
@@ -10,10 +157,10 @@ animated_java.action.export.name: Export
animated_java.action.extract.name: Extract
animated_java.action.extract.confirm: Confirm Extraction
animated_java.action.create_text_display.title: Add Text Display
-animated_java.action.create_vanilla_item_display.title: Add Item Display
-animated_java.action.create_vanilla_block_display.title: Add Block Display
-animated_java.action.open_vanilla_item_display_config.name: Item Display Config
-animated_java.action.open_vanilla_block_display_config.name: Block Display Config
+animated_java.action.create_item_display.title: Add Item Display
+animated_java.action.create_block_display.title: Add Block Display
+animated_java.action.open_item_display_config.name: Item Display Config
+animated_java.action.open_block_display_config.name: Block Display Config
### Popups
animated_java.popup.loading.loading: Loading Animated Java...
@@ -328,8 +475,8 @@ animated_java.dialog.locator_config.ticking_commands.description: |-
## Text Display Config Dialog
animated_java.dialog.text_display_config.title: Text Display Config
-animated_java.dialog.bone_config.vanilla_item_model.title: Vanilla Item Model
-animated_java.dialog.bone_config.vanilla_item_model.description: |-
+animated_java.dialog.bone_config.item_model.title: Vanilla Item Model
+animated_java.dialog.bone_config.item_model.description: |-
If set, the bone will render as a vanilla item model.
This will overwrite the bone's existing cubes.
@@ -381,26 +528,26 @@ animated_java.dialog.text_display_config.billboard.options.horizontal: Horizonta
animated_java.dialog.text_display_config.billboard.options.center: Center
## Block Display Config Dialog
-animated_java.dialog.vanilla_block_display_config.title: Block Display Config
-animated_java.dialog.vanilla_block_display.custom_name.title: Custom Name
-animated_java.dialog.vanilla_block_display.custom_name.description: The custom name of the block display.
-animated_java.dialog.vanilla_block_display.custom_name.invalid_json.error: |-
+animated_java.dialog.block_display_config.title: Block Display Config
+animated_java.dialog.block_display.custom_name.title: Custom Name
+animated_java.dialog.block_display.custom_name.description: The custom name of the block display.
+animated_java.dialog.block_display.custom_name.invalid_json.error: |-
Invalid JSON Text!
{0}
-animated_java.dialog.vanilla_block_display.custom_name_visible.title: Custom Name Visible
-animated_java.dialog.vanilla_block_display.custom_name_visible.description: Whether or not the custom name should always be visible.
+animated_java.dialog.block_display.custom_name_visible.title: Custom Name Visible
+animated_java.dialog.block_display.custom_name_visible.description: Whether or not the custom name should always be visible.
## Item Display Config Dialog
-animated_java.dialog.vanilla_item_display_config.title: Item Display Config
-animated_java.dialog.vanilla_item_display.custom_name.title: Custom Name
-animated_java.dialog.vanilla_item_display.custom_name.description: The custom name of the item display.
-animated_java.dialog.vanilla_item_display.custom_name.invalid_json.error: |-
+animated_java.dialog.item_display_config.title: Item Display Config
+animated_java.dialog.item_display.custom_name.title: Custom Name
+animated_java.dialog.item_display.custom_name.description: The custom name of the item display.
+animated_java.dialog.item_display.custom_name.invalid_json.error: |-
Invalid JSON Text!
{0}
-animated_java.dialog.vanilla_item_display.custom_name_visible.title: Custom Name Visible
-animated_java.dialog.vanilla_item_display.custom_name_visible.description: Whether or not the custom name should always be visible.
+animated_java.dialog.item_display.custom_name_visible.title: Custom Name Visible
+animated_java.dialog.item_display.custom_name_visible.description: Whether or not the custom name should always be visible.
## Variant Config Dialog
animated_java.dialog.variant_config.title: Variant Config
@@ -576,8 +723,8 @@ animated_java.tool.text_display.see_through.title: See Through
animated_java.tool.text_display.see_through.description: Whether or not the text display should be visible through blocks.
# Item Display Panel
-animated_java.panel.vanilla_item_display.title: Displayed Item
-animated_java.panel.vanilla_item_display.description: The item to display.
+animated_java.panel.item_display.title: Displayed Item
+animated_java.panel.item_display.description: The item to display.
animated_java.tool.item_display.item_display.title: Item Display Mode
animated_java.tool.item_display.item_display.description: Which item model transform to apply to the item (as defined in display field in model JSON).
animated_java.tool.item_display.item_display.options.none: None
@@ -591,12 +738,12 @@ animated_java.tool.item_display.item_display.options.ground: Ground
animated_java.tool.item_display.item_display.options.fixed: Fixed
# Block Display Panel
-animated_java.panel.vanilla_block_display.title: Displayed Block
-animated_java.panel.vanilla_block_display.description: The block to display. Supports block states!
+animated_java.panel.block_display.title: Displayed Block
+animated_java.panel.block_display.description: The block to display. Supports block states!
### Custom Elements
## Item Display
-animated_java.vanilla_item_display.title: Item Display
+animated_java.item_display.title: Item Display
## Block Display
diff --git a/src/mods/assetSetupMod.ts b/src/mods/assetSetupMod.ts
deleted file mode 100644
index c3f55817..00000000
--- a/src/mods/assetSetupMod.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { PACKAGE } from '../constants'
-import {
- hideLoadingPopup,
- showLoadingPopup,
- showOfflineError,
-} from '../interface/popup/animatedJavaLoading'
-import { events } from '../util/events'
-import { createBlockbenchMod } from '../util/moddingTools'
-
-createBlockbenchMod(
- `${PACKAGE.name}:assetLoading`,
- undefined,
- () => {
- // Show loading popup
- void showLoadingPopup().then(async () => {
- if (!window.navigator.onLine) {
- showOfflineError()
- // return
- }
- events.NETWORK_CONNECTED.dispatch()
-
- await Promise.all([
- new Promise(resolve =>
- events.MINECRAFT_ASSETS_LOADED.subscribe(() => resolve())
- ),
- new Promise(resolve =>
- events.MINECRAFT_REGISTRY_LOADED.subscribe(() => resolve())
- ),
- new Promise(resolve =>
- events.MINECRAFT_FONTS_LOADED.subscribe(() => resolve())
- ),
- new Promise(resolve =>
- events.BLOCKSTATE_REGISTRY_LOADED.subscribe(() => resolve())
- ),
- ])
- .then(() => {
- hideLoadingPopup()
- })
- .catch(error => {
- console.error(error)
- Blockbench.showToastNotification({
- text: 'Animated Java failed to load! Please restart Blockbench',
- color: 'var(--color-error)',
- })
- })
- })
- },
- () => {
- //
- }
-)
diff --git a/src/mods/formatIconMod.ts b/src/mods/formatIconMod.ts
deleted file mode 100644
index 4a855724..00000000
--- a/src/mods/formatIconMod.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import Icon from '../components/icon.svelte'
-import { PACKAGE } from '../constants'
-import { injectSvelteCompomponent } from '../util/injectSvelteComponent'
-import { createBlockbenchMod } from '../util/moddingTools'
-
-createBlockbenchMod(
- `${PACKAGE.name}:formatIconMod`,
- undefined,
- () => {
- void injectSvelteCompomponent({
- elementSelector: () => document.querySelector('[format=animated_java_blueprint]'),
- component: Icon,
- props: {},
- prepend: true,
- postMount: () => {
- document
- .querySelector('[format=animated_java_blueprint] span i')
- ?.parentElement?.remove()
- const duplicates = [...document.querySelectorAll('#animated_java\\:icon')]
- if (duplicates.length > 1) {
- duplicates.slice(1).forEach(d => d.remove())
- }
- },
- })
- },
- () => {
- document.querySelector('#animated_java\\:icon')?.remove()
- }
-)
-
-createBlockbenchMod(
- `${PACKAGE.name}:prioritizeAnimatedJavaFormats`,
- undefined,
- () => {
- const interval = setInterval(() => {
- const ajFormats = $("li.format_category > label:contains('Animated Java')")
- .first()
- .parent()
- if (ajFormats.length === 0) return
-
- const mcFormats = $("li.format_category > label:contains('General')").first().parent()
-
- ajFormats.insertBefore(mcFormats)
-
- clearInterval(interval)
- }, 16)
- },
- () => {
- // Pass
- }
-)
diff --git a/src/mods/functions.molang b/src/mods/functions.molang
deleted file mode 100644
index 3bab9c8d..00000000
--- a/src/mods/functions.molang
+++ /dev/null
@@ -1,165 +0,0 @@
-smoothmin(a, b, k): |-
- v.h = math.clamp(0.5 + (0.5 * (a - b) / k), 0, 1);
- return math.lerp(a, b, v.h) - (k * v.h * (1 - v.h));
-
-smoothclamp(value, min, max, k): |-
- return lunar.smoothmin(lunar.smoothmin(value, min, -k), max, k);
-
-lopsided_wave(value, lopside_mag): |-
- return math.sin(value + math.cos(value) * lopside_mag);
-
-easeinsine(progress): |-
- return 1 - math.cos((progress * 180) / 2);
-
-easeoutsine(progress): |-
- return math.sin((progress * 180) / 2);
-
-easeinoutsine(progress): |-
- return(math.cos(180 * progress) - 1) * -1 / 2;
-
-easeinquad(progress): |-
- return progress * progress;
-
-easeoutquad(progress): |-
- return 1 - (1 - progress) * (1 - progress);
-
-easeinoutquad(progress): |-
- return progress < 0.5
- ? 2 * progress * progress
- : 1 - math.pow(-2 * progress + 2, 2) / 2;
-
-easeincubic(progress): |-
- return progress * progress * progress;
-
-easeoutcubic(progress): |-
- return 1 - math.pow(1 - progress, 3);
-
-easeinoutcubic(progress): |-
- return progress < 0.5
- ? 4 * progress * progress * progress
- : 1 - math.pow(-2 * progress + 2, 3) / 2;
-
-easeinquart(progress): |-
- return progress * progress * progress * progress;
-
-easeoutquart(progress): |-
- return 1 - math.pow(1 - progress, 4);
-
-easeinoutquart(progress): |-
- return progress < 0.5
- ? 8 * progress * progress * progress * progress
- : 1 - math.pow(-2 * progress + 2, 4) / 2;
-
-easeinquint(progress): |-
- return progress * progress * progress * progress * progress;
-
-easeoutquint(progress): |-
- return 1 - math.pow(1 - progress, 5);
-
-easeinoutquint(progress): |-
- return progress < 0.5
- ? 16 * progress * progress * progress * progress * progress
- : 1 - math.pow(-2 * progress + 2, 5) / 2;
-
-easeinexpo(progress): |-
- return progress == 0
- ? 0
- : math.pow(2, 10 * progress - 10);
-
-easeoutexpo(progress): |-
- return progress == 1
- ? 1
- : 1 - math.pow(2, -10 * progress);
-
-easeinoutexpo(progress): |-
- return progress == 0
- ? 0
- : progress == 1
- ? 1
- : progress < 0.5
- ? math.pow(2, 20 * progress - 10) / 2
- : (2 - math.pow(2, -20 * progress + 10)) / 2;
-
-easeincirc(progress): |-
- return math.sqrt(1 - math.pow(progress - 1, 2));
-
-easeoutcirc(progress): |-
- return math.sqrt(1 - math.pow(progress - 1, 2));
-
-easeinoutcirc(progress): |-
- return progress < 0.5
- ? (1 - math.sqrt(1 - math.pow(2 * progress, 2))) / 2
- : (math.sqrt(1 - math.pow(-2 * progress + 2, 2)) + 1) / 2;
-
-easeinback(progress, overshoot): |-
- t.overshoot=1.70158 * (overshoot ?? 1);
- return (t.overshoot + 1) * progress * progress * progress - t.overshoot * progress * progress;
-
-easeoutback(progress, overshoot): |-
- t.overshoot=1.70158 * (overshoot ?? 1);
- return 1 + (t.overshoot + 1) * math.pow(progress - 1, 3) + t.overshoot * math.pow(progress - 1, 2);
-
-easeinoutback(progress, overshoot): |-
- t.overshoot=1.70158 * (overshoot ?? 1);
- t.c2 = t.overshoot + 1;
- return progress < 0.5
- ? (math.pow(2 * progress, 2) * ((t.c2 + 1) * 2 * progress - t.c2)) / 2
- : (math.pow(2 * progress - 2, 2) * ((t.c2 + 1) * (progress * 2 - 2) + t.c2) + 2) / 2;
-
-easeinelastic(progress): |-
- return progress == 0
- ? 0
- : progress == 1
- ? 1
- : -math.pow(2, 10 * progress - 10) * math.sin((progress * 10 - 10.75) * 90);
-
-easeoutelastic(progress): |-
- return progress == 0
- ? 0
- : progress == 1
- ? 1
- : math.pow(2, -10 * progress) * math.sin((progress * 10 - 0.75) * 90) + 1;
-
-easeinoutelastic(progress): |-
- return progress == 0
- ? 0
- : progress == 1
- ? 1
- : progress < 0.5
- ? (math.pow(2, 20 * progress - 10) * math.sin((20 * progress - 11.125) * 90) * -1) / 2
- : (math.pow(2, -20 * progress + 10) * math.sin((20 * progress - 11.125) * 90)) / 2 + 1;
-
-easeinbounce(progress): |-
- return 1 - easeoutbounce(1 - progress);
-
-easeoutbounce(progress): |-
- t.n1=7.5625;
- t.d1=2.75;
- return progress < 1 / t.d1
- ? (t.n1 * progress * progress)
- : progress < 2 / t.d1
- ? {
- progress = progress - 1.5 / t.d1;
- t.n1 * progress * progress + 0.75;
- }
- : progress < 2.5 / t.d1
- ? {
- progress = progress - 2.25 / t.d1;
- t.n1 * progress * progress + 0.9375;
- }
- : {
- progress = progress - 2.625 / t.d1;
- t.n1 * progress * progress + 0.984375;
- };
-
-easeinoutbounce(progress): |-
- return progress < 0.5
- ? 1-easeinbounce(1-2 * progress) / 2
- : 1 + easeoutbounce(2 * progress - 1) / 2;
-
-linear_wave(progress, hang): |-
- t.progress = progress * (math.pi / 180) + math.pi * 600;
- t.hang = hang * (math.pi / 180);
- return math.mod(math.abs(t.progress), 2 * math.pi + t.hang * 2) > math.pi + t.hang
- ? math.clamp(-math.mod(math.abs(t.progress), math.pi + t.hang) / math.pi + 1, 0, 1)
- : math.clamp(math.mod(math.abs(t.progress), math.pi + t.hang) / math.pi, 0, 1);
\ No newline at end of file
diff --git a/src/mods/index.ts b/src/mods/index.ts
deleted file mode 100644
index 7776807d..00000000
--- a/src/mods/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import './assetSetupMod'
-import './addLocatorActionMod'
-import './animationControllerMod'
-import './animationPropertiesAction'
-import './animationPropertiesMod'
-import './blockbenchReadMod'
-import './boneInterpolationMod'
-import './bonePropertiesMod'
-import './cubeOutlineMod'
-import './customKeyframeEasingsMod'
-import './customKeyframesMod'
-import './exportOverActionMod'
-import './formatIconMod'
-import './groupContextMenuMod'
-import './groupNameMod'
-import './keyframeMod'
-import './locatorAnimatorMod'
-import './locatorContextMenuMod'
-import './locatorPropertiesMod'
-import './modelFormatConvertToMod'
-import './modelFormatMod'
-import './molangMod'
-import './panelMod'
-import './projectSettingsActionOverride'
-import './saveAllAnimationsActionMod'
-import './saveProjectActionMod'
-import './saveProjectAsActionMod'
-import './showDefaultPoseMod'
-import './variantPreviewCubeFaceMod'
-import './cameraNameMod'
-import './pluginsDialogMod'
diff --git a/src/mods/modelFormatConvertToMod.ts b/src/mods/modelFormatConvertToMod.ts
deleted file mode 100644
index 6b27cc5b..00000000
--- a/src/mods/modelFormatConvertToMod.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { BLUEPRINT_FORMAT, convertToBlueprint } from '../blueprintFormat'
-import { PACKAGE } from '../constants'
-import { createBlockbenchMod } from '../util/moddingTools'
-
-createBlockbenchMod(
- `${PACKAGE.name}:modelFormatConvertToMod`,
- {
- original: ModelFormat.prototype.convertTo,
- },
- context => {
- ModelFormat.prototype.convertTo = function (this: ModelFormat) {
- const result = context.original.call(this)
- if (this === BLUEPRINT_FORMAT) convertToBlueprint()
- return result
- }
- return context
- },
- context => {
- ModelFormat.prototype.convertTo = context.original
- }
-)
diff --git a/src/mods/molangMod.ts b/src/mods/molangMod.ts
deleted file mode 100644
index 81c227f8..00000000
--- a/src/mods/molangMod.ts
+++ /dev/null
@@ -1,482 +0,0 @@
-import { PACKAGE } from '../constants'
-import { events } from '../util/events'
-import { createBlockbenchMod } from '../util/moddingTools'
-import MolangFunctionFile from './functions.molang'
-
-const GLOBAL_VARIABLES = Animator.MolangParser.global_variables
-
-const ROOT_TOKENS = [
- 'true',
- 'false',
- 'math.',
- 'query.', //'q.',
- 'variable.', //'v.',
- 'temp.', //'t.',
- 'context.', //'c.',
- 'this',
- 'loop()',
- 'return',
- 'break',
- 'continue',
-]
-const MOLANG_QUERIES = [
- // common
- 'all_animations_finished',
- 'any_animation_finished',
- 'anim_time',
- 'life_time',
- 'yaw_speed',
- 'ground_speed',
- 'vertical_speed',
- 'property',
- 'has_property()',
- 'variant',
- 'mark_variant',
- 'skin_id',
-
- 'above_top_solid',
- 'actor_count',
- 'all()',
- 'all_tags',
- 'anger_level',
- 'any()',
- 'any_tag',
- 'approx_eq()',
- 'armor_color_slot',
- 'armor_material_slot',
- 'armor_texture_slot',
- 'average_frame_time',
- 'blocking',
- 'body_x_rotation',
- 'body_y_rotation',
- 'bone_aabb',
- 'bone_origin',
- 'bone_rotation',
- 'camera_distance_range_lerp',
- 'camera_rotation()',
- 'can_climb',
- 'can_damage_nearby_mobs',
- 'can_dash',
- 'can_fly',
- 'can_power_jump',
- 'can_swim',
- 'can_walk',
- 'cape_flap_amount',
- 'cardinal_facing',
- 'cardinal_facing_2d',
- 'cardinal_player_facing',
- 'combine_entities()',
- 'count',
- 'current_squish_value',
- 'dash_cooldown_progress',
- 'day',
- 'death_ticks',
- 'debug_output',
- 'delta_time',
- 'distance_from_camera',
- 'effect_emitter_count',
- 'effect_particle_count',
- 'equipment_count',
- 'equipped_item_all_tags',
- 'equipped_item_any_tag()',
- 'equipped_item_is_attachable',
- 'eye_target_x_rotation',
- 'eye_target_y_rotation',
- 'facing_target_to_range_attack',
- 'frame_alpha',
- 'get_actor_info_id',
- 'get_animation_frame',
- 'get_default_bone_pivot',
- 'get_locator_offset',
- 'get_root_locator_offset',
- 'had_component_group()',
- 'has_any_family()',
- 'has_armor_slot',
- 'has_biome_tag',
- 'has_block_property',
- 'has_cape',
- 'has_collision',
- 'has_dash_cooldown',
- 'has_gravity',
- 'has_owner',
- 'has_rider',
- 'has_target',
- 'head_roll_angle',
- 'head_x_rotation',
- 'head_y_rotation',
- 'health',
- 'heartbeat_interval',
- 'heartbeat_phase',
- 'heightmap',
- 'hurt_direction',
- 'hurt_time',
- 'in_range()',
- 'invulnerable_ticks',
- 'is_admiring',
- 'is_alive',
- 'is_angry',
- 'is_attached_to_entity',
- 'is_avoiding_block',
- 'is_avoiding_mobs',
- 'is_baby',
- 'is_breathing',
- 'is_bribed',
- 'is_carrying_block',
- 'is_casting',
- 'is_celebrating',
- 'is_celebrating_special',
- 'is_charged',
- 'is_charging',
- 'is_chested',
- 'is_critical',
- 'is_croaking',
- 'is_dancing',
- 'is_delayed_attacking',
- 'is_digging',
- 'is_eating',
- 'is_eating_mob',
- 'is_elder',
- 'is_emerging',
- 'is_emoting',
- 'is_enchanted',
- 'is_fire_immune',
- 'is_first_person',
- 'is_ghost',
- 'is_gliding',
- 'is_grazing',
- 'is_idling',
- 'is_ignited',
- 'is_illager_captain',
- 'is_in_contact_with_water',
- 'is_in_love',
- 'is_in_ui',
- 'is_in_water',
- 'is_in_water_or_rain',
- 'is_interested',
- 'is_invisible',
- 'is_item_equipped',
- 'is_item_name_any()',
- 'is_jump_goal_jumping',
- 'is_jumping',
- 'is_laying_down',
- 'is_laying_egg',
- 'is_leashed',
- 'is_levitating',
- 'is_lingering',
- 'is_moving',
- 'is_name_any()',
- 'is_on_fire',
- 'is_on_ground',
- 'is_on_screen',
- 'is_onfire',
- 'is_orphaned',
- 'is_owner_identifier_any()',
- 'is_persona_or_premium_skin',
- 'is_playing_dead',
- 'is_powered',
- 'is_pregnant',
- 'is_ram_attacking',
- 'is_resting',
- 'is_riding',
- 'is_roaring',
- 'is_rolling',
- 'is_saddled',
- 'is_scared',
- 'is_selected_item',
- 'is_shaking',
- 'is_shaking_wetness',
- 'is_sheared',
- 'is_shield_powered',
- 'is_silent',
- 'is_sitting',
- 'is_sleeping',
- 'is_sneaking',
- 'is_sneezing',
- 'is_sniffing',
- 'is_sonic_boom',
- 'is_spectator',
- 'is_sprinting',
- 'is_stackable',
- 'is_stalking',
- 'is_standing',
- 'is_stunned',
- 'is_swimming',
- 'is_tamed',
- 'is_transforming',
- 'is_using_item',
- 'is_wall_climbing',
- 'item_in_use_duration',
- 'item_is_charged',
- 'item_max_use_duration',
- 'item_remaining_use_duration',
- 'item_slot_to_bone_name()',
- 'key_frame_lerp_time',
- 'last_frame_time',
- 'last_hit_by_player',
- 'lie_amount',
- 'life_span',
- 'lod_index',
- 'log',
- 'main_hand_item_max_duration',
- 'main_hand_item_use_duration',
- 'max_durability',
- 'max_health',
- 'max_trade_tier',
- 'maximum_frame_time',
- 'minimum_frame_time',
- 'model_scale',
- 'modified_distance_moved',
- 'modified_move_speed',
- 'moon_brightness',
- 'moon_phase',
- 'movement_direction',
- 'noise',
- 'on_fire_time',
- 'out_of_control',
- 'player_level',
- 'position()',
- 'position_delta()',
- 'previous_squish_value',
- 'remaining_durability',
- 'roll_counter',
- 'rotation_to_camera()',
- 'shake_angle',
- 'shake_time',
- 'shield_blocking_bob',
- 'show_bottom',
- 'sit_amount',
- 'sleep_rotation',
- 'sneeze_counter',
- 'spellcolor',
- 'standing_scale',
- 'structural_integrity',
- 'surface_particle_color',
- 'surface_particle_texture_coordinate',
- 'surface_particle_texture_size',
- 'swell_amount',
- 'swelling_dir',
- 'swim_amount',
- 'tail_angle',
- 'target_x_rotation',
- 'target_y_rotation',
- 'texture_frame_index',
- 'time_of_day',
- 'time_since_last_vibration_detection',
- 'time_stamp',
- 'total_emitter_count',
- 'total_particle_count',
- 'trade_tier',
- 'unhappy_counter',
- 'walk_distance',
- 'wing_flap_position',
- 'wing_flap_speed',
-]
-const MOLANG_QUERY_LABELS = {
- 'in_range()': 'in_range( value, min, max )',
- 'all()': 'in_range( value, values... )',
- 'any()': 'in_range( value, values... )',
- 'approx_eq()': 'in_range( value, values... )',
-}
-const DEFAULT_CONTEXT = [
- 'item_slot',
- 'block_face',
- 'cardinal_block_face_placed_on',
- 'is_first_person',
- 'owning_entity',
- 'player_offhand_arm_height',
- 'other',
- 'count',
-]
-const DEFAULT_VARIABLES = ['attack_time', 'is_first_person']
-const MATH_FUNCTIONS = [
- 'sin()',
- 'cos()',
- 'abs()',
- 'clamp()',
- 'pow()',
- 'sqrt()',
- 'random()',
- 'ceil()',
- 'round()',
- 'trunc()',
- 'floor()',
- 'mod()',
- 'min()',
- 'max()',
- 'exp()',
- 'ln()',
- 'lerp()',
- 'lerprotate()',
- 'pi',
- 'asin()',
- 'acos()',
- 'atan()',
- 'atan2()',
- 'die_roll()',
- 'die_roll_integer()',
- 'hermite_blend()',
- 'random_integer()',
-]
-const MATH_FUNCTION_LABELS = {
- 'clamp()': 'clamp( value, min, max )',
- 'pow()': 'pow( base, exponent )',
- 'random()': 'random( low, high )',
- 'mod()': 'mod( value, denominator )',
- 'min()': 'min( A, B )',
- 'max()': 'max( A, B )',
- 'lerp()': 'lerp( start, end, 0_to_1 )',
- 'lerprotate()': 'lerprotate( start, end, 0_to_1 )',
- 'atan2()': 'atan2( y, x )',
- 'die_roll()': 'die_roll( num, low, high )',
- 'die_roll_integer()': 'die_roll_integer( num, low, high )',
- 'random_integer()': 'random_integer( low, high )',
- 'hermite_blend()': 'hermite_blend( 0_to_1 )',
-}
-
-const CUSTOM_FUNCTIONS: Record number> = {}
-const CUSTOM_FUNCTION_LABELS: Record = {}
-
-for (const [call, body] of Object.entries(MolangFunctionFile)) {
- const match = call.match(/^(.+?)\((.*?)\)$/)
- if (!match) continue
- const name = match[1]
- const argList = match[2].split(',').map(v => v.trim())
- CUSTOM_FUNCTIONS[name] = (...args: number[]) => {
- const variables: Record = {}
- for (let i = 0; i < args.length; i++) {
- variables[argList[i]] = args[i] || 0
- }
- return Animator.MolangParser.parse(body, variables)
- }
- CUSTOM_FUNCTION_LABELS[name] = name + '( ' + argList.join(', ') + ' )'
-}
-
-function getProjectVariables(current: string) {
- const set = new Set()
- const expressions = getAllMolangExpressions()
- expressions.forEach((exp: MolangExpression) => {
- if (!exp.value) return
- const matches = exp.value.match(/(v|variable)\.\w+/gi)
- if (!matches) return
- matches.forEach(match => {
- const name = match.substring(match.indexOf('.') + 1)
- if (name !== current) set.add(name)
- })
- })
- return set
-}
-
-function filterAndSortList(
- list: string[],
- match: string,
- blacklist: string[] | false | undefined = false,
- labels: Record | undefined = undefined
-) {
- const result = list.filter(f => f.startsWith(match) && f.length != match.length)
- list.forEach(f => {
- if (!result.includes(f) && f.includes(match) && f.length != match.length) result.push(f)
- })
- if (blacklist) blacklist.forEach(black => result.remove(black))
- return result.map(text => {
- return { text, label: labels && labels[text], overlap: match.length }
- })
-}
-
-createBlockbenchMod(
- `${PACKAGE.name}:molangMod`,
- {
- originalAutocompleteMolang: Animator.autocompleteMolang,
- unsubscribeSelectAjProject: undefined as (() => void) | undefined,
- unsuscribeUnselectAjProject: undefined as (() => void) | undefined,
- },
- context => {
- context.unsubscribeSelectAjProject = events.SELECT_AJ_PROJECT.subscribe(() => {
- Object.assign(GLOBAL_VARIABLES, CUSTOM_FUNCTIONS)
-
- Animator.autocompleteMolang = function (text, position, type) {
- let beginning = text
- .substring(0, position)
- .split(/[^a-zA-Z_.]\.*/g)
- .last()
- if (!beginning) return []
-
- beginning = beginning.toLowerCase()
- if (beginning.includes('.')) {
- const [namespace, dir] = beginning.split('.')
- if (namespace == 'math') {
- return filterAndSortList(
- MATH_FUNCTIONS,
- dir,
- undefined,
- MATH_FUNCTION_LABELS
- )
- }
- if (namespace == 'query' || namespace == 'q') {
- return filterAndSortList(
- MOLANG_QUERIES,
- dir,
- type !== 'controller' && [
- 'all_animations_finished',
- 'any_animation_finished',
- ],
- MOLANG_QUERY_LABELS
- )
- }
- if (namespace == 'temp' || namespace == 't') {
- const temps = text.match(/([^a-z]|^)t(emp)?\.\w+/gi)
- if (temps) {
- const temps2 = temps.map(t => t.split('.')[1])
- const temps3 = temps2.filter(
- (t, i) => t !== dir && temps2.indexOf(t) === i
- )
- return filterAndSortList(temps3, dir)
- }
- }
- if (namespace == 'context' || namespace == 'c') {
- return filterAndSortList([...DEFAULT_CONTEXT], dir)
- }
- if (namespace == 'variable' || namespace == 'v') {
- const options = [...getProjectVariables(dir)]
- options.safePush(...DEFAULT_VARIABLES)
- return filterAndSortList(options, dir)
- }
- } else {
- const root_tokens = ROOT_TOKENS.slice()
- let labels = {}
- if (type === 'placeholders') {
- labels = {
- 'toggle()': 'toggle( name )',
- 'slider()': 'slider( name, step?, min?, max? )',
- 'impulse()': 'impulse( name, duration )',
- }
- root_tokens.push(...Object.keys(labels))
- }
- return filterAndSortList(
- [...root_tokens, ...Object.keys(CUSTOM_FUNCTION_LABELS)],
- beginning,
- undefined,
- { ...labels, ...CUSTOM_FUNCTION_LABELS }
- )
- }
- return []
- }
- })
-
- context.unsuscribeUnselectAjProject = events.UNSELECT_AJ_PROJECT.subscribe(() => {
- for (const key of Object.keys(CUSTOM_FUNCTIONS)) {
- delete GLOBAL_VARIABLES[key]
- }
- Animator.autocompleteMolang = context.originalAutocompleteMolang
- })
-
- return context
- },
- context => {
- for (const key of Object.keys(CUSTOM_FUNCTIONS)) {
- delete GLOBAL_VARIABLES[key]
- }
- Animator.autocompleteMolang = context.originalAutocompleteMolang
- context.unsubscribeSelectAjProject?.()
- context.unsuscribeUnselectAjProject?.()
- }
-)
diff --git a/src/nodeConfigs.ts b/src/nodeConfigs.ts
deleted file mode 100644
index 06ad0760..00000000
--- a/src/nodeConfigs.ts
+++ /dev/null
@@ -1,759 +0,0 @@
-import { NbtByte, NbtCompound, NbtFloat, NbtInt, NbtString, NbtTag } from 'deepslate/lib/nbt'
-import {
- IBlueprintBoneConfigJSON,
- IBlueprintCameraConfigJSON,
- IBlueprintLocatorConfigJSON,
- IBlueprintTextDisplayConfigJSON,
-} from './blueprintFormat'
-
-export type BillboardMode = 'fixed' | 'vertical' | 'horizontal' | 'center'
-
-// TODO: Refactor these configs to inherit from a base class
-export class BoneConfig {
- private _customName?: string
- private _customNameVisible?: boolean
- private _billboard?: BillboardMode
- private _overrideBrightness?: boolean
- private _brightnessOverride?: number
- private _enchanted?: boolean
- private _glowing?: boolean
- private _overrideGlowColor?: boolean
- private _glowColor?: string
- private _inheritSettings?: boolean
- private _invisible?: boolean
- private _nbt?: string
- private _shadowRadius?: number
- private _shadowStrength?: number
- private _useNBT?: boolean
-
- static getDefault(): BoneConfig {
- return BoneConfig.fromJSON({
- custom_name: '',
- custom_name_visible: false,
- billboard: 'fixed',
- override_brightness: false,
- brightness_override: 0,
- enchanted: false,
- glowing: false,
- override_glow_color: false,
- glow_color: '#ffffff',
- inherit_settings: true,
- invisible: false,
- nbt: '{}',
- shadow_radius: 0,
- shadow_strength: 1,
- use_nbt: false,
- })
- }
-
- get customName(): NonNullable {
- if (this._customName !== undefined) return this._customName
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.customName
- }
- set customName(value: BoneConfig['_customName']) {
- this._customName = value
- }
-
- get customNameVisible(): NonNullable {
- if (this._customNameVisible !== undefined) return this._customNameVisible
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.customNameVisible
- }
- set customNameVisible(value: BoneConfig['_customNameVisible']) {
- this._customNameVisible = value
- }
-
- get billboard(): NonNullable {
- if (this._billboard !== undefined) return this._billboard
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.billboard
- }
- set billboard(value: BoneConfig['_billboard']) {
- this._billboard = value
- }
-
- get overrideBrightness(): NonNullable {
- if (this._overrideBrightness !== undefined) return this._overrideBrightness
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.overrideBrightness
- }
- set overrideBrightness(value: BoneConfig['_overrideBrightness']) {
- this._overrideBrightness = value
- }
-
- get brightnessOverride(): NonNullable {
- if (this._brightnessOverride !== undefined) return this._brightnessOverride
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.brightnessOverride
- }
- set brightnessOverride(value: BoneConfig['_brightnessOverride']) {
- this._brightnessOverride = value
- }
-
- get enchanted(): NonNullable {
- if (this._enchanted !== undefined) return this._enchanted
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.enchanted
- }
- set enchanted(value: BoneConfig['_enchanted']) {
- this._enchanted = value
- }
-
- get glowing(): NonNullable {
- if (this._glowing !== undefined) return this._glowing
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.glowing
- }
- set glowing(value: BoneConfig['_glowing']) {
- this._glowing = value
- }
-
- get overrideGlowColor(): NonNullable {
- if (this._overrideGlowColor !== undefined) return this._overrideGlowColor
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.overrideGlowColor
- }
- set overrideGlowColor(value: BoneConfig['_overrideGlowColor']) {
- this._overrideGlowColor = value
- }
-
- get glowColor(): NonNullable {
- if (this._glowColor !== undefined) return this._glowColor
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.glowColor
- }
- set glowColor(value: BoneConfig['_glowColor']) {
- this._glowColor = value
- }
-
- get inheritSettings(): NonNullable {
- if (this._inheritSettings !== undefined) return this._inheritSettings
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.inheritSettings
- }
- set inheritSettings(value: BoneConfig['_inheritSettings']) {
- this._inheritSettings = value
- }
-
- get invisible(): NonNullable {
- if (this._invisible !== undefined) return this._invisible
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.invisible
- }
- set invisible(value: BoneConfig['_invisible']) {
- this._invisible = value
- }
-
- get nbt(): NonNullable {
- if (this._nbt !== undefined) return this._nbt
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.nbt
- }
- set nbt(value: BoneConfig['_nbt']) {
- this._nbt = value
- }
-
- get shadowRadius(): NonNullable {
- if (this._shadowRadius !== undefined) return this._shadowRadius
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.shadowRadius
- }
- set shadowRadius(value: BoneConfig['_shadowRadius']) {
- this._shadowRadius = value
- }
-
- get shadowStrength(): NonNullable {
- if (this._shadowStrength !== undefined) return this._shadowStrength
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.shadowStrength
- }
- set shadowStrength(value: BoneConfig['_shadowStrength']) {
- this._shadowStrength = value
- }
-
- get useNBT(): NonNullable {
- if (this._useNBT !== undefined) return this._useNBT
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.useNBT
- }
- set useNBT(value: BoneConfig['_useNBT']) {
- this._useNBT = value
- }
-
- public checkIfEqual(other: BoneConfig) {
- return (
- this._customName === other._customName &&
- this._customNameVisible === other._customNameVisible &&
- this._billboard === other._billboard &&
- this._overrideBrightness === other._overrideBrightness &&
- this._brightnessOverride === other._brightnessOverride &&
- this._enchanted === other._enchanted &&
- this._glowing === other._glowing &&
- this._overrideGlowColor === other._overrideGlowColor &&
- this._glowColor === other._glowColor &&
- this._inheritSettings === other._inheritSettings &&
- this._invisible === other._invisible &&
- this._nbt === other._nbt &&
- this._shadowRadius === other._shadowRadius &&
- this._shadowStrength === other._shadowStrength &&
- this._useNBT === other._useNBT
- )
- }
-
- public isDefault(): boolean {
- return this.checkIfEqual(BoneConfig.getDefault())
- }
-
- public toJSON(): IBlueprintBoneConfigJSON {
- return {
- custom_name: this._customName,
- custom_name_visible: this._customNameVisible,
- billboard: this._billboard,
- override_brightness: this._overrideBrightness,
- brightness_override: this._brightnessOverride,
- enchanted: this._enchanted,
- glowing: this._glowing,
- override_glow_color: this._overrideGlowColor,
- glow_color: this._glowColor,
- inherit_settings: this._inheritSettings,
- invisible: this._invisible,
- nbt: this._nbt,
- shadow_radius: this._shadowRadius,
- shadow_strength: this._shadowStrength,
- use_nbt: this._useNBT,
- }
- }
-
- inheritFrom(other: BoneConfig) {
- if (other._customName !== undefined) this.customName = other.customName
- if (other._customNameVisible !== undefined) this.customNameVisible = other.customNameVisible
- if (other._billboard !== undefined) this.billboard = other.billboard
- if (other._overrideBrightness !== undefined)
- this.overrideBrightness = other.overrideBrightness
- if (other._brightnessOverride !== undefined)
- this.brightnessOverride = other.brightnessOverride
- if (other._enchanted !== undefined) this.enchanted = other.enchanted
- if (other._glowing !== undefined) this.glowing = other.glowing
- if (other._overrideGlowColor !== undefined) this.overrideGlowColor = other.overrideGlowColor
- if (other._glowColor !== undefined) this.glowColor = other.glowColor
- if (other._inheritSettings !== undefined) this.inheritSettings = other.inheritSettings
- if (other._invisible !== undefined) this.invisible = other.invisible
- if (other._nbt !== undefined) this.nbt = other.nbt
- if (other._shadowRadius !== undefined) this.shadowRadius = other.shadowRadius
- if (other._shadowStrength !== undefined) this.shadowStrength = other.shadowStrength
- if (other._useNBT !== undefined) this.useNBT = other.useNBT
- }
-
- public static fromJSON(json: IBlueprintBoneConfigJSON): BoneConfig {
- const config = new BoneConfig()
- if (json.custom_name !== undefined) config._customName = json.custom_name
- if (json.custom_name_visible !== undefined)
- config._customNameVisible = json.custom_name_visible
- if (json.billboard !== undefined) config._billboard = json.billboard
- if (json.override_brightness !== undefined)
- config._overrideBrightness = json.override_brightness
- if (json.brightness_override !== undefined)
- config._brightnessOverride = json.brightness_override
- if (json.enchanted !== undefined) config._enchanted = json.enchanted
- if (json.glowing !== undefined) config._glowing = json.glowing
- if (json.override_glow_color !== undefined)
- config._overrideGlowColor = json.override_glow_color
- if (json.glow_color !== undefined) config._glowColor = json.glow_color
- if (json.inherit_settings !== undefined) config._inheritSettings = json.inherit_settings
- if (json.invisible !== undefined) config._invisible = json.invisible
- if (json.nbt !== undefined) config._nbt = json.nbt
- if (json.shadow_radius !== undefined) config._shadowRadius = json.shadow_radius
- if (json.shadow_strength !== undefined) config._shadowStrength = json.shadow_strength
- if (json.use_nbt !== undefined) config._useNBT = json.use_nbt
- return config
- }
-
- public toNBT(compound: NbtCompound = new NbtCompound()): NbtCompound {
- if (this.useNBT) {
- const newData = NbtTag.fromString(this.nbt) as NbtCompound
- for (const key of newData.keys()) {
- compound.set(key, newData.get(key)!)
- }
- return compound
- }
-
- if (this._customName) {
- compound.set('CustomName', new NbtString(this.customName))
- }
-
- if (this._customNameVisible) {
- compound.set('CustomNameVisible', new NbtByte(Number(this.customNameVisible)))
- }
-
- if (this._billboard) {
- compound.set('billboard', new NbtString(this.billboard))
- }
-
- if (this.overrideBrightness) {
- compound.set(
- 'brightness',
- new NbtCompound()
- .set('block', new NbtFloat(this.brightnessOverride))
- .set('sky', new NbtFloat(this.brightnessOverride))
- )
- }
-
- if (this.enchanted) {
- const item = (compound.get('item') as NbtCompound) || new NbtCompound()
- compound.set(
- 'item',
- item.set(
- 'components',
- new NbtCompound().set(
- 'minecraft:enchantments',
- new NbtCompound().set(
- 'levels',
- new NbtCompound().set('minecraft:infinity', new NbtInt(1))
- )
- )
- )
- )
- }
-
- if (this.glowing) {
- compound.set('Glowing', new NbtByte(Number(this.glowing)))
- }
- if (this.overrideGlowColor) {
- compound.set(
- 'glow_color_override',
- new NbtInt(Number(this.glowColor.replace('#', '0x')))
- )
- }
-
- // TODO Figure out a good solution for toggling a bone's visibility...
- // if (force || config.invisible !== defaultConfig.invisible) {
- // compound.set('invisible', new NbtByte(1))
- // }
-
- if (this._shadowRadius) {
- compound.set('shadow_radius', new NbtFloat(this.shadowRadius))
- }
-
- if (this._shadowStrength) {
- compound.set('shadow_strength', new NbtFloat(this.shadowStrength))
- }
-
- return compound
- }
-}
-
-export class LocatorConfig {
- private _useEntity?: boolean
- private _entityType?: string
- private _syncPassengerRotation?: boolean
- private _summonCommands?: string
- private _tickingCommands?: string
-
- getDefault(): LocatorConfig {
- return LocatorConfig.fromJSON({
- use_entity: false,
- entity_type: 'minecraft:pig',
- sync_passenger_rotation: false,
- summon_commands: '',
- ticking_commands: '',
- })
- }
-
- get useEntity(): NonNullable {
- if (this._useEntity !== undefined) return this._useEntity
- const defaultConfig = this.getDefault()
- return defaultConfig.useEntity
- }
- set useEntity(value: NonNullable) {
- this._useEntity = value
- }
-
- get entityType(): NonNullable {
- if (this._entityType !== undefined) return this._entityType
- const defaultConfig = this.getDefault()
- return defaultConfig.entityType
- }
- set entityType(value: NonNullable) {
- this._entityType = value
- }
-
- get syncPassengerRotation(): NonNullable {
- if (this._syncPassengerRotation !== undefined) return this._syncPassengerRotation
- const defaultConfig = this.getDefault()
- return defaultConfig.syncPassengerRotation
- }
- set syncPassengerRotation(value: NonNullable) {
- this._syncPassengerRotation = value
- }
-
- get summonCommands(): NonNullable {
- if (this._summonCommands !== undefined) return this._summonCommands
- const defaultConfig = this.getDefault()
- return defaultConfig.summonCommands
- }
- set summonCommands(value: NonNullable) {
- this._summonCommands = value
- }
-
- get tickingCommands(): NonNullable {
- if (this._tickingCommands !== undefined) return this._tickingCommands
- const defaultConfig = this.getDefault()
- return defaultConfig.tickingCommands
- }
- set tickingCommands(value: NonNullable) {
- this._tickingCommands = value
- }
-
- public toJSON(): IBlueprintLocatorConfigJSON {
- return {
- use_entity: this._useEntity,
- entity_type: this._entityType,
- sync_passenger_rotation: this._syncPassengerRotation,
- summon_commands: this._summonCommands,
- ticking_commands: this._tickingCommands,
- }
- }
-
- public static fromJSON(json: IBlueprintLocatorConfigJSON): LocatorConfig {
- const config = new LocatorConfig()
- if (json.use_entity !== undefined) config._useEntity = json.use_entity
- if (json.entity_type !== undefined) config._entityType = json.entity_type
- if (json.sync_passenger_rotation !== undefined)
- config._syncPassengerRotation = json.sync_passenger_rotation
- if (json.summon_commands !== undefined) config._summonCommands = json.summon_commands
- if (json.ticking_commands !== undefined) config._tickingCommands = json.ticking_commands
- return config
- }
-
- public isDefault(): boolean {
- return this.checkIfEqual(new LocatorConfig())
- }
-
- public checkIfEqual(other: LocatorConfig) {
- return (
- this.useEntity === other.useEntity &&
- this.entityType === other.entityType &&
- this.syncPassengerRotation === other.syncPassengerRotation &&
- this.summonCommands === other.summonCommands &&
- this.tickingCommands === other.tickingCommands
- )
- }
-}
-
-export class CameraConfig {
- private _entityType?: string
- private _nbt?: string
- private _tickingCommands?: string
-
- getDefault(): CameraConfig {
- return CameraConfig.fromJSON({
- entity_type: 'minecraft:item_display',
- nbt: '{}',
- ticking_commands: '',
- })
- }
-
- get entityType(): NonNullable {
- if (this._entityType !== undefined) return this._entityType
- const defaultConfig = this.getDefault()
- return defaultConfig.entityType
- }
- set entityType(value: NonNullable) {
- this._entityType = value
- }
-
- get nbt(): NonNullable {
- if (this._nbt !== undefined) return this._nbt
- const defaultConfig = this.getDefault()
- return defaultConfig.nbt
- }
- set nbt(value: NonNullable) {
- this._nbt = value
- }
-
- get tickingCommands(): NonNullable {
- if (this._tickingCommands !== undefined) return this._tickingCommands
- const defaultConfig = this.getDefault()
- return defaultConfig.tickingCommands
- }
- set tickingCommands(value: NonNullable) {
- this._tickingCommands = value
- }
-
- public toJSON(): IBlueprintCameraConfigJSON {
- return {
- entity_type: this.entityType,
- nbt: this.nbt,
- ticking_commands: this.tickingCommands,
- }
- }
-
- public static fromJSON(json: IBlueprintCameraConfigJSON): CameraConfig {
- const config = new CameraConfig()
- if (json.entity_type != undefined) config.entityType = json.entity_type
- if (json.nbt != undefined) config.nbt = json.nbt
- if (json.ticking_commands != undefined) config.tickingCommands = json.ticking_commands
- return config
- }
-
- public isDefault(): boolean {
- return this.checkIfEqual(new CameraConfig())
- }
-
- public checkIfEqual(other: CameraConfig) {
- return (
- this.entityType === other.entityType &&
- this.nbt === other.nbt &&
- this.tickingCommands === other.tickingCommands
- )
- }
-}
-
-export class TextDisplayConfig {
- private _billboard?: BillboardMode
- private _overrideBrightness?: boolean
- private _brightnessOverride?: number
- private _glowing?: boolean
- private _overrideGlowColor?: boolean
- private _glowColor?: string
- private _invisible?: boolean
- private _shadowRadius?: number
- private _shadowStrength?: number
- private _useNBT?: boolean
- private _nbt?: string
-
- static getDefault(): TextDisplayConfig {
- return TextDisplayConfig.fromJSON({
- billboard: 'fixed',
- override_brightness: false,
- brightness_override: 0,
- glowing: false,
- override_glow_color: false,
- glow_color: '#ffffff',
- invisible: false,
- nbt: '{}',
- shadow_radius: 0,
- shadow_strength: 1,
- use_nbt: false,
- })
- }
-
- get billboard(): NonNullable {
- if (this._billboard !== undefined) return this._billboard
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.billboard
- }
- set billboard(value: BoneConfig['_billboard']) {
- this._billboard = value
- }
-
- get overrideBrightness(): NonNullable {
- if (this._overrideBrightness !== undefined) return this._overrideBrightness
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.overrideBrightness
- }
- set overrideBrightness(value: BoneConfig['_overrideBrightness']) {
- this._overrideBrightness = value
- }
-
- get brightnessOverride(): NonNullable {
- if (this._brightnessOverride !== undefined) return this._brightnessOverride
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.brightnessOverride
- }
- set brightnessOverride(value: BoneConfig['_brightnessOverride']) {
- this._brightnessOverride = value
- }
-
- get glowing(): NonNullable {
- if (this._glowing !== undefined) return this._glowing
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.glowing
- }
- set glowing(value: BoneConfig['_glowing']) {
- this._glowing = value
- }
-
- get overrideGlowColor(): NonNullable {
- if (this._overrideGlowColor !== undefined) return this._overrideGlowColor
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.overrideGlowColor
- }
- set overrideGlowColor(value: BoneConfig['_overrideGlowColor']) {
- this._overrideGlowColor = value
- }
-
- get glowColor(): NonNullable {
- if (this._glowColor !== undefined) return this._glowColor
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.glowColor
- }
- set glowColor(value: BoneConfig['_glowColor']) {
- this._glowColor = value
- }
-
- get invisible(): NonNullable {
- if (this._invisible !== undefined) return this._invisible
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.invisible
- }
- set invisible(value: BoneConfig['_invisible']) {
- this._invisible = value
- }
-
- get nbt(): NonNullable {
- if (this._nbt !== undefined) return this._nbt
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.nbt
- }
- set nbt(value: BoneConfig['_nbt']) {
- this._nbt = value
- }
-
- get shadowRadius(): NonNullable {
- if (this._shadowRadius !== undefined) return this._shadowRadius
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.shadowRadius
- }
- set shadowRadius(value: BoneConfig['_shadowRadius']) {
- this._shadowRadius = value
- }
-
- get shadowStrength(): NonNullable {
- if (this._shadowStrength !== undefined) return this._shadowStrength
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.shadowStrength
- }
- set shadowStrength(value: BoneConfig['_shadowStrength']) {
- this._shadowStrength = value
- }
-
- get useNBT(): NonNullable {
- if (this._useNBT !== undefined) return this._useNBT
- const defaultConfig = BoneConfig.getDefault()
- return defaultConfig.useNBT
- }
- set useNBT(value: BoneConfig['_useNBT']) {
- this._useNBT = value
- }
-
- getDefault(): TextDisplayConfig {
- return TextDisplayConfig.fromJSON({
- billboard: 'center',
- })
- }
-
- get tickingCommands(): NonNullable {
- if (this._billboard !== undefined) return this._billboard
- const defaultConfig = this.getDefault()
- return defaultConfig.tickingCommands
- }
- set tickingCommands(value: NonNullable) {
- this._billboard = value
- }
-
- public toJSON(): IBlueprintTextDisplayConfigJSON {
- return {
- billboard: this._billboard,
- override_brightness: this._overrideBrightness,
- brightness_override: this._brightnessOverride,
- glowing: this._glowing,
- override_glow_color: this._overrideGlowColor,
- glow_color: this._glowColor,
- invisible: this._invisible,
- nbt: this._nbt,
- shadow_radius: this._shadowRadius,
- shadow_strength: this._shadowStrength,
- use_nbt: this._useNBT,
- }
- }
-
- public static fromJSON(json: IBlueprintTextDisplayConfigJSON): TextDisplayConfig {
- const config = new TextDisplayConfig()
- if (json.billboard !== undefined) config._billboard = json.billboard
- if (json.override_brightness !== undefined)
- config._overrideBrightness = json.override_brightness
- if (json.brightness_override !== undefined)
- config._brightnessOverride = json.brightness_override
- if (json.glowing !== undefined) config._glowing = json.glowing
- if (json.override_glow_color !== undefined)
- config._overrideGlowColor = json.override_glow_color
- if (json.glow_color !== undefined) config._glowColor = json.glow_color
- if (json.invisible !== undefined) config._invisible = json.invisible
- if (json.nbt !== undefined) config._nbt = json.nbt
- if (json.shadow_radius !== undefined) config._shadowRadius = json.shadow_radius
- if (json.shadow_strength !== undefined) config._shadowStrength = json.shadow_strength
- if (json.use_nbt !== undefined) config._useNBT = json.use_nbt
-
- return config
- }
-
- public toNBT(compound = new NbtCompound()) {
- if (this.useNBT) {
- const newData = NbtTag.fromString(this.nbt) as NbtCompound
- for (const key of newData.keys()) {
- compound.set(key, newData.get(key)!)
- }
- return compound
- }
-
- if (this._billboard) {
- compound.set('billboard', new NbtString(this.billboard))
- }
-
- if (this.overrideBrightness) {
- compound.set(
- 'brightness',
- new NbtCompound()
- .set('block', new NbtFloat(this.brightnessOverride))
- .set('sky', new NbtFloat(this.brightnessOverride))
- )
- }
-
- if (this.glowing) {
- compound.set('Glowing', new NbtByte(Number(this.glowing)))
- }
- if (this.overrideGlowColor) {
- compound.set(
- 'glow_color_override',
- new NbtInt(Number(this.glowColor.replace('#', '0x')))
- )
- }
-
- // TODO Figure out a good solution for toggling a bone's visibility...
- // if (force || config.invisible !== defaultConfig.invisible) {
- // compound.set('invisible', new NbtByte(1))
- // }
-
- if (this._shadowRadius) {
- compound.set('shadow_radius', new NbtFloat(this.shadowRadius))
- }
-
- if (this._shadowStrength) {
- compound.set('shadow_strength', new NbtFloat(this.shadowStrength))
- }
-
- return compound
- }
-
- public isDefault(): boolean {
- return this.checkIfEqual(new TextDisplayConfig())
- }
-
- public checkIfEqual(other: TextDisplayConfig) {
- return (
- this._billboard === other._billboard &&
- this._overrideBrightness === other._overrideBrightness &&
- this._brightnessOverride === other._brightnessOverride &&
- this._glowing === other._glowing &&
- this._overrideGlowColor === other._overrideGlowColor &&
- this._glowColor === other._glowColor &&
- this._invisible === other._invisible &&
- this._nbt === other._nbt &&
- this._shadowRadius === other._shadowRadius &&
- this._shadowStrength === other._shadowStrength &&
- this._useNBT === other._useNBT
- )
- }
-}
diff --git a/src/plugin/index.ts b/src/plugin/index.ts
new file mode 100644
index 00000000..3d2ea92a
--- /dev/null
+++ b/src/plugin/index.ts
@@ -0,0 +1,35 @@
+import EVENTS from '@events'
+import { PACKAGE } from '../constants'
+import { openInstallPopup } from '../ui/popups/installed'
+
+export default function register() {
+ BBPlugin.register(PACKAGE.name, {
+ title: PACKAGE.title,
+ author: PACKAGE.author.name,
+ description: PACKAGE.description,
+ icon: 'icon.svg',
+ variant: 'desktop',
+ version: PACKAGE.version,
+ min_version: PACKAGE.min_blockbench_version,
+ tags: ['Minecraft: Java Edition', 'Animation', 'Display Entities'],
+ await_loading: true,
+ onload() {
+ EVENTS.LOAD.dispatch()
+ },
+ onunload() {
+ EVENTS.UNLOAD.dispatch()
+ },
+ oninstall() {
+ EVENTS.INSTALL.dispatch()
+ openInstallPopup()
+ },
+ onuninstall() {
+ EVENTS.UNINSTALL.dispatch()
+ Blockbench.showMessageBox({
+ title: 'Animated Java has Been Uninstalled!',
+ message: 'In order to fully uninstall Animated Java, please restart Blockbench.',
+ buttons: ['OK'],
+ })
+ },
+ })
+}
diff --git a/src/pluginPackage/about.svelte b/src/plugin/package/about.svelte
similarity index 70%
rename from src/pluginPackage/about.svelte
rename to src/plugin/package/about.svelte
index 23d4fc6a..24d203b8 100644
--- a/src/pluginPackage/about.svelte
+++ b/src/plugin/package/about.svelte
@@ -39,28 +39,34 @@
Features
-
Variants: Swap between different textures in-game.
- Highly optimized: Hours of performance tests and optimization tweaks have gone into Animated
- Java's Exported Data Pack to make sure it has as little performance impact as possible.
+ Function API - Simple, yet powerful, API for summoning, and controlling animated models.
-
Limited Molang support. If Blockbench can render it, Animated Java can animate it.
-
Text Display previewing and animation support.
-
Resource Pack-less exporting. Animate Vanilla block and item models!
-
Locators: Run commands relative to a locators position via keyframes.
+
Variants - Swap between different textures in-game.
+
Text Displays - Preview, edit, and animate text displays in Blockbench.
+
Keyframe Easing Curves - Create smooth animations with ease.
- Camera Plugin Support: Install the Official Camera Plugin to create cinematic camera paths with ease!
+ Locators - Execute commands using Command Keyframes, teleport entities in an animation,
+ and more.
-
Animation Tweening: Create smooth transitions between animations.
-
Many different configuration options.
+
Animation Tweening - Smoothly transition between animations.
- {#if pluginModeEnabled}
+ {#if IS_PLUGIN_MODE}
@@ -117,7 +115,7 @@
@@ -173,7 +171,7 @@
red button?`,
+ `Skill Issue.`,
+ `You have how many elements!?`,
+ `I'll export successfully some day!`,
+ `When I grow up, I wanna be just like Blender!`,
+ `Should'a seen that one comming...`,
+ `It's all Jannis' fault! :(`,
+ `Snaviewavie did an oopsie poopsie x3`,
+ `We to a little trolling`,
+ `execute run execute run execute run execute run say This is fine.`,
+ `This is why we can't have nice things. :(`,
+ `Have you tried turning it off and on again?`,
+ `What if I put my command block next to yours? Haha just kidding... Unless?`,
+ `If at first you don't succeed, try, try again!`,
+ `B:01010111 01100101 00100000 01100100 01101111 00100000 01100001 00100000 01101100 01101001 01110100 01110100 01101100 01100101 00100000 01110100 01110010 01101111 01101100 01101100 01101001 01101110 01100111`,
+ `
+
SnaveSutit would like to know your location
+
+
+
+
+
`,
+ `I've decided to stop working for today. Try again tomorrow!`,
+ `Every time you see this error message, a developer vanishes in a puff of binary.`,
+ `"Flavor Text"? I've never tasted text before...`,
+ `( ͡° ͜ʖ ͡°)`,
+ `That's a nice model you have there, it'd be a shame if something were to happen to it...`,
+ `Some day you'll learn. But until then, I control the cheese`,
+ `Please deposit 5 coins!`,
+ `Click here to find a solution!`,
+ ``,
+ `Failed to find global 'pandemic'`,
+ `I'm sorry, Dave. I'm afraid I can't do that.`,
+]
+
+export function openUnexpectedErrorDialog(error: Error) {
+ new SvelteDialog({
+ id: `${PACKAGE.name}:unexpectedError`,
+ title: translate('dialog.unexpected_error.title'),
+ width: 600,
+ component: UnexpectedErrorDialog,
+ props: {
+ error,
+ },
+ preventKeybinds: true,
+ buttons: [translate('dialog.unexpected_error.close_button')],
+ }).show()
+}
diff --git a/src/ui/dialogs/unexpected-error/unexpectedErrorDialog.svelte b/src/ui/dialogs/unexpected-error/unexpectedErrorDialog.svelte
new file mode 100644
index 00000000..ed623a09
--- /dev/null
+++ b/src/ui/dialogs/unexpected-error/unexpectedErrorDialog.svelte
@@ -0,0 +1,75 @@
+
+
+
+ 
- 
- 
- 
- 
+ 
+ 
`,
+ `Failed to find global 'pandemic'`,
+ `I'm sorry, Dave. I'm afraid I can't do that.`,
+]
+
+export function openUnexpectedErrorDialog(error: Error) {
+ new SvelteDialog({
+ id: `${PACKAGE.name}:unexpectedError`,
+ title: translate('dialog.unexpected_error.title'),
+ width: 600,
+ component: UnexpectedErrorDialog,
+ props: {
+ error,
+ },
+ preventKeybinds: true,
+ buttons: [translate('dialog.unexpected_error.close_button')],
+ }).show()
+}
diff --git a/src/ui/dialogs/unexpected-error/unexpectedErrorDialog.svelte b/src/ui/dialogs/unexpected-error/unexpectedErrorDialog.svelte
new file mode 100644
index 00000000..ed623a09
--- /dev/null
+++ b/src/ui/dialogs/unexpected-error/unexpectedErrorDialog.svelte
@@ -0,0 +1,75 @@
+
+
+
+ 
+