Skip to content

Commit 26e09c5

Browse files
jacobsjojacobsjo
committed
dependency updates
1 parent 6917429 commit 26e09c5

26 files changed

+5056
-7168
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
"idb-keyval": "^6.2.1",
2020
"leaflet": "^1.9.4",
2121
"mc-datapack-loader": "0.5.1",
22-
"pinia": "^2.1.4",
23-
"vue": "^3.3.4",
24-
"vue-i18n": "^9.2.2",
22+
"pinia": "^3.0.3",
23+
"vue": "^3.5.21",
24+
"vue-i18n": "^11.1.12",
2525
"vue-slider-component": "^4.1.0-beta.7"
2626
},
2727
"devDependencies": {
28-
"@intlify/unplugin-vue-i18n": "^0.11.0",
28+
"@intlify/unplugin-vue-i18n": "^11.0.1",
2929
"@types/leaflet": "^1.9.3",
3030
"@types/node": "^20.3.1",
3131
"@types/wicg-file-system-access": "^2020.9.6",
3232
"@vitejs/plugin-vue": "^4.2.3",
3333
"typescript": "^5.1.3",
3434
"vite": "^4.3.9",
3535
"vite-plugin-pwa": "^0.16.4",
36-
"vue-tsc": "^1.8.1"
36+
"vue-tsc": "^3.0.7"
3737
}
3838
}

‎src/BuildIn/MultiNoiseBiomeParameterList.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Most content of this file is Copyright (c) Mojang. This file is not covered by the Licence in LICENSE.txt !
33
*/
44

5-
import { versionMetadata } from "../util"
5+
import { versionMetadata } from "../util.js"
66

77
export function getPreset(key: string, mc_version: string) {
88
if (key === "minecraft:nether") {

‎src/MapLayers/BiomeLayer.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import * as L from "leaflet"
22
//import { last, range, takeWhile } from "lodash";
33
import { Climate } from "deepslate";
4-
import { calculateHillshade, getCustomDensityFunction, hashCode } from "../util";
4+
import { calculateHillshade, getCustomDensityFunction, hashCode } from "../util.js";
55
import MultiNoiseCalculator from "../webworker/MultiNoiseCalculator?worker"
6-
import { useSearchStore } from "../stores/useBiomeSearchStore";
7-
import { useLoadedDimensionStore } from "../stores/useLoadedDimensionStore";
8-
import { useSettingsStore } from "../stores/useSettingsStore";
9-
import { useDatapackStore } from "../stores/useDatapackStore";
6+
import { useSearchStore } from "../stores/useBiomeSearchStore.js";
7+
import { useLoadedDimensionStore } from "../stores/useLoadedDimensionStore.js";
8+
import { useSettingsStore } from "../stores/useSettingsStore.js";
9+
import { useDatapackStore } from "../stores/useDatapackStore.js";
1010
import { Ref, toRaw, watch } from "vue";
1111
import { ResourceLocation } from "mc-datapack-loader";
1212

‎src/components/Collapsable.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<script setup lang="ts">
22
import { ref } from 'vue';
3+
import { useI18n } from 'vue-i18n';
4+
const i18n = useI18n()
35
46
const open = ref(true)
57
</script>
68

79
<template>
810
<div class="toggle" :class="{open}" >
9-
<font-awesome-icon icon="fa-bars" class="icon" tabindex="0" @click="open = !open" @keypress.enter="open = !open" :title="$t('toggle_sidebar.title')" />
11+
<font-awesome-icon icon="fa-bars" class="icon" tabindex="0" @click="open = !open" @keypress.enter="open = !open" :title="i18n.t('toggle_sidebar.title')" />
1012
</div>
1113
<div class="content">
1214
<Transition name="slide">

‎src/components/DatapackEntry.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import MinecraftText from './MinecraftText.vue';
55
import { useSettingsStore } from '../stores/useSettingsStore';
66
import { versionMetadata } from '../util';
77
import { computed } from 'vue';
8+
import { useI18n } from 'vue-i18n';
9+
10+
const i18n = useI18n()
811
912
const props = defineProps({
1013
datapack: Object,
@@ -30,7 +33,7 @@ import { computed } from 'vue';
3033
<div class="description">
3134
<MinecraftText :component="desciption" />
3235
</div>
33-
<font-awesome-icon v-if="removable" icon="fa-xmark" class="close_button" tabindex="0" :title="$t('datapack_list.remove_datapack.title')" @click="$emit('close')" @keypress.enter="$emit('close')" />
36+
<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')" />
3437
</div>
3538
</template>
3639

‎src/components/Footer.vue‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<script setup lang="ts">
22
import { ref } from 'vue';
33
import LocaleChanger from './LocaleChanger.vue';
4+
import { useI18n } from 'vue-i18n';
5+
6+
const i18n = useI18n()
47
58
const show_more = ref(false)
69
@@ -10,16 +13,16 @@ const show_more = ref(false)
1013
<div class="footer">
1114
<div class="smallprint">
1215
<p>Copyright © 2023 jacobsjo</p>
13-
<p id="note">{{ $t('footer.legel.note') }}</p>
14-
<a href="https://jacobsjo.eu/about.html" target="_blank">{{ $t('footer.about') }}</a>
15-
<a href="OTHER_LICENSES.txt" target="_blank">{{ $t('footer.licenses') }}</a>
16-
<a href="https://weblate.catter.dev/projects/jacobsjo/mc-datapack-map/" target="_blank">{{ $t('footer.translate') }}</a>
17-
<a @click="show_more = !show_more" :class="{'highlight': show_more}">{{ $t('footer.more') }} </a>
16+
<p id="note">{{ i18n.t('footer.legel.note') }}</p>
17+
<a href="https://jacobsjo.eu/about.html" target="_blank">{{ i18n.t('footer.about') }}</a>
18+
<a href="OTHER_LICENSES.txt" target="_blank">{{ i18n.t('footer.licenses') }}</a>
19+
<a href="https://weblate.catter.dev/projects/jacobsjo/mc-datapack-map/" target="_blank">{{ i18n.t('footer.translate') }}</a>
20+
<a @click="show_more = !show_more" :class="{'highlight': show_more}">{{ i18n.t('footer.more') }} </a>
1821
<div v-if="show_more" class="more">
19-
<a href="https://github.com/jacobsjo/mc-datapack-map" target="_blank">{{ $t('footer.view_source') }}</a>
20-
<a href="https://github.com/jacobsjo/mc-datapack-map/issues" target="_blank">{{ $t('footer.report_issue') }}</a>
21-
<a href="https://jacobsjo.eu" target="_blank">{{ $t('footer.other') }}</a>
22-
<a href="https://github.com/jacobsjo/mc-datapack-map/wiki" target="_blank">{{ $t('footer.wiki') }}</a>
22+
<a href="https://github.com/jacobsjo/mc-datapack-map" target="_blank">{{ i18n.t('footer.view_source') }}</a>
23+
<a href="https://github.com/jacobsjo/mc-datapack-map/issues" target="_blank">{{ i18n.t('footer.report_issue') }}</a>
24+
<a href="https://jacobsjo.eu" target="_blank">{{ i18n.t('footer.other') }}</a>
25+
<a href="https://github.com/jacobsjo/mc-datapack-map/wiki" target="_blank">{{ i18n.t('footer.wiki') }}</a>
2326
</div>
2427
</div>
2528
<LocaleChanger />

‎src/components/LocaleChanger.vue‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
import { useSettingsStore } from '../stores/useSettingsStore';
33
import { EventTracker } from '../util/EventTracker';
44
import { updateUrlParam } from '../util';
5+
import { useI18n } from 'vue-i18n';
6+
7+
const i18n = useI18n()
58
69
const settingsStore = useSettingsStore()
710
@@ -14,21 +17,21 @@ function updateUrlSearch(locale: string) {
1417

1518
<template>
1619
<div class="locale-info">
17-
<a v-bind:href="`https://weblate.catter.dev/projects/jacobsjo/mc-datapack-map/${$i18n.locale}`" target="_blank">
18-
<img v-bind:src="`https://weblate.catter.dev/widget/jacobsjo/mc-datapack-map/${$i18n.locale}/svg-badge.svg`" alt="Translation status" />
20+
<a v-bind:href="`https://weblate.catter.dev/projects/jacobsjo/mc-datapack-map/${i18n.locale.value}`" target="_blank">
21+
<img v-bind:src="`https://weblate.catter.dev/widget/jacobsjo/mc-datapack-map/${i18n.locale.value}/svg-badge.svg`" alt="Translation status" />
1922
</a>
2023
</div>
2124
<div class="locale-changer">
22-
<font-awesome-icon icon="fa-earth-europe" class="icon" :title="$t('locale.change_locale.title')" />
23-
<select v-model="$i18n.locale" @change="() => updateUrlSearch($i18n.locale)">
24-
<option v-for="lang in $i18n.availableLocales" :key="lang" :value="lang" :dir="$t('locale.text_direction', [], { locale: lang })">
25-
{{ $t("locale.local_name", [], { locale: lang }) }}
25+
<font-awesome-icon icon="fa-earth-europe" class="icon" :title="i18n.t('locale.change_locale.title')" />
26+
<select v-model="i18n.locale.value" @change="() => updateUrlSearch(i18n.locale.value)">
27+
<option v-for="lang in i18n.availableLocales" :key="lang" :value="lang" :dir="i18n.t('locale.text_direction', [], { locale: lang })">
28+
{{ i18n.t("locale.local_name", [], { locale: lang }) }}
2629
</option>
2730
</select>
2831
</div>
2932
<div class="setting">
30-
<div class="title">{{ $t('settings.dev_mode.label') }}</div>
31-
<input type="checkbox" :aria-label="$t('settings.dev_mode.aria-label')" v-model="settingsStore.dev_mode">
33+
<div class="title">{{ i18n.t('settings.dev_mode.label') }}</div>
34+
<input type="checkbox" :aria-label="i18n.t('settings.dev_mode.aria-label')" v-model="settingsStore.dev_mode">
3235
</div>
3336
</template>
3437

‎src/components/MainMap.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -317,29 +317,29 @@ watch(searchStore.structures, () => {
317317
<Suspense>
318318
<YSlider class="slider" v-model:y="y" />
319319
</Suspense>
320-
<MapButton icon="fa-arrows-down-to-line" :disabled="loadedDimensionStore.surface_density_function === undefined" v-model="project_down" :title="$t('map.setting.project')" />
321-
<MapButton icon="fa-mountain-sun" :disabled="(!project_down || loadedDimensionStore.surface_density_function === undefined) && ! loadedDimensionStore.terrain_density_function" v-model="do_hillshade" :title="$t('map.setting.hillshade')" />
322-
<MapButton icon="fa-water" :disabled="loadedDimensionStore.surface_density_function === undefined" v-model="show_sealevel" :title="$t('map.setting.sealevel')" />
323-
<MapButton icon="fa-table-cells" v-model="show_graticule" :title="$t('map.setting.graticule')" />
320+
<MapButton icon="fa-arrows-down-to-line" :disabled="loadedDimensionStore.surface_density_function === undefined" v-model="project_down" :title="i18n.t('map.setting.project')" />
321+
<MapButton icon="fa-mountain-sun" :disabled="(!project_down || loadedDimensionStore.surface_density_function === undefined) && ! loadedDimensionStore.terrain_density_function" v-model="do_hillshade" :title="i18n.t('map.setting.hillshade')" />
322+
<MapButton icon="fa-water" :disabled="loadedDimensionStore.surface_density_function === undefined" v-model="show_sealevel" :title="i18n.t('map.setting.sealevel')" />
323+
<MapButton icon="fa-table-cells" v-model="show_graticule" :title="i18n.t('map.setting.graticule')" />
324324
</div>
325325
</div>
326326
<BiomeTooltip id="tooltip" v-if="show_tooltip" :style="{ left: tooltip_left + 'px', top: tooltip_top + 'px' }"
327327
:biome="tooltip_biome" :pos="tooltip_position" />
328328
<div class="top">
329329
<Transition>
330330
<div class="info zoom" v-if="needs_zoom">
331-
{{ $t('map.info.structures_hidden') }}
331+
{{ i18n.t('map.info.structures_hidden') }}
332332
</div>
333333
</Transition>
334334
<Transition>
335335
<div class="info unsupported" v-if="searchStore.structure_sets.has_invalid">
336-
{{ $t('map.error.structures_unsupported') }}
336+
{{ i18n.t('map.error.structures_unsupported') }}
337337
</div>
338338
</Transition>
339339
</div>
340340
<Transition>
341341
<div class="info bottom teleport" v-if="show_info">
342-
{{ $t('map.info.teleport_command_copied') }}
342+
{{ i18n.t('map.info.teleport_command_copied') }}
343343
</div>
344344
</Transition>
345345
</template>

‎src/components/MenuButtons.vue‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import { useSearchStore } from '../stores/useBiomeSearchStore';
88
import StructureDropdown from './dropdown/StructureDropdown.vue';
99
import { useSettingsStore } from '../stores/useSettingsStore';
1010
import { EventTracker } from '../util/EventTracker';
11+
import { useI18n } from 'vue-i18n';
12+
13+
const i18n = useI18n()
1114
1215
const datapackStore = useDatapackStore()
1316
const searchStore = useSearchStore()
@@ -50,7 +53,7 @@ function clearStructureSearch() {
5053
class="button"
5154
tabindex="0"
5255
:class="{open: openDropdownOpen }"
53-
:title="$t('menu.add.title')"
56+
:title="i18n.t('menu.add.title')"
5457
@click="openDropdownOpen = true"
5558
@keypress.enter="openDropdownOpen = true"
5659
/>
@@ -63,7 +66,7 @@ function clearStructureSearch() {
6366
open: searchBiomeDropdownOpen,
6467
active: searchStore.biomes.size > 0
6568
}"
66-
:title="$t('menu.search_biome.title')"
69+
:title="i18n.t('menu.search_biome.title')"
6770
@click="searchBiomeDropdownOpen = true"
6871
@keypress.enter="searchBiomeDropdownOpen = true"
6972
@contextmenu.prevent="clearBiomeSearch"
@@ -74,7 +77,7 @@ function clearStructureSearch() {
7477
:icon="!searchStore.disabled ? 'fa-toggle-on' : 'fa-toggle-off'"
7578
class="button transparent"
7679
tabindex="0"
77-
:title="$t('menu.search_biome.toggle')"
80+
:title="i18n.t('menu.search_biome.toggle')"
7881
@click.prevent="toggleBiomeSearch"
7982
/>
8083
</span>
@@ -86,14 +89,14 @@ function clearStructureSearch() {
8689
open: structureDropdownOpen,
8790
active: searchStore.structures.size > 0
8891
}"
89-
:title="$t('menu.structure_positions.title')"
92+
:title="i18n.t('menu.structure_positions.title')"
9093
@click="structureDropdownOpen = true"
9194
@keypress.enter="structureDropdownOpen = true"
9295
@contextmenu.prevent="clearStructureSearch"
9396
@dblclick.prevent="clearStructureSearch"
9497
/>
9598

96-
<font-awesome-icon v-if="settingsStore.dev_mode" icon="fa-rotate-right" class="button" tabindex="0" :title="$t('menu.reload_datapacks.title')" @click="reload" @keypress.enter="reload" />
99+
<font-awesome-icon v-if="settingsStore.dev_mode" icon="fa-rotate-right" class="button" tabindex="0" :title="i18n.t('menu.reload_datapacks.title')" @click="reload" @keypress.enter="reload" />
97100
</div>
98101
<div class="dropdowns">
99102
<Transition>

0 commit comments

Comments
 (0)