Merge branch 'main' into dimension-padding

jacobsjo · Dec 2, 2024 · a80bc81 · a80bc81
2 parents 4a2fe36 + a8c7e44
commit a80bc81
Show file tree

Hide file tree

Showing 31 changed files with 813 additions and 181 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -66,6 +66,7 @@
     "dropdown.add.picker.pack": "Packs (*.zip)",
     "dropdown.add.picker.mod": "Mods (*.jar)",
     "dropdown.add.folder": "Open Folder",
+    "dropdown.add.modrinth": "Open from Modrinth",
     "dropdown.add.built_in.update_1_20": "Update 1.20",
     "dropdown.add.built_in.update_1_21": "Update 1.21",
     "dropdown.add.built_in.winter_drop": "Winter Drop",
@@ -76,8 +77,21 @@
     "dropdown.add.recents.enable.note": "(accept local storage)",
     "dropdown.add.recents.empty": "Empty",
     "dropdown.add.recents.unavailable": "Unsupported in this browser",
+    "dropdown.add.recents.type.zip": "zip file stored in browser",
+    "dropdown.add.recents.type.folder": "folder datapack directly opened from disk",
+    "dropdown.add.recents.type.modrinth": "newest version from modrinth",
+    "dropdown.add.recents.wrong_version": "unavailable for this version ",
     "dropdown.search_biome.placeholder": "Search Biome",
     "dropdown.structure_positions.placeholder": "Search Structure",
+    "modrinth.title": "Open from Modrinth",
+    "modrinth.search.aria-label": "Searchbar for datapacks on Modrinth",
+    "modrinth.search.placeholder": "Search Modrinth...",
+    "modrinth.include-mods": "include mods",
+    "modrinth.include-mods.aria-label": "include mods in search",
+    "modrinth.include-mods.notice": "Not all mods are supported by this map",
+    "modrinth.ignore-version": "ignore minecraft version",
+    "modrinth.ignore-version.aria-label": "ignore minecraft version in search",
+    "modrinth.ignore-version.notice": "Datapacks for other versions might not work as expected",
     "toggle_sidebar.title": "Toggle Sidebar",
     "map.info.structures_hidden": "Some structures are hidden. Zoom in to see more.",
     "map.info.teleport_command_copied": "Teleport Command Copied",

diff --git a/locales/fr.json b/locales/fr.json
@@ -85,11 +85,9 @@
     "map.info.structures_hidden": "Certaines structures sont cachées. Zoomez pour en voir plus.",
     "footer.more": "plus…",
     "settings.mc_version.mc1_20_6": "Minecraft 1.20.6",
-    "settings.mc_version.mc1_21": "Minecraft 1.21",
     "tip_message.kofi": "Offrez moi un café",
     "tip_message.message": "Si vous trouvez cette carte utile, j'accepte les pourboires !",
     "tip_message.github": "Sponsor",
     "tip_message.close": "Fermer",
-    "map.setting.graticule": "Montrer la grille de région",
-    "settings.mc_version.mc1_21_2": "Minecraft 1.21.2"
+    "map.setting.graticule": "Montrer la grille de région"
 }
diff --git a/locales/ja.json b/locales/ja.json
@@ -8,7 +8,6 @@
     "settings.mc_version.mc1_20_2": "Minecraft 1.20.2",
     "settings.mc_version.mc1_20_4": "Minecraft 1.20.4",
     "settings.mc_version.mc1_20_6": "Minecraft 1.20.6",
-    "settings.mc_version.mc1_21": "Minecraft 1.21",
     "settings.dev_mode.label": "開発者モード:",
     "settings.dev_mode.aria-label": "開発者モード",
     "settings.seed.randomize_button.title": "ランダムシード",

diff --git a/locales/ru.json b/locales/ru.json
@@ -84,6 +84,5 @@
     "dropdown.add.recents.not_found": "Набор не найден. Удаление из недавно использованных.",
     "map.info.structures_hidden": "Некоторые строения скрыты. Приблизьте, чтобы увидеть больше.",
     "footer.more": "ещё…",
-    "settings.mc_version.mc1_21": "Minecraft 1.21",
     "settings.mc_version.mc1_20_6": "Minecraft 1.20.6"
 }
diff --git a/locales/tr.json b/locales/tr.json
@@ -7,7 +7,6 @@
     "settings.mc_version.mc1_20_2": "Minecraft 1.20.2",
     "settings.mc_version.mc1_20_4": "Minecraft 1.20.4",
     "settings.mc_version.mc1_20_6": "Minecraft 1.20.6",
-    "settings.mc_version.mc1_21": "Minecraft 1.21",
     "settings.seed.randomize_button.title": "Rasgele tohum",
     "minecraft.dimension.minecraft.overworld": "Overworld",
     "minecraft.dimension.minecraft.the_end": "End",

diff --git a/locales/zh_CN.json b/locales/zh_CN.json
@@ -83,7 +83,6 @@
     "map.tooltip.spawn": "出生点",
     "dropdown.add.built_in.update_1_21": "更新至 1.21",
     "footer.more": "更多…",
-    "settings.mc_version.mc1_21": "Minecraft 1.21",
     "settings.mc_version.mc1_20_6": "Minecraft 1.20.6",
     "minecraft.structure.minecraft.trial_chambers": "试炼密室"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "deepslate": "^0.22.4",
     "idb-keyval": "^6.2.1",
     "leaflet": "^1.9.4",
-    "mc-datapack-loader": "0.4.1",
+    "mc-datapack-loader": "0.5.0",
     "pinia": "^2.1.4",
     "vue": "^3.3.4",
     "vue-i18n": "^9.2.2",

diff --git a/public/images/modrinth.svg b/public/images/modrinth.svg
diff --git a/src/App.vue b/src/App.vue
@@ -4,13 +4,19 @@ import Collapsable from './components/Collapsable.vue';
 import MainMap from './components/MainMap.vue';
 import Sidebar from './components/Sidebar.vue';
 import { useLoadedDimensionStore } from './stores/useLoadedDimensionStore';
+import { useUiStore } from './stores/useUiStore';
+import Popup from './components/Popup.vue';
+import ModrinthMenu from './components/modrinth/ModrinthMenu.vue';
 
 const loaded = ref(false)
 
+const uiStore = useUiStore()
+
 onBeforeMount(async () => {
   const loadedDimensionStore = useLoadedDimensionStore()
   await loadedDimensionStore.reload()
   loaded.value = true
+
 })
 
 </script>

diff --git a/src/components/Collapsable.vue b/src/components/Collapsable.vue
@@ -40,7 +40,8 @@ const open = ref(true)
 }
 
 .toggle.open {
-    left: 15.8rem
+    left: 15.8rem;
+    border-radius: 1rem;
 }
 
 .icon {

diff --git a/src/components/DatapackEntry.vue b/src/components/DatapackEntry.vue
@@ -7,7 +7,8 @@ import { versionMetadata } from '../util';
 import { computed } from 'vue';
 
     const props = defineProps({
-        datapack: Object
+        datapack: Object,
+        removable: Boolean
     })
 
     const settings = useSettingsStore()
@@ -29,7 +30,7 @@ import { computed } from 'vue';
         <div class="description">
             <MinecraftText :component="desciption" />
         </div>
-        <font-awesome-icon icon="fa-xmark" class="close_button" tabindex="0" :title="$t('datapack_list.remove_datapack.title')" @click="$emit('close')" @keypress.enter="$emit('close')" />
+        <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')" />
     </div>
 </template>
 

diff --git a/src/components/DatapackList.vue b/src/components/DatapackList.vue
@@ -8,7 +8,7 @@ const store = useDatapackStore();
 <template>
     <div class="datapack_list">
         <Suspense>
-            <DatapackEntry v-for="(datapack, index) in store.datapacks" :datapack="datapack.datapack" :key="datapack.key" @close="store.removeDatapack(index)"/>
+            <DatapackEntry v-for="(datapack, index) in store.datapacks" :datapack="datapack.datapack" :key="datapack.key" :removable="index > 0" @close="store.removeDatapack(index)"/>
         </Suspense>
 
     </div>