Make some structural changes to rename to ACLauncher

This commit is contained in:
zontreck 2024-03-15 16:31:06 -07:00
parent e859b38044
commit b74ed5cc4c
42 changed files with 243 additions and 247 deletions

View file

@ -41,7 +41,7 @@ jobs:
cache: "gradle" cache: "gradle"
- name: Run Unit Tests - name: Run Unit Tests
run: ./gradlew --no-daemon test --tests com.atlauncher.* run: ./gradlew --no-daemon test --tests com.aclauncher.*
- name: Run UI Tests - name: Run UI Tests
uses: coactions/setup-xvfb@v1 uses: coactions/setup-xvfb@v1
@ -148,7 +148,7 @@ jobs:
echo 'EOF' >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV
- name: Create ATLauncher Version - name: Create ATLauncher Version
uses: ATLauncher/release-atlauncher-action@master uses: ATLauncher/release-aclauncher-action@master
timeout-minutes: 30 timeout-minutes: 30
with: with:
api-key: ${{ secrets.ATLAUNCHER_API_KEY }} api-key: ${{ secrets.ATLAUNCHER_API_KEY }}

View file

@ -10,23 +10,23 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Publish atlauncher AUR package - name: Publish aclauncher AUR package
uses: ./.github/actions/publish-to-aur uses: ./.github/actions/publish-to-aur
with: with:
version: ${{ github.event.client_payload.version }} version: ${{ github.event.client_payload.version }}
workingDir: ./packaging/aur/atlauncher workingDir: ./packaging/aur/aclauncher
packageName: atlauncher packageName: aclauncher
aurUsername: ${{ secrets.AUR_USERNAME }} aurUsername: ${{ secrets.AUR_USERNAME }}
aurEmail: ${{ secrets.AUR_EMAIL }} aurEmail: ${{ secrets.AUR_EMAIL }}
aurSshPrivateKey: ${{ secrets.AUR_SSH_PRIVATE_KEY }} aurSshPrivateKey: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
aurCommitMessage: Update to version ${{ github.event.client_payload.version }} 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 uses: ./.github/actions/publish-to-aur
with: with:
version: ${{ github.event.client_payload.version }} version: ${{ github.event.client_payload.version }}
workingDir: ./packaging/aur/atlauncher-bin workingDir: ./packaging/aur/aclauncher-bin
packageName: atlauncher-bin packageName: aclauncher-bin
aurUsername: ${{ secrets.AUR_USERNAME }} aurUsername: ${{ secrets.AUR_USERNAME }}
aurEmail: ${{ secrets.AUR_EMAIL }} aurEmail: ${{ secrets.AUR_EMAIL }}
aurSshPrivateKey: ${{ secrets.AUR_SSH_PRIVATE_KEY }} aurSshPrivateKey: ${{ secrets.AUR_SSH_PRIVATE_KEY }}

View file

@ -4,7 +4,7 @@ on:
push: push:
branches: [master] branches: [master]
paths: paths:
- "src/main/java/com/atlauncher/**" - "src/main/java/com/aclauncher/**"
jobs: jobs:
synchronize-with-crowdin: synchronize-with-crowdin:

View file

@ -4,13 +4,13 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#JAVA_HOME" /> <option name="gradleJvm" value="17" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/legacy-launch" />
</set> </set>
</option> </option>
</GradleProjectSettings> </GradleProjectSettings>

View file

@ -1,4 +1,4 @@
# Getting support for ATLauncher # Getting support for ACLauncher
Hello there :wave:. Hello there :wave:.
@ -14,7 +14,7 @@ If you're looking for support for:
* Pack install issues * Pack install issues
Then please visit our [Discord server](https://atl.pw/discord) and post in one of the support channels, where the 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 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. correct place once triaged.
@ -27,7 +27,7 @@ If you're looking for support for:
* Pack bug reports * Pack bug reports
* Mod issues * 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. 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 Each modpack is developed by a person (or team) and they're responsible for providing support. Your first step should be

View file

@ -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 When creating tests for a class it should be placed in the '/src/test/java/' folder within it's correct package name
structure. 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 ## Filenames of tests
Tests should be named after their class name with 'Test' appended to it in the correct directory structure explained 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 @Before
public void setUp() throws Exception { public void setUp() throws Exception {
testStorage = temporaryFolder.newFolder("ATLauncherTests").toPath(); testStorage = temporaryFolder.newFolder("ACLauncherTests").toPath();
} }
``` ```

View file

@ -36,7 +36,7 @@ apply plugin: 'org.mini2Dx.gettext'
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
group = 'com.atlauncher' group = 'com.aclauncher'
version = rootProject.file('src/main/resources/version').text.trim().replace('.Beta', '') version = rootProject.file('src/main/resources/version').text.trim().replace('.Beta', '')
repositories { repositories {
@ -104,7 +104,7 @@ dependencies {
} }
application { application {
mainClass = 'com.atlauncher.App' mainClass = 'com.aclauncher.App'
applicationDefaultJvmArgs = [ applicationDefaultJvmArgs = [
"-Djna.nosys=true", "-Djna.nosys=true",
"-Djava.net.preferIPv4Stack=true", "-Djava.net.preferIPv4Stack=true",
@ -128,8 +128,8 @@ jar {
'SplashScreen-Image': '/assets/image/splash-screen.png', 'SplashScreen-Image': '/assets/image/splash-screen.png',
'Implementation-Title': project.name, 'Implementation-Title': project.name,
'Implementation-Version': archiveVersion, 'Implementation-Version': archiveVersion,
'Implementation-Vender': 'ATLauncher', 'Implementation-Vender': 'ACLauncher',
'Main-Class': 'com.atlauncher.App', 'Main-Class': 'com.aclauncher.App',
'Multi-Release': 'true' 'Multi-Release': 'true'
) )
} }
@ -140,22 +140,22 @@ apollo {
"ID" : "java.lang.String", "ID" : "java.lang.String",
"DateTime" : "java.util.Date" "DateTime" : "java.util.Date"
] ]
packageName = "com.atlauncher.graphql" packageName = "com.aclauncher.graphql"
} }
gettext { gettext {
translations { translations {
srcDir = 'src' srcDir = 'src'
include = 'main/java/com/atlauncher/**/*.java' include = 'main/java/com/aclauncher/**/*.java'
excludes = [ excludes = [
'main/java/com/atlauncher/adapter/**/*.java', 'main/java/com/aclauncher/adapter/**/*.java',
'main/java/com/atlauncher/annot/**/*.java', 'main/java/com/aclauncher/annot/**/*.java',
'main/java/com/atlauncher/collection/**/*.java', 'main/java/com/aclauncher/collection/**/*.java',
'main/java/com/atlauncher/evnt/**/*.java', 'main/java/com/aclauncher/evnt/**/*.java',
'main/java/com/atlauncher/exceptions/**/*.java', 'main/java/com/aclauncher/exceptions/**/*.java',
'main/java/com/atlauncher/interfaces/**/*.java', 'main/java/com/aclauncher/interfaces/**/*.java',
'main/java/com/atlauncher/listener/**/*.java', 'main/java/com/aclauncher/listener/**/*.java',
'main/java/com/atlauncher/utils/**/*.java' 'main/java/com/aclauncher/utils/**/*.java'
] ]
commentFormat = ' #. ' commentFormat = ' #. '
outputFilename = 'translations.pot' outputFilename = 'translations.pot'
@ -167,8 +167,8 @@ license {
include '**/*.java' include '**/*.java'
exclude 'io/github/**/*.java' exclude 'io/github/**/*.java'
exclude 'net/minecraft/**/*.java' exclude 'net/minecraft/**/*.java'
exclude 'com/atlauncher/graphql/**/*.java' exclude 'com/aclauncher/graphql/**/*.java'
exclude 'com/atlauncher/gui/layouts/WrapLayout.java' exclude 'com/aclauncher/gui/layouts/WrapLayout.java'
newLine = false newLine = false
properties { properties {
year = currentYear() year = currentYear()
@ -202,8 +202,8 @@ shadowJar {
} }
macAppBundle { macAppBundle {
mainClassName = 'com.atlauncher.App' mainClassName = 'com.aclauncher.App'
appName = 'ATLauncher' appName = 'ACLauncher'
appStyle = 'universalJavaApplicationStub' appStyle = 'universalJavaApplicationStub'
runtimeConfigurationName = 'shadow' runtimeConfigurationName = 'shadow'
jarTask = 'shadowJar' jarTask = 'shadowJar'
@ -218,7 +218,7 @@ macAppBundle {
} }
copyToResourcesJava { copyToResourcesJava {
rename("ATLauncher-${project.version}.jar", "ATLauncher.jar") rename("ACLauncher-${project.version}.jar", "ACLauncher.jar")
} }
def currentYear() { def currentYear() {
@ -228,9 +228,9 @@ def currentYear() {
} }
launch4j { launch4j {
outfile = "ATLauncher-${project.version}.exe" outfile = "ACLauncher-${project.version}.exe"
jreMinVersion = "${project.targetCompatibility.toString()}" jreMinVersion = "${project.targetCompatibility.toString()}"
mainClassName = 'com.atlauncher.App' mainClassName = 'com.aclauncher.App'
icon = "${projectDir}/src/main/resources/assets/image/icon.ico" icon = "${projectDir}/src/main/resources/assets/image/icon.ico"
version = "${project.version}" version = "${project.version}"
textVersion = "${project.version}" textVersion = "${project.version}"
@ -290,7 +290,7 @@ task createMacApp(type: Zip) {
} }
copyArtifacts.finalizedBy { 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 { clean.doFirst {

View file

@ -1,2 +1,2 @@
name=ATLauncher name=ACLauncher
org.gradle.jvmargs=-Xms128m -Xmx1024m org.gradle.jvmargs=-Xms128m -Xmx1024m

View file

@ -0,0 +1,53 @@
# Maintainer: Alan Jenkins <alan.james.jenkins at gmail dot com>
# Maintainer: Ryan Dowling <ryan at ryandowling dot me>
# Contributor: Maximilian Berger <snowdragon92 at gmail dot com>
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"
}

View file

@ -4,9 +4,9 @@ set -euo pipefail
# fix for users of special IM modules # fix for users of special IM modules
#unset XMODIFIERS GTK_IM_MODULE QT_IM_MODULE #unset XMODIFIERS GTK_IM_MODULE QT_IM_MODULE
mkdir -p "${HOME}/.local/share/atlauncher" mkdir -p "${HOME}/.local/share/aclauncher"
cd "${HOME}/.local/share/atlauncher" cd "${HOME}/.local/share/aclauncher"
cp -u /usr/share/java/atlauncher/ATLauncher.jar . cp -u /usr/share/java/aclauncher/ACLauncher.jar .
# disable launcher updates since we're managing updates through AUR # 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

View file

@ -1,9 +1,9 @@
[Desktop Entry] [Desktop Entry]
Name=ATLauncher Name=ACLauncher
GenericName=ATLauncher GenericName=ACLauncher
Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
Exec=atlauncher Exec=aclauncher
Icon=atlauncher Icon=aclauncher
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Game; Categories=Game;

View file

@ -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:

View file

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View file

Before

Width:  |  Height:  |  Size: 951 B

After

Width:  |  Height:  |  Size: 951 B

View file

@ -4,24 +4,24 @@
# Contributor: Cobalt Space <cobaltspace at protonmail dot com> # Contributor: Cobalt Space <cobaltspace at protonmail dot com>
pkgname=atlauncher pkgname=atlauncher
_upstreamname=ATLauncher _upstreamname=ACLauncher
pkgrel=1 pkgrel=1
pkgver=3.4.35.9 pkgver=3.4.35.9
pkgdesc="A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install pkgdesc="A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install
modpacks easily and quickly." modpacks easily and quickly."
arch=('any') arch=('any')
url="https://github.com/ATLauncher/ATLauncher" url="https://git.zontreck.com/zontreck/ACLauncher"
license=('GPL3') license=('GPL3')
depends=('java-runtime>=17' 'openal') depends=('java-runtime>=17' 'openal')
makedepends=('jdk17-openjdk') makedepends=('jdk17-openjdk')
provides=('atlauncher') provides=('aclauncher')
conflicts=('atlauncher-bin') conflicts=('aclauncher-bin')
source=("$_upstreamname-$pkgver.tar.gz::https://github.com/ATLauncher/ATLauncher/archive/v$pkgver.tar.gz" source=("$_upstreamname-$pkgver.tar.gz::https://git.zontreck.com/zontreck/ACLauncher/archive/v$pkgver.tar.gz"
"atlauncher" "aclauncher"
"atlauncher.desktop" "aclauncher.desktop"
"atlauncher.png" "aclauncher.png"
"atlauncher.svg") "aclauncher.svg")
sha256sums=('309cdde942b87d566975a3f488fc9e0bd96108cec4cb8fe736260d6db998d746' sha256sums=('309cdde942b87d566975a3f488fc9e0bd96108cec4cb8fe736260d6db998d746'
'5fd73a6159b9407a732f5956f58b3c9a890699fe14760c6e4f93f9876a32e635' '5fd73a6159b9407a732f5956f58b3c9a890699fe14760c6e4f93f9876a32e635'
@ -40,21 +40,21 @@ package() {
cd "$srcdir" cd "$srcdir"
# create folder for the main jar executable # create folder for the main jar executable
mkdir -p "$pkgdir/usr/share/java/atlauncher/" mkdir -p "$pkgdir/usr/share/java/aclauncher/"
chmod -R 755 "$pkgdir/usr/share/java/atlauncher/" chmod -R 755 "$pkgdir/usr/share/java/aclauncher/"
# create folder for other files # create folder for other files
mkdir -p "$pkgdir/usr/share/atlauncher/Downloads" mkdir -p "$pkgdir/usr/share/aclauncher/Downloads"
chmod 777 "$pkgdir/usr/share/atlauncher/Downloads" chmod 777 "$pkgdir/usr/share/aclauncher/Downloads"
# install shell wrapper script # 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 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 desktop launcher with icon
install -D -m644 "$srcdir/atlauncher.desktop" "$pkgdir/usr/share/applications/atlauncher.desktop" install -D -m644 "$srcdir/aclauncher.desktop" "$pkgdir/usr/share/applications/aclauncher.desktop"
install -D -m644 "$srcdir/atlauncher.png" "$pkgdir/usr/share/pixmaps/atlauncher.png" install -D -m644 "$srcdir/aclauncher.png" "$pkgdir/usr/share/pixmaps/aclauncher.png"
install -D -m644 "$srcdir/atlauncher.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/atlauncher.svg" install -D -m644 "$srcdir/aclauncher.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/aclauncher.svg"
} }

View file

@ -4,9 +4,9 @@ set -euo pipefail
# fix for users of special IM modules # fix for users of special IM modules
#unset XMODIFIERS GTK_IM_MODULE QT_IM_MODULE #unset XMODIFIERS GTK_IM_MODULE QT_IM_MODULE
mkdir -p "${HOME}/.local/share/atlauncher" mkdir -p "${HOME}/.local/share/aclauncher"
cd "${HOME}/.local/share/atlauncher" cd "${HOME}/.local/share/aclauncher"
cp -u /usr/share/java/atlauncher/ATLauncher.jar . cp -u /usr/share/java/aclauncher/ACLauncher.jar .
# disable launcher updates since we're managing updates through AUR # 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

View file

@ -1,9 +1,9 @@
[Desktop Entry] [Desktop Entry]
Name=ATLauncher Name=ACLauncher
GenericName=ATLauncher GenericName=ACLauncher
Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
Exec=atlauncher Exec=aclauncher
Icon=atlauncher Icon=aclauncher
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Game; Categories=Game;

View file

@ -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:

View file

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View file

Before

Width:  |  Height:  |  Size: 951 B

After

Width:  |  Height:  |  Size: 951 B

View file

@ -1,53 +0,0 @@
# Maintainer: Alan Jenkins <alan.james.jenkins at gmail dot com>
# Maintainer: Ryan Dowling <ryan at ryandowling dot me>
# Contributor: Maximilian Berger <snowdragon92 at gmail dot com>
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"
}

View file

@ -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:

View file

@ -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:

View file

@ -1,10 +1,10 @@
[Desktop Entry] [Desktop Entry]
Categories=Game; Categories=Game;
Exec=atlauncher Exec=aclauncher
Icon=atlauncher Icon=aclauncher
Keywords=game;Minecraft; Keywords=game;Minecraft;
MimeType= 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. Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
Path= Path=
StartupNotify=true StartupNotify=true

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html --> <!-- https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html -->
<component type="desktop"> <component type="desktop">
<id>atlauncher</id> <id>aclauncher</id>
<metadata_license>MIT</metadata_license> <metadata_license>MIT</metadata_license>
<name>ATLauncher</name> <name>ACLauncher</name>
<summary>A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.</summary> <summary>A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.</summary>
<icon type="remote" width="500" height="500">https://atlauncher.com/assets/images/logo.png</icon> <icon type="remote" width="500" height="500">https://atlauncher.com/assets/images/logo.png</icon>
<description> <description>
@ -27,18 +27,18 @@
<categories> <categories>
<category>Game</category> <category>Game</category>
</categories> </categories>
<url type="homepage">https://atlauncher.com/</url> <url type="homepage">https://zontreck.com/</url>
<url type="bugtracker">https://github.com/ATLauncher/ATLauncher/issues</url> <url type="bugtracker">https://github.com/ATLauncher/ATLauncher/issues</url>
<url type="faq">https://atlauncher.com/help</url> <url type="faq">https://atlauncher.com/help</url>
<url type="help">https://atl.pw/discord</url> <url type="help">https://atl.pw/discord</url>
<url type="translate">https://translate.atlauncher.com/</url> <url type="translate">https://translate.atlauncher.com/</url>
<url type="contact">https://atlauncher.com/contact-us</url> <url type="contact">https://atlauncher.com/contact-us</url>
<launchable type="desktop-id">atlauncher.desktop</launchable> <launchable type="desktop-id">aclauncher.desktop</launchable>
<releases> <releases>
<release date="2021-02-01" version="1"/> <release date="2021-02-01" version="1"/>
</releases> </releases>
<project_license>GPL-3.0</project_license> <project_license>GPL-3.0</project_license>
<developer_name>The ATLauncher Team</developer_name> <developer_name>The ACLauncher Team</developer_name>
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<image type="source" width="1186" height="693">https://atlauncher.com/assets/images/features/home.png</image> <image type="source" width="1186" height="693">https://atlauncher.com/assets/images/features/home.png</image>

View file

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View file

Before

Width:  |  Height:  |  Size: 951 B

After

Width:  |  Height:  |  Size: 951 B

View file

@ -1,7 +1,7 @@
# Deb packaging # Deb packaging
docker build -t atlauncher/atlauncher-packaging-linux-deb -f deb/Dockerfile . docker build -t aclauncher/aclauncher-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 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 # RPM packaging
docker build -t atlauncher/atlauncher-packaging-linux-rpm -f rpm/Dockerfile . docker build -t aclauncher/aclauncher-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 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

View file

@ -2,13 +2,13 @@ FROM debian:11
LABEL maintainer="ryan.dowling@atlauncher.com" LABEL maintainer="ryan.dowling@atlauncher.com"
# add in all the files # add in all the files
ADD deb/control /work/atlauncher/DEBIAN/control ADD deb/control /work/aclauncher/DEBIAN/control
ADD deb/postrm /work/atlauncher/DEBIAN/postrm ADD deb/postrm /work/aclauncher/DEBIAN/postrm
ADD deb/atlauncher /work/atlauncher/usr/bin/atlauncher ADD deb/aclauncher /work/aclauncher/usr/bin/aclauncher
ADD _common/atlauncher.desktop /work/atlauncher/usr/share/applications/atlauncher.desktop ADD _common/aclauncher.desktop /work/aclauncher/usr/share/applications/aclauncher.desktop
ADD _common/atlauncher.metainfo.xml /work/atlauncher/usr/share/metainfo/atlauncher.metainfo.xml ADD _common/aclauncher.metainfo.xml /work/aclauncher/usr/share/metainfo/aclauncher.metainfo.xml
ADD _common/atlauncher.png /work/atlauncher/usr/share/pixmaps/atlauncher.png ADD _common/aclauncher.png /work/aclauncher/usr/share/pixmaps/aclauncher.png
ADD _common/atlauncher.svg /work/atlauncher/usr/share/icons/hicolor/scalable/apps/atlauncher.svg ADD _common/aclauncher.svg /work/aclauncher/usr/share/icons/hicolor/scalable/apps/aclauncher.svg
# chmod to what is needed # chmod to what is needed
RUN chmod -R 0755 /work RUN chmod -R 0755 /work

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
INSTDIR="${XDG_DATA_HOME-$HOME/.local/share}/atlauncher" INSTDIR="${XDG_DATA_HOME-$HOME/.local/share}/aclauncher"
if [[ ! -d ${INSTDIR} ]]; then if [[ ! -d ${INSTDIR} ]]; then
mkdir -p $INSTDIR mkdir -p $INSTDIR
@ -9,8 +9,8 @@ fi
cd $INSTDIR cd $INSTDIR
if [[ ! -f ${INSTDIR}/ATLauncher.jar ]]; then if [[ ! -f ${INSTDIR}/ACLauncher.jar ]]; then
wget "https://download.nodecdn.net/containers/atl/ATLauncher.jar" 2>&1 wget "https://git.zontreck.com/zontreck/ACLauncher-binaries/raw/branch/master/ACLauncher.jar" 2>&1
fi 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 "$@"

View file

@ -1,10 +1,10 @@
Package: atlauncher Package: aclauncher
Version: 1.4-1 Version: 1.4-1
Section: games Section: games
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: java17-runtime | java-17-runtime, wget, desktop-file-utils Depends: java17-runtime | java-17-runtime, wget, desktop-file-utils
Installed-Size: 2220 Installed-Size: 2220
Maintainer: Ryan Dowling <ryan.dowling@atlauncher.com> Maintainer: Tara Piccari <tarapiccari@gmail.com>
Description: A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. 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

View file

@ -1,5 +1,5 @@
FROM fedora:37 FROM fedora:37
LABEL maintainer="ryan.dowling@atlauncher.com" LABEL maintainer="tarapiccari@gmail.com"
# install dependencies # install dependencies
RUN dnf install -y rpmdevtools libappstream-glib desktop-file-utils \ 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 && rm -rf /var/cache/dnf
# add in all the files # add in all the files
ADD rpm/atlauncher.spec /work/atlauncher.spec ADD rpm/aclauncher.spec /work/aclauncher.spec
ADD rpm/atlauncher /work/atlauncher ADD rpm/aclauncher /work/aclauncher
ADD _common/atlauncher.desktop /work/atlauncher.desktop ADD _common/aclauncher.desktop /work/aclauncher.desktop
ADD _common/atlauncher.metainfo.xml /work/atlauncher.metainfo.xml ADD _common/aclauncher.metainfo.xml /work/aclauncher.metainfo.xml
ADD _common/atlauncher.png /work/atlauncher.png ADD _common/aclauncher.png /work/aclauncher.png
ADD _common/atlauncher.svg /work/atlauncher.svg ADD _common/aclauncher.svg /work/aclauncher.svg
# chmod to what is needed # chmod to what is needed
RUN chmod -R 0755 /work RUN chmod -R 0755 /work

View file

@ -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 "$@"

View file

@ -1,10 +1,10 @@
Name: atlauncher Name: aclauncher
Version: 1.3 Version: 1.3
Release: 1%{?dist} Release: 1%{?dist}
Summary: A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. Summary: A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
License: GPLv3 License: GPLv3
URL: https://atlauncher.com URL: https://zontreck.com
BuildArch: noarch BuildArch: noarch
@ -14,7 +14,7 @@ BuildRequires: desktop-file-utils
Requires: wget Requires: wget
Requires: java >= 1:17 Requires: java >= 1:17
Requires: xrandr Requires: xrandr
Provides: atlauncher Provides: aclauncher
%description %description
A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly. 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 %build
%check %check
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/atlauncher.metainfo.xml appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/aclauncher.metainfo.xml
desktop-file-validate %{buildroot}/%{_datadir}/applications/atlauncher.desktop desktop-file-validate %{buildroot}/%{_datadir}/applications/aclauncher.desktop
%install %install
mkdir -p %{buildroot}/usr/bin 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 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 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 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} 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 %files
/usr/bin/atlauncher /usr/bin/aclauncher
/usr/share/pixmaps/atlauncher.png /usr/share/pixmaps/aclauncher.png
/usr/share/icons/hicolor/scalable/apps/atlauncher.svg /usr/share/icons/hicolor/scalable/apps/aclauncher.svg
%{_datadir}/applications/atlauncher.desktop %{_datadir}/applications/aclauncher.desktop
%{_metainfodir}/atlauncher.metainfo.xml %{_metainfodir}/aclauncher.metainfo.xml
%changelog %changelog

View file

@ -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 "$@"

View file

@ -1,5 +1,5 @@
#define MyAppName "ATLauncher" #define MyAppName "ACLauncher"
#define MyAppURL "https://atlauncher.com" #define MyAppURL "https://zontreck.com"
#define MyAppVersion "1.2.0.0" #define MyAppVersion "1.2.0.0"
[Setup] [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 Source: "{tmp}\jre.zip"; DestDir: "{tmp}"; Flags: external deleteafterinstall; Components: java
[Components] [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 Name: "java"; Description: "Install Java 17 (For ATLauncher Only)"; ExtraDiskSpaceRequired: 129016602; Types: full; Flags: disablenouninstallwarning
[Languages] [Languages]
@ -88,7 +88,7 @@ begin
end else if CurPageID = wpReady then begin end else if CurPageID = wpReady then begin
DownloadPage.Clear; 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 WizardIsComponentSelected('java') then begin
if IsWin64 then begin if IsWin64 then begin

View file

@ -1,7 +1,7 @@
copy ..\..\build\gettext\translations.pot in\translations.pot copy ..\..\build\gettext\translations.pot in\translations.pot
docker build -t atlauncher/deduplicatetranslations . docker build -t aclauncher/deduplicatetranslations .
FOR /F "tokens=* USEBACKQ" %%F IN (`docker create -t atlauncher/deduplicatetranslations`) DO ( FOR /F "tokens=* USEBACKQ" %%F IN (`docker create -t aclauncher/deduplicatetranslations`) DO (
SET IMAGE_ID=%%F SET IMAGE_ID=%%F
) )

View file

@ -1,6 +1,6 @@
cp ../../build/gettext/translations.pot in/translations.pot cp ../../build/gettext/translations.pot in/translations.pot
docker build -t atlauncher/deduplicatetranslations . docker build -t aclauncher/deduplicatetranslations .
IMAGE_ID=`docker create -t atlauncher/deduplicatetranslations .` IMAGE_ID=`docker create -t aclauncher/deduplicatetranslations .`
docker cp ${IMAGE_ID}:/deduplicateTranslations/out/translations.pot ./out/translations.pot docker cp ${IMAGE_ID}:/deduplicateTranslations/out/translations.pot ./out/translations.pot

View file

@ -1,5 +1,5 @@
docker build -t atlauncher/processtranslations . docker build -t aclauncher/processtranslations .
FOR /F "tokens=* USEBACKQ" %%F IN (`docker create -t atlauncher/processtranslations`) DO ( FOR /F "tokens=* USEBACKQ" %%F IN (`docker create -t aclauncher/processtranslations`) DO (
SET IMAGE_ID=%%F SET IMAGE_ID=%%F
) )

View file

@ -1,4 +1,4 @@
docker build -t atlauncher/processtranslations . docker build -t aclauncher/processtranslations .
IMAGE_ID=`docker create -t atlauncher/processtranslations .` IMAGE_ID=`docker create -t aclauncher/processtranslations .`
docker cp ${IMAGE_ID}:/processTranslations/out ./out docker cp ${IMAGE_ID}:/processTranslations/out ./out