fix: fabric version detection
This commit is contained in:
@ -500,8 +500,10 @@ export function initMinecraftHandlers() {
|
|||||||
let versionToLaunch = versionToLaunchOverride;
|
let versionToLaunch = versionToLaunchOverride;
|
||||||
|
|
||||||
if (!versionToLaunch) {
|
if (!versionToLaunch) {
|
||||||
if (versionsContents.includes(`${baseVersion}-${fabricVersion}`)) {
|
if (
|
||||||
versionToLaunch = `${baseVersion}-${fabricVersion}`;
|
versionsContents.includes(`${baseVersion}-fabric${fabricVersion}`)
|
||||||
|
) {
|
||||||
|
versionToLaunch = `${baseVersion}-fabric${fabricVersion}`;
|
||||||
} else if (versionsContents.includes(packName)) {
|
} else if (versionsContents.includes(packName)) {
|
||||||
versionToLaunch = packName;
|
versionToLaunch = packName;
|
||||||
} else {
|
} else {
|
||||||
@ -605,12 +607,12 @@ export function initMinecraftHandlers() {
|
|||||||
if (fabricVersion) {
|
if (fabricVersion) {
|
||||||
event.sender.send('installation-status', {
|
event.sender.send('installation-status', {
|
||||||
step: 'fabric-install',
|
step: 'fabric-install',
|
||||||
message: `Установка Fabric ${fabricVersion.version}...`,
|
message: `Установка Fabric ${fabricVersion}...`,
|
||||||
});
|
});
|
||||||
|
|
||||||
await installFabric({
|
await installFabric({
|
||||||
minecraftVersion: baseVersion,
|
minecraftVersion: baseVersion,
|
||||||
version: fabricVersion.version,
|
version: fabricVersion, // Используйте напрямую, без .version
|
||||||
minecraft: minecraftDir,
|
minecraft: minecraftDir,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -621,7 +623,7 @@ export function initMinecraftHandlers() {
|
|||||||
// 3. Подготовка версии и установка зависимостей
|
// 3. Подготовка версии и установка зависимостей
|
||||||
try {
|
try {
|
||||||
// Используем идентификатор Fabric-версии
|
// Используем идентификатор Fabric-версии
|
||||||
const fabricVersionId = `${baseVersion}-${fabricVersion}`;
|
const fabricVersionId = `${baseVersion}-fabric${fabricVersion}`;
|
||||||
|
|
||||||
event.sender.send('installation-status', {
|
event.sender.send('installation-status', {
|
||||||
step: 'version-parse',
|
step: 'version-parse',
|
||||||
|
@ -22,7 +22,7 @@ const launchOptions = {
|
|||||||
memory: 4096,
|
memory: 4096,
|
||||||
baseVersion: '1.21.4',
|
baseVersion: '1.21.4',
|
||||||
serverIp: 'popa-popa.ru',
|
serverIp: 'popa-popa.ru',
|
||||||
fabricVersion: 'fabric0.16.14',
|
fabricVersion: '0.16.14', // Уберите префикс "fabric"
|
||||||
};
|
};
|
||||||
|
|
||||||
const AuthCheck = ({ children }: { children: ReactNode }) => {
|
const AuthCheck = ({ children }: { children: ReactNode }) => {
|
||||||
|
Reference in New Issue
Block a user