1.0.0 beta ready to deploy

src/client/kotlin/dev/zxq5/client/FantasysmpDataGenerator.kt

@@ -7,3 +7,5 @@ object FantasysmpDataGenerator : DataGeneratorEntrypoint {
 	override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) {
 	}
 }
+
+

src/main/kotlin/dev/zxq5/items/Dragonite.kt

@@ -17,17 +17,16 @@ import net.minecraft.world.InteractionResult
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ToolMaterial
-import net.minecraft.world.item.component.BlocksAttacks
+import net.minecraft.world.item.component.UseCooldown
 import net.minecraft.world.item.equipment.*
 import net.minecraft.world.level.Level
-import java.util.Optional
 
 
 object Dragonite {
     const val BASE_DURABILITY = 40;
-    val witherite_material_key: ResourceKey<EquipmentAsset> = ResourceKey.create<EquipmentAsset>(
+    val MATERIAL: ResourceKey<EquipmentAsset> = ResourceKey.create<EquipmentAsset>(
         EquipmentAssets.ROOT_ID,
-        Identifier.fromNamespaceAndPath(Fantasysmp.MOD_ID, "dragon")
+        Identifier.fromNamespaceAndPath(Fantasysmp.MOD_ID, "dragonite")
     )
 
     val armorMaterial = ArmorMaterial(
@@ -44,39 +43,49 @@ object Dragonite {
         3.0f,
         0.1f,
         ItemTags.REPAIRS_NETHERITE_ARMOR,
-        witherite_material_key,
+        MATERIAL,
     )
 
-    val SWORD = register("dragon_sword", ::DragoniteSword,
+    val SWORD = register("dragonite_sword", ::DragoniteSword,
         Item.Properties()
+            .enchantable(armorMaterial.enchantmentValue)
+            .component(DataComponents.USE_COOLDOWN, UseCooldown(0.0f))
             .sword(ToolMaterial.NETHERITE, 3.0F, -2.4F)
     )
     val HELMET = register(
-        "dragon_helmet",
+        "dragonite_helmet",
         ::Item,
-        Item.Properties().humanoidArmor(armorMaterial , ArmorType.HELMET)
+        Item.Properties()
+            .enchantable(Witherite.armorMaterial.enchantmentValue)
+            .humanoidArmor(armorMaterial , ArmorType.HELMET)
             .durability(ArmorType.HELMET.getDurability(armorMaterial.durability))
     )
 
     val CHESTPLATE = register(
-        "dragon_chestplate",
+        "dragonite_chestplate",
         ::Item,
-        Item.Properties().humanoidArmor(armorMaterial , ArmorType.CHESTPLATE)
+        Item.Properties()
+            .enchantable(Witherite.armorMaterial.enchantmentValue)
+            .humanoidArmor(armorMaterial , ArmorType.CHESTPLATE)
             .component(DataComponents.GLIDER, Unit.INSTANCE)
             .durability(ArmorType.CHESTPLATE.getDurability(armorMaterial.durability))
     )
 
     val LEGGINGS = register(
-        "dragon_leggings",
+        "dragonite_leggings",
         ::Item,
-        Item.Properties().humanoidArmor(armorMaterial , ArmorType.LEGGINGS)
+        Item.Properties()
+            .enchantable(Witherite.armorMaterial.enchantmentValue)
+            .humanoidArmor(armorMaterial , ArmorType.LEGGINGS)
             .durability(ArmorType.LEGGINGS.getDurability(armorMaterial.durability))
     )
 
     val BOOTS = register(
-        "dragon_boots",
+        "dragonite_boots",
         ::Item,
-        Item.Properties().humanoidArmor(armorMaterial , ArmorType.BOOTS)
+        Item.Properties()
+            .enchantable(Witherite.armorMaterial.enchantmentValue)
+            .humanoidArmor(armorMaterial , ArmorType.BOOTS)
             .durability(ArmorType.BOOTS.getDurability(armorMaterial.durability))
     )
 

src/main/kotlin/dev/zxq5/items/Witherite.kt

@@ -16,6 +16,7 @@ import net.minecraft.world.entity.projectile.hurtingprojectile.WitherSkull
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ToolMaterial
 import net.minecraft.world.item.component.BlocksAttacks
+import net.minecraft.world.item.component.UseCooldown
 import net.minecraft.world.item.equipment.*
 import net.minecraft.world.level.Level
 import java.util.Optional
@@ -65,37 +66,51 @@ object Witherite {
     )
 
     val SWORD = register("witherite_sword", ::WitheriteSword,
-        Item.Properties().sword(ToolMaterial.NETHERITE, 3F, -2.4F)
+        Item.Properties()
+            .enchantable(armorMaterial.enchantmentValue)
+            .component(DataComponents.USE_COOLDOWN, UseCooldown(0.0f))
+            .sword(ToolMaterial.NETHERITE, 3F, -2.4F)
     )
 
     val AXE = register("witherite_axe", ::Item,
-        Item.Properties().axe(ToolMaterial.NETHERITE, 5F, -3F))
+        Item.Properties()
+            .enchantable(armorMaterial.enchantmentValue)
+            .axe(ToolMaterial.NETHERITE, 5F, -3F))
+
 
     val HELMET = register(
         "witherite_helmet",
         ::Item,
         Item.Properties().humanoidArmor(armorMaterial , ArmorType.HELMET)
+            .enchantable(armorMaterial.enchantmentValue)
             .durability(ArmorType.HELMET.getDurability(armorMaterial.durability))
     )
 
     val CHESTPLATE = register(
         "witherite_chestplate",
         ::Item,
-        Item.Properties().humanoidArmor(armorMaterial , ArmorType.CHESTPLATE)
+
+        Item.Properties()
+            .enchantable(armorMaterial.enchantmentValue)
+            .humanoidArmor(armorMaterial , ArmorType.CHESTPLATE)
             .durability(ArmorType.CHESTPLATE.getDurability(armorMaterial.durability))
     )
 
     val LEGGINGS = register(
         "witherite_leggings",
         ::Item,
-        Item.Properties().humanoidArmor(armorMaterial , ArmorType.LEGGINGS)
+        Item.Properties()
+            .enchantable(armorMaterial.enchantmentValue)
+            .humanoidArmor(armorMaterial , ArmorType.LEGGINGS)
             .durability(ArmorType.LEGGINGS.getDurability(armorMaterial.durability))
     )
 
     val BOOTS = register(
         "witherite_boots",
         ::Item,
-        Item.Properties().humanoidArmor(armorMaterial , ArmorType.BOOTS)
+        Item.Properties()
+            .enchantable(armorMaterial.enchantmentValue)
+            .humanoidArmor(armorMaterial , ArmorType.BOOTS)
             .durability(ArmorType.BOOTS.getDurability(armorMaterial.durability))
     )
 
@@ -110,14 +125,19 @@ class WitheriteSword(properties: Properties) : Item(properties) {
         if (level.isClientSide) {
             return InteractionResult.PASS;
         }
-
         if (!user.isCrouching) return InteractionResult.PASS
 
+        val stack = user.getItemInHand(hand)
+        if (user.cooldowns.isOnCooldown(stack)) return InteractionResult.PASS
+
         val skull = WitherSkull(EntityType.WITHER_SKULL, level)
         skull.setPos(user.eyePosition)
         skull.deltaMovement = user.lookAngle
         level.addFreshEntity(skull)
         skull.playSound(SoundEvents.WITHER_SHOOT)
+
+        user.cooldowns.addCooldown(stack, 25)
+
         return InteractionResult.SUCCESS;
     }
 }

src/main/resources/assets/fantasysmp/equipment/dragonite.json

@@ -2,17 +2,17 @@
     "layers": {
         "humanoid": [
             {
-            "texture": "fantasysmp:dragon"
+            "texture": "fantasysmp:dragonite"
             }
         ],
         "humanoid_leggings": [
             {
-            "texture": "fantasysmp:dragon"
+            "texture": "fantasysmp:dragonite"
             }
         ],
         "wings": [
             {
-                "texture": "fantasysmp:dragon",
+                "texture": "fantasysmp:dragonite",
                 "use_player_texture": false
             }
         ]

src/main/resources/assets/fantasysmp/items/dragonite_boots.json

@@ -1,6 +1,6 @@
 {
     "model": {
         "type": "minecraft:model",
-        "model": "fantasysmp:item/dragon_leggings"
+        "model": "fantasysmp:item/dragonite_boots"
     }
 }

src/main/resources/assets/fantasysmp/items/dragonite_chestplate.json

@@ -1,6 +1,6 @@
 {
     "model": {
         "type": "minecraft:model",
-        "model": "fantasysmp:item/dragon_helmet"
+        "model": "fantasysmp:item/dragonite_chestplate"
     }
 }

src/main/resources/assets/fantasysmp/items/dragonite_helmet.json

@@ -1,6 +1,6 @@
 {
     "model": {
         "type": "minecraft:model",
-        "model": "fantasysmp:item/dragon_sword"
+        "model": "fantasysmp:item/dragonite_helmet"
     }
 }

src/main/resources/assets/fantasysmp/items/dragonite_leggings.json

@@ -1,6 +1,6 @@
 {
     "model": {
         "type": "minecraft:model",
-        "model": "fantasysmp:item/dragon_chestplate"
+        "model": "fantasysmp:item/dragonite_leggings"
     }
 }

src/main/resources/assets/fantasysmp/items/dragonite_sword.json

@@ -1,6 +1,6 @@
 {
     "model": {
         "type": "minecraft:model",
-        "model": "fantasysmp:item/dragon_boots"
+        "model": "fantasysmp:item/dragonite_sword"
     }
 }

src/main/resources/assets/fantasysmp/lang/en_us.json

@@ -6,9 +6,11 @@
   "item.fantasysmp.witherite_boots": "Witherite Boots",
   "item.fantasysmp.witherite_axe": "Witherite Axe",
   "item.fantasysmp.witherite_shield": "Witherite Shield",
-  "item.fantasysmp.dragon_sword": "Dragon Sword",
+  "item.fantasysmp.dragonite_ingot": "Dragonite Ingot",
-  "item.fantasysmp.dragon_helmet": "Dragon Helmet",
+  "item.fantasysmp.dragon_scale": "Dragon Scale",
-  "item.fantasysmp.dragon_chestplate": "Dragon Chestplate",
+  "item.fantasysmp.dragonite_sword": "Dragonite Sword",
-  "item.fantasysmp.dragon_leggings": "Dragon Leggings",
+  "item.fantasysmp.dragonite_helmet": "Dragonite Helmet",
-  "item.fantasysmp.dragon_boots": "Dragon Boots"
+  "item.fantasysmp.dragonite_chestplate": "Dragonite Chestplate",
+  "item.fantasysmp.dragonite_leggings": "Dragonite Leggings",
+  "item.fantasysmp.dragonite_boots": "Dragonite Boots"
 }

src/main/resources/assets/fantasysmp/models/item/dragonite_boots.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/netherite_boots",
     "textures": {
-        "layer0": "fantasysmp:item/dragon_boots"
+        "layer0": "fantasysmp:item/dragonite_boots"
     }
 }

src/main/resources/assets/fantasysmp/models/item/dragonite_chestplate.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/netherite_chestplate",
     "textures": {
-        "layer0": "fantasysmp:item/dragon_chestplate"
+        "layer0": "fantasysmp:item/dragonite_chestplate"
     }
 }

src/main/resources/assets/fantasysmp/models/item/dragonite_helmet.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/netherite_helmet",
     "textures": {
-        "layer0": "fantasysmp:item/dragon_helmet"
+        "layer0": "fantasysmp:item/dragonite_helmet"
     }
 }

src/main/resources/assets/fantasysmp/models/item/dragonite_leggings.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/netherite_leggings",
     "textures": {
-        "layer0": "fantasysmp:item/dragon_leggings"
+        "layer0": "fantasysmp:item/dragonite_leggings"
     }
 }

src/main/resources/assets/fantasysmp/models/item/dragonite_sword.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/netherite_sword",
     "textures": {
-        "layer0": "fantasysmp:item/dragon_sword"
+        "layer0": "fantasysmp:item/dragonite_sword"
     }
 }

src/main/resources/data/fantasysmp/recipe/dragonite_boots.json

@@ -4,7 +4,7 @@
   "base": "minecraft:netherite_boots",
   "addition": "fantasysmp:dragonite_ingot",
   "result": {
-    "id": "fantasysmp:dragon_boots"
+    "id": "fantasysmp:dragonite_boots"
   }
 }
 

src/main/resources/data/fantasysmp/recipe/dragonite_chestplate.json

@@ -4,6 +4,6 @@
   "base": "minecraft:netherite_chestplate",
   "addition": "fantasysmp:dragonite_ingot",
   "result": {
-    "id": "fantasysmp:dragon_chestplate"
+    "id": "fantasysmp:dragonite_chestplate"
   }
 }

src/main/resources/data/fantasysmp/recipe/dragonite_helmet.json

@@ -4,6 +4,6 @@
   "base": "minecraft:netherite_helmet",
   "addition": "fantasysmp:dragonite_ingot",
   "result": {
-    "id": "fantasysmp:dragon_helmet"
+    "id": "fantasysmp:dragonite_helmet"
   }
 }

src/main/resources/data/fantasysmp/recipe/dragonite_leggings.json

@@ -4,6 +4,6 @@
   "base": "minecraft:netherite_leggings",
   "addition": "fantasysmp:dragonite_ingot",
   "result": {
-    "id": "fantasysmp:dragon_leggings"
+    "id": "fantasysmp:dragonite_leggings"
   }
 }

src/main/resources/data/fantasysmp/recipe/dragonite_sword.json

@@ -4,6 +4,6 @@
   "base": "minecraft:netherite_sword",
   "addition": "fantasysmp:dragonite_ingot",
   "result": {
-    "id": "fantasysmp:dragon_sword"
+    "id": "fantasysmp:dragonite_sword"
   }
 }

src/main/resources/data/minecraft/tags/item/axes.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "fantasysmp:witherite_axe"
+  ]
+}

src/main/resources/data/minecraft/tags/item/enchantable/armor.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    "fantasysmp:witherite_helmet",
+    "fantasysmp:witherite_chestplate",
+    "fantasysmp:witherite_leggings",
+    "fantasysmp:witherite_boots",
+    "fantasysmp:dragonite_helmet",
+    "fantasysmp:dragonite_chestplate",
+    "fantasysmp:dragonite_leggings",
+    "fantasysmp:dragonite_boots"
+  ]
+}

src/main/resources/data/minecraft/tags/item/enchantable/chest_armor.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "fantasysmp:witherite_chestplate",
+    "fantasysmp:dragonite_chestplate"
+  ]
+}

src/main/resources/data/minecraft/tags/item/enchantable/foot_armor.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "fantasysmp:witherite_boots",
+    "fantasysmp:dragonite_boots"
+  ]
+}

src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "fantasysmp:witherite_helmet",
+    "fantasysmp:dragonite_helmet"
+  ]
+}

src/main/resources/data/minecraft/tags/item/enchantable/leg_armor.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "fantasysmp:witherite_leggings",
+    "fantasysmp:dragonite_leggings"
+  ]
+}

src/main/resources/data/minecraft/tags/item/swords.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "fantasysmp:witherite_sword",
+    "fantasysmp:dragonite_sword"
+  ]
+}