Skip to content

Commit 92dbc7a

Browse files
SnaveSutitSnaveSutit
committed
❗ Git, the version manager from hell
1 parent 13c9783 commit 92dbc7a

File tree

8 files changed

+20
-29
lines changed

8 files changed

+20
-29
lines changed

‎src/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import { TRANSPARENT_TEXTURE, Variant } from './variants'
2424
import './systems/minecraft/registryManager'
2525
import { MINECRAFT_REGISTRY } from './systems/minecraft/registryManager'
2626
import resourcepackCompiler from './systems/resourcepackCompiler'
27-
import { openExportProgressDialog } from './interface/exportProgressDialog'
27+
import { openExportProgressDialog } from './interface/dialog/exportProgress'
2828
import { isDataPackPath, isResourcePackPath, parseResourcePackPath } from './util/minecraftUtil'
2929
import { blueprintSettingErrors } from './blueprintSettings'
30-
import { openUnexpectedErrorDialog } from './interface/unexpectedErrorDialog'
30+
import { openUnexpectedErrorDialog } from './interface/dialog/unexpectedError'
3131
import { BLUEPRINT_CODEC, BLUEPRINT_FORMAT } from './blueprintFormat'
3232
import { TextDisplay } from './outliner/textDisplay'
3333
import { getLatestVersionClientDownloadUrl } from './systems/minecraft/assetManager'
@@ -39,8 +39,8 @@ import { VanillaItemDisplay } from './outliner/vanillaItemDisplay'
3939
import { VanillaBlockDisplay, debugBlockState, debugBlocks } from './outliner/vanillaBlockDisplay'
4040
import { BLOCKSTATE_REGISTRY } from './systems/minecraft/blockstateManager'
4141
import { exportProject } from './systems/exporter'
42-
import { openBlueprintLoadingDialog } from './interface/blueprintLoadingPopup'
43-
import { openInstallPopup } from './interface/installedPopup'
42+
import { openBlueprintLoadingDialog } from './interface/popup/blueprintLoading'
43+
import { openInstallPopup } from './interface/popup/installed'
4444
import { cleanupExportedFiles } from './systems/cleaner'
4545
import mcbFiles from './systems/datapackCompiler/mcbFiles'
4646
import { openChangelogDialog } from './interface/changelogDialog'

‎src/interface/animatedJavaBarItem.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { cleanupExportedFiles } from '../systems/cleaner'
55
import { exportProject } from '../systems/exporter'
66
import { createAction, createBarMenu } from '../util/moddingTools'
77
import { translate } from '../util/translation'
8-
import { openAboutDialog } from './aboutDialog'
9-
import { openBlueprintSettingsDialog } from './blueprintSettingsDialog'
8+
import { openAboutDialog } from './dialog/about'
9+
import { openBlueprintSettingsDialog } from './dialog/blueprintSettings'
1010
import { openChangelogDialog } from './changelogDialog'
1111

1212
function createIconImg() {

‎src/outliner/textDisplay.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ import { createAction, createBlockbenchMod } from '../util/moddingTools'
99
import { getVanillaFont } from '../systems/minecraft/fontManager'
1010
import { JsonText } from '../systems/minecraft/jsonText'
1111
import { Valuable } from '../util/stores'
12-
import { toSafeFuntionName } from '../util/minecraftUtil'
1312
import { TextDisplayConfig } from '../nodeConfigs'
14-
import { TEXT_DISPLAY_CONFIG_ACTION } from '../interface/textDisplayConfigDialog'
13+
import { TEXT_DISPLAY_CONFIG_ACTION } from '../interface/dialog/textDisplayConfig'
1514
import { events } from '../util/events'
1615
import { translate } from '../util/translation'
1716
import { ResizableOutlinerElement } from './resizableOutlinerElement'
18-
import { VanillaBlockDisplay } from './vanillaBlockDisplay'
19-
import { VanillaItemDisplay } from './vanillaItemDisplay'
2017
import { sanitizeOutlinerElementName } from './util'
2118

2219
interface TextDisplayOptions {
@@ -292,7 +289,7 @@ export class TextDisplay extends ResizableOutlinerElement {
292289

293290
async waitForReady() {
294291
while (!this.ready) {
295-
await new Promise(resolve => setTimeout(resolve, 1000 / framespersecond))
292+
await new Promise(resolve => requestAnimationFrame(resolve))
296293
}
297294
}
298295

‎src/outliner/vanillaBlockDisplay.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
import { IBlueprintBoneConfigJSON, isCurrentFormat } from '../blueprintFormat'
22
import { PACKAGE } from '../constants'
3-
import { VANILLA_BLOCK_DISPLAY_CONFIG_ACTION } from '../interface/vanillaBlockDisplayConfigDialog'
3+
import { VANILLA_BLOCK_DISPLAY_CONFIG_ACTION } from '../interface/dialog/vanillaBlockDisplayConfig'
44
import { BoneConfig } from '../nodeConfigs'
55
import { getBlockModel } from '../systems/minecraft/blockModelManager'
66
import { BlockStateValue, getBlockState } from '../systems/minecraft/blockstateManager'
77
import { MINECRAFT_REGISTRY } from '../systems/minecraft/registryManager'
88
import { getCurrentVersion } from '../systems/minecraft/versionManager'
99
import { events } from '../util/events'
10-
import { parseBlock, toSafeFuntionName } from '../util/minecraftUtil'
10+
import { parseBlock } from '../util/minecraftUtil'
1111
import { createAction, createBlockbenchMod } from '../util/moddingTools'
1212
import { Valuable } from '../util/stores'
1313
import { translate } from '../util/translation'
1414
import { ResizableOutlinerElement } from './resizableOutlinerElement'
15-
import { TextDisplay } from './textDisplay'
1615
import { sanitizeOutlinerElementName } from './util'
17-
import { VanillaItemDisplay } from './vanillaItemDisplay'
1816

1917
const ERROR_OUTLINE_MATERIAL = Canvas.outlineMaterial.clone()
2018
ERROR_OUTLINE_MATERIAL.color.set('#ff0000')
@@ -112,7 +110,7 @@ export class VanillaBlockDisplay extends ResizableOutlinerElement {
112110

113111
async waitForReady() {
114112
while (!this.ready) {
115-
await new Promise(resolve => setTimeout(resolve, 1000 / framespersecond))
113+
await new Promise(resolve => requestAnimationFrame(resolve))
116114
}
117115
}
118116

‎src/outliner/vanillaItemDisplay.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
import { IBlueprintBoneConfigJSON, isCurrentFormat } from '../blueprintFormat'
22
import { PACKAGE } from '../constants'
3-
import { VANILLA_ITEM_DISPLAY_CONFIG_ACTION } from '../interface/vanillaItemDisplayConfigDialog'
3+
import { VANILLA_ITEM_DISPLAY_CONFIG_ACTION } from '../interface/dialog/vanillaItemDisplayConfig'
44
import { BoneConfig } from '../nodeConfigs'
55
import { getItemModel } from '../systems/minecraft/itemModelManager'
66
import { MINECRAFT_REGISTRY } from '../systems/minecraft/registryManager'
77
import { getCurrentVersion } from '../systems/minecraft/versionManager'
88
import { events } from '../util/events'
9-
import { toSafeFuntionName } from '../util/minecraftUtil'
109
import { createAction, createBlockbenchMod } from '../util/moddingTools'
1110
import { Valuable } from '../util/stores'
1211
import { translate } from '../util/translation'
1312
import { ResizableOutlinerElement } from './resizableOutlinerElement'
14-
import { TextDisplay } from './textDisplay'
1513
import { sanitizeOutlinerElementName } from './util'
16-
import { VanillaBlockDisplay } from './vanillaBlockDisplay'
1714

1815
interface VanillaItemDisplayOptions {
1916
name?: string
@@ -121,7 +118,7 @@ export class VanillaItemDisplay extends ResizableOutlinerElement {
121118

122119
async waitForReady() {
123120
while (!this.ready) {
124-
await new Promise(resolve => setTimeout(resolve, 1000 / framespersecond))
121+
await new Promise(resolve => requestAnimationFrame(resolve))
125122
}
126123
}
127124

‎src/systems/datapackCompiler/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
parseResourceLocation,
2323
} from '../../util/minecraftUtil'
2424
import { JsonText } from '../minecraft/jsonText'
25-
import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/exportProgressDialog'
25+
import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
2626
import { eulerFromQuaternion, floatToHex, roundTo, tinycolorToDecimal } from '../../util/misc'
2727
import { MSLimiter } from '../../util/msLimiter'
2828
import { compile } from './compiler'

‎src/systems/resourcepackCompiler/1.21.4.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/exportProgressDialog'
1+
import { MAX_PROGRESS, PROGRESS, PROGRESS_DESCRIPTION } from '../../interface/dialog/exportProgress'
22
import { isResourcePackPath, toSafeFuntionName } from '../../util/minecraftUtil'
33
import { TRANSPARENT_TEXTURE, Variant } from '../../variants'
44
import { IntentionalExportError } from '../exporter'

‎src/systems/resourcepackCompiler/index.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import _1_20_5 from './1.21.1'
2-
import _1_21_2 from './1.21.2'
1+
import _1_20_4 from './1.20.4'
32
import _1_21_4 from './1.21.4'
43

54
export default {
6-
'1.20.4': _1_20_5,
7-
'1.20.5': _1_20_5,
8-
'1.21.0': _1_20_5,
9-
'1.21.2': _1_21_2,
5+
'1.20.4': _1_20_4,
6+
'1.20.5': _1_20_4,
7+
'1.21.0': _1_20_4,
8+
'1.21.2': _1_20_4,
109
'1.21.4': _1_21_4,
1110
}

0 commit comments

Comments
 (0)