- some fixes

Author: Smartin-b

build.gradle

@@ -7,33 +7,23 @@ plugins {
     id "io.github.pacifistmc.forgix" version "1.2.6"
 
 }
-
-//apply plugin: "io.github.pacifistmc.forgix"
-
 architectury {
     minecraft = rootProject.minecraft_version
 }
 
 forgix {
     group = "smartin.miapi"
-    mergedJarName = "Truly-Modular-${rootProject.mod_version}.jar"
+    mergedJarName = "Truly-Modular-miapi-${rootProject.mod_version}-${rootProject.minecraft_version}.jar"
+}
 
-    /*
-    if (findProject(":forge"))
-        forge {
-            jarLocation = "forge/build/libs/miapi-${rootProject.versionStr}.jar"
-        }
+tasks.register('buildMerged') {
+    dependsOn 'miapi:forge', 'miapi build', 'miapi:mergeJars'
 
-    findProject(":fabric")
-    fabric {
-        jarLocation = "fabric/build/libs/miapi-${rootProject.versionStr}.jar"
+    doLast {
+        println "Build completed"
     }
-
-    removeDuplicate "smartin.miapi"
-     */
 }
 
-
 subprojects {
     apply plugin: "dev.architectury.loom"
 

common/src/main/java/smartin/miapi/item/modular/Transform.java

@@ -136,9 +136,9 @@ public Matrix4f toMatrix() {
      */
     public Transform copy() {
         Transform copy = new Transform(
-                this.rotation != null ? new Vector3f(this.rotation) : new Vector3f(),
-                this.translation != null ? new Vector3f(this.translation) : new Vector3f(),
-                this.scale != null ? new Vector3f(this.scale) : new Vector3f()
+                this.rotation != null ? new Vector3f(this.rotation) : new Vector3f(0,0,0),
+                this.translation != null ? new Vector3f(this.translation) : new Vector3f(0,0,0),
+                this.scale != null ? new Vector3f(this.scale) : new Vector3f(1,1,1)
         );
 
         copy.origin = this.origin;

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

@@ -173,7 +173,7 @@ public static void setup() {
 
         //ATTRIBUTE
         registerAtt("generic.durability", false, () ->
-                        new ClampedEntityAttribute("miapi.attribute.name.durability", 300.0, 1.0, 16777216).setTracked(true),
+                        new ClampedEntityAttribute("miapi.attribute.name.durability", 1.0, 1.0, 16777216).setTracked(true),
                 att -> ITEM_DURABILITY = att);
 
         // reach

common/src/main/resources/data/miapi/materials/crystal/diamond.json

@@ -6,7 +6,7 @@
   "hardness": 6,
   "density": 2.9,
   "flexibility": 0,
-  "durability": 800,
+  "durability": 1560,
   "mining_speed": 8,
   "mining_level": 3,
   "color": "49EAD6",

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

@@ -8,7 +8,7 @@
     "hardness": 3.8,
     "density": 3.6,
     "flexibility": 1,
-    "durability": 800,
+    "durability": 200,
     "color": "E47B55",
     "textures": [
         "metal"

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

@@ -8,7 +8,7 @@
     "hardness": 4,
     "density": 4.6,
     "flexibility": 1,
-    "durability": 800,
+    "durability": 32,
     "color": "FFD700",
     "textures": [
         "contrast"

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

@@ -6,7 +6,7 @@
   "hardness": 5,
   "density": 3.8,
   "flexibility": 1,
-  "durability": 800,
+  "durability": 250,
   "color": "FCFCFC",
   "textures": [
     "metal"

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

@@ -6,7 +6,7 @@
   "hardness": 7,
   "density": 3.8,
   "flexibility": 3,
-  "durability": 800,
+  "durability": 2031,
   "color": "695e5f",
   "textures": [
     "metal"

common/src/main/resources/data/miapi/materials/stone/stone.json

@@ -6,7 +6,7 @@
   "hardness": 4,
   "density": 3,
   "flexibility": 0,
-  "durability": 800,
+  "durability": 131,
   "color": "757575",
   "mining_speed": 4,
   "mining_level": 1,

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

@@ -48,13 +48,6 @@
             "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3",
             "seperateOnItem": true
         },
-        {
-            "attribute": "miapi:generic.shield_break",
-            "value": "1.5",
-            "operation": "+",
-            "slot": "mainhand",
-            "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
-        },
         {
             "attribute": "generic.attack_speed",
             "value": "+0.5",
@@ -68,6 +61,23 @@
             "operation": "+",
             "slot": "mainhand",
             "uuid": "CB3F55D3-645C-4F38-A497-9C13A33DB5CF"
+        },
+        {
+            "attribute": "miapi:generic.durability",
+            "value": "[material.durability]* 0.25",
+            "operation": "+",
+            "slot": "mainhand",
+            "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
+        }
+    ],
+    "applyPotionEffects": [
+        {
+            "event": "attack",
+            "target": "target",
+            "duration": 5,
+            "amplifier": 1,
+            "effect": "minecraft:poison",
+            "predicate": "miapi:test"
         }
     ],
     "displayName": "miapi.module.blade_dagger.name",