Skip to content

Commit f360d67

Browse files
committed
🚧 Major source reorganization, and new UI
1 parent 57b5c8c commit f360d67

File tree

122 files changed

+5178
-1995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+5178
-1995
lines changed

src/assets/impulse_command_block.png

21.1 KB
Loading

src/assets/mc-build-base.tmLanguage.json

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

src/assets/mcfunction.tmLanguage.json

Lines changed: 686 additions & 0 deletions
Large diffs are not rendered by default.

src/assets/papermc.svg

Lines changed: 1 addition & 0 deletions
Loading

src/blueprintFormat.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import * as blueprintSettings from './blueprintSettings'
22
import { BillboardMode, BoneConfig, LocatorConfig } from './nodeConfigs'
3-
import ProjectTitleSvelte from './components/projectTitle.svelte'
3+
import ProjectTitleSvelte from './svelte/projectTitle.svelte'
44
import { PACKAGE } from './constants'
55
import { events } from './util/events'
66
import { injectSvelteCompomponent } from './util/injectSvelteComponent'
7-
import { toSafeFuntionName } from './util/minecraftUtil'
7+
import { toSafeFunctionName } from './util/minecraftUtil'
88
import { addProjectToRecentProjects } from './util/misc'
99
import { Valuable } from './util/stores'
1010
import { Variant } from './variants'
11-
import FormatPageSvelte from './components/formatPage.svelte'
11+
import FormatPageSvelte from './svelte/formatPage.svelte'
1212
import { translate } from './util/translation'
1313
import { process } from './systems/modelDataFixerUpper'
1414

@@ -161,7 +161,7 @@ export function convertToBlueprint() {
161161
}
162162
for (const animation of Blockbench.Animation.all) {
163163
animation.createUniqueName(Blockbench.Animation.all.filter(a => a !== animation))
164-
animation.name = toSafeFuntionName(animation.name)
164+
animation.name = toSafeFunctionName(animation.name)
165165
}
166166
for (const cube of Cube.all) {
167167
cube.setUVMode(false)
@@ -324,7 +324,7 @@ export const BLUEPRINT_CODEC = new Blockbench.Codec('animated_java_blueprint', {
324324
parseGroups(model.outliner)
325325

326326
for (const group of Group.all) {
327-
group.name = toSafeFuntionName(group.name)
327+
group.name = toSafeFunctionName(group.name)
328328
}
329329
}
330330

src/blueprintSettings.ts

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,39 @@
11
import { type MinecraftVersion } from './systems/datapackCompiler/mcbFiles'
22
import { Valuable } from './util/stores'
33

4-
export type ExportMode = 'raw' | 'zip' | 'none'
4+
export type ExportMode = 'folder' | 'zip' | 'none'
5+
export type ExportEnvironment = 'vanilla' | 'plugin'
6+
export type DataPackAnimationSystem = 'functions' | 'storage'
57

68
export const defaultValues = {
7-
export_namespace: 'blueprint',
9+
id: 'animated_java:new_blueprint',
10+
tag_prefix: `aj.new_blueprint`,
11+
auto_generate_tag_prefix: true,
812
show_bounding_box: false,
913
auto_bounding_box: true,
1014
bounding_box: [48, 48],
1115
// Export Settings
12-
enable_plugin_mode: false,
13-
resource_pack_export_mode: 'raw' as ExportMode,
14-
data_pack_export_mode: 'raw' as ExportMode,
15-
target_minecraft_version: '1.21.2' as MinecraftVersion,
16+
environment: 'vanilla' as ExportEnvironment,
17+
resource_pack_export_mode: 'folder' as ExportMode,
18+
data_pack_export_mode: 'folder' as ExportMode,
19+
target_minecraft_version: '1.21.4' as MinecraftVersion,
1620
// Resource Pack Settings
17-
display_item: 'minecraft:white_dye',
1821
custom_model_data_offset: 0,
1922
enable_advanced_resource_pack_settings: false,
2023
resource_pack: '',
24+
display_item: 'minecraft:white_dye',
2125
// Data Pack Settings
2226
enable_advanced_data_pack_settings: false,
2327
data_pack: '',
2428
summon_commands: '',
2529
ticking_commands: '',
2630
interpolation_duration: 1,
2731
teleportation_duration: 1,
28-
use_storage_for_animation: false,
32+
animation_system: 'functions' as DataPackAnimationSystem,
2933
show_function_errors: true,
3034
show_outdated_warning: true,
3135
// Plugin Settings
32-
baked_animations: true,
36+
bake_animations: false,
3337
json_file: '',
3438
}
3539

0 commit comments

Comments
 (0)