diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index a73b627..62008db 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -1,33 +1,47 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+# Build Workflow
 
-name: Java CI with Gradle
+name: Build with Gradle
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
-    branches: [ main ]
+  workflow_dispatch:
+  push:
+
+concurrency:
+  group: ${{ github.head_ref || format('{0}-{1}', github.ref, github.run_number) }}
+  cancel-in-progress: true
 
 jobs:
   build:
+    name: Build
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '8'
-          distribution: 'adopt'
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-      - name: Setup Forge Workspace
-        run: ./gradlew setupCIWorkspace
-      - name: Build with Gradle
-        run: ./gradlew build
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.2.3
+          java-version: 21
+          distribution: temurin
+
+      - uses: actions/cache@v4
         with:
-          path: ./build/libs/
\ No newline at end of file
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            **/loom-cache
+            **/prebundled-jars
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Chmod Gradle
+        run: chmod +x ./gradlew
+
+      - name: Build
+        run: ./gradlew build --no-daemon
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index aa1ace6..63f1b03 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,8 +17,8 @@ plugins {
 
 toolkitLoomHelper {
     useOneConfig {
-        version = "1.0.0-alpha.47"
-        loaderVersion = "1.1.0-alpha.34"
+        version = "1.0.0-alpha.49"
+        loaderVersion = "1.1.0-alpha.35"
 
         usePolyMixin = true
         polyMixinVersion = "0.8.4+build.2"
diff --git a/root.gradle.kts b/root.gradle.kts
index 24bbe32..64b87aa 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -17,4 +17,6 @@ preprocess {
             }
         }
     }
+
+    strictExtraMappings.set(true)
 }