Skip to content

Commit 638df19

Browse files
committed
Remove unneeded duplicate merging tech
1 parent 257f0a0 commit 638df19

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

exporters/datapackExporter/exporter/datapackGen.ts

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ export function loadDataPackGenerator() {
4242
projects: Record<
4343
string,
4444
{
45-
tick_functions: string[]
46-
load_functions: string[]
45+
// tick_functions: string[]
46+
// load_functions: string[]
4747
file_list: string[]
4848
}
4949
>
@@ -87,23 +87,23 @@ export function loadDataPackGenerator() {
8787
throw new ExpectedError(message)
8888
}
8989

90-
if (!project.tick_functions) {
91-
const message = `Failed to read the animated_java.mcdata file. (Missing project tick_functions). Please delete the file and try again.`
92-
Blockbench.showMessageBox({
93-
title: 'Failed to read .ajmeta',
94-
message,
95-
})
96-
throw new ExpectedError(message)
97-
}
98-
99-
if (!project.load_functions) {
100-
const message = `Failed to read the animated_java.mcdata file. (Missing project load_functions). Please delete the file and try again.`
101-
Blockbench.showMessageBox({
102-
title: 'Failed to read .ajmeta',
103-
message,
104-
})
105-
throw new ExpectedError(message)
106-
}
90+
// if (!project.tick_functions) {
91+
// const message = `Failed to read the animated_java.mcdata file. (Missing project tick_functions). Please delete the file and try again.`
92+
// Blockbench.showMessageBox({
93+
// title: 'Failed to read .ajmeta',
94+
// message,
95+
// })
96+
// throw new ExpectedError(message)
97+
// }
98+
99+
// if (!project.load_functions) {
100+
// const message = `Failed to read the animated_java.mcdata file. (Missing project load_functions). Please delete the file and try again.`
101+
// Blockbench.showMessageBox({
102+
// title: 'Failed to read .ajmeta',
103+
// message,
104+
// })
105+
// throw new ExpectedError(message)
106+
// }
107107

108108
progress.total += project.file_list.length
109109
const clock = new LimitClock(10)
@@ -120,25 +120,25 @@ export function loadDataPackGenerator() {
120120
}
121121
project.file_list = G.DATAPACK.getAllFilePaths()
122122

123-
tickFunctionTag.customJsonMerger = (a, b) => {
124-
a.values = a.values.filter(v => !project.tick_functions.includes(v))
125-
a.values.push(...b.values)
126-
return a
127-
}
123+
// tickFunctionTag.customJsonMerger = (a, b) => {
124+
// a.values = a.values.filter(v => !project.tick_functions.includes(v))
125+
// a.values.push(...b.values)
126+
// return a
127+
// }
128128

129-
loadFunctionTag.customJsonMerger = (a, b) => {
130-
a.values = a.values.filter(v => !project.load_functions.includes(v))
131-
a.values.push(...b.values)
132-
return a
133-
}
129+
// loadFunctionTag.customJsonMerger = (a, b) => {
130+
// a.values = a.values.filter(v => !project.load_functions.includes(v))
131+
// a.values.push(...b.values)
132+
// return a
133+
// }
134134

135135
await fs.promises.rm(existingMetaFile)
136136
} else {
137137
content = {
138138
projects: {
139139
[G.NAMESPACE]: {
140-
tick_functions: tickFunctionTag.content.values,
141-
load_functions: loadFunctionTag.content.values,
140+
// tick_functions: tickFunctionTag.content.values,
141+
// load_functions: loadFunctionTag.content.values,
142142
file_list: G.DATAPACK.getAllFilePaths(),
143143
},
144144
},

0 commit comments

Comments
 (0)