debugging and arrow

Smartin-b · Smartin-b · commit 6908b69f4e50 · 2023-08-10T10:34:52.000+02:00
diff --git a/common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatDisplay.java b/common/src/main/java/smartin/miapi/client/gui/crafting/statdisplay/StatDisplay.java
@@ -87,6 +87,7 @@ public class StatDisplay extends InteractAbleWidget {
                 .Builder(AttributeRegistry.PROJECTILE_SPEED)
                 .setTranslationKey("projectile_speed")
                 .setFormat("##.#")
+                .setDefault(0.0)
                 .setMax(10).build());
         addStatDisplay(AttributeSingleDisplay
                 .Builder(AttributeRegistry.PROJECTILE_ACCURACY)
diff --git a/common/src/main/java/smartin/miapi/client/modelrework/BakedMiapiModel.java b/common/src/main/java/smartin/miapi/client/modelrework/BakedMiapiModel.java
@@ -44,6 +44,7 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod
 
         for (BakedModel model : models) {
             for (Direction direction : Direction.values()) {
+                MinecraftClient.getInstance().world.getProfiler().push("BakedModel");
                 if (model.getOverrides() != null && !model.getOverrides().equals(ModelOverrideList.EMPTY)) {
                     model = model.getOverrides().apply(model, stack, MinecraftClient.getInstance().world, entity, light);
                 }
@@ -58,8 +59,10 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod
                     consumer.quad(matrices.peek(), bakedQuad, 1, 1, 1, lightValue, overlay);
                 });
                 immediate.draw();
+                MinecraftClient.getInstance().world.getProfiler().pop();
 
                 if (settings.shouldRender()) {
+                    MinecraftClient.getInstance().world.getProfiler().push("Glint");
                     rootSettings.applySpeed();
                     settings.applyAlpha();
                     VertexConsumer glintConsumer = immediate.getBuffer(RegistryInventory.Client.modularItemGlint);
@@ -71,6 +74,7 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod
                         glintConsumer.quad(matrices.peek(), bakedQuad, (float) glintColor.r() / 255, (float) glintColor.g() / 255, (float) glintColor.b() / 255, lightValue, overlay);
                     });
                     immediate.draw();
+                    MinecraftClient.getInstance().world.getProfiler().pop();
                 }
             }
         }
diff --git a/common/src/main/java/smartin/miapi/client/modelrework/MiapiItemModel.java b/common/src/main/java/smartin/miapi/client/modelrework/MiapiItemModel.java
@@ -1,5 +1,6 @@
 package smartin.miapi.client.modelrework;
 
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.util.math.MatrixStack;
@@ -54,13 +55,15 @@ public void render(String modelType, MatrixStack matrices, ModelTransformationMo
     }
 
     public void render(String modelType, ItemStack stack, MatrixStack matrices, ModelTransformationMode mode, float tickDelta, VertexConsumerProvider vertexConsumers, LivingEntity entity, int light, int overlay) {
+        MinecraftClient.getInstance().world.getProfiler().push("modular_item");
         matrices.push();
         for (ModelTransformer transformer : modelTransformers) {
             matrices = transformer.transform(matrices, stack, mode, modelType, tickDelta);
         }
         RegistryInventory.Client.glintShader.getUniformOrDefault("ModelMat").set(new Matrix4f(matrices.peek().getPositionMatrix()));
         rootModel.render(modelType, stack, matrices, mode, tickDelta, vertexConsumers, entity, light, overlay);
         matrices.pop();
+        MinecraftClient.getInstance().world.getProfiler().pop();
     }
 
     @Override
diff --git a/common/src/main/java/smartin/miapi/item/modular/items/ModularBow.java b/common/src/main/java/smartin/miapi/item/modular/items/ModularBow.java
@@ -26,10 +26,10 @@
 
 import java.util.function.Predicate;
 
-public class ExampleModularBowItem extends BowItem implements ModularItem {
+public class ModularBow extends BowItem implements ModularItem {
     public static boolean betterInfinity = true;
 
-    public ExampleModularBowItem() {
+    public ModularBow() {
         super(new Item.Settings());
         if (smartin.miapi.Environment.isClient()) {
             registerAnimations();
@@ -44,7 +44,7 @@ public void onStoppedUsing(ItemStack bowStack, World world, LivingEntity user, i
         PlayerEntity playerEntity = (PlayerEntity) user;
         boolean consumeArrow = !playerEntity.getAbilities().creativeMode;
         ItemStack projectileStack = playerEntity.getProjectileType(bowStack);
-        if(EnchantmentHelper.getLevel(Enchantments.INFINITY, bowStack) > 0 &&(projectileStack.isEmpty() || (projectileStack.getItem() instanceof ArrowItem && projectileStack.getOrCreateNbt().isEmpty()))){
+        if (EnchantmentHelper.getLevel(Enchantments.INFINITY, bowStack) > 0 && (projectileStack.isEmpty() || (projectileStack.getItem() instanceof ArrowItem && projectileStack.getOrCreateNbt().isEmpty()))) {
             consumeArrow = false;
             projectileStack = new ItemStack(Items.ARROW);
         }
@@ -69,11 +69,12 @@ public void onStoppedUsing(ItemStack bowStack, World world, LivingEntity user, i
             itemProjectile.setPierceLevel((byte) ((byte) (int) AttributeProperty.getActualValue(projectileStack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_PIERCING) + piercingLevel));
 
             float divergence = (float) AttributeProperty.getActualValue(projectileStack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_ACCURACY);
-            float speed = (float) AttributeProperty.getActualValue(projectileStack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_SPEED);
+            float speed = (float) AttributeProperty.getActualValue(projectileStack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_SPEED, 1.5f);
             float damage = (float) AttributeProperty.getActualValue(bowStack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_DAMAGE);
             divergence += (float) AttributeProperty.getActualValue(bowStack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_ACCURACY);
             speed += (float) AttributeProperty.getActualValue(bowStack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_SPEED);
             damage += (float) AttributeProperty.getActualValue(projectileStack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_DAMAGE);
+            speed = speed * pullProgress;
             damage = damage / speed;
             itemProjectile.setDamage(damage);
             itemProjectile.setSpeedDamage(true);
@@ -123,7 +124,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
     }
 
     public static float getPullProgress(int useTicks, ItemStack stack) {
-        float f = (float) ((float) useTicks / AttributeProperty.getActualValue(stack, EquipmentSlot.MAINHAND, AttributeRegistry.BOW_DRAW_TIME));
+        float f = (float) useTicks / 20.0f;
         if ((f = (f * f + f * 2.0f) / 3.0f) > 1.0f) {
             f = 1.0f;
         }
diff --git a/common/src/main/java/smartin/miapi/modules/abilities/util/ItemProjectile/ItemProjectile.java b/common/src/main/java/smartin/miapi/modules/abilities/util/ItemProjectile/ItemProjectile.java
@@ -15,6 +15,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.hit.BlockHitResult;
@@ -101,6 +102,11 @@ public void tick() {
             this.dealtDamage = true;
         }
 
+        this.velocityDirty = true;
+        if(this.getWorld() instanceof ServerWorld){
+            this.setVelocity(this.getVelocity());
+        }
+
         Entity entity = this.getOwner();
         int loyaltyLevel = this.dataTracker.get(LOYALTY);
         if (loyaltyLevel > 0 && (this.dealtDamage || this.isNoClip()) && entity != null) {
diff --git a/common/src/main/java/smartin/miapi/modules/properties/AttributeProperty.java b/common/src/main/java/smartin/miapi/modules/properties/AttributeProperty.java
@@ -251,7 +251,7 @@ public static double getActualValue(ItemStack stack, EquipmentSlot slot, EntityA
         AttributeContainer container1 = new AttributeContainer(container);
 
         container1.addTemporaryModifiers(map);
-        if (container1.hasAttribute(entityAttribute)) {
+        if (map.containsKey(entityAttribute) && container1.hasAttribute(entityAttribute)) {
             return container1.getValue(entityAttribute);
         } else {
             return fallback;
diff --git a/common/src/main/java/smartin/miapi/registries/RegistryInventory.java b/common/src/main/java/smartin/miapi/registries/RegistryInventory.java
@@ -242,7 +242,7 @@ public static void setup() {
         register(modularItems, "modular_hoe", ModularWeapon::new);
         register(modularItems, "modular_mattock", ModularWeapon::new);
 
-        register(modularItems, "modular_bow", ExampleModularBowItem::new);
+        register(modularItems, "modular_bow", ModularBow::new);
         register(modularItems, "modular_arrow", ModularArrow::new);
 
         register(modularItems, "modular_helmet", ModularHelmet::new);
@@ -302,7 +302,7 @@ public static void setup() {
                         new ClampedEntityAttribute("miapi.attribute.name.projectile_damage", 2.0, 0.0, 1024.0).setTracked(true),
                 att -> PROJECTILE_DAMAGE = att);
         registerAtt("generic.projectile_speed", true, () ->
-                        new ClampedEntityAttribute("miapi.attribute.name.projectile_speed", 1.0, 0.0, 1024.0).setTracked(true),
+                        new ClampedEntityAttribute("miapi.attribute.name.projectile_speed", 1.5, 0.0, 1024.0).setTracked(true),
                 att -> PROJECTILE_SPEED = att);
         registerAtt("generic.projectile_accuracy", true, () ->
                         new ClampedEntityAttribute("miapi.attribute.name.projectile_accuracy", 1.0, 0.0, 1024.0).setTracked(true),
diff --git a/common/src/main/resources/data/miapi/modules/bow/arm/normal_bow_arms.json b/common/src/main/resources/data/miapi/modules/bow/arm/normal_bow_arms.json
@@ -47,6 +47,22 @@
             }
         }
     },
+    "attributes": [
+        {
+            "attribute": "miapi:generic.projectile_speed",
+            "value": "([material.hardness] + [material.flexibility] ) / 9",
+            "operation": "+",
+            "slot": "mainhand",
+            "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
+        },
+        {
+            "attribute": "miapi:generic.durability",
+            "value": "[material.durability] / 2",
+            "operation": "+",
+            "slot": "mainhand",
+            "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
+        }
+    ],
     "allowedMaterial": {
         "allowedMaterials": [
             "wood",
diff --git a/common/src/main/resources/data/miapi/modules/bow/handle/normal_bow_handle.json b/common/src/main/resources/data/miapi/modules/bow/handle/normal_bow_handle.json
@@ -23,6 +23,15 @@
     "allowedInSlots": [
         "bow","melee"
     ],
+    "attributes": [
+        {
+            "attribute": "miapi:generic.durability",
+            "value": "[material.durability] / 2",
+            "operation": "+",
+            "slot": "mainhand",
+            "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
+        }
+    ],
     "slots": {
         "0": {
             "allowed": [
diff --git a/common/src/main/resources/data/miapi/modules/bow/string/normal_bow_string.json b/common/src/main/resources/data/miapi/modules/bow/string/normal_bow_string.json
@@ -26,7 +26,14 @@
     "attributes": [
         {
             "attribute": "miapi:generic.projectile_speed",
-            "value": "3.5",
+            "value": "1.5",
+            "operation": "+",
+            "slot": "mainhand",
+            "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"
+        },
+        {
+            "attribute": "miapi:generic.durability",
+            "value": "[material.durability] / 2",
             "operation": "+",
             "slot": "mainhand",
             "uuid": "AAAAAAAA-4180-4865-B01B-BCCE9785ACA3"

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod`
`44`	`44`
`45`	`45`	`for (BakedModel model : models) {`
`46`	`46`	`for (Direction direction : Direction.values()) {`
	`47`	`+ MinecraftClient.getInstance().world.getProfiler().push("BakedModel");`
`47`	`48`	`if (model.getOverrides() != null && !model.getOverrides().equals(ModelOverrideList.EMPTY)) {`
`48`	`49`	`model = model.getOverrides().apply(model, stack, MinecraftClient.getInstance().world, entity, light);`
`49`	`50`	`}`
`@@ -58,8 +59,10 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod`
`58`	`59`	`consumer.quad(matrices.peek(), bakedQuad, 1, 1, 1, lightValue, overlay);`
`59`	`60`	`});`
`60`	`61`	`immediate.draw();`
	`62`	`+ MinecraftClient.getInstance().world.getProfiler().pop();`
`61`	`63`
`62`	`64`	`if (settings.shouldRender()) {`
	`65`	`+ MinecraftClient.getInstance().world.getProfiler().push("Glint");`
`63`	`66`	`rootSettings.applySpeed();`
`64`	`67`	`settings.applyAlpha();`
`65`	`68`	`VertexConsumer glintConsumer = immediate.getBuffer(RegistryInventory.Client.modularItemGlint);`
`@@ -71,6 +74,7 @@ public void render(MatrixStack matrices, ItemStack stack, ModelTransformationMod`
`71`	`74`	`glintConsumer.quad(matrices.peek(), bakedQuad, (float) glintColor.r() / 255, (float) glintColor.g() / 255, (float) glintColor.b() / 255, lightValue, overlay);`
`72`	`75`	`});`
`73`	`76`	`immediate.draw();`
	`77`	`+ MinecraftClient.getInstance().world.getProfiler().pop();`
`74`	`78`	`}`
`75`	`79`	`}`
`76`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package smartin.miapi.client.modelrework;`
`2`	`2`
	`3`	`+import net.minecraft.client.MinecraftClient;`
`3`	`4`	`import net.minecraft.client.render.VertexConsumerProvider;`
`4`	`5`	`import net.minecraft.client.render.model.json.ModelTransformationMode;`
`5`	`6`	`import net.minecraft.client.util.math.MatrixStack;`
`@@ -54,13 +55,15 @@ public void render(String modelType, MatrixStack matrices, ModelTransformationMo`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`public void render(String modelType, ItemStack stack, MatrixStack matrices, ModelTransformationMode mode, float tickDelta, VertexConsumerProvider vertexConsumers, LivingEntity entity, int light, int overlay) {`
	`58`	`+ MinecraftClient.getInstance().world.getProfiler().push("modular_item");`
`57`	`59`	`matrices.push();`
`58`	`60`	`for (ModelTransformer transformer : modelTransformers) {`
`59`	`61`	`matrices = transformer.transform(matrices, stack, mode, modelType, tickDelta);`
`60`	`62`	`}`
`61`	`63`	`RegistryInventory.Client.glintShader.getUniformOrDefault("ModelMat").set(new Matrix4f(matrices.peek().getPositionMatrix()));`
`62`	`64`	`rootModel.render(modelType, stack, matrices, mode, tickDelta, vertexConsumers, entity, light, overlay);`
`63`	`65`	`matrices.pop();`
	`66`	`+ MinecraftClient.getInstance().world.getProfiler().pop();`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`@Override`