diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml index f3a74d24..ae1d2cf0 100644 --- a/.github/workflows/application.yml +++ b/.github/workflows/application.yml @@ -41,7 +41,7 @@ jobs: cache: "gradle" - name: Run Unit Tests - run: ./gradlew --no-daemon test --tests com.atlauncher.* + run: ./gradlew --no-daemon test --tests com.aclauncher.* - name: Run UI Tests uses: coactions/setup-xvfb@v1 @@ -148,7 +148,7 @@ jobs: echo 'EOF' >> $GITHUB_ENV - name: Create ATLauncher Version - uses: ATLauncher/release-atlauncher-action@master + uses: ATLauncher/release-aclauncher-action@master timeout-minutes: 30 with: api-key: ${{ secrets.ATLAUNCHER_API_KEY }} diff --git a/.github/workflows/aur-publish.yml b/.github/workflows/aur-publish.yml index 823c6308..293938d7 100644 --- a/.github/workflows/aur-publish.yml +++ b/.github/workflows/aur-publish.yml @@ -10,23 +10,23 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Publish atlauncher AUR package + - name: Publish aclauncher AUR package uses: ./.github/actions/publish-to-aur with: version: ${{ github.event.client_payload.version }} - workingDir: ./packaging/aur/atlauncher - packageName: atlauncher + workingDir: ./packaging/aur/aclauncher + packageName: aclauncher aurUsername: ${{ secrets.AUR_USERNAME }} aurEmail: ${{ secrets.AUR_EMAIL }} aurSshPrivateKey: ${{ secrets.AUR_SSH_PRIVATE_KEY }} aurCommitMessage: Update to version ${{ github.event.client_payload.version }} - - name: Publish atlauncher-bin AUR package + - name: Publish aclauncher-bin AUR package uses: ./.github/actions/publish-to-aur with: version: ${{ github.event.client_payload.version }} - workingDir: ./packaging/aur/atlauncher-bin - packageName: atlauncher-bin + workingDir: ./packaging/aur/aclauncher-bin + packageName: aclauncher-bin aurUsername: ${{ secrets.AUR_USERNAME }} aurEmail: ${{ secrets.AUR_EMAIL }} aurSshPrivateKey: ${{ secrets.AUR_SSH_PRIVATE_KEY }} diff --git a/.github/workflows/crowdin-sync.yml b/.github/workflows/crowdin-sync.yml index 4921b26d..33268a5d 100644 --- a/.github/workflows/crowdin-sync.yml +++ b/.github/workflows/crowdin-sync.yml @@ -4,7 +4,7 @@ on: push: branches: [master] paths: - - "src/main/java/com/atlauncher/**" + - "src/main/java/com/aclauncher/**" jobs: synchronize-with-crowdin: diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 920af046..7f4f8c24 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,19 +1,19 @@ - - - + \ No newline at end of file diff --git a/SUPPORT.md b/SUPPORT.md index 83e1cc97..5b1f78a0 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -1,4 +1,4 @@ -# Getting support for ATLauncher +# Getting support for ACLauncher Hello there :wave:. @@ -14,7 +14,7 @@ If you're looking for support for: * Pack install issues Then please visit our [Discord server](https://atl.pw/discord) and post in one of the support channels, where the -community and contributors to ATLauncher will be able to help you resolve your issue. +community and contributors to ACLauncher will be able to help you resolve your issue. If we find that it's an issue with the launcher code itself, then we will raise issues (or ask you to raise them) in the correct place once triaged. @@ -27,7 +27,7 @@ If you're looking for support for: * Pack bug reports * Mod issues -Then please note that ATLauncher only hosts the modpacks, we do not create, maintain or even have the power to fix or +Then please note that ACLauncher only hosts the modpacks, we do not create, maintain or even have the power to fix or make the changes you may be looking for/having. Each modpack is developed by a person (or team) and they're responsible for providing support. Your first step should be diff --git a/TESTING.md b/TESTING.md index dd0a3afa..f67f99cc 100644 --- a/TESTING.md +++ b/TESTING.md @@ -6,7 +6,7 @@ to follow when making tests. When creating tests for a class it should be placed in the '/src/test/java/' folder within it's correct package name structure. -For instance a test for 'com.atlauncher.SomeClass' would go in '/src/test/java/com/atlauncher/'. +For instance a test for 'com.aclauncher.SomeClass' would go in '/src/test/java/com/aclauncher/'. ## Filenames of tests Tests should be named after their class name with 'Test' appended to it in the correct directory structure explained @@ -37,7 +37,7 @@ private Path testStorage; @Before public void setUp() throws Exception { - testStorage = temporaryFolder.newFolder("ATLauncherTests").toPath(); + testStorage = temporaryFolder.newFolder("ACLauncherTests").toPath(); } ``` diff --git a/build.gradle b/build.gradle index d8aa5852..449c43e8 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ apply plugin: 'org.mini2Dx.gettext' sourceCompatibility = '1.8' targetCompatibility = '1.8' -group = 'com.atlauncher' +group = 'com.aclauncher' version = rootProject.file('src/main/resources/version').text.trim().replace('.Beta', '') repositories { @@ -104,7 +104,7 @@ dependencies { } application { - mainClass = 'com.atlauncher.App' + mainClass = 'com.aclauncher.App' applicationDefaultJvmArgs = [ "-Djna.nosys=true", "-Djava.net.preferIPv4Stack=true", @@ -128,8 +128,8 @@ jar { 'SplashScreen-Image': '/assets/image/splash-screen.png', 'Implementation-Title': project.name, 'Implementation-Version': archiveVersion, - 'Implementation-Vender': 'ATLauncher', - 'Main-Class': 'com.atlauncher.App', + 'Implementation-Vender': 'ACLauncher', + 'Main-Class': 'com.aclauncher.App', 'Multi-Release': 'true' ) } @@ -140,22 +140,22 @@ apollo { "ID" : "java.lang.String", "DateTime" : "java.util.Date" ] - packageName = "com.atlauncher.graphql" + packageName = "com.aclauncher.graphql" } gettext { translations { srcDir = 'src' - include = 'main/java/com/atlauncher/**/*.java' + include = 'main/java/com/aclauncher/**/*.java' excludes = [ - 'main/java/com/atlauncher/adapter/**/*.java', - 'main/java/com/atlauncher/annot/**/*.java', - 'main/java/com/atlauncher/collection/**/*.java', - 'main/java/com/atlauncher/evnt/**/*.java', - 'main/java/com/atlauncher/exceptions/**/*.java', - 'main/java/com/atlauncher/interfaces/**/*.java', - 'main/java/com/atlauncher/listener/**/*.java', - 'main/java/com/atlauncher/utils/**/*.java' + 'main/java/com/aclauncher/adapter/**/*.java', + 'main/java/com/aclauncher/annot/**/*.java', + 'main/java/com/aclauncher/collection/**/*.java', + 'main/java/com/aclauncher/evnt/**/*.java', + 'main/java/com/aclauncher/exceptions/**/*.java', + 'main/java/com/aclauncher/interfaces/**/*.java', + 'main/java/com/aclauncher/listener/**/*.java', + 'main/java/com/aclauncher/utils/**/*.java' ] commentFormat = ' #. ' outputFilename = 'translations.pot' @@ -167,8 +167,8 @@ license { include '**/*.java' exclude 'io/github/**/*.java' exclude 'net/minecraft/**/*.java' - exclude 'com/atlauncher/graphql/**/*.java' - exclude 'com/atlauncher/gui/layouts/WrapLayout.java' + exclude 'com/aclauncher/graphql/**/*.java' + exclude 'com/aclauncher/gui/layouts/WrapLayout.java' newLine = false properties { year = currentYear() @@ -202,8 +202,8 @@ shadowJar { } macAppBundle { - mainClassName = 'com.atlauncher.App' - appName = 'ATLauncher' + mainClassName = 'com.aclauncher.App' + appName = 'ACLauncher' appStyle = 'universalJavaApplicationStub' runtimeConfigurationName = 'shadow' jarTask = 'shadowJar' @@ -218,7 +218,7 @@ macAppBundle { } copyToResourcesJava { - rename("ATLauncher-${project.version}.jar", "ATLauncher.jar") + rename("ACLauncher-${project.version}.jar", "ACLauncher.jar") } def currentYear() { @@ -228,9 +228,9 @@ def currentYear() { } launch4j { - outfile = "ATLauncher-${project.version}.exe" + outfile = "ACLauncher-${project.version}.exe" jreMinVersion = "${project.targetCompatibility.toString()}" - mainClassName = 'com.atlauncher.App' + mainClassName = 'com.aclauncher.App' icon = "${projectDir}/src/main/resources/assets/image/icon.ico" version = "${project.version}" textVersion = "${project.version}" @@ -290,7 +290,7 @@ task createMacApp(type: Zip) { } copyArtifacts.finalizedBy { - println 'ATLauncher has been built. Distribution files are located in the dist directory.' + println 'ACLauncher has been built. Distribution files are located in the dist directory.' } clean.doFirst { diff --git a/gradle.properties b/gradle.properties index 90e2aa73..1107d0e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -name=ATLauncher +name=ACLauncher org.gradle.jvmargs=-Xms128m -Xmx1024m diff --git a/packaging/aur/atlauncher-bin/.gitignore b/packaging/aur/aclauncher-bin/.gitignore similarity index 100% rename from packaging/aur/atlauncher-bin/.gitignore rename to packaging/aur/aclauncher-bin/.gitignore diff --git a/packaging/aur/aclauncher-bin/PKGBUILD b/packaging/aur/aclauncher-bin/PKGBUILD new file mode 100644 index 00000000..3b8746ea --- /dev/null +++ b/packaging/aur/aclauncher-bin/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer: Alan Jenkins +# Maintainer: Ryan Dowling +# Contributor: Maximilian Berger + +pkgname=aclauncher-bin +_upstreamname=ACLauncher +pkgrel=1 +pkgver=3.4.35.9 +pkgdesc="A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install +modpacks easily and quickly." +arch=('any') +url="https://zontreck.com/" +license=('GPL3') +depends=('java-runtime>=17' 'openal') +makedepends=('unzip') +provides=('aclauncher') +conflicts=('aclauncher') + +source=("aclauncher-${pkgver}-${pkgrel}.jar::https://git.zontreck.com/zontreck/ACLauncher/releases/download/v$pkgver/$_upstreamname-$pkgver.jar" + "aclauncher" + "aclauncher.desktop" + "aclauncher.png" + "aclauncher.svg") +noextract=("aclauncher-${pkgver}-${pkgrel}.jar") + +sha256sums=('636306873ab821bb63106f82111f85594f0263e867e5e86330e70fd36cc8b11e' + '9cfb56200cc85f78df173f6775ae045b43c467b4e6cce1dcc0c50d42a90b42d5' + '2e7eed9ae7174e0c94ff0a71d3735b73b6742f911033dccd6b52853d511d766c' + 'dd370888c78fdb652d656d97e4a7f7e8c90aa8d75d4f4d01d0bd32e95c327c47' + '5e8aa9b202e69296b649d8d9bcf92083a05426e9480487aeea606c2490a2c5fa') + +package() { + cd "$srcdir" + + # create folder for the main jar executable + mkdir -p "$pkgdir/usr/share/java/aclauncher/" + chmod -R 755 "$pkgdir/usr/share/java/aclauncher/" + + # create folder for other files + mkdir -p "$pkgdir/usr/share/aclauncher/Downloads" + chmod 777 "$pkgdir/usr/share/aclauncher/Downloads" + + # install shell wrapper script + install -D -m755 "$srcdir/aclauncher" "$pkgdir/usr/bin/aclauncher" + + # install jar + install -D -m644 "$srcdir/aclauncher-${pkgver}-${pkgrel}.jar" "$pkgdir/usr/share/java/aclauncher/ACLauncher.jar" + + # install desktop launcher with icon + install -D -m644 "$srcdir/aclauncher.desktop" "$pkgdir/usr/share/applications/aclauncher.desktop" + install -D -m644 "$srcdir/aclauncher.png" "$pkgdir/usr/share/pixmaps/aclauncher.png" + install -D -m644 "$srcdir/aclauncher.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/aclauncher.svg" +} diff --git a/packaging/aur/atlauncher-bin/atlauncher b/packaging/aur/aclauncher-bin/aclauncher similarity index 57% rename from packaging/aur/atlauncher-bin/atlauncher rename to packaging/aur/aclauncher-bin/aclauncher index dfcc4b3e..566d6343 100644 --- a/packaging/aur/atlauncher-bin/atlauncher +++ b/packaging/aur/aclauncher-bin/aclauncher @@ -4,9 +4,9 @@ set -euo pipefail # fix for users of special IM modules #unset XMODIFIERS GTK_IM_MODULE QT_IM_MODULE -mkdir -p "${HOME}/.local/share/atlauncher" -cd "${HOME}/.local/share/atlauncher" -cp -u /usr/share/java/atlauncher/ATLauncher.jar . +mkdir -p "${HOME}/.local/share/aclauncher" +cd "${HOME}/.local/share/aclauncher" +cp -u /usr/share/java/aclauncher/ACLauncher.jar . # disable launcher updates since we're managing updates through AUR -exec java -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -jar ATLauncher.jar --install-method=aur-bin --no-launcher-update "$@" >/dev/null +exec java -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -jar ACLauncher.jar --install-method=aur-bin --no-launcher-update "$@" >/dev/null diff --git a/packaging/aur/atlauncher/atlauncher.desktop b/packaging/aur/aclauncher-bin/aclauncher.desktop similarity index 76% rename from packaging/aur/atlauncher/atlauncher.desktop rename to packaging/aur/aclauncher-bin/aclauncher.desktop index 547d4b6c..5350e7d7 100644 --- a/packaging/aur/atlauncher/atlauncher.desktop +++ b/packaging/aur/aclauncher-bin/aclauncher.desktop @@ -1,9 +1,9 @@ [Desktop Entry] -Name=ATLauncher -GenericName=ATLauncher +Name=ACLauncher +GenericName=ACLauncher Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. -Exec=atlauncher -Icon=atlauncher +Exec=aclauncher +Icon=aclauncher Terminal=false Type=Application Categories=Game; diff --git a/packaging/aur/aclauncher-bin/aclauncher.install b/packaging/aur/aclauncher-bin/aclauncher.install new file mode 100644 index 00000000..5ae85d6e --- /dev/null +++ b/packaging/aur/aclauncher-bin/aclauncher.install @@ -0,0 +1,14 @@ +# This is a default template for a post-install scriptlet. +# Uncomment only required functions and remove any functions +# you don't need (and this header). + +## arg 1: the new package version +post_install() { + echo ">>> PACKAGES NOTES" + echo ">>> --------------" + echo ">>> This launcher requires you to login with a valid zontreck.com account to be" + echo ">>> able to install mod packs and play hackcraft." + echo ">>> --------------" +} + +# vim:set ts=2 sw=2 et: diff --git a/packaging/aur/atlauncher-bin/atlauncher.png b/packaging/aur/aclauncher-bin/aclauncher.png similarity index 100% rename from packaging/aur/atlauncher-bin/atlauncher.png rename to packaging/aur/aclauncher-bin/aclauncher.png diff --git a/packaging/aur/atlauncher-bin/atlauncher.svg b/packaging/aur/aclauncher-bin/aclauncher.svg similarity index 100% rename from packaging/aur/atlauncher-bin/atlauncher.svg rename to packaging/aur/aclauncher-bin/aclauncher.svg diff --git a/packaging/aur/atlauncher/.gitignore b/packaging/aur/aclauncher/.gitignore similarity index 100% rename from packaging/aur/atlauncher/.gitignore rename to packaging/aur/aclauncher/.gitignore diff --git a/packaging/aur/atlauncher/PKGBUILD b/packaging/aur/aclauncher/PKGBUILD similarity index 57% rename from packaging/aur/atlauncher/PKGBUILD rename to packaging/aur/aclauncher/PKGBUILD index 7c5533d6..aa2883fa 100644 --- a/packaging/aur/atlauncher/PKGBUILD +++ b/packaging/aur/aclauncher/PKGBUILD @@ -4,24 +4,24 @@ # Contributor: Cobalt Space pkgname=atlauncher -_upstreamname=ATLauncher +_upstreamname=ACLauncher pkgrel=1 pkgver=3.4.35.9 pkgdesc="A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly." arch=('any') -url="https://github.com/ATLauncher/ATLauncher" +url="https://git.zontreck.com/zontreck/ACLauncher" license=('GPL3') depends=('java-runtime>=17' 'openal') makedepends=('jdk17-openjdk') -provides=('atlauncher') -conflicts=('atlauncher-bin') +provides=('aclauncher') +conflicts=('aclauncher-bin') -source=("$_upstreamname-$pkgver.tar.gz::https://github.com/ATLauncher/ATLauncher/archive/v$pkgver.tar.gz" - "atlauncher" - "atlauncher.desktop" - "atlauncher.png" - "atlauncher.svg") +source=("$_upstreamname-$pkgver.tar.gz::https://git.zontreck.com/zontreck/ACLauncher/archive/v$pkgver.tar.gz" + "aclauncher" + "aclauncher.desktop" + "aclauncher.png" + "aclauncher.svg") sha256sums=('309cdde942b87d566975a3f488fc9e0bd96108cec4cb8fe736260d6db998d746' '5fd73a6159b9407a732f5956f58b3c9a890699fe14760c6e4f93f9876a32e635' @@ -40,21 +40,21 @@ package() { cd "$srcdir" # create folder for the main jar executable - mkdir -p "$pkgdir/usr/share/java/atlauncher/" - chmod -R 755 "$pkgdir/usr/share/java/atlauncher/" + mkdir -p "$pkgdir/usr/share/java/aclauncher/" + chmod -R 755 "$pkgdir/usr/share/java/aclauncher/" # create folder for other files - mkdir -p "$pkgdir/usr/share/atlauncher/Downloads" - chmod 777 "$pkgdir/usr/share/atlauncher/Downloads" + mkdir -p "$pkgdir/usr/share/aclauncher/Downloads" + chmod 777 "$pkgdir/usr/share/aclauncher/Downloads" # install shell wrapper script - install -D -m755 "$srcdir/atlauncher" "$pkgdir/usr/bin/atlauncher" + install -D -m755 "$srcdir/aclauncher" "$pkgdir/usr/bin/aclauncher" # install jar - install -D -m644 "$srcdir/$_upstreamname-$pkgver/dist/$_upstreamname-$pkgver.jar" "$pkgdir/usr/share/java/atlauncher/ATLauncher.jar" + install -D -m644 "$srcdir/$_upstreamname-$pkgver/dist/$_upstreamname-$pkgver.jar" "$pkgdir/usr/share/java/aclauncher/ACLauncher.jar" # install desktop launcher with icon - install -D -m644 "$srcdir/atlauncher.desktop" "$pkgdir/usr/share/applications/atlauncher.desktop" - install -D -m644 "$srcdir/atlauncher.png" "$pkgdir/usr/share/pixmaps/atlauncher.png" - install -D -m644 "$srcdir/atlauncher.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/atlauncher.svg" + install -D -m644 "$srcdir/aclauncher.desktop" "$pkgdir/usr/share/applications/aclauncher.desktop" + install -D -m644 "$srcdir/aclauncher.png" "$pkgdir/usr/share/pixmaps/aclauncher.png" + install -D -m644 "$srcdir/aclauncher.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/aclauncher.svg" } diff --git a/packaging/aur/atlauncher/atlauncher b/packaging/aur/aclauncher/aclauncher similarity index 57% rename from packaging/aur/atlauncher/atlauncher rename to packaging/aur/aclauncher/aclauncher index 30ab3d3b..fea1ef94 100644 --- a/packaging/aur/atlauncher/atlauncher +++ b/packaging/aur/aclauncher/aclauncher @@ -4,9 +4,9 @@ set -euo pipefail # fix for users of special IM modules #unset XMODIFIERS GTK_IM_MODULE QT_IM_MODULE -mkdir -p "${HOME}/.local/share/atlauncher" -cd "${HOME}/.local/share/atlauncher" -cp -u /usr/share/java/atlauncher/ATLauncher.jar . +mkdir -p "${HOME}/.local/share/aclauncher" +cd "${HOME}/.local/share/aclauncher" +cp -u /usr/share/java/aclauncher/ACLauncher.jar . # disable launcher updates since we're managing updates through AUR -exec java -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -jar ATLauncher.jar --install-method=aur --no-launcher-update "$@" >/dev/null +exec java -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -jar ACLauncher.jar --install-method=aur --no-launcher-update "$@" >/dev/null diff --git a/packaging/aur/atlauncher-bin/atlauncher.desktop b/packaging/aur/aclauncher/aclauncher.desktop similarity index 76% rename from packaging/aur/atlauncher-bin/atlauncher.desktop rename to packaging/aur/aclauncher/aclauncher.desktop index 547d4b6c..5350e7d7 100644 --- a/packaging/aur/atlauncher-bin/atlauncher.desktop +++ b/packaging/aur/aclauncher/aclauncher.desktop @@ -1,9 +1,9 @@ [Desktop Entry] -Name=ATLauncher -GenericName=ATLauncher +Name=ACLauncher +GenericName=ACLauncher Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. -Exec=atlauncher -Icon=atlauncher +Exec=aclauncher +Icon=aclauncher Terminal=false Type=Application Categories=Game; diff --git a/packaging/aur/aclauncher/aclauncher.install b/packaging/aur/aclauncher/aclauncher.install new file mode 100644 index 00000000..5ae85d6e --- /dev/null +++ b/packaging/aur/aclauncher/aclauncher.install @@ -0,0 +1,14 @@ +# This is a default template for a post-install scriptlet. +# Uncomment only required functions and remove any functions +# you don't need (and this header). + +## arg 1: the new package version +post_install() { + echo ">>> PACKAGES NOTES" + echo ">>> --------------" + echo ">>> This launcher requires you to login with a valid zontreck.com account to be" + echo ">>> able to install mod packs and play hackcraft." + echo ">>> --------------" +} + +# vim:set ts=2 sw=2 et: diff --git a/packaging/aur/atlauncher/atlauncher.png b/packaging/aur/aclauncher/aclauncher.png similarity index 100% rename from packaging/aur/atlauncher/atlauncher.png rename to packaging/aur/aclauncher/aclauncher.png diff --git a/packaging/aur/atlauncher/atlauncher.svg b/packaging/aur/aclauncher/aclauncher.svg similarity index 100% rename from packaging/aur/atlauncher/atlauncher.svg rename to packaging/aur/aclauncher/aclauncher.svg diff --git a/packaging/aur/atlauncher-bin/PKGBUILD b/packaging/aur/atlauncher-bin/PKGBUILD deleted file mode 100644 index 1590fde4..00000000 --- a/packaging/aur/atlauncher-bin/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: Alan Jenkins -# Maintainer: Ryan Dowling -# Contributor: Maximilian Berger - -pkgname=atlauncher-bin -_upstreamname=ATLauncher -pkgrel=1 -pkgver=3.4.35.9 -pkgdesc="A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install -modpacks easily and quickly." -arch=('any') -url="https://atlauncher.com/" -license=('GPL3') -depends=('java-runtime>=17' 'openal') -makedepends=('unzip') -provides=('atlauncher') -conflicts=('atlauncher') - -source=("atlauncher-${pkgver}-${pkgrel}.jar::https://github.com/ATLauncher/ATLauncher/releases/download/v$pkgver/$_upstreamname-$pkgver.jar" - "atlauncher" - "atlauncher.desktop" - "atlauncher.png" - "atlauncher.svg") -noextract=("atlauncher-${pkgver}-${pkgrel}.jar") - -sha256sums=('636306873ab821bb63106f82111f85594f0263e867e5e86330e70fd36cc8b11e' - '9cfb56200cc85f78df173f6775ae045b43c467b4e6cce1dcc0c50d42a90b42d5' - '2e7eed9ae7174e0c94ff0a71d3735b73b6742f911033dccd6b52853d511d766c' - 'dd370888c78fdb652d656d97e4a7f7e8c90aa8d75d4f4d01d0bd32e95c327c47' - '5e8aa9b202e69296b649d8d9bcf92083a05426e9480487aeea606c2490a2c5fa') - -package() { - cd "$srcdir" - - # create folder for the main jar executable - mkdir -p "$pkgdir/usr/share/java/atlauncher/" - chmod -R 755 "$pkgdir/usr/share/java/atlauncher/" - - # create folder for other files - mkdir -p "$pkgdir/usr/share/atlauncher/Downloads" - chmod 777 "$pkgdir/usr/share/atlauncher/Downloads" - - # install shell wrapper script - install -D -m755 "$srcdir/atlauncher" "$pkgdir/usr/bin/atlauncher" - - # install jar - install -D -m644 "$srcdir/atlauncher-${pkgver}-${pkgrel}.jar" "$pkgdir/usr/share/java/atlauncher/ATLauncher.jar" - - # install desktop launcher with icon - install -D -m644 "$srcdir/atlauncher.desktop" "$pkgdir/usr/share/applications/atlauncher.desktop" - install -D -m644 "$srcdir/atlauncher.png" "$pkgdir/usr/share/pixmaps/atlauncher.png" - install -D -m644 "$srcdir/atlauncher.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/atlauncher.svg" -} diff --git a/packaging/aur/atlauncher-bin/atlauncher.install b/packaging/aur/atlauncher-bin/atlauncher.install deleted file mode 100644 index 8a5f7ed2..00000000 --- a/packaging/aur/atlauncher-bin/atlauncher.install +++ /dev/null @@ -1,16 +0,0 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -post_install() { - echo ">>> PACKAGES NOTES" - echo ">>> --------------" - echo ">>> This launcher requires you to login with a valid minecraft.net account to be" - echo ">>> able to install mod packs and play minecraft." - echo ">>> To create an account, connect to https://www.minecraft.net/store/minecraft-java-edition" - echo ">>> and buy the full game. You should then be able to log in and play." - echo ">>> --------------" -} - -# vim:set ts=2 sw=2 et: diff --git a/packaging/aur/atlauncher/atlauncher.install b/packaging/aur/atlauncher/atlauncher.install deleted file mode 100644 index 8a5f7ed2..00000000 --- a/packaging/aur/atlauncher/atlauncher.install +++ /dev/null @@ -1,16 +0,0 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -post_install() { - echo ">>> PACKAGES NOTES" - echo ">>> --------------" - echo ">>> This launcher requires you to login with a valid minecraft.net account to be" - echo ">>> able to install mod packs and play minecraft." - echo ">>> To create an account, connect to https://www.minecraft.net/store/minecraft-java-edition" - echo ">>> and buy the full game. You should then be able to log in and play." - echo ">>> --------------" -} - -# vim:set ts=2 sw=2 et: diff --git a/packaging/linux/_common/atlauncher.desktop b/packaging/linux/_common/aclauncher.desktop similarity index 85% rename from packaging/linux/_common/atlauncher.desktop rename to packaging/linux/_common/aclauncher.desktop index 4e57bc21..e617d883 100644 --- a/packaging/linux/_common/atlauncher.desktop +++ b/packaging/linux/_common/aclauncher.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Categories=Game; -Exec=atlauncher -Icon=atlauncher +Exec=aclauncher +Icon=aclauncher Keywords=game;Minecraft; MimeType= -Name=ATLauncher +Name=ACLauncher Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. Path= StartupNotify=true diff --git a/packaging/linux/_common/atlauncher.metainfo.xml b/packaging/linux/_common/aclauncher.metainfo.xml similarity index 94% rename from packaging/linux/_common/atlauncher.metainfo.xml rename to packaging/linux/_common/aclauncher.metainfo.xml index 0879442a..3950e2a8 100644 --- a/packaging/linux/_common/atlauncher.metainfo.xml +++ b/packaging/linux/_common/aclauncher.metainfo.xml @@ -1,9 +1,9 @@ - atlauncher + aclauncher MIT - ATLauncher + ACLauncher A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. https://atlauncher.com/assets/images/logo.png @@ -27,18 +27,18 @@ Game - https://atlauncher.com/ + https://zontreck.com/ https://github.com/ATLauncher/ATLauncher/issues https://atlauncher.com/help https://atl.pw/discord https://translate.atlauncher.com/ https://atlauncher.com/contact-us - atlauncher.desktop + aclauncher.desktop GPL-3.0 - The ATLauncher Team + The ACLauncher Team https://atlauncher.com/assets/images/features/home.png diff --git a/packaging/linux/_common/atlauncher.png b/packaging/linux/_common/aclauncher.png similarity index 100% rename from packaging/linux/_common/atlauncher.png rename to packaging/linux/_common/aclauncher.png diff --git a/packaging/linux/_common/atlauncher.svg b/packaging/linux/_common/aclauncher.svg similarity index 100% rename from packaging/linux/_common/atlauncher.svg rename to packaging/linux/_common/aclauncher.svg diff --git a/packaging/linux/build.sh b/packaging/linux/build.sh index a184ad75..b9e5cb02 100644 --- a/packaging/linux/build.sh +++ b/packaging/linux/build.sh @@ -1,7 +1,7 @@ # Deb packaging -docker build -t atlauncher/atlauncher-packaging-linux-deb -f deb/Dockerfile . -docker run --rm -i -v $PWD/out:/work/out -w /work/out atlauncher/atlauncher-packaging-linux-deb dpkg-deb --build ../atlauncher atlauncher-1.4-1.deb +docker build -t aclauncher/aclauncher-packaging-linux-deb -f deb/Dockerfile . +docker run --rm -i -v $PWD/out:/work/out -w /work/out aclauncher/aclauncher-packaging-linux-deb dpkg-deb --build ../aclauncher aclauncher-1.4-1.deb # RPM packaging -docker build -t atlauncher/atlauncher-packaging-linux-rpm -f rpm/Dockerfile . -docker run --rm -i -v $PWD/out:/root/rpmbuild/RPMS/noarch -w /work atlauncher/atlauncher-packaging-linux-rpm rpmbuild -bb --build-in-place --target noarch atlauncher.spec +docker build -t aclauncher/aclauncher-packaging-linux-rpm -f rpm/Dockerfile . +docker run --rm -i -v $PWD/out:/root/rpmbuild/RPMS/noarch -w /work aclauncher/aclauncher-packaging-linux-rpm rpmbuild -bb --build-in-place --target noarch aclauncher.spec diff --git a/packaging/linux/deb/Dockerfile b/packaging/linux/deb/Dockerfile index 1ff72989..7410f902 100644 --- a/packaging/linux/deb/Dockerfile +++ b/packaging/linux/deb/Dockerfile @@ -2,13 +2,13 @@ FROM debian:11 LABEL maintainer="ryan.dowling@atlauncher.com" # add in all the files -ADD deb/control /work/atlauncher/DEBIAN/control -ADD deb/postrm /work/atlauncher/DEBIAN/postrm -ADD deb/atlauncher /work/atlauncher/usr/bin/atlauncher -ADD _common/atlauncher.desktop /work/atlauncher/usr/share/applications/atlauncher.desktop -ADD _common/atlauncher.metainfo.xml /work/atlauncher/usr/share/metainfo/atlauncher.metainfo.xml -ADD _common/atlauncher.png /work/atlauncher/usr/share/pixmaps/atlauncher.png -ADD _common/atlauncher.svg /work/atlauncher/usr/share/icons/hicolor/scalable/apps/atlauncher.svg +ADD deb/control /work/aclauncher/DEBIAN/control +ADD deb/postrm /work/aclauncher/DEBIAN/postrm +ADD deb/aclauncher /work/aclauncher/usr/bin/aclauncher +ADD _common/aclauncher.desktop /work/aclauncher/usr/share/applications/aclauncher.desktop +ADD _common/aclauncher.metainfo.xml /work/aclauncher/usr/share/metainfo/aclauncher.metainfo.xml +ADD _common/aclauncher.png /work/aclauncher/usr/share/pixmaps/aclauncher.png +ADD _common/aclauncher.svg /work/aclauncher/usr/share/icons/hicolor/scalable/apps/aclauncher.svg # chmod to what is needed RUN chmod -R 0755 /work diff --git a/packaging/linux/deb/atlauncher b/packaging/linux/deb/atlauncher index a75f99bf..730a6b2c 100644 --- a/packaging/linux/deb/atlauncher +++ b/packaging/linux/deb/atlauncher @@ -1,7 +1,7 @@ #!/bin/bash set -euo pipefail -INSTDIR="${XDG_DATA_HOME-$HOME/.local/share}/atlauncher" +INSTDIR="${XDG_DATA_HOME-$HOME/.local/share}/aclauncher" if [[ ! -d ${INSTDIR} ]]; then mkdir -p $INSTDIR @@ -9,8 +9,8 @@ fi cd $INSTDIR -if [[ ! -f ${INSTDIR}/ATLauncher.jar ]]; then - wget "https://download.nodecdn.net/containers/atl/ATLauncher.jar" 2>&1 +if [[ ! -f ${INSTDIR}/ACLauncher.jar ]]; then + wget "https://git.zontreck.com/zontreck/ACLauncher-binaries/raw/branch/master/ACLauncher.jar" 2>&1 fi -exec java -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -jar ATLauncher.jar --install-method=deb "$@" +exec java -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -jar ACLauncher.jar --install-method=deb "$@" diff --git a/packaging/linux/deb/control b/packaging/linux/deb/control index 7e272bf3..34b0b5e8 100644 --- a/packaging/linux/deb/control +++ b/packaging/linux/deb/control @@ -1,10 +1,10 @@ -Package: atlauncher +Package: aclauncher Version: 1.4-1 Section: games Priority: optional Architecture: all Depends: java17-runtime | java-17-runtime, wget, desktop-file-utils Installed-Size: 2220 -Maintainer: Ryan Dowling +Maintainer: Tara Piccari Description: A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. -Homepage: https://atlauncher.com +Homepage: https://zontreck.com diff --git a/packaging/linux/rpm/Dockerfile b/packaging/linux/rpm/Dockerfile index 5c3780c1..79c689a1 100644 --- a/packaging/linux/rpm/Dockerfile +++ b/packaging/linux/rpm/Dockerfile @@ -1,5 +1,5 @@ FROM fedora:37 -LABEL maintainer="ryan.dowling@atlauncher.com" +LABEL maintainer="tarapiccari@gmail.com" # install dependencies RUN dnf install -y rpmdevtools libappstream-glib desktop-file-utils \ @@ -7,12 +7,12 @@ RUN dnf install -y rpmdevtools libappstream-glib desktop-file-utils \ && rm -rf /var/cache/dnf # add in all the files -ADD rpm/atlauncher.spec /work/atlauncher.spec -ADD rpm/atlauncher /work/atlauncher -ADD _common/atlauncher.desktop /work/atlauncher.desktop -ADD _common/atlauncher.metainfo.xml /work/atlauncher.metainfo.xml -ADD _common/atlauncher.png /work/atlauncher.png -ADD _common/atlauncher.svg /work/atlauncher.svg +ADD rpm/aclauncher.spec /work/aclauncher.spec +ADD rpm/aclauncher /work/aclauncher +ADD _common/aclauncher.desktop /work/aclauncher.desktop +ADD _common/aclauncher.metainfo.xml /work/aclauncher.metainfo.xml +ADD _common/aclauncher.png /work/aclauncher.png +ADD _common/aclauncher.svg /work/aclauncher.svg # chmod to what is needed RUN chmod -R 0755 /work diff --git a/packaging/linux/rpm/aclauncher b/packaging/linux/rpm/aclauncher new file mode 100644 index 00000000..48e2bbbf --- /dev/null +++ b/packaging/linux/rpm/aclauncher @@ -0,0 +1,16 @@ +#!/bin/bash +set -euo pipefail + +INSTDIR="${XDG_DATA_HOME-$HOME/.local/share}/aclauncher" + +if [[ ! -d ${INSTDIR} ]]; then + mkdir -p $INSTDIR +fi + +cd $INSTDIR + +if [[ ! -f ${INSTDIR}/ACLauncher.jar ]]; then + wget "https://git.zontreck.com/zontreck/ACLauncher-binaries/raw/branch/master/ACLauncher.jar" 2>&1 +fi + +exec java -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -jar ACLauncher.jar --install-method=rpm "$@" diff --git a/packaging/linux/rpm/atlauncher.spec b/packaging/linux/rpm/aclauncher.spec similarity index 56% rename from packaging/linux/rpm/atlauncher.spec rename to packaging/linux/rpm/aclauncher.spec index 8c516c6d..371e3f62 100644 --- a/packaging/linux/rpm/atlauncher.spec +++ b/packaging/linux/rpm/aclauncher.spec @@ -1,10 +1,10 @@ -Name: atlauncher +Name: aclauncher Version: 1.3 Release: 1%{?dist} Summary: A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. License: GPLv3 -URL: https://atlauncher.com +URL: https://zontreck.com BuildArch: noarch @@ -14,7 +14,7 @@ BuildRequires: desktop-file-utils Requires: wget Requires: java >= 1:17 Requires: xrandr -Provides: atlauncher +Provides: aclauncher %description A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. @@ -25,31 +25,31 @@ A launcher for Minecraft which integrates multiple different modpacks to allow y %build %check -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/atlauncher.metainfo.xml -desktop-file-validate %{buildroot}/%{_datadir}/applications/atlauncher.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/aclauncher.metainfo.xml +desktop-file-validate %{buildroot}/%{_datadir}/applications/aclauncher.desktop %install mkdir -p %{buildroot}/usr/bin -install -m 0755 atlauncher %{buildroot}/usr/bin/atlauncher +install -m 0755 aclauncher %{buildroot}/usr/bin/aclauncher mkdir -p %{buildroot}/usr/share/pixmaps -install -m 0644 atlauncher.png %{buildroot}/usr/share/pixmaps/atlauncher.png +install -m 0644 aclauncher.png %{buildroot}/usr/share/pixmaps/aclauncher.png mkdir -p %{buildroot}/usr/share/icons/hicolor/scalable/apps -install -m 0644 atlauncher.svg %{buildroot}/usr/share/icons/hicolor/scalable/apps/atlauncher.svg +install -m 0644 aclauncher.svg %{buildroot}/usr/share/icons/hicolor/scalable/apps/aclauncher.svg mkdir -p %{buildroot}/%{_datadir}/applications -install -m 0644 atlauncher.desktop %{buildroot}/%{_datadir}/applications/atlauncher.desktop +install -m 0644 aclauncher.desktop %{buildroot}/%{_datadir}/applications/aclauncher.desktop mkdir -p %{buildroot}/%{_metainfodir} -install -m 0644 atlauncher.metainfo.xml %{buildroot}/%{_metainfodir}/atlauncher.metainfo.xml +install -m 0644 aclauncher.metainfo.xml %{buildroot}/%{_metainfodir}/aclauncher.metainfo.xml %files -/usr/bin/atlauncher -/usr/share/pixmaps/atlauncher.png -/usr/share/icons/hicolor/scalable/apps/atlauncher.svg -%{_datadir}/applications/atlauncher.desktop -%{_metainfodir}/atlauncher.metainfo.xml +/usr/bin/aclauncher +/usr/share/pixmaps/aclauncher.png +/usr/share/icons/hicolor/scalable/apps/aclauncher.svg +%{_datadir}/applications/aclauncher.desktop +%{_metainfodir}/aclauncher.metainfo.xml %changelog diff --git a/packaging/linux/rpm/atlauncher b/packaging/linux/rpm/atlauncher deleted file mode 100644 index 27e564a9..00000000 --- a/packaging/linux/rpm/atlauncher +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -euo pipefail - -INSTDIR="${XDG_DATA_HOME-$HOME/.local/share}/atlauncher" - -if [[ ! -d ${INSTDIR} ]]; then - mkdir -p $INSTDIR -fi - -cd $INSTDIR - -if [[ ! -f ${INSTDIR}/ATLauncher.jar ]]; then - wget "https://download.nodecdn.net/containers/atl/ATLauncher.jar" 2>&1 -fi - -exec java -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -jar ATLauncher.jar --install-method=rpm "$@" diff --git a/packaging/windows-setup/installer.iss b/packaging/windows-setup/installer.iss index ee3c2a8a..1680eeae 100644 --- a/packaging/windows-setup/installer.iss +++ b/packaging/windows-setup/installer.iss @@ -1,5 +1,5 @@ -#define MyAppName "ATLauncher" -#define MyAppURL "https://atlauncher.com" +#define MyAppName "ACLauncher" +#define MyAppURL "https://zontreck.com" #define MyAppVersion "1.2.0.0" [Setup] @@ -42,7 +42,7 @@ Source: "{tmp}\{#MyAppName}.exe"; DestDir: "{app}"; Flags: external ignoreversio Source: "{tmp}\jre.zip"; DestDir: "{tmp}"; Flags: external deleteafterinstall; Components: java [Components] -Name: "atlauncher"; Description: "ATLauncher"; ExtraDiskSpaceRequired: 20000000; Types: full compact custom; Flags: fixed +Name: "aclauncher"; Description: "ACLauncher"; ExtraDiskSpaceRequired: 20000000; Types: full compact custom; Flags: fixed Name: "java"; Description: "Install Java 17 (For ATLauncher Only)"; ExtraDiskSpaceRequired: 129016602; Types: full; Flags: disablenouninstallwarning [Languages] @@ -88,7 +88,7 @@ begin end else if CurPageID = wpReady then begin DownloadPage.Clear; - DownloadPage.Add('https://download.nodecdn.net/containers/atl/ATLauncher.exe', '{#MyAppName}.exe', ''); + DownloadPage.Add('https://git.zontreck.com/zontreck/ACLauncher-binaries/raw/branch/master/ACLauncher.exe', '{#MyAppName}.exe', ''); if WizardIsComponentSelected('java') then begin if IsWin64 then begin diff --git a/scripts/deduplicateTranslations/deduplicateTranslations.bat b/scripts/deduplicateTranslations/deduplicateTranslations.bat index 894ef761..8090c56e 100644 --- a/scripts/deduplicateTranslations/deduplicateTranslations.bat +++ b/scripts/deduplicateTranslations/deduplicateTranslations.bat @@ -1,7 +1,7 @@ copy ..\..\build\gettext\translations.pot in\translations.pot -docker build -t atlauncher/deduplicatetranslations . -FOR /F "tokens=* USEBACKQ" %%F IN (`docker create -t atlauncher/deduplicatetranslations`) DO ( +docker build -t aclauncher/deduplicatetranslations . +FOR /F "tokens=* USEBACKQ" %%F IN (`docker create -t aclauncher/deduplicatetranslations`) DO ( SET IMAGE_ID=%%F ) diff --git a/scripts/deduplicateTranslations/deduplicateTranslations.sh b/scripts/deduplicateTranslations/deduplicateTranslations.sh index d8033d0c..1af4cea8 100644 --- a/scripts/deduplicateTranslations/deduplicateTranslations.sh +++ b/scripts/deduplicateTranslations/deduplicateTranslations.sh @@ -1,6 +1,6 @@ cp ../../build/gettext/translations.pot in/translations.pot -docker build -t atlauncher/deduplicatetranslations . -IMAGE_ID=`docker create -t atlauncher/deduplicatetranslations .` +docker build -t aclauncher/deduplicatetranslations . +IMAGE_ID=`docker create -t aclauncher/deduplicatetranslations .` docker cp ${IMAGE_ID}:/deduplicateTranslations/out/translations.pot ./out/translations.pot diff --git a/scripts/processTranslations/processTranslations.bat b/scripts/processTranslations/processTranslations.bat index af6454c8..b300c834 100644 --- a/scripts/processTranslations/processTranslations.bat +++ b/scripts/processTranslations/processTranslations.bat @@ -1,5 +1,5 @@ -docker build -t atlauncher/processtranslations . -FOR /F "tokens=* USEBACKQ" %%F IN (`docker create -t atlauncher/processtranslations`) DO ( +docker build -t aclauncher/processtranslations . +FOR /F "tokens=* USEBACKQ" %%F IN (`docker create -t aclauncher/processtranslations`) DO ( SET IMAGE_ID=%%F ) diff --git a/scripts/processTranslations/processTranslations.sh b/scripts/processTranslations/processTranslations.sh index 151c4357..bd91c9f9 100644 --- a/scripts/processTranslations/processTranslations.sh +++ b/scripts/processTranslations/processTranslations.sh @@ -1,4 +1,4 @@ -docker build -t atlauncher/processtranslations . -IMAGE_ID=`docker create -t atlauncher/processtranslations .` +docker build -t aclauncher/processtranslations . +IMAGE_ID=`docker create -t aclauncher/processtranslations .` docker cp ${IMAGE_ID}:/processTranslations/out ./out