-basic bettercombat support

Author: Smartin-b

color/colorstandard.txt

@@ -0,0 +1,8 @@
+181818
+393939
+444444
+6B6B6B
+969696
+BEBEBE
+D8D8D8
+FFFFFF

common/build.gradle

@@ -1,3 +1,19 @@
+repositories {
+    maven { url 'https://maven.kosmx.dev/' }
+    maven { url 'https://maven.shedaniel.me/' }
+    maven { url 'https://maven.fabricmc.net/' }
+    maven { url 'https://jitpack.io' }
+    maven { url 'https://maven.terraformersmc.com/' }
+    maven { url 'https://www.cursemaven.com' }
+    maven {
+        name = 'Modrinth'
+        url = 'https://api.modrinth.com/maven'
+        content {
+            includeGroup 'maven.modrinth'
+        }
+    }
+}
+
 loom {
     accessWidenerPath = file("src/main/resources/miapi.accesswidener")
 }
@@ -10,6 +26,8 @@ dependencies {
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 
     implementation('org.mariuszgromada.math:MathParser.org-mXparser:4.4.2')
+    modImplementation 'dev.kosmx.player-anim:player-animation-lib:1.0.2-rc1+1.20'
+    modApi "curse.maven:bettercombat-639842:4597949"
 }
 
 architectury {
@@ -26,6 +44,5 @@ publishing {
 
     // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
     repositories {
-        // Add repositories to publish to here.
     }
 }

common/src/main/java/smartin/miapi/mixin/BCWeaponRegistryMixin.java

@@ -0,0 +1,27 @@
+package smartin.miapi.mixin;
+
+
+import net.bettercombat.api.WeaponAttributes;
+import net.bettercombat.logic.WeaponRegistry;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import smartin.miapi.modules.properties.compat.BetterCombatHelper;
+
+@Mixin(WeaponRegistry.class)
+public class BCWeaponRegistryMixin {
+    @Inject(
+            method = "getAttributes(Lnet/minecraft/item/ItemStack;)Lnet/bettercombat/api/WeaponAttributes;",
+            at = @At("HEAD"),
+            cancellable = true,
+            remap = false,
+            require = -1)
+    private static void getAttributes(ItemStack itemStack, CallbackInfoReturnable<WeaponAttributes> cir) {
+        WeaponAttributes attributes = BetterCombatHelper.getAttributes(itemStack);
+        if (attributes != null) {
+            cir.setReturnValue(attributes);
+        }
+    }
+}

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

@@ -0,0 +1,52 @@
+package smartin.miapi.modules.properties.compat;
+
+import com.google.gson.JsonElement;
+import com.google.gson.stream.JsonReader;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Identifier;
+import smartin.miapi.Miapi;
+import smartin.miapi.attributes.AttributeRegistry;
+import smartin.miapi.item.modular.ModularItem;
+import smartin.miapi.modules.ItemModule;
+import smartin.miapi.modules.cache.ModularItemCache;
+import smartin.miapi.modules.properties.AttributeProperty;
+
+import java.io.StringReader;
+
+public class BetterCombatHelper {
+    public static void setup() {
+        ModularItemCache.setSupplier(BetterCombatProperty.KEY, BetterCombatHelper::getContainer);
+    }
+
+    private static net.bettercombat.api.WeaponAttributes getContainer(ItemStack stack) {
+        return container(ItemModule.getMergedProperty(stack, BetterCombatProperty.property));
+    }
+
+    private static float getAttackRange(ItemStack stack) {
+        return (float) AttributeProperty.getActualValue(stack, EquipmentSlot.MAINHAND, AttributeRegistry.ATTACK_RANGE) + 2.5f;
+    }
+
+    private static net.bettercombat.api.WeaponAttributes container(JsonElement data) {
+        if (data == null) {
+            Miapi.LOGGER.warn("returning null cause data is null");
+            return null;
+        }
+        String jsonString = data.toString();
+        Miapi.LOGGER.warn(jsonString);
+        JsonReader jsonReader = new JsonReader(new StringReader(jsonString));
+        net.bettercombat.api.WeaponAttributes attributes = net.bettercombat.logic.WeaponRegistry.resolveAttributes(new Identifier(Miapi.MOD_ID, "modular_item"), net.bettercombat.api.WeaponAttributesHelper.decode(jsonReader));
+        Miapi.LOGGER.warn(attributes.toString());
+        return attributes;
+    }
+
+    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());
+            return attributes;
+        } else {
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,31 @@
+package smartin.miapi.modules.properties.compat;
+
+import com.google.gson.JsonElement;
+import dev.architectury.platform.Platform;
+import smartin.miapi.modules.properties.util.MergeType;
+import smartin.miapi.modules.properties.util.ModuleProperty;
+
+public class BetterCombatProperty implements ModuleProperty {
+    public static String KEY = "better_combat_config";
+    public static BetterCombatProperty property;
+
+    public BetterCombatProperty() {
+        property = this;
+        if (Platform.isModLoaded("bettercombat")) {
+            BetterCombatHelper.setup();
+        }
+    }
+
+    @Override
+    public boolean load(String moduleKey, JsonElement data) throws Exception {
+        if (Platform.isModLoaded("bettercombat")) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public JsonElement merge(JsonElement old, JsonElement toMerge, MergeType type) {
+        return ModuleProperty.super.merge(old, toMerge, type);
+    }
+}

common/src/main/java/smartin/miapi/registries/RegistryInventory.java

@@ -34,6 +34,7 @@
 import smartin.miapi.modules.edit_options.PropertyInjectionDev;
 import smartin.miapi.modules.edit_options.skins.SkinOptions;
 import smartin.miapi.modules.properties.*;
+import smartin.miapi.modules.properties.compat.BetterCombatProperty;
 import smartin.miapi.modules.properties.render.*;
 import smartin.miapi.modules.properties.util.ModuleProperty;
 
@@ -266,6 +267,9 @@ public static void setup() {
         registerMiapi(moduleProperties, MiningLevelProperty.KEY, new MiningLevelProperty());
         registerMiapi(moduleProperties, TagProperty.KEY, new TagProperty());
 
+        //compat
+        registerMiapi(moduleProperties, BetterCombatProperty.KEY, new BetterCombatProperty());
+
         // ABILITIES
         registerMiapi(useAbilityRegistry, "throw", new ThrowingAbility());
         registerMiapi(useAbilityRegistry, "block", new BlockAbility());

common/src/main/resources/data/miapi/materials/metal/skulk.json

@@ -0,0 +1,25 @@
+{
+  "key": "sculk",
+  "translation": "miapi.material.skulk",
+  "icon": "textures/item/iron.png",
+  "groups": [
+    "wood",
+    "metal"
+  ],
+  "hardness": 1,
+  "density": 1,
+  "flexibility": 0,
+  "durability": 3000,
+  "mining_speed": 75,
+  "mining_level": 3,
+  "color": "444444",
+  "textures": [
+    "contrast"
+  ],
+  "items": [
+    {
+      "item": "minecraft:sculk",
+      "value": 1.0
+    }
+  ]
+}

common/src/main/resources/data/miapi/modules/sword/blade/blade_dagger.json

@@ -70,6 +70,9 @@
             "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
         }
     ],
+    "better_combat_config": {
+        "parent": "bettercombat:dagger"
+    },
     "applyPotionEffects": [
         {
             "event": "attack",

common/src/main/resources/data/miapi/modules/sword/blade/blade_greatsword.json

@@ -32,6 +32,9 @@
         ],
         "cost": 1
     },
+    "better_combat_config": {
+        "parent": "bettercombat:claymore"
+    },
     "attributes": [
         {
             "attribute": "generic.attack_speed",

common/src/main/resources/data/miapi/modules/sword/blade/blade_katana.json

@@ -23,6 +23,9 @@
     "allowedInSlots": [
         "sword_blade_large"
     ],
+    "better_combat_config": {
+        "parent": "bettercombat:katana"
+    },
     "allowedMaterial": {
         "allowedMaterials": [
             "wood","stone","metal","crystal"

common/src/main/resources/data/miapi/modules/sword/blade/blade_longsword.json

@@ -20,6 +20,9 @@
             }
         }
     },
+    "better_combat_config": {
+        "parent": "bettercombat:claymore"
+    },
     "allowedInSlots": [
         "sword_blade_large"
     ],

common/src/main/resources/data/miapi/modules/sword/blade/blade_rapier.json

@@ -23,6 +23,9 @@
     "allowedInSlots": [
         "sword_blade"
     ],
+    "better_combat_config": {
+        "parent": "bettercombat:rapier"
+    },
     "allowedMaterial": {
         "allowedMaterials": [
             "wood","stone","metal","crystal"

common/src/main/resources/data/miapi/modules/sword/blade/blade_sword.json

@@ -23,6 +23,9 @@
     "allowedInSlots": [
         "sword_blade"
     ],
+    "better_combat_config": {
+        "parent": "bettercombat:sword"
+    },
     "allowedMaterial": {
         "allowedMaterials": [
             "wood","stone","metal","crystal"

common/src/main/resources/data/miapi/modules/sword/blade/blade_throwing_knife.json

@@ -23,6 +23,9 @@
     "allowedInSlots": [
         "sword_blade_small"
     ],
+    "better_combat_config": {
+        "parent": "bettercombat:soul_knife"
+    },
     "allowedMaterial": {
         "allowedMaterials": [
             "wood","stone","metal","crystal"

common/src/main/resources/data/miapi/synergies/compat/bettercombat/one_handed/one_handed_greatsword.json

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

common/src/main/resources/data/miapi/synergies/compat/bettercombat/one_handed/one_handed_katana.json

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

common/src/main/resources/data/miapi/synergies/compat/bettercombat/one_handed/one_handed_longsword.json

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

common/src/main/resources/miapi-common.mixins.json

@@ -4,11 +4,12 @@
     "package": "smartin.miapi.mixin",
     "compatibilityLevel": "JAVA_17",
     "mixins": [
-        "LootContextTypesAccessor",
+        "BCWeaponRegistryMixin",
+        "InventoryValidationMixin",
         "ItemStackMixin",
         "LivingEntityAccessor",
         "LivingEntityMixin",
-        "InventoryValidationMixin"
+        "LootContextTypesAccessor"
     ],
     "client": [
         "client.ArmorFeatureRendererMixin",

fabric/build.gradle

@@ -1,7 +1,21 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
 }
-
+repositories {
+    maven { url 'https://maven.kosmx.dev/' }
+    maven { url 'https://maven.shedaniel.me/' }
+    maven { url 'https://maven.fabricmc.net/' }
+    maven { url 'https://jitpack.io' }
+    maven { url 'https://maven.terraformersmc.com/' }
+    maven { url 'https://www.cursemaven.com' }
+    maven {
+        name = 'Modrinth'
+        url = 'https://api.modrinth.com/maven'
+        content {
+            includeGroup 'maven.modrinth'
+        }
+    }
+}
 architectury {
     platformSetupLoomIde()
     fabric()
@@ -31,6 +45,10 @@ 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'
+
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 }