diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a267287..e49414c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,10 @@
 name: Java CI
 
-on: [push]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
 
 jobs:
   buildJar:
@@ -14,9 +18,17 @@ jobs:
         java-version: 17
     - name: Set up PATH
       run: |
+        ls "${ANDROID_HOME}/build-tools/34.0.0"
         echo "${ANDROID_HOME}/build-tools/34.0.0" >> $GITHUB_PATH
+        echo "Updated PATH: $PATH"
+    - name: General information
+      run: |
+        java --version
+        d8 --version
     - name: Build mod jar
-      run: ./gradlew deploy
+      run: |
+        chmod +x gradlew
+        ./gradlew deploy
     - name: Upload built jar file
       uses: actions/upload-artifact@v4
       with:
diff --git a/build.gradle b/build.gradle
index 6b387b2..4b69fef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,12 +74,12 @@ tasks.register('jarAndroid') {
 
         //dex and desugar files - this requires d8 in your PATH
         "$d8 $dependencies --min-api 14 --output ${project.archivesBaseName}Android.jar ${project.archivesBaseName}Desktop.jar"
-                .execute(null, new File("$project.rootProject.layout.buildDirectory/libs")).waitForProcessOutput(System.out, System.err)
+                .execute(null, new File("${layout.buildDirectory.get()}/libs")).waitForProcessOutput(System.out, System.err)
     }
 }
 
 jar{
-    archiveFileName = "${project.rootProject.layout.buildDirectory}Desktop.jar"
+    archiveFileName = "${project.archivesBaseName}Desktop.jar"
 
     from{
         configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) }
@@ -99,10 +99,10 @@ tasks.register('deploy', Jar) {
     dependsOn jar
     archiveFileName = "${project.archivesBaseName}.jar"
 
-    from { [zipTree("$rootProject.layout.buildDirectory/libs/${project.archivesBaseName}Desktop.jar"), zipTree("$rootProject.layout.buildDirectory/libs/${project.archivesBaseName}Android.jar")] }
+    from { [zipTree("${layout.buildDirectory.get()}/libs/${project.archivesBaseName}Desktop.jar"), zipTree("${layout.buildDirectory.get()}/libs/${project.archivesBaseName}Android.jar")] }
 
     doLast {
-        delete { delete "$rootProject.layout.buildDirectory/libs/${project.archivesBaseName}Desktop.jar" }
-        delete { delete "$rootProject.layout.buildDirectory/libs/${project.archivesBaseName}Android.jar" }
+        delete { delete "${layout.buildDirectory.get()}/libs/${project.archivesBaseName}Desktop.jar" }
+        delete { delete "${layout.buildDirectory.get()}/libs/${project.archivesBaseName}Android.jar" }
     }
 }