Merge pull request #173 from tr7zw/WIP/allinone

All in one merge
tr7zw · Jan 3, 2024 · af62e30 · af62e30
2 parents 2ddf4fb + ef1c9ca
commit af62e30
Show file tree

Hide file tree

Showing 77 changed files with 1,234 additions and 569 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,23 +20,21 @@ jobs:
         with:
           cache-read-only: false
           gradle-home-cache-cleanup: true
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlecw
+# Already needs to be executable, so the dirty check is correct
+#      - name: make gradle wrapper executable
+#        if: ${{ runner.os != 'Windows' }}
+#        run: chmod +x ./gradlecw
       - name: build
         run: ./gradlecw build
       - name: capture build artifacts
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
-          path: |
-            NEAFabric/build/libs/*
-            NEAForge/build/libs/*
-            NEAVersionless/build/libs/*
-      - name: Test Report
-        uses: dorny/test-reporter@v1
-        if: success() || failure()
-        with:
-          name: JUnit Tests
-          path: '**/build/test-results/test/TEST-*.xml'
-          reporter: java-junit        
+          path: 'versions/**/build/libs/*.jar'
+#      - name: Test Report
+#        uses: dorny/test-reporter@v1
+#        if: success() || failure()
+#        with:
+#          name: JUnit Tests
+#          path: '**/build/test-results/test/TEST-*.xml'
+#          reporter: java-junit        
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,9 @@ gradle/wrapper
 VersionShared
 UtilityCode
 formatter.xml
+src/main/fabric-resources/fabric.mod.json
+src/main/forge-resources/META-INF/mods.toml
+src/main/neoforge-resources/META-INF/mods.toml
+**/src/main/java/dev/tr7zw/config/CustomConfigScreen.java
+**/src/main/java/dev/tr7zw/util/ComponentProvider.java
+src/main/resources/pack.mcmeta
diff --git a/NEAFabric/src/main/java/dev/tr7zw/notenoughanimations/NEAnimationsMod.java b/NEAFabric/src/main/java/dev/tr7zw/notenoughanimations/NEAnimationsMod.java
diff --git a/NEAFabric/src/main/resources/fabric.mod.json b/NEAFabric/src/main/resources/fabric.mod.json
diff --git a/NEAFabric/src/test/java/dev/tr7zw/tests/MixinTests.java b/NEAFabric/src/test/java/dev/tr7zw/tests/MixinTests.java
diff --git a/NEAFabric/src/test/java/dev/tr7zw/tests/TestUtil.java b/NEAFabric/src/test/java/dev/tr7zw/tests/TestUtil.java
diff --git a/NEAForge/src/main/java/dev/tr7zw/notenoughanimations/NEAnimationsModForge.java b/NEAForge/src/main/java/dev/tr7zw/notenoughanimations/NEAnimationsModForge.java
diff --git a/NEAForge/src/main/resources/META-INF/mods.toml b/NEAForge/src/main/resources/META-INF/mods.toml
diff --git a/NEAForge/src/main/resources/pack.mcmeta b/NEAForge/src/main/resources/pack.mcmeta
diff --git a/NEAVersionless/src/main/java/dev/tr7zw/notenoughanimations/versionless/config/Config.java b/NEAVersionless/src/main/java/dev/tr7zw/notenoughanimations/versionless/config/Config.java
@@ -10,8 +10,8 @@
 
 public class Config {
 
-    public int configVersion = 9;
-    public float animationSmoothingSpeed = 20f;
+    public int configVersion = 10;
+    public float animationSmoothingSpeed = 0.5f;
     public Set<String> holdingItems = new HashSet<>(
             Arrays.asList("minecraft:clock", "minecraft:compass", "minecraft:torch", "minecraft:lantern",
                     "minecraft:soul_torch", "minecraft:soul_lantern", "minecraft:recovery_compass"));