Switch to gradle-compose

.github/workflows/gradle.yml → .github/workflows/build.yml

@@ -20,22 +20,20 @@ jobs:
     steps:
       - name: checkout repository
         uses: actions/checkout@v2
-      - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
       - name: setup jdk ${{ matrix.java }}
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
       - name: make gradle wrapper executable
         if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
+        run: chmod +x ./gradlecw
       - name: build
-        run: ./gradlew build
+        run: ./gradlecw build
       - name: capture build artifacts
         if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from LTS java on one OS
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
           path: |
-            FPFabric/build/libs/
-            FPForge/build/libs/
+            FPFabric/build/libs/*
+            FPForge/build/libs/*

.github/workflows/tag.yml

@@ -0,0 +1,34 @@
+name: Create Release
+
+on: create
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        # Use these Java versions
+        java: [
+          17
+        ]
+        # and run on both Linux and Windows
+        os: [ubuntu-20.04]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v2
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: make gradle wrapper executable
+        if: ${{ runner.os != 'Windows' }}
+        run: chmod +x ./gradlecw
+      - name: build
+        run: ./gradlecw build
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            FPFabric/build/libs/*
+            FPForge/build/libs/*

.gitignore

@@ -5,6 +5,10 @@ build/
 out/
 classes/
 
+# eclipse
+
+*.launch
+
 # idea
 
 .idea/
@@ -20,8 +24,17 @@ bin/
 .classpath
 .project
 
+# macos
+
+*.DS_Store
+
 # fabric
 
 run/
-**/logs/latest.log
-logs/debug.log
+
+# compose
+
+*.gradle
+*.properties
+gradle/wrapper
+VersionShared

FPShared/src/main/java/dev/tr7zw/firstperson/FirstPersonModelCore.java → Shared/src/main/java/dev/tr7zw/firstperson/FirstPersonModelCore.java

@@ -11,7 +11,7 @@
 import com.google.gson.GsonBuilder;
 import com.mojang.blaze3d.vertex.PoseStack;
 
-import dev.tr7zw.firstperson.config.CustomConfigScreen;
+import dev.tr7zw.config.CustomConfigScreen;
 import dev.tr7zw.firstperson.config.FirstPersonSettings;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
@@ -110,6 +110,12 @@ public void save() {
                 writeSettings();
             }
 
+            @Override
+            public void reset() {
+                config = new FirstPersonSettings();
+                writeSettings();
+            }
+
         };
 
         return screen;