Skip to content

Commit ba2997e

Browse files
SnaveSutitSnaveSutit
committed
Merge branch 'experimental'
2 parents fbfaed9 + 6bd14ae commit ba2997e

Some content is hidden

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

56 files changed

+3578
-2059
lines changed

‎exporters/datapackExporter/datapackExporter.ts‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { loadDataPackGenerator } from './exporter/datapackGen'
1+
import { generateDatapack } from './exporter/gen/datapack'
22
import { loadTranslations } from './exporter/translations'
33

44
export function loadExporter() {
@@ -109,6 +109,39 @@ export function loadExporter() {
109109
docsLink:
110110
'/docs/exporters/datapack_exporter/settings#include_remove_all_function',
111111
}),
112+
// Tag Toggles
113+
include_on_load_function_tags: new Settings.CheckboxSetting({
114+
id: 'animated_java:datapack_exporter/include_on_load_function_tags',
115+
displayName: TRANSLATIONS.include_on_load_function_tags.name,
116+
description: TRANSLATIONS.include_on_load_function_tags.description,
117+
defaultValue: true,
118+
docsLink:
119+
'/docs/exporters/datapack_exporter/settings#include_on_load_function_tags',
120+
}),
121+
include_on_tick_function_tags: new Settings.CheckboxSetting({
122+
id: 'animated_java:datapack_exporter/include_on_tick_function_tags',
123+
displayName: TRANSLATIONS.include_on_tick_function_tags.name,
124+
description: TRANSLATIONS.include_on_tick_function_tags.description,
125+
defaultValue: true,
126+
docsLink:
127+
'/docs/exporters/datapack_exporter/settings#include_on_tick_function_tags',
128+
}),
129+
include_on_summon_function_tags: new Settings.CheckboxSetting({
130+
id: 'animated_java:datapack_exporter/include_on_summon_function_tags',
131+
displayName: TRANSLATIONS.include_on_summon_function_tags.name,
132+
description: TRANSLATIONS.include_on_summon_function_tags.description,
133+
defaultValue: true,
134+
docsLink:
135+
'/docs/exporters/datapack_exporter/settings#include_on_summon_function_tags',
136+
}),
137+
include_on_remove_function_tags: new Settings.CheckboxSetting({
138+
id: 'animated_java:datapack_exporter/include_on_remove_function_tags',
139+
displayName: TRANSLATIONS.include_on_remove_function_tags.name,
140+
description: TRANSLATIONS.include_on_remove_function_tags.description,
141+
defaultValue: true,
142+
docsLink:
143+
'/docs/exporters/datapack_exporter/settings#include_on_remove_function_tags',
144+
}),
112145
}
113146
},
114147
settingsStructure: [
@@ -158,7 +191,32 @@ export function loadExporter() {
158191
},
159192
],
160193
},
194+
{
195+
type: 'group',
196+
title: TRANSLATIONS.function_tag_toggles_group.title,
197+
openByDefault: false,
198+
children: [
199+
{
200+
type: 'setting',
201+
settingId: 'animated_java:datapack_exporter/include_on_load_function_tags',
202+
},
203+
{
204+
type: 'setting',
205+
settingId: 'animated_java:datapack_exporter/include_on_tick_function_tags',
206+
},
207+
{
208+
type: 'setting',
209+
settingId:
210+
'animated_java:datapack_exporter/include_on_summon_function_tags',
211+
},
212+
{
213+
type: 'setting',
214+
settingId:
215+
'animated_java:datapack_exporter/include_on_remove_function_tags',
216+
},
217+
],
218+
},
161219
],
162-
export: loadDataPackGenerator() as any,
220+
export: generateDatapack as any,
163221
})
164222
}

‎exporters/datapackExporter/datapack_structure.yml‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
datapack:
2+
- data:
3+
- animated_java:
4+
- functions:
5+
- project_name:
6+
- animations:
7+
- animation_name:
8+
- apply_frame.mcfunction
9+
- next_frame.mcfunction
10+
- pause.mcfunction
11+
- play.mcfunction
12+
- resume.mcfunction
13+
- stop.mcfunction
14+
- tween:
15+
- play.mcfunction
16+
- resume.mcfunction
17+
- pause_all_animations.mcfunction
18+
- apply_variant:
19+
- variant_a.mcfunction
20+
- variant_b.mcfunction
21+
- variant_c.mcfunction
22+
- summon.mcfunction
23+
- summon:
24+
- variant_a.mcfunction
25+
- variant_b.mcfunction
26+
- variant_c.mcfunction
27+
- remove:
28+
- this.mcfunction
29+
- rigs.mcfunction
30+
- all.mcfunction
31+
- reset_rig.mcfunction
32+
- uninstall.mcfunction
33+
- zzzzzzzz:
34+
- animations:
35+
- animation_name:
36+
- apply_frame_as_root.mcfunction
37+
- end_loop.mcfunction
38+
- end.mcfunction
39+
- next_frame_as_root.mcfunction
40+
- pause_as_root.mcfunction
41+
- play_as_root.mcfunction
42+
- resume_as_root.mcfunction
43+
- stop_as_root.mcfunction
44+
- tick_animation.mcfunction
45+
- tick_tween.mcfunction
46+
- tick.mcfunction
47+
- tween_as_root.mcfunction
48+
- tween_play_as_root.mcfunction
49+
- tween_resume_as_root.mcfunction
50+
- pause_all_animations_as_root.mcfunction
51+
- tick.mcfunction
52+
- apply_variant:
53+
- variant_a:
54+
- as_root.mcfunction
55+
- as_bones.mcfunction
56+
- variant_b:
57+
- as_root.mcfunction
58+
- as_bones.mcfunction
59+
- variant_c:
60+
- as_root.mcfunction
61+
- as_bones.mcfunction
62+
- remove:
63+
- as_root.mcfunction
64+
- summon:
65+
- as_root.mcfunction
66+
- as_rig_entities.mcfunction
67+
- as_bones.mcfunction
68+
- as_locators.mcfunction
69+
- as_cameras.mcfunction
70+
- load.mcfunction
71+
- load_as_root.mcfunction
72+
- tick.mcfunction
73+
- tick_as_root.mcfunction
74+
- tags:
75+
- functions:
76+
- project_name:
77+
- on_load:
78+
- as_root.json
79+
- as_rig_entities.json
80+
- as_bones.json
81+
- as_locators.json
82+
- as_locator_targets.json
83+
- as_cameras.json
84+
- as_camera_targets.json
85+
- on_tick:
86+
- as_root.json
87+
- as_rig_entities.json
88+
- as_bones.json
89+
- as_locators.json
90+
- as_locator_targets.json
91+
- as_cameras.json
92+
- as_camera_targets.json
93+
- on_summon:
94+
- as_root.json
95+
- as_rig_entities.json
96+
- as_bones.json
97+
- as_locators.json
98+
- as_locator_targets.json
99+
- as_cameras.json
100+
- as_camera_targets.json
101+
- on_remove:
102+
- as_root.json
103+
- as_rig_entities.json
104+
- as_bones.json
105+
- as_locators.json
106+
- as_locator_targets.json
107+
- as_cameras.json
108+
- as_camera_targets.json
109+
- minecraft:
110+
- tags:
111+
- functions:
112+
- tick.json
113+
- load.json
114+
- .ajmeta
115+
- pack.mcmeta

‎exporters/datapackExporter/exporter/datapackGen.ts‎

Lines changed: 0 additions & 118 deletions
This file was deleted.

0 commit comments

Comments
 (0)