Skip to content

Commit c7b49fc

Browse files
jacobsjojacobsjo
committed
update deepslate etc
1 parent 7353097 commit c7b49fc

File tree

6 files changed

+65
-42
lines changed

6 files changed

+65
-42
lines changed

‎package-lock.json‎

Lines changed: 8 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"@fortawesome/free-solid-svg-icons": "^6.4.0",
1616
"@fortawesome/vue-fontawesome": "^3.0.3",
1717
"@vueuse/components": "^10.2.0",
18-
"deepslate": "^0.23.4",
18+
"deepslate": "^0.25.1",
1919
"idb-keyval": "^6.2.1",
2020
"leaflet": "^1.9.4",
21-
"mc-datapack-loader": "0.5.1",
21+
"mc-datapack-loader": "0.6.0",
2222
"pinia": "^3.0.3",
2323
"vue": "^3.5.21",
2424
"vue-i18n": "^11.1.12",

‎scripts/createVanillaZips.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,7 @@ def emptyTmp():
128128
main('tags/1.21.3-', "winter_drop", "_1_21_3")
129129
main('tags/1.21.4-', "", "_1_21_4")
130130
main('tags/1.21.5-', "", "_1_21_5")
131-
main('tags/1.21.7-', "", "_1_21_7")
131+
main('tags/1.21.8-', "", "_1_21_8")
132+
main('tags/1.21.10-', "", "_1_21_10")
133+
main('tags/1.21.11-', "", "_1_21_11")
132134

‎src/components/DatapackEntry.vue‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import { useI18n } from 'vue-i18n';
2020
const datapack = (props.datapack as Datapack)!
2121
const image = await datapack.getImage()
2222
const mcMeta = await datapack.getMcmeta()
23-
const rawDescription = mcMeta?.pack.description
24-
const formatRange = mcMeta?.pack.supported_formats ?? mcMeta?.pack.pack_format ?? 0
25-
const supported = computed(() => PackMcmeta.MatchFormatRange(formatRange, versionMetadata[settings.mc_version].datapackFormat))
23+
const rawDescription = mcMeta?.description
24+
const formatRange = mcMeta?.formats
25+
const supported = computed(() => formatRange ? PackMcmeta.MatchFormatRange(formatRange, versionMetadata[settings.mc_version].datapackFormat) : true)
2626
const desciption = TextComponent.parse(rawDescription ?? "")
2727
2828
</script>
@@ -31,6 +31,7 @@ import { useI18n } from 'vue-i18n';
3131
<div class="datapack" :class="{ unsupported: !supported}">
3232
<img class="image" :src="image" alt="pack.png" />
3333
<div class="description">
34+
{{ formatRange }}
3435
<MinecraftText :component="desciption" />
3536
</div>
3637
<font-awesome-icon v-if="removable" icon="fa-xmark" class="close_button" tabindex="0" :title="i18n.t('datapack_list.remove_datapack.title')" @click="$emit('close')" @keypress.enter="$emit('close')" />

‎src/stores/useSettingsStore.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { parseSeed, updateUrlParam, versionMetadata } from "../util.js";
88

99
export const useSettingsStore = defineStore('settings', () => {
1010
const defaults = {
11-
mc_version: "1_21_7",
11+
mc_version: "1_21_11",
1212
world_preset: "minecraft:normal",
1313
dimension: "minecraft:overworld",
1414
seed: "0"

‎src/util.ts‎

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Climate, DensityFunction, Identifier, lerp, NoiseRouter, NoiseSettings, WorldgenRegistries } from "deepslate"
2-
import { ResourceLocation } from "mc-datapack-loader"
2+
import { PackFormat, ResourceLocation } from "mc-datapack-loader"
33
import { SpawnTarget } from "./util/SpawnTarget.js"
44

55
export function lerpClimate(a: Climate.TargetPoint, b: Climate.TargetPoint, c: number) {
@@ -107,7 +107,7 @@ export function updateUrlParam(param: string, value?: string, default_value?: st
107107

108108
type Metadata = {
109109
vanillaDatapack: string,
110-
datapackFormat: number,
110+
datapackFormat: PackFormat,
111111
canonicalNames: string[],
112112
resourceLocations: {
113113
structure: ResourceLocation
@@ -134,7 +134,7 @@ export const versionMetadata: { [version: string]: Metadata } = {
134134
translation_key: "dropdown.add.built_in.update_1_20"
135135
}
136136
],
137-
datapackFormat: 12,
137+
datapackFormat: new PackFormat(12),
138138
canonicalNames: ["1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4"],
139139
resourceLocations: {
140140
structure: ResourceLocation.LEGACY_STRUCTURE
@@ -150,7 +150,7 @@ export const versionMetadata: { [version: string]: Metadata } = {
150150
"1_20": {
151151
vanillaDatapack: "1_20",
152152
experimentalDatapacks: [],
153-
datapackFormat: 15,
153+
datapackFormat: new PackFormat(15),
154154
canonicalNames: ["1.20", "1.20.1"],
155155
resourceLocations: {
156156
structure: ResourceLocation.LEGACY_STRUCTURE
@@ -166,7 +166,7 @@ export const versionMetadata: { [version: string]: Metadata } = {
166166
"1_20_2": {
167167
vanillaDatapack: "1_20_2",
168168
experimentalDatapacks: [],
169-
datapackFormat: 18,
169+
datapackFormat: new PackFormat(18),
170170
canonicalNames: ["1.20.2"],
171171
resourceLocations: {
172172
structure: ResourceLocation.LEGACY_STRUCTURE
@@ -187,7 +187,7 @@ export const versionMetadata: { [version: string]: Metadata } = {
187187
translation_key: "dropdown.add.built_in.update_1_21"
188188
}
189189
],
190-
datapackFormat: 26,
190+
datapackFormat: new PackFormat(26),
191191
canonicalNames: ["1.20.3", "1.20.4"],
192192
resourceLocations: {
193193
structure: ResourceLocation.LEGACY_STRUCTURE
@@ -208,7 +208,7 @@ export const versionMetadata: { [version: string]: Metadata } = {
208208
translation_key: "dropdown.add.built_in.update_1_21"
209209
}
210210
],
211-
datapackFormat: 41,
211+
datapackFormat: new PackFormat(41),
212212
canonicalNames: ["1.20.5", "1.20.6"],
213213
resourceLocations: {
214214
structure: ResourceLocation.LEGACY_STRUCTURE
@@ -224,7 +224,7 @@ export const versionMetadata: { [version: string]: Metadata } = {
224224
"1_21_1": {
225225
vanillaDatapack: "1_21",
226226
experimentalDatapacks: [],
227-
datapackFormat: 48,
227+
datapackFormat: new PackFormat(48),
228228
canonicalNames: ["1.21", "1.21.1"],
229229
resourceLocations: {
230230
structure: ResourceLocation.STRUCTURE
@@ -245,7 +245,7 @@ export const versionMetadata: { [version: string]: Metadata } = {
245245
"translation_key": "dropdown.add.built_in.winter_drop"
246246
}
247247
],
248-
datapackFormat: 57,
248+
datapackFormat: new PackFormat(57),
249249
canonicalNames: ["1.21.2", "1.21.3"],
250250
resourceLocations: {
251251
structure: ResourceLocation.STRUCTURE
@@ -261,7 +261,7 @@ export const versionMetadata: { [version: string]: Metadata } = {
261261
"1_21_4": {
262262
vanillaDatapack: "1_21_4",
263263
experimentalDatapacks: [],
264-
datapackFormat: 61,
264+
datapackFormat: new PackFormat(61),
265265
canonicalNames: ["1.21.4"],
266266
resourceLocations: {
267267
structure: ResourceLocation.STRUCTURE
@@ -277,7 +277,7 @@ export const versionMetadata: { [version: string]: Metadata } = {
277277
"1_21_5": {
278278
vanillaDatapack: "1_21_5",
279279
experimentalDatapacks: [],
280-
datapackFormat: 71,
280+
datapackFormat: new PackFormat(71),
281281
canonicalNames: ["1.21.5"],
282282
resourceLocations: {
283283
structure: ResourceLocation.STRUCTURE
@@ -290,11 +290,11 @@ export const versionMetadata: { [version: string]: Metadata } = {
290290
spawnAlgorithm: SpawnTarget.Algorithm.BEST_CLIMATE,
291291
dimensionPaddingEnabled: true
292292
},
293-
"1_21_7": {
294-
vanillaDatapack: "1_21_7",
293+
"1_21_8": {
294+
vanillaDatapack: "1_21_8",
295295
experimentalDatapacks: [],
296-
datapackFormat: 81,
297-
canonicalNames: ["1.21.6", "1.21.7"],
296+
datapackFormat: new PackFormat(81),
297+
canonicalNames: ["1.21.6", "1.21.7", "1.21.8"],
298298
resourceLocations: {
299299
structure: ResourceLocation.STRUCTURE
300300
},
@@ -306,4 +306,36 @@ export const versionMetadata: { [version: string]: Metadata } = {
306306
spawnAlgorithm: SpawnTarget.Algorithm.BEST_CLIMATE,
307307
dimensionPaddingEnabled: true
308308
},
309+
"1_21_10": {
310+
vanillaDatapack: "1_21_10",
311+
experimentalDatapacks: [],
312+
datapackFormat: new PackFormat(88),
313+
canonicalNames: ["1.21.9", "1.21.10"],
314+
resourceLocations: {
315+
structure: ResourceLocation.STRUCTURE
316+
},
317+
biomes: {
318+
cherry_grove: "minecraft:cherry_grove",
319+
pale_garden_1: "minecraft:pale_garden",
320+
pale_garden_2: "minecraft:pale_garden"
321+
},
322+
spawnAlgorithm: SpawnTarget.Algorithm.BEST_CLIMATE,
323+
dimensionPaddingEnabled: true
324+
},
325+
"1_21_11": {
326+
vanillaDatapack: "1_21_11",
327+
experimentalDatapacks: [],
328+
datapackFormat: new PackFormat(94, 1),
329+
canonicalNames: ["1.21.11"],
330+
resourceLocations: {
331+
structure: ResourceLocation.STRUCTURE
332+
},
333+
biomes: {
334+
cherry_grove: "minecraft:cherry_grove",
335+
pale_garden_1: "minecraft:pale_garden",
336+
pale_garden_2: "minecraft:pale_garden"
337+
},
338+
spawnAlgorithm: SpawnTarget.Algorithm.BEST_CLIMATE,
339+
dimensionPaddingEnabled: true
340+
}
309341
}

0 commit comments

Comments
 (0)