Merge remote-tracking branch 'upstream/master' into pm5

# Conflicts:
#	src/item/component/IconComponent.php

src/item/ItemComponentsTrait.php

@@ -5,6 +5,7 @@
 
 use customiesdevs\customies\item\component\AllowOffHandComponent;
 use customiesdevs\customies\item\component\ArmorComponent;
+use customiesdevs\customies\item\component\AttackDamageComponent;
 use customiesdevs\customies\item\component\CanDestroyInCreativeComponent;
 use customiesdevs\customies\item\component\CooldownComponent;
 use customiesdevs\customies\item\component\CreativeCategoryComponent;
@@ -30,6 +31,8 @@
 use pocketmine\item\Durable;
 use pocketmine\item\Food;
 use pocketmine\item\ProjectileItem;
+use pocketmine\item\Sword;
+use pocketmine\item\Tool;
 use pocketmine\nbt\tag\CompoundTag;
 use RuntimeException;
 
@@ -112,6 +115,17 @@ protected function initComponent(string $texture, ?CreativeInventoryInfo $creati
 		if($this->getFuelTime() > 0) {
 			$this->addComponent(new FuelComponent($this->getFuelTime()));
 		}
+
+		if($this->getAttackPoints() > 0) {
+			$this->addComponent(new AttackDamageComponent($this->getAttackPoints() - 1));
+		}
+
+		if($this instanceof Tool) {
+			$this->addComponent(new HandEquippedComponent());
+			if ($this instanceof Sword) {
+				$this->addComponent(new CanDestroyInCreativeComponent(false));
+			}
+		}
 	}
 
 	/**

src/item/component/AttackDamageComponent.php

@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+namespace customiesdevs\customies\item\component;
+
+final class AttackDamageComponent implements ItemComponent {
+
+	private int $damage;
+
+	public function __construct(int $damage) {
+		$this->damage = $damage;
+	}
+
+	public function getName(): string {
+		return "damage";
+	}
+
+	public function getValue(): int {
+		return $this->damage;
+	}
+
+	public function isProperty(): bool {
+		return true;
+	}
+}

src/item/component/IconComponent.php

@@ -17,7 +17,7 @@ public function getName(): string {
 
 	public function getValue(): array {
 		return [
-            "texture" => $this->texture,
+			"texture" => $this->texture,
 			"textures" => [
 				"default" => $this->texture
 			]

src/item/component/RarityComponent.php

@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace customiesdevs\customies\item\component;
+
+final class RarityComponent implements ItemComponent {
+
+	public const COMMON = "common";
+	public const UNCOMMON = "uncommon";
+	public const RARE = "rare";
+	public const EPIC = "epic";
+
+	private string $rarity;
+
+	public function __construct(string $rarity) {
+		$this->rarity = $rarity;
+	}
+
+	public function getName(): string {
+		return "minecraft:rarity";
+	}
+
+	public function getValue(): array {
+		return [
+			"value" => $this->rarity
+		];
+	}
+
+	public function isProperty(): bool {
+		return false;
+	}
+}

src/item/component/UseModifiersComponent.php

@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+namespace customiesdevs\customies\item\component;
+
+final class UseModifiersComponent implements ItemComponent {
+
+    public function __construct(private float $movementModifier, private float $useDuration) {}
+
+    public function getName(): string {
+        return "minecraft:use_modifiers";
+    }
+
+    public function getValue(): array {
+        return [
+            "movement_modifier" => $this->movementModifier,
+            "use_duration" => $this->useDuration
+        ];
+    }
+
+    public function isProperty(): bool {
+        return false;
+    }
+}