- minor fixes

Author: Smartin-b

common/src/main/java/smartin/miapi/entity/arrowhitbehaviours/EntityStickBehaviour.java

@@ -1,12 +1,16 @@
 package smartin.miapi.entity.arrowhitbehaviours;
 
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.projectile.ArrowEntity;
 import net.minecraft.util.hit.EntityHitResult;
 import smartin.miapi.entity.ItemProjectileEntity;
 
 public class EntityStickBehaviour implements ProjectileHitBehaviour {
     @Override
     public void onHit(ItemProjectileEntity projectile, Entity hit, EntityHitResult hitResult) {
+        ArrowEntity arrowEntity;
+        LivingEntity livingEntity;
         projectile.discard();
     }
 }

common/src/main/java/smartin/miapi/modules/properties/ArrowProperty.java

@@ -0,0 +1,38 @@
+package smartin.miapi.modules.properties;
+
+import com.google.gson.JsonElement;
+import dev.architectury.event.EventResult;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.LivingEntity;
+import smartin.miapi.entity.arrowhitbehaviours.EntityStickBehaviour;
+import smartin.miapi.events.MiapiProjectileEvents;
+import smartin.miapi.modules.ItemModule;
+import smartin.miapi.modules.properties.util.ModuleProperty;
+
+/**
+ * This property is responsible for teleporting a hit target of projectiles
+ */
+public class ArrowProperty implements ModuleProperty {
+    public static final String KEY = "is_arrow";
+    public static ArrowProperty property;
+    public static EntityStickBehaviour entityStickBehaviour = new EntityStickBehaviour();
+
+    public ArrowProperty() {
+        property = this;
+        MiapiProjectileEvents.MODULAR_PROJECTILE_ENTITY_HIT.register(event -> {
+            JsonElement element = ItemModule.getMergedProperty(event.projectile.asItemStack(), property);
+            if (element != null && element.getAsBoolean() && event.entityHitResult.getEntity() instanceof LivingEntity livingEntity) {
+                if (EnchantmentHelper.getLoyalty(event.projectile.asItemStack()) < 1) {
+                    event.projectile.projectileHitBehaviour = entityStickBehaviour;
+                }
+            }
+            return EventResult.pass();
+        });
+    }
+
+    @Override
+    public boolean load(String moduleKey, JsonElement data) throws Exception {
+        data.getAsBoolean();
+        return true;
+    }
+}

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

@@ -400,6 +400,7 @@ public static void setup() {
             registerMiapi(moduleProperties, ChannelingProperty.KEY, new ChannelingProperty());
             registerMiapi(moduleProperties, AirDragProperty.KEY, new AirDragProperty());
             registerMiapi(moduleProperties, WaterDragProperty.KEY, new WaterDragProperty());
+            registerMiapi(moduleProperties, ArrowProperty.KEY, new ArrowProperty());
 
             //compat
             registerMiapi(moduleProperties, BetterCombatProperty.KEY, new BetterCombatProperty());

common/src/main/resources/data/miapi/modules/arrow/shaft/arrow_shaft.json

@@ -24,6 +24,7 @@
         "arrow_shaft",
         "melee"
     ],
+    "is_arrow": true,
     "allowedMaterial": {
         "allowedMaterials": [
             "wood",

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

@@ -27,13 +27,7 @@
         ]
     },
     "allowedInSlots": [
-        "wood",
-        "metal",
-        "flint",
-        "bone",
-        "stone",
-        "crystal",
-        "glass"
+        "sword_blade"
     ],
     "tag": [
         "blade",
@@ -44,7 +38,13 @@
     },
     "allowedMaterial": {
         "allowedMaterials": [
-            "wood","stone","metal","crystal"
+            "wood",
+            "metal",
+            "flint",
+            "bone",
+            "stone",
+            "crystal",
+            "glass"
         ],
         "cost": 1
     },

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

@@ -76,7 +76,7 @@
         },
         {
             "attribute": "miapi:generic.projectile_speed",
-            "value": "2.5",
+            "value": "1.5",
             "operation": "+",
             "slot": "mainhand",
             "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"

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

@@ -28,13 +28,7 @@
         ]
     },
     "allowedInSlots": [
-        "wood",
-        "metal",
-        "flint",
-        "bone",
-        "stone",
-        "crystal",
-        "glass"
+        "sword_blade_small"
     ],
     "better_combat_config": {
         "parent": "bettercombat:dagger"
@@ -45,7 +39,13 @@
     ],
     "allowedMaterial": {
         "allowedMaterials": [
-            "wood","stone","metal","crystal"
+            "wood",
+            "metal",
+            "flint",
+            "bone",
+            "stone",
+            "crystal",
+            "glass"
         ],
         "cost": 1
     },
@@ -87,7 +87,7 @@
         },
         {
             "attribute": "miapi:generic.projectile_speed",
-            "value": "2.0",
+            "value": "1.3",
             "operation": "+",
             "slot": "mainhand",
             "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"

gradle.properties

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