- sb please figure out why compiled versions dont work thx

Author: Smartin-b

common/src/main/java/smartin/miapi/modules/properties/compat/BetterCombatHelper.java

@@ -43,7 +43,9 @@ public static net.bettercombat.api.WeaponAttributes container(JsonElement data)
     public static net.bettercombat.api.WeaponAttributes getAttributes(ItemStack stack) {
         if (stack.getItem() instanceof ModularItem) {
             net.bettercombat.api.WeaponAttributes attributes = (net.bettercombat.api.WeaponAttributes) ModularItemCache.get(stack, BetterCombatProperty.KEY);
-            attributes = new net.bettercombat.api.WeaponAttributes(getAttackRange(stack), attributes.pose(), attributes.offHandPose(), attributes.isTwoHanded(), attributes.category(), attributes.attacks());
+            if(attributes!=null){
+                attributes = new net.bettercombat.api.WeaponAttributes(getAttackRange(stack), attributes.pose(), attributes.offHandPose(), attributes.isTwoHanded(), attributes.category(), attributes.attacks());
+            }
             return attributes;
         } else {
             return null;

common/src/main/java/smartin/miapi/modules/properties/compat/BetterCombatProperty.java

@@ -19,7 +19,7 @@ public BetterCombatProperty() {
     @Override
     public boolean load(String moduleKey, JsonElement data) throws Exception {
         if (Platform.isModLoaded("bettercombat")) {
-            BetterCombatHelper.container(data);
+            //BetterCombatHelper.container(data);
             return true;
         }
         return false;

common/src/main/resources/data/miapi/synergies/compat/bettercombat/polearm/polearm_dagger.json

@@ -0,0 +1,16 @@
+{
+    "blade_dagger": {
+        "condition": {
+            "type": "otherModule",
+            "condition": {
+                "type": "module",
+                "module": "handle_polearm"
+            }
+        },
+        "properties": {
+            "better_combat_config": {
+                "parent": "bettercombat:spear"
+            }
+        }
+    }
+}

common/src/main/resources/data/miapi/synergies/compat/bettercombat/polearm/polearm_greatsword.json

@@ -0,0 +1,16 @@
+{
+    "blade_greatsword": {
+        "condition": {
+            "type": "otherModule",
+            "condition": {
+                "type": "module",
+                "module": "handle_polearm"
+            }
+        },
+        "properties": {
+            "better_combat_config": {
+                "parent": "bettercombat:staff"
+            }
+        }
+    }
+}

common/src/main/resources/data/miapi/synergies/compat/bettercombat/polearm/polearm_katana.json

@@ -0,0 +1,16 @@
+{
+    "blade_katana": {
+        "condition": {
+            "type": "otherModule",
+            "condition": {
+                "type": "module",
+                "module": "handle_polearm"
+            }
+        },
+        "properties": {
+            "better_combat_config": {
+                "parent": "bettercombat:halberd"
+            }
+        }
+    }
+}

common/src/main/resources/data/miapi/synergies/compat/bettercombat/polearm/polearm_longsword.json

@@ -0,0 +1,16 @@
+{
+    "blade_longsword": {
+        "condition": {
+            "type": "otherModule",
+            "condition": {
+                "type": "module",
+                "module": "handle_short"
+            }
+        },
+        "properties": {
+            "better_combat_config": {
+                "parent": "bettercombat:staff"
+            }
+        }
+    }
+}

common/src/main/resources/data/miapi/synergies/compat/bettercombat/polearm/polearm_rapier.json

@@ -0,0 +1,16 @@
+{
+    "blade_rapier": {
+        "condition": {
+            "type": "otherModule",
+            "condition": {
+                "type": "module",
+                "module": "handle_polearm"
+            }
+        },
+        "properties": {
+            "better_combat_config": {
+                "parent": "bettercombat:staff"
+            }
+        }
+    }
+}

common/src/main/resources/data/miapi/synergies/compat/bettercombat/polearm/polearm_sword.json

@@ -0,0 +1,16 @@
+{
+    "blade_sword": {
+        "condition": {
+            "type": "otherModule",
+            "condition": {
+                "type": "module",
+                "module": "handle_polearm"
+            }
+        },
+        "properties": {
+            "better_combat_config": {
+                "parent": "bettercombat:spear"
+            }
+        }
+    }
+}

common/src/main/resources/data/miapi/synergies/compat/bettercombat/polearm/polearm_throwing_knife.json

@@ -0,0 +1,16 @@
+{
+    "blade_throwing_knife": {
+        "condition": {
+            "type": "otherModule",
+            "condition": {
+                "type": "module",
+                "module": "handle_polearm"
+            }
+        },
+        "properties": {
+            "better_combat_config": {
+                "parent": "bettercombat:spear"
+            }
+        }
+    }
+}

fabric/build.gradle

@@ -45,9 +45,9 @@ dependencies {
 
     implementation(include('org.mariuszgromada.math:MathParser.org-mXparser:4.4.2'))
 
-    //modImplementation "curse.maven:cloth-348521:4554906"
-    //modImplementation "curse.maven:bettercombat-639842:4597949"
-    //modImplementation 'dev.kosmx.player-anim:player-animation-lib-fabric:1.0.2-rc1+1.20'
+    modImplementation "curse.maven:cloth-348521:4554906"
+    modImplementation "curse.maven:bettercombat-639842:4597949"
+    modImplementation 'dev.kosmx.player-anim:player-animation-lib-fabric:1.0.2-rc1+1.20'
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 minecraft_version=1.20.1
 
 archives_base_name=miapi
-mod_version=0.2-SNAPSHOT
+mod_version=0.3.1-SNAPSHOT
 maven_group=smartin
 
 architectury_version=9.0.8