Add soft compatibility with Spell Engine, disable idle animation whil…

…e casting spells
ZsoltMolnarrr · Nov 1, 2023 · 72a7853 · 72a7853
1 parent 21386d9
commit 72a7853
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.8.2
+
+- Add soft compatibility with Spell Engine, disable idle animation while casting spells
+
 # 1.8.1
 
 - (Forge) fix hand swap deleting offhand item, when holding two handed items.

diff --git a/common/src/main/java/net/bettercombat/Platform.java b/common/src/main/java/net/bettercombat/Platform.java
@@ -1,6 +1,7 @@
 package net.bettercombat;
 
 import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.entity.player.PlayerEntity;
 
 public class Platform {
     public static final boolean Fabric;
@@ -23,4 +24,7 @@ protected static Type getPlatformType() {
     public static boolean isModLoaded(String modid) {
         throw new AssertionError();
     }
+
+    @ExpectPlatform
+    public static boolean isCastingSpell(PlayerEntity player) { throw new AssertionError(); }
 }
diff --git a/common/src/main/java/net/bettercombat/mixin/client/AbstractClientPlayerEntityMixin.java b/common/src/main/java/net/bettercombat/mixin/client/AbstractClientPlayerEntityMixin.java
@@ -12,6 +12,7 @@
 import dev.kosmx.playerAnim.core.util.Vec3f;
 import dev.kosmx.playerAnim.impl.IAnimatedPlayer;
 import net.bettercombat.BetterCombat;
+import net.bettercombat.Platform;
 import net.bettercombat.client.BetterCombatClient;
 import net.bettercombat.client.animation.AnimationRegistry;
 import net.bettercombat.client.animation.PlayerAttackAnimatable;
@@ -73,7 +74,11 @@ public void updateAnimationsOnTick() {
         var mainHandStack = player.getMainHandStack();
         // No pose during special activities
 
-        if (player.handSwinging || player.isSwimming() || player.isUsingItem() || CrossbowItem.isCharged(mainHandStack)) {
+        if (player.handSwinging // Official mapping name: `isHandBusy`
+                || player.isSwimming()
+                || player.isUsingItem()
+                || Platform.isCastingSpell(player)
+                || CrossbowItem.isCharged(mainHandStack)) {
             mainHandBodyPose.setPose(null, isLeftHanded);
             mainHandItemPose.setPose(null, isLeftHanded);
             offHandBodyPose.setPose(null, isLeftHanded);

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -24,6 +24,13 @@ repositories {
     maven { url 'https://jitpack.io' }
     maven { url 'https://maven.shedaniel.me' }
     maven { url 'https://maven.terraformersmc.com' }
+    maven {
+        name = 'Modrinth'
+        url = 'https://api.modrinth.com/maven'
+        content {
+            includeGroup 'maven.modrinth'
+        }
+    }
 }
 
 dependencies {
@@ -42,6 +49,7 @@ dependencies {
     // modImplementation(files("../fabric/run/mods/dev/player-animation-lib-fabric-${project.player_anim_version}.jar"))
     shadowCommon(implementation ("com.github.ZsoltMolnarrr:TinyConfig:${project.tiny_config_version}"))
     // modApi include("com.github.ZsoltMolnarrr:TinyConfig:${project.tiny_config_version}")
+    modCompileOnly("maven.modrinth:spell-engine:${project.spell_engine_version}")
 }
 
 processResources {

diff --git a/fabric/src/main/java/net/bettercombat/fabric/PlatformImpl.java b/fabric/src/main/java/net/bettercombat/fabric/PlatformImpl.java
@@ -1,7 +1,9 @@
 package net.bettercombat.fabric;
 
 import net.bettercombat.Platform;
+import net.bettercombat.fabric.client.SpellEngineCompatibility;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.entity.player.PlayerEntity;
 
 import static net.bettercombat.Platform.Type.FABRIC;
 
@@ -13,4 +15,8 @@ public static Platform.Type getPlatformType() {
     public static boolean isModLoaded(String modid) {
         return FabricLoader.getInstance().isModLoaded(modid);
     }
+
+    public static boolean isCastingSpell(PlayerEntity player) {
+        return SpellEngineCompatibility.isCastingSpell(player);
+    }
 }
diff --git a/fabric/src/main/java/net/bettercombat/fabric/client/SpellEngineCompatibility.java b/fabric/src/main/java/net/bettercombat/fabric/client/SpellEngineCompatibility.java
@@ -0,0 +1,19 @@
+package net.bettercombat.fabric.client;
+
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.entity.player.PlayerEntity;
+import net.spell_engine.internals.casting.SpellCasterEntity;
+
+public class SpellEngineCompatibility {
+    private static Boolean isLoaded = null;
+    public static boolean isCastingSpell(PlayerEntity player) {
+        if (isLoaded == null) {
+            isLoaded = FabricLoader.getInstance().isModLoaded("spell_engine");
+        }
+        if (isLoaded) {
+            // return (SpellCasterEntity) .isCastingSpell(player);
+            return ((SpellCasterEntity)player).getCurrentSpell() != null;
+        }
+        return false;
+    }
+}
diff --git a/forge/src/main/java/net/bettercombat/forge/PlatformImpl.java b/forge/src/main/java/net/bettercombat/forge/PlatformImpl.java
@@ -1,6 +1,7 @@
 package net.bettercombat.forge;
 
 import net.bettercombat.Platform;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraftforge.fml.ModList;
 
 import static net.bettercombat.Platform.Type.FORGE;
@@ -13,4 +14,8 @@ public static Platform.Type getPlatformType() {
     public static boolean isModLoaded(String modid) {
         return ModList.get().isLoaded(modid);
     }
+
+    public static boolean isCastingSpell(PlayerEntity player) {
+        return false;
+    }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ loader_version=0.14.21
 forge_version=47.2.0
 
 # Mod Properties
-mod_version=1.8.1
+mod_version=1.8.2
 maven_group=net
 archives_base_name=bettercombat
 
@@ -27,4 +27,5 @@ tiny_config_version=2.3.2
 # Compatibility
 mod_menu_version=7.0.1
 #https://modrinth.com/mod/first-person-model/version/evkvoubL = 2.2.3-1.20
-fpm_version=evkvoubL
+fpm_version=evkvoubL
+spell_engine_version=0.12.0+1.20.1