diff --git a/package.json b/package.json index dcdbf7f..e977cb2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "drehmal-installer", - "version": "1.0.2", + "version": "1.0.3b1", "description": "Drehmal, Minecraft map installer", "productName": "Drehmal Installer", "author": "Primordial Team", diff --git a/scripts/.gitignore b/scripts/.gitignore index cc9e16c..39f9948 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -2,3 +2,5 @@ Drehmal* map* parts* archive* +resources.zip +*.zip diff --git a/src/providers/InstallFabric.ts b/src/providers/InstallFabric.ts index e0f9ea8..8f09de8 100644 --- a/src/providers/InstallFabric.ts +++ b/src/providers/InstallFabric.ts @@ -50,7 +50,7 @@ export async function installFabric(ref: Ref) { '-dir', minecraftDir.value, '-mcversion', - '1.17.1', + launcher.value.fabric.minecraftVersion, ]); fabricProc.stdout.on('data', (data: any) => { console.log(`Fabric: ${data}`); @@ -79,7 +79,11 @@ export async function installFabric(ref: Ref) { ); data['profiles'][map.value.versionName] = JSON.parse( - JSON.stringify(data['profiles']['fabric-loader-1.17.1']) + JSON.stringify( + data['profiles'][ + `fabric-loader-${launcher.value.fabric.minecraftVersion}` + ] + ) ); data['profiles'][map.value.versionName]['name'] = map.value.versionName; diff --git a/src/stores/SourcesStore.ts b/src/stores/SourcesStore.ts index 5ef7d18..7df181a 100644 --- a/src/stores/SourcesStore.ts +++ b/src/stores/SourcesStore.ts @@ -3,22 +3,22 @@ import { ref } from 'vue'; export const useSourcesStore = defineStore('sources', () => { const map = ref({ - version: '2.2.0', + version: '2.2.1-b1.0.0', versionName: 'Drehmal: APOTHEOSIS', - compressedSizeInBytes: 4305446839, - uncompressedSizeInBytes: 6358552801, - hash: 'b03d3e38047df58e514a9580793dbf626ef5d7938564063f02b3eec559511748', + compressedSizeInBytes: 4335162502, + uncompressedSizeInBytes: 6515883517, + hash: '542c0e1b4009071ae1e68d63842af2ed823837fdb31865dd0add0db17303ce8f', shards: [ - 'https://github.com/Drehmal-Team/map/releases/download/v2.2.0/shard_1.zip', // 1 - 'https://github.com/Drehmal-Team/map/releases/download/v2.2.0/shard_2.zip', // 2 - 'https://github.com/Drehmal-Team/map/releases/download/v2.2.0/shard_3.zip', // 3 + 'https://github.com/Drehmal-Team/map/releases/download/v2.2.1-b1.0.0/shard_1.zip', // 1 + 'https://github.com/Drehmal-Team/map/releases/download/v2.2.1-b1.0.0/shard_2.zip', // 2 + 'https://github.com/Drehmal-Team/map/releases/download/v2.2.1-b1.0.0/shard_3.zip', // 3 ], }); const resourcePack = ref({ - version: '2.2.0', + version: '2.2.1-b1.0.0', source: - 'https://github.com/Drehmal-Team/map/releases/download/v2.2.0/resources.zip', + 'https://github.com/Drehmal-Team/map/releases/download/v2.2.1-b1.0.0/resources.zip', }); const partner = ref({ @@ -31,165 +31,171 @@ export const useSourcesStore = defineStore('sources', () => { name: 'fabric', version: '0.11.2', source: - 'https://maven.fabricmc.net/net/fabricmc/fabric-installer/0.11.2/fabric-installer-0.11.2.jar', - minecraftVersion: '1.17.1', + 'https://maven.fabricmc.net/net/fabricmc/fabric-installer/1.0.1/fabric-installer-1.0.1.jar', + minecraftVersion: '1.20.1', }, - // using https://www.drehmal.net/2-2-mod-list modList: [ { name: 'Animatica', url: 'https://modrinth.com/mod/animatica', source: - 'https://cdn.modrinth.com/data/PRN43VSY/versions/0.4%2B1.17/animatica-0.4%2B1.17.jar', - mc_version: '1.17.1', - mod_version: '0.4', + 'https://cdn.modrinth.com/data/PRN43VSY/versions/uNgEPb10/animatica-0.6%2B1.20.jar', + mc_version: '1.20.1', + mod_version: '0.6', }, { name: 'CIT Resewn', url: 'https://modrinth.com/mod/cit-resewn', source: - 'https://cdn.modrinth.com/data/otVJckYQ/versions/0.9.1%2B1.17.1/CITResewn-0.9.1%2B1.17.1.jar', - mc_version: '1.17.1', - mod_version: '0.9.1', + 'https://cdn.modrinth.com/data/otVJckYQ/versions/8uQeAHwk/citresewn-1.1.5%2B1.20.1.jar', + mc_version: '1.20.1', + mod_version: '1.1.5', + }, + { + name: 'Cloth Config', + url: 'https://modrinth.com/mod/cloth-config', + source: + 'https://cdn.modrinth.com/data/9s6osm5g/versions/J3FLptsi/cloth-config-11.1.118-fabric.jar', + mc_version: '1.20.1', + mod_version: '11.1.118', }, { name: 'Cull Leaves', url: 'https://modrinth.com/mod/cull-leaves', source: - 'https://cdn.modrinth.com/data/GNxdLCoP/versions/2.3.2/cullleaves-2.3.2.jar', - mc_version: '1.17.1', - mod_version: '2.3.2', + 'https://cdn.modrinth.com/data/GNxdLCoP/versions/3rzOQJrq/cullleaves-fabric-3.2.0.jar', + mc_version: '1.20.1', + mod_version: '3.2.0', + }, + { + name: 'Disable Custom Worlds Advice', + url: 'https://modrinth.com/mod/dcwa', + source: + 'https://cdn.modrinth.com/data/HdwRs3kc/versions/P23QCBEG/DisableCustomWorldsAdvice-4.1.jar', + mc_version: '1.20.1', + mod_version: '4.1', }, { name: 'Dynamic FPS', url: 'https://modrinth.com/mod/dynamic-fps', source: - 'https://cdn.modrinth.com/data/LQ3K71Q1/versions/v2.0.6/dynamic-fps-2.0.6.jar', - mc_version: '1.17.1', - mod_version: '2.0.6', + 'https://cdn.modrinth.com/data/LQ3K71Q1/versions/48hFxWw7/dynamic-fps-3.4.3%2Bminecraft-1.20.0-fabric.jar', + mc_version: '1.20.1', + mod_version: '3.4.2', }, { name: 'Entity Culling', url: 'https://modrinth.com/mod/entity-culling', source: - 'https://cdn.modrinth.com/data/NNAgCjsB/versions/1.5.0-fabric-1.17/entityculling-fabric-mc1.17.1-1.5.0.jar', - mc_version: '1.17.1', - mod_version: '1.5.0', + 'https://cdn.modrinth.com/data/NNAgCjsB/versions/frGGaFrx/entityculling-fabric-1.6.5-mc1.20.1.jar', + mc_version: '1.20.1', + mod_version: '1.6.5', }, { name: 'Fabric API', url: 'https://modrinth.com/mod/fabric-api', source: - 'https://cdn.modrinth.com/data/P7dR8mSH/versions/0.46.1%2B1.17/fabric-api-0.46.1%2B1.17.jar', - mc_version: '1.17.1', - mod_version: '0.46.1', + 'https://cdn.modrinth.com/data/P7dR8mSH/versions/P7uGFii0/fabric-api-0.92.2%2B1.20.1.jar', + mc_version: '1.20.1', + mod_version: '0.92.2', }, { name: 'FabricSkyboxes', url: 'https://modrinth.com/mod/fabricskyboxes', source: - 'https://cdn.modrinth.com/data/YBz7DOs8/versions/sP82Z0Yi/fabricskyboxes-0.7.2%2Bmc1.17.1.jar', - mc_version: '1.17.1', - mod_version: '0.7.2', + 'https://cdn.modrinth.com/data/YBz7DOs8/versions/cezLH6eB/fabricskyboxes-0.7.3%2Bmc1.20.1.jar', + mc_version: '1.20.1', + mod_version: '0.7.3', }, { name: 'Indium', url: 'https://modrinth.com/mod/indium', source: - 'https://cdn.modrinth.com/data/Orvt0mRa/versions/1.0.1%2Bmc1.17.1/indium-1.0.1%2Bmc1.17.1.jar', - mc_version: '1.17.1', - mod_version: '1.0.1', + 'https://cdn.modrinth.com/data/Orvt0mRa/versions/Aouse6P7/indium-1.0.30%2Bmc1.20.4.jar', + mc_version: '1.20.1', + mod_version: '1.0.30', }, { name: 'Iris Shaders', url: 'https://modrinth.com/mod/iris', source: - 'https://cdn.modrinth.com/data/YL57xq9U/versions/pkGrlTNQ/iris-mc1.17.1-1.2.7.jar', - mc_version: '1.17.1', - mod_version: '1.2.7', + 'https://cdn.modrinth.com/data/YL57xq9U/versions/KHQ2Hnpt/iris-1.7.0%2Bmc1.20.1.jar', + mc_version: '1.20.1', + mod_version: '1.7.0', }, { name: 'LambDynamicLights', url: 'https://modrinth.com/mod/lambdynamiclights', source: - 'https://cdn.modrinth.com/data/yBW8D80W/versions/2.1.0%2B1.17/lambdynamiclights-2.1.0%2B1.17.jar', - mc_version: '1.17.1', - mod_version: 'LambDynamicLights 2.1.0 (1.17-1.18)', + 'https://cdn.modrinth.com/data/yBW8D80W/versions/mYl4RvKg/lambdynamiclights-2.3.2%2B1.20.1.jar', + mc_version: '1.20.1', + mod_version: '2.3.2', }, { name: 'Lazy DFU', url: 'https://modrinth.com/mod/lazydfu', source: - 'https://cdn.modrinth.com/data/hvFnDODi/versions/0.1.2/lazydfu-0.1.2.jar', - mc_version: '1.17.1', - mod_version: '0.1.2', + 'https://cdn.modrinth.com/data/hvFnDODi/versions/0.1.3/lazydfu-0.1.3.jar', + mc_version: '1.20.1', + mod_version: '0.1.3', }, { name: 'Lithium', url: 'https://modrinth.com/mod/lithium', source: - 'https://cdn.modrinth.com/data/gvQqBUqZ/versions/mc1.17.1-0.7.5/lithium-fabric-mc1.17.1-0.7.5.jar', - mc_version: '1.17.1', - mod_version: '0.7.5', - }, - { - name: 'Starlight', - url: 'https://modrinth.com/mod/starlight', - source: - 'https://cdn.modrinth.com/data/H8CaAYZC/versions/Starlight%201.0.0%201.17.x/starlight-1.0.0%2Bfabric.73f6d37.jar', - mc_version: '1.17.1', - mod_version: '1.0.0', + 'https://cdn.modrinth.com/data/gvQqBUqZ/versions/ZSNsJrPI/lithium-fabric-mc1.20.1-0.11.2.jar', + mc_version: '1.20.1', + mod_version: '0.11.2', }, { name: 'Sodium', url: 'https://modrinth.com/mod/sodium', source: - 'https://cdn.modrinth.com/data/AANobbMI/versions/mc1.17.1-0.3.4/sodium-fabric-mc1.17.1-0.3.4%2Bbuild.13.jar', - mc_version: '1.17.1', - mod_version: '0.3.4', + 'https://cdn.modrinth.com/data/AANobbMI/versions/mhZtY2lR/sodium-fabric-0.5.8%2Bmc1.20.1.jar', + mc_version: '1.20.1', + mod_version: '0.5.8', }, { name: 'Sodium Extra', url: 'https://modrinth.com/mod/sodium-extra', source: - 'https://cdn.modrinth.com/data/PtjYWJkn/versions/1OzghAbl/sodium-extra-0.4.18%2Bmc1.17.1-build.97.jar', - mc_version: '1.17.1', - mod_version: '0.4.18', + 'https://cdn.modrinth.com/data/PtjYWJkn/versions/I7ggF6B5/sodium-extra-0.5.4%2Bmc1.20.1-build.115.jar', + mc_version: '1.20.1', + mod_version: '0.5.4', }, { - name: "Reese's Sodium Options", - url: 'https://modrinth.com/mod/reeses-sodium-options', + name: 'Starlight', + url: 'https://modrinth.com/mod/starlight', source: - 'https://cdn.modrinth.com/data/Bh37bMuy/versions/r2sBtu0R/reeses_sodium_options-1.5.0%2Bmc1.17.1-build.69.jar', - mc_version: '1.17.1', - mod_version: '1.5.0', + 'https://cdn.modrinth.com/data/H8CaAYZC/versions/XGIsoVGT/starlight-1.1.2%2Bfabric.dbc156f.jar', + mc_version: '1.20.1', + mod_version: '1.1.2', }, { name: 'WI Zoom', url: 'https://modrinth.com/mod/wi-zoom', source: - 'https://cdn.modrinth.com/data/o7DitHWP/versions/OYzl0qI6/WI-Zoom-1.3-MC1.17.1.jar', - mc_version: '1.17.1', - mod_version: '1.3', + 'https://cdn.modrinth.com/data/o7DitHWP/versions/AYN9L9xU/WI-Zoom-1.5-MC1.20.1.jar', + mc_version: '1.20.1', + mod_version: '1.5', }, { name: 'Entity Texture Features', url: 'https://modrinth.com/mod/entitytexturefeatures', source: - 'https://cdn.modrinth.com/data/BVzZfTc1/versions/a4YzsmzU/entity_texture_features_fabric_1.17.1-4.3.1.jar', - mc_version: '1.17.1', - mod_version: '4.3.1', + 'https://cdn.modrinth.com/data/4I1XuqiY/versions/jkLvxFFA/entity_model_features_fabric_1.20.1-2.0.2.jar', + mc_version: '1.20.1', + mod_version: '2.0.2', }, { - name: 'CEM', - url: 'https://github.com/YoungSoulluoS/cem_Fork', + name: 'Entity Texture Features', + url: 'https://modrinth.com/mod/entitytexturefeatures', source: - 'https://github.com/YoungSoulluoS/cem_Fork/releases/download/Soul_Fork_10_1.19.4/cem-0.7.1_S8_1.17.jar', - mc_version: '1.17.1', - mod_version: '0.7.1', + 'https://cdn.modrinth.com/data/BVzZfTc1/versions/jXc7eTKi/entity_texture_features_fabric_1.20.1-6.0.1.jar', + mc_version: '1.20.1', + mod_version: '6.0.1', }, ], - launcher_icon: 'data:image/png;base64,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', }); @@ -202,10 +208,10 @@ export const useSourcesStore = defineStore('sources', () => { }); const server = ref({ - // per https://minecraft.wiki/w/Java_Edition_1.17.1 + // per https://minecraft.wiki/w/Java_Edition_1.20.1 source: - 'https://piston-data.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar', - version: '1.17.1', + 'https://piston-data.mojang.com/v1/objects/84194a2f286ef7c14ed7ce0090dba59902951553/server.jar', + version: '1.20.1', properties: [ 'enable-command-block=true', 'view-distance=16',