From a02c0389de675e35ea48464efba8e76eca6e0377 Mon Sep 17 00:00:00 2001 From: Nikita Kulikov Date: Thu, 11 Jul 2024 20:46:15 +0100 Subject: [PATCH] Add skyfactory --- launcher.json | 1 + scripts/upload.sh | 8 ++++---- .../lionzxy/tplauncher/minecraft/MinecraftContext.kt | 10 +++++----- .../kotlin/ru/lionzxy/tplauncher/utils/LogoUtils.kt | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 launcher.json diff --git a/launcher.json b/launcher.json new file mode 100644 index 0000000..49acaf7 --- /dev/null +++ b/launcher.json @@ -0,0 +1 @@ +{"version":"1.2.07112044","downloadFullPath":"https://minecraft.glitchless.ru/1.2.07112044.jar","SHA-256":"AQNW2bhV5PJ5C/E64cR8SvCxSdZ0Dj/Qe3B96styGNQ="} diff --git a/scripts/upload.sh b/scripts/upload.sh index c1471bf..bc8abff 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash -cd ../ +#cd ../ -export JAVA_HOME="/Library/Java/JavaVirtualMachines/liberica-jdk-8-full.jdk/Contents/Home/" +#export JAVA_HOME="/Library/Java/JavaVirtualMachines/liberica-jdk-8-full.jdk/Contents/Home/" -rm -rf build/libs/ +#rm -rf build/libs/ -./gradlew fatJar +#./gradlew fatJar JARPATH="build/libs/$(ls build/libs/ | tail -n +1 | head -1)" diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/minecraft/MinecraftContext.kt b/src/main/kotlin/ru/lionzxy/tplauncher/minecraft/MinecraftContext.kt index 41195a5..527f1b0 100644 --- a/src/main/kotlin/ru/lionzxy/tplauncher/minecraft/MinecraftContext.kt +++ b/src/main/kotlin/ru/lionzxy/tplauncher/minecraft/MinecraftContext.kt @@ -34,12 +34,12 @@ enum class MinecraftModpack( defaultServer = null, version = "1.7.10-Forge10.13.4.1614-1.7.10" ), - RLCRAFT( - modpackName = "RLCraft", + SKYFACTORY( + modpackName = "SkyFactory", initialDownloadLink = null, - updateJsonLink = "$BASE_URL/incremental/rlcraft_changelog.json", - updateHostLink = "$BASE_URL/incremental/rlcraft", - defaultServer = ServerInfo("mc.glitchless.ru", "RLCraft Server", null, 25569), + updateJsonLink = "$BASE_URL/incremental/skyfactory_changelog.json", + updateHostLink = "$BASE_URL/incremental/skyfactory", + defaultServer = ServerInfo("mc.glitchless.ru", "SkyFactory Server", null, 25568), version = "1.12.2-forge-14.23.5.2860" ); diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/utils/LogoUtils.kt b/src/main/kotlin/ru/lionzxy/tplauncher/utils/LogoUtils.kt index ee66001..855e56a 100644 --- a/src/main/kotlin/ru/lionzxy/tplauncher/utils/LogoUtils.kt +++ b/src/main/kotlin/ru/lionzxy/tplauncher/utils/LogoUtils.kt @@ -73,6 +73,6 @@ object LogoUtils { private fun setLogoForMac() { val image = Toolkit.getDefaultToolkit().getImage(logoUrl) // Only for JDK 8, for JDK 9 use https://stackoverflow.com/questions/6006173/how-do-you-change-the-dock-icon-of-a-java-program/56924202#56924202 - com.apple.eawt.Application.getApplication().dockIconImage = image + //com.apple.eawt.Application.getApplication().dockIconImage = image } }