Skip to content

Commit eca9b95

Browse files
SnaveSutitSnaveSutit
committed
fixed merge conflicts
1 parent 923643a commit eca9b95

File tree

5 files changed

+48
-50
lines changed

5 files changed

+48
-50
lines changed

‎src/exporters/animationExporter.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
import * as aj from '../animatedJava'
1+
import type * as aj from '../animatedJava'
22

3-
import { CustomError } from '../util/customError'
4-
import { JsonText } from '../util/minecraft/jsonText'
3+
import * as fs from 'fs'
4+
import { tl } from '../util/intl'
55
import { Path } from '../util/path'
6-
import { removeKeyGently } from '../util/misc'
7-
import { roundToN } from '../util/misc'
8-
import { safeFunctionName, format, fixIndent } from '../util/replace'
9-
import { SNBT, SNBTTag, SNBTTagType } from '../util/SNBT'
106
import { store } from '../util/store'
11-
import { tl } from '../util/intl'
12-
import { generateTree } from '../util/treeGen'
7+
import { roundToN } from '../util/misc'
138
import { compileMC } from '../compileLangMC'
14-
import * as fs from 'fs'
9+
import { removeKeyGently } from '../util/misc'
10+
import { generateTree } from '../util/treeGen'
11+
import { CustomError } from '../util/customError'
12+
import { JsonText } from '../util/minecraft/jsonText'
1513
import { Entities } from '../util/minecraft/entities'
14+
import { SNBT, SNBTTag, SNBTTagType } from '../util/SNBT'
15+
import { safeFunctionName, format, fixIndent } from '../util/replace'
1616

17-
interface animationExporterSettings {
17+
interface vanillaAnimationExporterSettings {
1818
allBonesTag: string
1919
animatingFlagScoreboardObjective: string
2020
animationLoopModeScoreboardObjective: string
@@ -88,7 +88,7 @@ async function createMCFile(
8888
variantTouchedModels: aj.variantTouchedModels
8989
): Promise<{ mcFile: string; mcbConfig: MCBConfig }> {
9090
const ajSettings = settings.animatedJava
91-
const exporterSettings: animationExporterSettings =
91+
const exporterSettings: vanillaAnimationExporterSettings =
9292
settings.vanillaAnimationExporter
9393
const projectName = safeFunctionName(ajSettings.projectName)
9494

@@ -1044,7 +1044,7 @@ async function createMCFile(
10441044
async function exportMCFile(
10451045
generated: { mcFile: string; mcbConfig: MCBConfig },
10461046
ajSettings: aj.GlobalSettings,
1047-
exporterSettings: animationExporterSettings
1047+
exporterSettings: vanillaAnimationExporterSettings
10481048
) {
10491049
if (!exporterSettings.mcbFilePath) {
10501050
throw new CustomError(
@@ -1077,7 +1077,7 @@ async function exportMCFile(
10771077
async function exportDataPack(
10781078
generated: { mcFile: string; mcbConfig: MCBConfig },
10791079
ajSettings: aj.GlobalSettings,
1080-
exporterSettings: animationExporterSettings
1080+
exporterSettings: vanillaAnimationExporterSettings
10811081
) {
10821082
if (!exporterSettings.dataPackPath) {
10831083
console.log(exporterSettings.dataPackPath)
@@ -1212,7 +1212,7 @@ async function exportDataPack(
12121212
}
12131213

12141214
async function animationExport(data: any) {
1215-
const exporterSettings: animationExporterSettings =
1215+
const exporterSettings: vanillaAnimationExporterSettings =
12161216
data.settings.vanillaAnimationExporter
12171217
const generated = await createMCFile(
12181218
data.bones,
@@ -1268,8 +1268,8 @@ function validateFormattedStringSetting(required: string[]) {
12681268

12691269
const Exporter = (AJ: any) => {
12701270
AJ.settings.registerPluginSettings(
1271-
'animatedJava.exporters.animation', // Plugin ID
1272-
'vanillaAnimationExporter', // Plugin Settings Key
1271+
'animatedJava.exporters.vanillaAnimation', // Exporter ID
1272+
'vanillaAnimationExporter', // Exporter Settings Key
12731273
{
12741274
rootEntityType: {
12751275
title: tl(

‎src/exporters/statueExporter.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import * as aj from '../animatedJava'
1+
import type * as aj from '../animatedJava'
22

3+
import * as fs from 'fs'
34
import { tl } from '../util/intl'
5+
import { Path } from '../util/path'
6+
import { store } from '../util/store'
47
import { roundToN } from '../util/misc'
8+
import { compileMC } from '../compileLangMC'
59
import { CustomError } from '../util/customError'
610
import { JsonText } from '../util/minecraft/jsonText'
7-
import { store } from '../util/store'
8-
import { safeFunctionName, format, fixIndent } from '../util/replace'
9-
import { SNBT, SNBTTag, SNBTTagType } from '../util/SNBT'
10-
import { Path } from '../util/path'
11-
import { compileMC } from '../compileLangMC'
12-
import * as fs from 'fs'
1311
import { Entities } from '../util/minecraft/entities'
12+
import { SNBT, SNBTTag, SNBTTagType } from '../util/SNBT'
13+
import { safeFunctionName, format, fixIndent } from '../util/replace'
1414

15-
interface statueExporterSettings {
15+
interface vanillaStatueExporterSettings {
1616
modelTag: string
1717
rootTag: string
1818
allBonesTag: string
@@ -55,7 +55,7 @@ async function createMCFile(
5555
): Promise<{ mcFile: string; mcbConfig: MCBConfig }> {
5656
const FILE: string[] = []
5757
const ajSettings = settings.animatedJava
58-
const exporterSettings: statueExporterSettings =
58+
const exporterSettings: vanillaStatueExporterSettings =
5959
settings.vanillaStatueExporter
6060
const projectName = safeFunctionName(ajSettings.projectName)
6161

@@ -366,7 +366,7 @@ async function createMCFile(
366366
async function exportMCFile(
367367
generated: { mcFile: string; mcbConfig: MCBConfig },
368368
ajSettings: aj.GlobalSettings,
369-
exporterSettings: statueExporterSettings
369+
exporterSettings: vanillaStatueExporterSettings
370370
) {
371371
if (!exporterSettings.mcbFilePath) {
372372
throw new CustomError('MCB File Path Undefined', {
@@ -396,7 +396,7 @@ async function exportMCFile(
396396
async function exportDataPack(
397397
generated: { mcFile: string; mcbConfig: MCBConfig },
398398
ajSettings: aj.GlobalSettings,
399-
exporterSettings: statueExporterSettings
399+
exporterSettings: vanillaStatueExporterSettings
400400
) {
401401
if (!exporterSettings.dataPackPath) {
402402
console.log(exporterSettings.dataPackPath)
@@ -530,7 +530,7 @@ async function exportDataPack(
530530
}
531531

532532
async function statueExport(data: any) {
533-
const exporterSettings: statueExporterSettings =
533+
const exporterSettings: vanillaStatueExporterSettings =
534534
data.settings.vanillaStatueExporter
535535
const generated = await createMCFile(
536536
data.bones,
@@ -586,8 +586,8 @@ function validateFormattedStringSetting(required: string[]) {
586586

587587
const Exporter = (AJ: any) => {
588588
AJ.settings.registerPluginSettings(
589-
'animatedJava.exporters.statue', // Plugin ID
590-
'vanillaStatueExporter', // Plugin Settings Key
589+
'animatedJava.exporters.vanillaStatue', // Exporter ID
590+
'vanillaStatueExporter', // Exporter Settings Key
591591
{
592592
rootEntityType: {
593593
title: tl(

‎src/exporting.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
import type * as aj from './animatedJava'
2+
13
import * as fs from 'fs'
24
import * as path from 'path'
3-
import { settings } from './settings'
5+
import { tl } from './util/intl'
46
import { mkdir } from './util/ezfs'
7+
import { settings } from './settings'
58
import { CustomError } from './util/customError'
6-
import { tl } from './util/intl'
79
import { format, safeFunctionName } from './util/replace'
810
import { getModelPath } from './util/minecraft/resourcepack'
9-
import * as aj from './animatedJava'
1011
// @ts-ignore
1112
import transparent from './assets/transparent.png'
1213

‎src/mainEntry.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as aj from './animatedJava'
1+
import type * as aj from './animatedJava'
22

33
import { tl, intl } from './util/intl'
44
// @ts-ignore
@@ -46,17 +46,17 @@ intl.register('zh_tw', lang_zh_tw)
4646

4747
import './lifecycle'
4848
import './rotationSnap'
49-
import { DefaultSettings, settings } from './settings'
50-
import { format as modelFormat } from './modelFormat'
51-
import { CustomError } from './util/customError'
52-
import { ERROR } from './util/errors'
53-
import { store } from './util/store'
54-
import { bus } from './util/bus'
55-
import { CustomAction } from './util/customAction'
5649
import './ui/panel/states'
5750
import './ui/dialogs/settings'
51+
import { bus } from './util/bus'
52+
import { store } from './util/store'
53+
import { ERROR } from './util/errors'
5854
import EVENTS from './constants/events'
55+
import { CustomError } from './util/customError'
56+
import { CustomAction } from './util/customAction'
57+
import { format as modelFormat } from './modelFormat'
5958
import { renderAnimation } from './animationRenderer'
59+
import { DefaultSettings, settings } from './settings'
6060
// import { makeArmorStandModel } from './makeArmorStandModel'
6161

6262
import {

‎src/ui/dialogs/settings.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
import { bus } from '../../util/bus'
2-
import events from '../../constants/events'
3-
import React, { useEffect, useRef, useState } from 'react'
41
import ReactDom from 'react-dom'
5-
import {
6-
DefaultSettings,
7-
ForeignSettingTranslationKeys,
8-
settings,
9-
} from '../../settings'
2+
import { bus } from '../../util/bus'
103
import { tl } from '../../util/intl'
114
import { ERROR } from '../../util/errors'
5+
import events from '../../constants/events'
6+
import React, { useEffect, useRef, useState } from 'react'
7+
import { DefaultSettings, settings } from '../../settings'
8+
129
const dialog = electron.dialog
1310
let updateSettingsUiActions = {}
1411
let forceUpdateSettingsUi = () => {

0 commit comments

Comments
 (0)