Update compose, mc-publish, missing gitignore line

tr7zw · Jan 16, 2024 · 3fe5520 · 3fe5520
1 parent f7c0d2f
commit 3fe5520
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 44 deletions.
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           files: 'versions/**/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
       - name: Publish-1.16.5-forge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -31,7 +31,7 @@ jobs:
           files: 'versions/1.16.5-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.16.5
       - name: Publish-1.16.5-forge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -40,7 +40,7 @@ jobs:
           files: 'versions/1.16.5-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.16.5
       - name: Publish-1.16.5-fabric-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -49,7 +49,7 @@ jobs:
           files: 'versions/1.16.5-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.16.5
       - name: Publish-1.16.5-fabric-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -58,7 +58,7 @@ jobs:
           files: 'versions/1.16.5-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.16.5
       - name: Publish-1.17.1-forge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -68,7 +68,7 @@ jobs:
           files: 'versions/1.17.1-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.17.1
       - name: Publish-1.17.1-forge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -77,7 +77,7 @@ jobs:
           files: 'versions/1.17.1-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.17.1
       - name: Publish-1.17.1-fabric-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -86,7 +86,7 @@ jobs:
           files: 'versions/1.17.1-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.17.1
       - name: Publish-1.17.1-fabric-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -95,7 +95,7 @@ jobs:
           files: 'versions/1.17.1-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.17.1
       - name: Publish-1.18.2-forge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -105,7 +105,7 @@ jobs:
           files: 'versions/1.18.2-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.18.2
       - name: Publish-1.18.2-forge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -114,7 +114,7 @@ jobs:
           files: 'versions/1.18.2-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.18.2
       - name: Publish-1.18.2-fabric-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -123,7 +123,7 @@ jobs:
           files: 'versions/1.18.2-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.18.2
       - name: Publish-1.18.2-fabric-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -132,7 +132,7 @@ jobs:
           files: 'versions/1.18.2-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.18.2
       - name: Publish-1.19.2-forge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -142,7 +142,7 @@ jobs:
           files: 'versions/1.19.2-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.2
       - name: Publish-1.19.2-forge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -151,7 +151,7 @@ jobs:
           files: 'versions/1.19.2-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.2
       - name: Publish-1.19.2-fabric-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -160,7 +160,7 @@ jobs:
           files: 'versions/1.19.2-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.2
       - name: Publish-1.19.2-fabric-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -169,7 +169,7 @@ jobs:
           files: 'versions/1.19.2-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.2
       - name: Publish-1.19.3-forge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -179,7 +179,7 @@ jobs:
           files: 'versions/1.19.3-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.3
       - name: Publish-1.19.3-forge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -188,7 +188,7 @@ jobs:
           files: 'versions/1.19.3-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.3
       - name: Publish-1.19.3-fabric-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -197,7 +197,7 @@ jobs:
           files: 'versions/1.19.3-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.3
       - name: Publish-1.19.3-fabric-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -206,7 +206,7 @@ jobs:
           files: 'versions/1.19.3-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.3
       - name: Publish-1.19.4-forge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -216,7 +216,7 @@ jobs:
           files: 'versions/1.19.4-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.4
       - name: Publish-1.19.4-forge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -225,7 +225,7 @@ jobs:
           files: 'versions/1.19.4-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.4
       - name: Publish-1.19.4-fabric-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -234,7 +234,7 @@ jobs:
           files: 'versions/1.19.4-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.4
       - name: Publish-1.19.4-fabric-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -243,7 +243,7 @@ jobs:
           files: 'versions/1.19.4-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.19.4
       - name: Publish-1.20.1-forge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -253,7 +253,7 @@ jobs:
           files: 'versions/1.20.1-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.1
       - name: Publish-1.20.1-forge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -262,7 +262,7 @@ jobs:
           files: 'versions/1.20.1-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.1
       - name: Publish-1.20.1-fabric-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -271,7 +271,7 @@ jobs:
           files: 'versions/1.20.1-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.1
       - name: Publish-1.20.1-fabric-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -280,7 +280,7 @@ jobs:
           files: 'versions/1.20.1-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.1
       - name: Publish-1.20.2-forge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -290,7 +290,7 @@ jobs:
           files: 'versions/1.20.2-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.2
       - name: Publish-1.20.2-forge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -299,7 +299,7 @@ jobs:
           files: 'versions/1.20.2-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.2
       - name: Publish-1.20.2-neoforge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -309,7 +309,7 @@ jobs:
           files: 'versions/1.20.2-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.2
       - name: Publish-1.20.2-neoforge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -318,7 +318,7 @@ jobs:
           files: 'versions/1.20.2-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.2
       - name: Publish-1.20.2-fabric-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -327,7 +327,7 @@ jobs:
           files: 'versions/1.20.2-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.2
       - name: Publish-1.20.2-fabric-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -336,7 +336,7 @@ jobs:
           files: 'versions/1.20.2-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.2
       - name: Publish-1.20.4-forge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -346,7 +346,7 @@ jobs:
           files: 'versions/1.20.4-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.4
       - name: Publish-1.20.4-forge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -355,7 +355,7 @@ jobs:
           files: 'versions/1.20.4-forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.4
       - name: Publish-1.20.4-neoforge-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -365,7 +365,7 @@ jobs:
           files: 'versions/1.20.4-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.4
       - name: Publish-1.20.4-neoforge-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
@@ -374,7 +374,7 @@ jobs:
           files: 'versions/1.20.4-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.4
       - name: Publish-1.20.4-fabric-Curseforge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
@@ -383,7 +383,7 @@ jobs:
           files: 'versions/1.20.4-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.4
       - name: Publish-1.20.4-fabric-Modrinth
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,4 @@ src/main/neoforge-resources/META-INF/mods.toml
 src/main/resources/pack.mcmeta
 src/main/java/dev/tr7zw/notenoughanimations/NEAnimationsMod.java
 src/main/java/dev/tr7zw/util/NMSHelper.java
+src/main/java/dev/tr7zw/util/ModLoaderUtil.java
diff --git a/gradle/gradle-compose.jar b/gradle/gradle-compose.jar
diff --git a/src/main/java/dev/tr7zw/notenoughanimations/NEAnimationsLoader.java b/src/main/java/dev/tr7zw/notenoughanimations/NEAnimationsLoader.java
@@ -22,11 +22,11 @@ public abstract class NEAnimationsLoader extends NEABaseMod {
 
     protected NEAnimationsLoader() {
         INSTANCE = this;
-    	ModLoaderUtil.disableDisplayTest();
-    	ModLoaderUtil.registerConfigScreen(ConfigScreenProvider::createConfigScreen);
-    	ModLoaderUtil.registerClientSetupListener(this::onEnable);
+        ModLoaderUtil.disableDisplayTest();
+        ModLoaderUtil.registerConfigScreen(ConfigScreenProvider::createConfigScreen);
+        ModLoaderUtil.registerClientSetupListener(this::onEnable);
     }
-    
+
     public void onEnable() {
         if (settingsFile.exists()) {
             try {