🩹 Fix rebase issues when updating to origin

Author: SnaveSutit

src/systems/exporter.ts

@@ -7,11 +7,11 @@ import { resolvePath } from '../util/fileUtil'
 import { isResourcePackPath, sortMCVersions } from '../util/minecraftUtil'
 import { translate } from '../util/translation'
 import { Variant } from '../variants'
-import { hashAnimations, renderProjectAnimations } from './animationRenderer'
-import compileDataPack from './datapackCompiler'
-import resourcepackCompiler from './resourcepackCompiler'
-import { hashRig, renderRig } from './rigRenderer'
-import { isCubeValid } from './util'
+import { hashAnimations, renderProjectAnimations } from './animation-renderer'
+import datapackCompiler from './datapack-compiler'
+import { exportJSON } from './plugin-json-compiler'
+import resourcepackCompiler from './resourcepack-compiler'
+import { hashRig, renderRig } from './rig-renderer'
 
 export class IntentionalExportError extends Error {}
 

src/systems/minecraft-temp/assetManager.ts

@@ -2,7 +2,6 @@ import { PACKAGE } from '../../constants'
 import { getCurrentVersion, getLatestVersion } from './versionManager'
 
 import EVENTS from '@aj/util/events'
-import { app } from 'electron'
 import { type Unzipped } from 'fflate'
 import {
 	showOfflineError,
@@ -83,7 +82,7 @@ export async function getLatestVersionClientDownloadUrl() {
 }
 
 function getCachedJarFilePath() {
-	const userDataPath = (electron?.app ?? app).getPath('userData')
+	const userDataPath = electron.app.getPath('userData')
 	return PathModule.join(userDataPath, `${PACKAGE.name}/latest.jar`)
 }
 

src/systems/node-configs/index.ts

@@ -1,4 +1,5 @@
 import type { Alignment } from '@aj/blockbench-additions/outliner-elements/textDisplay'
+import { translate } from '@aj/util/translation'
 import { NbtByte, NbtCompound, NbtFloat, NbtInt, NbtString, NbtTag } from 'deepslate/lib/nbt'
 import { SerializableConfig } from './serializableConfig'
 export type { Serialized } from './serializableConfig'