.github/workflows/tag.yml

@@ -391,21 +391,59 @@ jobs:
           name: ${{github.ref_name}}-1.20.4 - Fabric
           files: 'versions/1.20.4-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
           game-versions: 1.20.4
-      - name: Publish-1.20.5-fabric-Curseforge
+      - name: Publish-1.20.6-forge-Curseforge
+        uses: Kir-Antipov/mc-publish@v3.3.0
+        with:
+          curseforge-id: 433760
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: forge
+          name: ${{github.ref_name}}-1.20.6 - Forge
+          version-type: beta
+          files: 'versions/1.20.6-forge/build/libs/!(*-@(dev|sources|javadoc)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-forge-Modrinth
+        uses: Kir-Antipov/mc-publish@v3.3.0
+        with:
+          modrinth-id: MPCX6s5C
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: forge
+          name: ${{github.ref_name}}-1.20.6 - Forge
+          files: 'versions/1.20.6-forge/build/libs/!(*-@(dev|sources|javadoc)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-neoforge-Curseforge
+        uses: Kir-Antipov/mc-publish@v3.3.0
+        with:
+          curseforge-id: 433760
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: neoforge
+          name: ${{github.ref_name}}-1.20.6 - NeoForge
+          version-type: beta
+          files: 'versions/1.20.6-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-neoforge-Modrinth
+        uses: Kir-Antipov/mc-publish@v3.3.0
+        with:
+          modrinth-id: MPCX6s5C
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          loaders: neoforge
+          name: ${{github.ref_name}}-1.20.6 - NeoForge
+          files: 'versions/1.20.6-neoforge/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-fabric-Curseforge
         uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           curseforge-id: 433760
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
           loaders: fabric
-          name: ${{github.ref_name}}-1.20.5 - Fabric
-          files: 'versions/1.20.5-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
-          game-versions: 1.20.5
-      - name: Publish-1.20.5-fabric-Modrinth
+          name: ${{github.ref_name}}-1.20.6 - Fabric
+          files: 'versions/1.20.6-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-fabric-Modrinth
         uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: MPCX6s5C
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
           loaders: fabric
-          name: ${{github.ref_name}}-1.20.5 - Fabric
-          files: 'versions/1.20.5-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
-          game-versions: 1.20.5
+          name: ${{github.ref_name}}-1.20.6 - Fabric
+          files: 'versions/1.20.6-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6

.gitignore

@@ -50,3 +50,4 @@ 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
+src/main/neoforge-resources/META-INF/neoforge.mods.toml

gradle-compose.yml

@@ -3,7 +3,7 @@ source: "https://github.com/tr7zw/ProcessedModTemplate/tree/master"
 replacements:
   name: "NotEnoughAnimations"
   id: "notenoughanimations"
-  version: "1.7.2"
+  version: "1.7.3"
   description: "Adding and improving animations in Third-Person."
   homepageUrl: "https://modrinth.com/mod/not-enough-animations"
   sourcesUrl: "https://github.com/tr7zw/NotEnoughAnimations"

settings.json

@@ -20,6 +20,8 @@
         "1.20.4-forge",
         "1.20.4-neoforge",
         "1.20.4-fabric",
-        "1.20.5-fabric"
+        "1.20.6-forge",
+        "1.20.6-neoforge",
+        "1.20.6-fabric"
     ]
 }

src/main/java/dev/tr7zw/notenoughanimations/NEAnimationsMod.java

@@ -22,9 +22,13 @@ public void onInitializeClient() {
 //$$ import net.minecraftforge.event.TickEvent.Type;
 //#elseif NEOFORGE
 //$$ import net.neoforged.fml.LogicalSide;
+//#if MC < 12005
 //$$ import net.neoforged.neoforge.event.TickEvent.PlayerTickEvent;
 //$$ import net.neoforged.neoforge.event.TickEvent.Phase;
 //$$ import net.neoforged.neoforge.event.TickEvent.Type;
+//#else
+//$$ import net.neoforged.neoforge.event.tick.PlayerTickEvent;
+//#endif
 //#endif
 //$$ import net.minecraft.client.Minecraft;
 //$$ import dev.tr7zw.util.ModLoaderUtil;
@@ -36,8 +40,13 @@ public void onInitializeClient() {
 //$$ ModLoaderUtil.registerForgeEvent(this::doClientTick);
 //$$ }
 //$$
+//#if MC >= 12005 && NEOFORGE
+//$$ private void doClientTick(PlayerTickEvent.Pre event) {
+//$$ if(event.getEntity() == Minecraft.getInstance().player && event.getEntity().level().isClientSide())
+//#else
 //$$ private void doClientTick(PlayerTickEvent event) {
 //$$ if(event.type == Type.PLAYER && event.player == Minecraft.getInstance().player && event.side == LogicalSide.CLIENT && event.phase == Phase.START)
+//#endif
 //$$ this.clientTick();
 //$$ }
 //$$

src/main/java/dev/tr7zw/notenoughanimations/logic/HeldItemHandler.java

@@ -230,21 +230,21 @@ private void renderText(LivingEntity entity, PoseStack matrices, ItemStack itemS
 //        }
     }
 
-    private BookAccess fromItem(ItemStack itemStack) {
-        // spotless:off
-    	//#if MC >= 11700
-        //$$ if (itemStack.is(Items.WRITTEN_BOOK))
-        //$$    return new BookViewScreen.WrittenBookAccess(itemStack);
-        //$$ if (itemStack.is(Items.WRITABLE_BOOK))
-        //$$    return new BookViewScreen.WritableBookAccess(itemStack);
-	//$$	//#else
-        //$$ if (itemStack.getItem() == (Items.WRITTEN_BOOK))
-        //$$     return new BookViewScreen.WrittenBookAccess(itemStack);
-        //$$ if (itemStack.getItem() == (Items.WRITABLE_BOOK))
-        //$$     return new BookViewScreen.WritableBookAccess(itemStack);
-		//#endif
-		//spotless:on
-        return BookViewScreen.EMPTY_ACCESS;
-    }
+//    private BookAccess fromItem(ItemStack itemStack) {
+//        // spotless:off
+//    	//#if MC >= 11700
+//        //$$ if (itemStack.is(Items.WRITTEN_BOOK))
+//        //$$    return new BookViewScreen.WrittenBookAccess(itemStack);
+//        //$$ if (itemStack.is(Items.WRITABLE_BOOK))
+//        //$$    return new BookViewScreen.WritableBookAccess(itemStack);
+//	//$$	//#else
+//        //$$ if (itemStack.getItem() == (Items.WRITTEN_BOOK))
+//        //$$     return new BookViewScreen.WrittenBookAccess(itemStack);
+//        //$$ if (itemStack.getItem() == (Items.WRITABLE_BOOK))
+//        //$$     return new BookViewScreen.WritableBookAccess(itemStack);
+//		//#endif
+//		//spotless:on
+//        return BookViewScreen.EMPTY_ACCESS;
+//    }
 
 }

versions/mainProject

@@ -1 +1 @@
-1.20.5-fabric
+1.20.6-fabric