Skip to content

Commit 827256f

Browse files
DeviouslrdDeviouslrd
committed
General improvements, all the files are now nearly identical, yet still perfectly functional
1 parent f356162 commit 827256f

File tree

8 files changed

+177
-286
lines changed

8 files changed

+177
-286
lines changed

‎No location/assets/consistency_plus/blockstates/dirt_bricks.json‎

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

‎functions/advancements.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ document.getElementById("advanceForm").onsubmit = form => {
6060
});
6161

6262
document.getElementById("generateBtn").value = "Generated!";
63+
document.getElementById("errorholder").innerHTML = "";
6364

6465
setTimeout(() => {
6566
document.getElementById("generateBtn").value ="Generate!";

‎functions/base.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,15 @@ document.getElementById("").onsubmit = form => {
3939
console.log('made file');
4040

4141
});
42-
43-
document.getElementById("generateBtn").value = "Generated!";
4442

45-
setTimeout(() => {
46-
document.getElementById("generateBtn").value ="Generate!";
47-
}, 1000);
4843
}
44+
45+
document.getElementById("generateBtn").value = "Generated!";
46+
document.getElementById("errorholder").innerHTML = "";
47+
48+
setTimeout(() => {
49+
document.getElementById("generateBtn").value ="Generate!";
50+
}, 1000);
51+
4952
}, 10);
5053
};

‎functions/block_models.js‎

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ document.getElementById("blockModelForm").onsubmit = form => {
1212
localStorage.modName = modName;
1313
localStorage.blockName = blockName;
1414

15-
if (!filepath || localStorage.path === undefined) {
16-
return console.log('No filepath.');
17-
}
15+
if (document.getElementById("saveLocation").value === 'No location') {
16+
return document.getElementById("errorholder").innerHTML = `Error: No save location given!`;
17+
}
1818

1919
blockName = blockName.toLowerCase().split(/ +/).join('_');
2020
modName = modName.toLowerCase().split(/ +/).join('_');
@@ -29,7 +29,6 @@ document.getElementById("blockModelForm").onsubmit = form => {
2929
setTimeout(() => {
3030
// Block Creator
3131
if (document.getElementById("block").checked === true) {
32-
3332
const jsonProduct = {
3433
parent: `minecraft:block/cube_all`, textures: { all: `${modName}:block/${blockName}`}
3534
};
@@ -40,17 +39,10 @@ document.getElementById("blockModelForm").onsubmit = form => {
4039
if (err) throw err;
4140
console.log('Made block file');
4241
});
43-
44-
document.getElementById("generateBtn").value = "Generated!";
45-
46-
setTimeout(() => {
47-
document.getElementById("generateBtn").value ="Generate!";
48-
}, 1000);
4942
}
5043

5144
// Slab Creator
5245
if (document.getElementById("slab").checked === true) {
53-
5446
const jsonProduct1 = {
5547
parent: `minecraft:block/slab`,
5648
textures: {
@@ -75,24 +67,16 @@ document.getElementById("blockModelForm").onsubmit = form => {
7567
fs.writeFile(`${filepath}\\assets\\${modName}\\models\\block\\${blockName}_slab.json`, jsonContent1, 'utf8', (err) => {
7668
if (err) throw err;
7769
console.log('Made slab file.');
78-
7970
});
8071

8172
fs.writeFile(`${filepath}\\assets\\${modName}\\models\\block\\${blockName}_slab_top.json`, jsonContent2, 'utf8', (err) => {
8273
if (err) throw err;
8374
console.log('Made slab_top file.');
8475
});
85-
86-
document.getElementById("generateBtn").value = "Generated!";
87-
88-
setTimeout(() => {
89-
document.getElementById("generateBtn").value ="Generate!";
90-
}, 1000);
9176
}
9277

9378
// Stair Creator
9479
if (document.getElementById("stairs").checked === true) {
95-
9680
const jsonProduct1 = {
9781
parent: "minecraft:block/stairs",
9882
textures: {
@@ -138,17 +122,10 @@ document.getElementById("blockModelForm").onsubmit = form => {
138122
if (err) throw err;
139123
console.log('Made outer stairs file.');
140124
});
141-
142-
document.getElementById("generateBtn").value = "Generated!";
143-
144-
setTimeout(() => {
145-
document.getElementById("generateBtn").value ="Generate!";
146-
}, 1000);
147125
}
148126

149127
// Wall Creator
150128
if (document.getElementById("wall").checked === true) {
151-
152129
const jsonProduct1 = {
153130
parent: `minecraft:block/template_wall_post`,
154131
textures: {
@@ -188,17 +165,10 @@ document.getElementById("blockModelForm").onsubmit = form => {
188165
if (err) throw err;
189166
console.log('Made the wall side top file.');
190167
});
191-
192-
document.getElementById("generateBtn").value = "Generated!";
193-
194-
setTimeout(() => {
195-
document.getElementById("generateBtn").value ="Generate!";
196-
}, 1000);
197168
}
198169

199170
// Pillar Creator
200171
if (document.getElementById("pillar").checked === true) {
201-
202172
const jsonProduct1 = {
203173
parent: "minecraft:block/cube_column",
204174
textures: {
@@ -227,21 +197,23 @@ document.getElementById("blockModelForm").onsubmit = form => {
227197
if (err) throw err;
228198
console.log('Made pillar horizontal file.');
229199
});
230-
231-
document.getElementById("generateBtn").value = "Generated!";
232200

233-
setTimeout(() => {
234-
document.getElementById("generateBtn").value ="Generate!";
235-
}, 1000);
236201
}
237202

238203
if (document.getElementById("block").checked === false &&
239204
document.getElementById("slab").checked === false &&
240205
document.getElementById("stairs").checked === false &&
241206
document.getElementById("wall").checked === false &&
242207
document.getElementById("pillar").checked === false) {
243-
document.getElementById("errorholder").innerHTML = "Error: No boxes were selected!";
208+
return document.getElementById("errorholder").innerHTML = "Error: No boxes were selected!";
244209
}
245-
210+
211+
document.getElementById("errorholder").innerHTML = "";
212+
document.getElementById("generateBtn").value = "Generated!";
213+
214+
setTimeout(() => {
215+
document.getElementById("generateBtn").value ="Generate!";
216+
}, 1000);
217+
246218
}, 10);
247219
};

‎functions/blockstates.js‎

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ document.getElementById("blockstateForm").onsubmit = form => {
2828
setTimeout(() => {
2929
// Block Creator
3030
if (document.getElementById("block").checked === true) {
31-
3231
const jsonProduct = {
3332
variants: { "": { model: `${modName}:block/${blockName}` }}
3433
};
@@ -39,12 +38,6 @@ document.getElementById("blockstateForm").onsubmit = form => {
3938
if (err) throw err;
4039
console.log('Made file');
4140
});
42-
43-
document.getElementById("generateBtn").value = "Generated!";
44-
45-
setTimeout(() => {
46-
document.getElementById("generateBtn").value ="Generate!";
47-
}, 1000);
4841
}
4942

5043
// Slab Creator
@@ -69,12 +62,6 @@ document.getElementById("blockstateForm").onsubmit = form => {
6962
if (err) throw err;
7063
console.log('Made file');
7164
});
72-
73-
document.getElementById("generateBtn").value = "Generated!";
74-
75-
setTimeout(() => {
76-
document.getElementById("generateBtn").value ="Generate!";
77-
}, 1000 );
7865
}
7966

8067
// Stairs Creator
@@ -169,17 +156,10 @@ document.getElementById("blockstateForm").onsubmit = form => {
169156
if (err) throw err;
170157
console.log('Made file');
171158
});
172-
173-
document.getElementById("generateBtn").value = "Generated!";
174-
175-
setTimeout(() => {
176-
document.getElementById("generateBtn").value ="Generate!";
177-
}, 1000 );
178159
}
179160

180161
// Wall Creator
181162
if (document.getElementById("wall").checked === true) {
182-
183163
const jsonProduct = {
184164
"multipart": [
185165
{ when: { up: true }, apply: { model: `${modName}:block/${blockName}_wall_post` } },
@@ -208,12 +188,6 @@ document.getElementById("blockstateForm").onsubmit = form => {
208188
if (err) throw err;
209189
console.log('Made file');
210190
});
211-
212-
document.getElementById("generateBtn").value = "Generated!";
213-
214-
setTimeout(() => {
215-
document.getElementById("generateBtn").value ="Generate!";
216-
}, 1000);
217191
}
218192

219193
// Pillar creator
@@ -241,21 +215,22 @@ document.getElementById("blockstateForm").onsubmit = form => {
241215
if (err) throw err;
242216
console.log('Made file');
243217
});
244-
245-
document.getElementById("generateBtn").value = "Generated!";
246-
247-
setTimeout(() => {
248-
document.getElementById("generateBtn").value ="Generate!";
249-
}, 1000 );
250218
}
251219

252220
if (document.getElementById("block").checked === false &&
253221
document.getElementById("slab").checked === false &&
254222
document.getElementById("stairs").checked === false &&
255223
document.getElementById("wall").checked === false &&
256224
document.getElementById("pillar").checked === false) {
257-
document.getElementById("errorholder").innerHTML = "Error: No boxes were selected!";
225+
return document.getElementById("errorholder").innerHTML = "Error: No boxes were selected!";
258226
}
227+
228+
document.getElementById("generateBtn").value = "Generated!";
229+
document.getElementById("errorholder").innerHTML = "";
230+
231+
setTimeout(() => {
232+
document.getElementById("generateBtn").value ="Generate!";
233+
}, 1000);
259234

260235
}, 10);
261236
};

‎functions/item_models.js‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ document.getElementById("itemModelForm").onsubmit = form => {
3838
if (err) throw err;
3939
console.log('Made the block file');
4040
});
41-
42-
document.getElementById("generateBtn").value = "Generated!";
43-
44-
setTimeout(() => {
45-
document.getElementById("generateBtn").value ="Generate!";
46-
}, 1000);
4741
}
4842

4943
// Slab Creator
@@ -58,12 +52,6 @@ document.getElementById("itemModelForm").onsubmit = form => {
5852
if (err) throw err;
5953
console.log('Made the slab file');
6054
});
61-
62-
document.getElementById("generateBtn").value = "Generated!";
63-
64-
setTimeout(() => {
65-
document.getElementById("generateBtn").value ="Generate!";
66-
}, 1000);
6755
}
6856

6957
// Stairs Creator
@@ -78,12 +66,6 @@ document.getElementById("itemModelForm").onsubmit = form => {
7866
if (err) throw err;
7967
console.log('Made the stairs file.');
8068
});
81-
82-
document.getElementById("generateBtn").value = "Generated!";
83-
84-
setTimeout(() => {
85-
document.getElementById("generateBtn").value ="Generate!";
86-
}, 1000);
8769
}
8870

8971
// Pillar Creator
@@ -98,12 +80,6 @@ document.getElementById("itemModelForm").onsubmit = form => {
9880
if (err) throw err;
9981
console.log('Made the pillar file');
10082
});
101-
102-
document.getElementById("generateBtn").value = "Generated!";
103-
104-
setTimeout(() => {
105-
document.getElementById("generateBtn").value ="Generate!";
106-
}, 1000);
10783
}
10884

10985
// Wall Creator
@@ -119,21 +95,22 @@ document.getElementById("itemModelForm").onsubmit = form => {
11995
if (err) throw err;
12096
console.log('Made the wall file');
12197
});
122-
123-
document.getElementById("generateBtn").value = "Generated!";
124-
125-
setTimeout(() => {
126-
document.getElementById("generateBtn").value ="Generate!";
127-
}, 1000 );
12898
}
12999

130100
if (document.getElementById("block").checked === false &&
131101
document.getElementById("slab").checked === false &&
132102
document.getElementById("stairs").checked === false &&
133103
document.getElementById("wall").checked === false &&
134104
document.getElementById("pillar").checked === false) {
135-
document.getElementById("errorholder").innerHTML = "Error: No boxes were selected!";
105+
return document.getElementById("errorholder").innerHTML = "Error: No boxes were selected!";
136106
}
107+
108+
document.getElementById("errorholder").innerHTML = "";
109+
document.getElementById("generateBtn").value = "Generated!";
110+
111+
setTimeout(() => {
112+
document.getElementById("generateBtn").value ="Generate!";
113+
}, 1000 );
137114

138115
}, 10);
139116
};

0 commit comments

Comments
 (0)