From d392be38c575c4acd69bb30b3271d2d0cd14a1ac Mon Sep 17 00:00:00 2001 From: zxq5 Date: Wed, 1 Jul 2026 22:32:27 +0100 Subject: [PATCH] 1.0.0 beta ready to deploy --- .../zxq5/client/FantasysmpDataGenerator.kt | 4 +- src/main/kotlin/dev/zxq5/items/Dragonite.kt | 37 +++++++++++------- src/main/kotlin/dev/zxq5/items/Witherite.kt | 32 ++++++++++++--- .../equipment/{dragon.json => dragonite.json} | 6 +-- ...gon_leggings.json => dragonite_boots.json} | 2 +- ..._helmet.json => dragonite_chestplate.json} | 2 +- ...ragon_sword.json => dragonite_helmet.json} | 2 +- ...hestplate.json => dragonite_leggings.json} | 2 +- ...dragon_boots.json => dragonite_sword.json} | 2 +- .../assets/fantasysmp/lang/en_us.json | 12 +++--- ...dragon_boots.json => dragonite_boots.json} | 2 +- ...stplate.json => dragonite_chestplate.json} | 2 +- ...agon_helmet.json => dragonite_helmet.json} | 2 +- ..._leggings.json => dragonite_leggings.json} | 2 +- ...dragon_sword.json => dragonite_sword.json} | 2 +- .../humanoid/{dragon.png => dragonite.png} | Bin .../{dragon.png => dragonite.png} | Bin .../wings/{dragon.png => dragonite.png} | Bin .../{dragon_boots.png => dragonite_boots.png} | Bin ...hestplate.png => dragonite_chestplate.png} | Bin ...dragon_helmet.png => dragonite_helmet.png} | Bin ...on_leggings.png => dragonite_leggings.png} | Bin .../{dragon_sword.png => dragonite_sword.png} | Bin ...dragon_boots.json => dragonite_boots.json} | 2 +- ...stplate.json => dragonite_chestplate.json} | 2 +- ...agon_helmet.json => dragonite_helmet.json} | 2 +- ..._leggings.json => dragonite_leggings.json} | 2 +- ...dragon_sword.json => dragonite_sword.json} | 2 +- .../data/minecraft/tags/item/axes.json | 5 +++ .../tags/item/enchantable/armor.json | 12 ++++++ .../tags/item/enchantable/chest_armor.json | 6 +++ .../tags/item/enchantable/foot_armor.json | 6 +++ .../tags/item/enchantable/head_armor.json | 6 +++ .../tags/item/enchantable/leg_armor.json | 6 +++ .../data/minecraft/tags/item/swords.json | 6 +++ 35 files changed, 124 insertions(+), 44 deletions(-) rename src/main/resources/assets/fantasysmp/equipment/{dragon.json => dragonite.json} (64%) rename src/main/resources/assets/fantasysmp/items/{dragon_leggings.json => dragonite_boots.json} (53%) rename src/main/resources/assets/fantasysmp/items/{dragon_helmet.json => dragonite_chestplate.json} (51%) rename src/main/resources/assets/fantasysmp/items/{dragon_sword.json => dragonite_helmet.json} (53%) rename src/main/resources/assets/fantasysmp/items/{dragon_chestplate.json => dragonite_leggings.json} (52%) rename src/main/resources/assets/fantasysmp/items/{dragon_boots.json => dragonite_sword.json} (53%) rename src/main/resources/assets/fantasysmp/models/item/{dragon_boots.json => dragonite_boots.json} (55%) rename src/main/resources/assets/fantasysmp/models/item/{dragon_chestplate.json => dragonite_chestplate.json} (55%) rename src/main/resources/assets/fantasysmp/models/item/{dragon_helmet.json => dragonite_helmet.json} (55%) rename src/main/resources/assets/fantasysmp/models/item/{dragon_leggings.json => dragonite_leggings.json} (55%) rename src/main/resources/assets/fantasysmp/models/item/{dragon_sword.json => dragonite_sword.json} (55%) rename src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid/{dragon.png => dragonite.png} (100%) rename src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid_leggings/{dragon.png => dragonite.png} (100%) rename src/main/resources/assets/fantasysmp/textures/entity/equipment/wings/{dragon.png => dragonite.png} (100%) rename src/main/resources/assets/fantasysmp/textures/item/{dragon_boots.png => dragonite_boots.png} (100%) rename src/main/resources/assets/fantasysmp/textures/item/{dragon_chestplate.png => dragonite_chestplate.png} (100%) rename src/main/resources/assets/fantasysmp/textures/item/{dragon_helmet.png => dragonite_helmet.png} (100%) rename src/main/resources/assets/fantasysmp/textures/item/{dragon_leggings.png => dragonite_leggings.png} (100%) rename src/main/resources/assets/fantasysmp/textures/item/{dragon_sword.png => dragonite_sword.png} (100%) rename src/main/resources/data/fantasysmp/recipe/{dragon_boots.json => dragonite_boots.json} (83%) rename src/main/resources/data/fantasysmp/recipe/{dragon_chestplate.json => dragonite_chestplate.json} (80%) rename src/main/resources/data/fantasysmp/recipe/{dragon_helmet.json => dragonite_helmet.json} (82%) rename src/main/resources/data/fantasysmp/recipe/{dragon_leggings.json => dragonite_leggings.json} (82%) rename src/main/resources/data/fantasysmp/recipe/{dragon_sword.json => dragonite_sword.json} (82%) create mode 100644 src/main/resources/data/minecraft/tags/item/axes.json create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/armor.json create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/chest_armor.json create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/foot_armor.json create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/leg_armor.json create mode 100644 src/main/resources/data/minecraft/tags/item/swords.json diff --git a/src/client/kotlin/dev/zxq5/client/FantasysmpDataGenerator.kt b/src/client/kotlin/dev/zxq5/client/FantasysmpDataGenerator.kt index 0067bc4..bbc0059 100644 --- a/src/client/kotlin/dev/zxq5/client/FantasysmpDataGenerator.kt +++ b/src/client/kotlin/dev/zxq5/client/FantasysmpDataGenerator.kt @@ -6,4 +6,6 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator object FantasysmpDataGenerator : DataGeneratorEntrypoint { override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) { } -} \ No newline at end of file +} + + diff --git a/src/main/kotlin/dev/zxq5/items/Dragonite.kt b/src/main/kotlin/dev/zxq5/items/Dragonite.kt index 476decb..59e33e2 100644 --- a/src/main/kotlin/dev/zxq5/items/Dragonite.kt +++ b/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 = ResourceKey.create( + val MATERIAL: ResourceKey = ResourceKey.create( 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)) ) diff --git a/src/main/kotlin/dev/zxq5/items/Witherite.kt b/src/main/kotlin/dev/zxq5/items/Witherite.kt index 8e03731..2891f5d 100644 --- a/src/main/kotlin/dev/zxq5/items/Witherite.kt +++ b/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; } } diff --git a/src/main/resources/assets/fantasysmp/equipment/dragon.json b/src/main/resources/assets/fantasysmp/equipment/dragonite.json similarity index 64% rename from src/main/resources/assets/fantasysmp/equipment/dragon.json rename to src/main/resources/assets/fantasysmp/equipment/dragonite.json index e68e3f4..680bcaf 100644 --- a/src/main/resources/assets/fantasysmp/equipment/dragon.json +++ b/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 } ] diff --git a/src/main/resources/assets/fantasysmp/items/dragon_leggings.json b/src/main/resources/assets/fantasysmp/items/dragonite_boots.json similarity index 53% rename from src/main/resources/assets/fantasysmp/items/dragon_leggings.json rename to src/main/resources/assets/fantasysmp/items/dragonite_boots.json index 77b439d..5fcfdda 100644 --- a/src/main/resources/assets/fantasysmp/items/dragon_leggings.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragon_helmet.json b/src/main/resources/assets/fantasysmp/items/dragonite_chestplate.json similarity index 51% rename from src/main/resources/assets/fantasysmp/items/dragon_helmet.json rename to src/main/resources/assets/fantasysmp/items/dragonite_chestplate.json index 8255a3c..cdb1acf 100644 --- a/src/main/resources/assets/fantasysmp/items/dragon_helmet.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragon_sword.json b/src/main/resources/assets/fantasysmp/items/dragonite_helmet.json similarity index 53% rename from src/main/resources/assets/fantasysmp/items/dragon_sword.json rename to src/main/resources/assets/fantasysmp/items/dragonite_helmet.json index 59e5199..43f09a8 100644 --- a/src/main/resources/assets/fantasysmp/items/dragon_sword.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragon_chestplate.json b/src/main/resources/assets/fantasysmp/items/dragonite_leggings.json similarity index 52% rename from src/main/resources/assets/fantasysmp/items/dragon_chestplate.json rename to src/main/resources/assets/fantasysmp/items/dragonite_leggings.json index 1254694..a2e417f 100644 --- a/src/main/resources/assets/fantasysmp/items/dragon_chestplate.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragon_boots.json b/src/main/resources/assets/fantasysmp/items/dragonite_sword.json similarity index 53% rename from src/main/resources/assets/fantasysmp/items/dragon_boots.json rename to src/main/resources/assets/fantasysmp/items/dragonite_sword.json index f4eff39..bd03da7 100644 --- a/src/main/resources/assets/fantasysmp/items/dragon_boots.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/lang/en_us.json b/src/main/resources/assets/fantasysmp/lang/en_us.json index f48210e..185b461 100644 --- a/src/main/resources/assets/fantasysmp/lang/en_us.json +++ b/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.dragon_helmet": "Dragon Helmet", - "item.fantasysmp.dragon_chestplate": "Dragon Chestplate", - "item.fantasysmp.dragon_leggings": "Dragon Leggings", - "item.fantasysmp.dragon_boots": "Dragon Boots" + "item.fantasysmp.dragonite_ingot": "Dragonite Ingot", + "item.fantasysmp.dragon_scale": "Dragon Scale", + "item.fantasysmp.dragonite_sword": "Dragonite Sword", + "item.fantasysmp.dragonite_helmet": "Dragonite Helmet", + "item.fantasysmp.dragonite_chestplate": "Dragonite Chestplate", + "item.fantasysmp.dragonite_leggings": "Dragonite Leggings", + "item.fantasysmp.dragonite_boots": "Dragonite Boots" } \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/models/item/dragon_boots.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_boots.json similarity index 55% rename from src/main/resources/assets/fantasysmp/models/item/dragon_boots.json rename to src/main/resources/assets/fantasysmp/models/item/dragonite_boots.json index 72c2e9d..f98b91c 100644 --- a/src/main/resources/assets/fantasysmp/models/item/dragon_boots.json +++ b/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" } } diff --git a/src/main/resources/assets/fantasysmp/models/item/dragon_chestplate.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_chestplate.json similarity index 55% rename from src/main/resources/assets/fantasysmp/models/item/dragon_chestplate.json rename to src/main/resources/assets/fantasysmp/models/item/dragonite_chestplate.json index 4aca58a..9ee4813 100644 --- a/src/main/resources/assets/fantasysmp/models/item/dragon_chestplate.json +++ b/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" } } diff --git a/src/main/resources/assets/fantasysmp/models/item/dragon_helmet.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_helmet.json similarity index 55% rename from src/main/resources/assets/fantasysmp/models/item/dragon_helmet.json rename to src/main/resources/assets/fantasysmp/models/item/dragonite_helmet.json index 840891e..98dc202 100644 --- a/src/main/resources/assets/fantasysmp/models/item/dragon_helmet.json +++ b/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" } } diff --git a/src/main/resources/assets/fantasysmp/models/item/dragon_leggings.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_leggings.json similarity index 55% rename from src/main/resources/assets/fantasysmp/models/item/dragon_leggings.json rename to src/main/resources/assets/fantasysmp/models/item/dragonite_leggings.json index 765c495..66994b6 100644 --- a/src/main/resources/assets/fantasysmp/models/item/dragon_leggings.json +++ b/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" } } diff --git a/src/main/resources/assets/fantasysmp/models/item/dragon_sword.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_sword.json similarity index 55% rename from src/main/resources/assets/fantasysmp/models/item/dragon_sword.json rename to src/main/resources/assets/fantasysmp/models/item/dragonite_sword.json index eecf62f..59afadc 100644 --- a/src/main/resources/assets/fantasysmp/models/item/dragon_sword.json +++ b/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" } } diff --git a/src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid/dragon.png b/src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid/dragonite.png similarity index 100% rename from src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid/dragon.png rename to src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid/dragonite.png diff --git a/src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid_leggings/dragon.png b/src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid_leggings/dragonite.png similarity index 100% rename from src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid_leggings/dragon.png rename to src/main/resources/assets/fantasysmp/textures/entity/equipment/humanoid_leggings/dragonite.png diff --git a/src/main/resources/assets/fantasysmp/textures/entity/equipment/wings/dragon.png b/src/main/resources/assets/fantasysmp/textures/entity/equipment/wings/dragonite.png similarity index 100% rename from src/main/resources/assets/fantasysmp/textures/entity/equipment/wings/dragon.png rename to src/main/resources/assets/fantasysmp/textures/entity/equipment/wings/dragonite.png diff --git a/src/main/resources/assets/fantasysmp/textures/item/dragon_boots.png b/src/main/resources/assets/fantasysmp/textures/item/dragonite_boots.png similarity index 100% rename from src/main/resources/assets/fantasysmp/textures/item/dragon_boots.png rename to src/main/resources/assets/fantasysmp/textures/item/dragonite_boots.png diff --git a/src/main/resources/assets/fantasysmp/textures/item/dragon_chestplate.png b/src/main/resources/assets/fantasysmp/textures/item/dragonite_chestplate.png similarity index 100% rename from src/main/resources/assets/fantasysmp/textures/item/dragon_chestplate.png rename to src/main/resources/assets/fantasysmp/textures/item/dragonite_chestplate.png diff --git a/src/main/resources/assets/fantasysmp/textures/item/dragon_helmet.png b/src/main/resources/assets/fantasysmp/textures/item/dragonite_helmet.png similarity index 100% rename from src/main/resources/assets/fantasysmp/textures/item/dragon_helmet.png rename to src/main/resources/assets/fantasysmp/textures/item/dragonite_helmet.png diff --git a/src/main/resources/assets/fantasysmp/textures/item/dragon_leggings.png b/src/main/resources/assets/fantasysmp/textures/item/dragonite_leggings.png similarity index 100% rename from src/main/resources/assets/fantasysmp/textures/item/dragon_leggings.png rename to src/main/resources/assets/fantasysmp/textures/item/dragonite_leggings.png diff --git a/src/main/resources/assets/fantasysmp/textures/item/dragon_sword.png b/src/main/resources/assets/fantasysmp/textures/item/dragonite_sword.png similarity index 100% rename from src/main/resources/assets/fantasysmp/textures/item/dragon_sword.png rename to src/main/resources/assets/fantasysmp/textures/item/dragonite_sword.png diff --git a/src/main/resources/data/fantasysmp/recipe/dragon_boots.json b/src/main/resources/data/fantasysmp/recipe/dragonite_boots.json similarity index 83% rename from src/main/resources/data/fantasysmp/recipe/dragon_boots.json rename to src/main/resources/data/fantasysmp/recipe/dragonite_boots.json index 490222d..a2079af 100644 --- a/src/main/resources/data/fantasysmp/recipe/dragon_boots.json +++ b/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" } } diff --git a/src/main/resources/data/fantasysmp/recipe/dragon_chestplate.json b/src/main/resources/data/fantasysmp/recipe/dragonite_chestplate.json similarity index 80% rename from src/main/resources/data/fantasysmp/recipe/dragon_chestplate.json rename to src/main/resources/data/fantasysmp/recipe/dragonite_chestplate.json index a145c4a..f24b329 100644 --- a/src/main/resources/data/fantasysmp/recipe/dragon_chestplate.json +++ b/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" } } diff --git a/src/main/resources/data/fantasysmp/recipe/dragon_helmet.json b/src/main/resources/data/fantasysmp/recipe/dragonite_helmet.json similarity index 82% rename from src/main/resources/data/fantasysmp/recipe/dragon_helmet.json rename to src/main/resources/data/fantasysmp/recipe/dragonite_helmet.json index 88359f7..ae29f48 100644 --- a/src/main/resources/data/fantasysmp/recipe/dragon_helmet.json +++ b/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" } } diff --git a/src/main/resources/data/fantasysmp/recipe/dragon_leggings.json b/src/main/resources/data/fantasysmp/recipe/dragonite_leggings.json similarity index 82% rename from src/main/resources/data/fantasysmp/recipe/dragon_leggings.json rename to src/main/resources/data/fantasysmp/recipe/dragonite_leggings.json index cdf1757..a787d8d 100644 --- a/src/main/resources/data/fantasysmp/recipe/dragon_leggings.json +++ b/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" } } diff --git a/src/main/resources/data/fantasysmp/recipe/dragon_sword.json b/src/main/resources/data/fantasysmp/recipe/dragonite_sword.json similarity index 82% rename from src/main/resources/data/fantasysmp/recipe/dragon_sword.json rename to src/main/resources/data/fantasysmp/recipe/dragonite_sword.json index 5ca572b..1542957 100644 --- a/src/main/resources/data/fantasysmp/recipe/dragon_sword.json +++ b/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" } } diff --git a/src/main/resources/data/minecraft/tags/item/axes.json b/src/main/resources/data/minecraft/tags/item/axes.json new file mode 100644 index 0000000..bcdbc21 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/axes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "fantasysmp:witherite_axe" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/armor.json new file mode 100644 index 0000000..6a91eff --- /dev/null +++ b/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" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/chest_armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/chest_armor.json new file mode 100644 index 0000000..31aec6d --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/enchantable/chest_armor.json @@ -0,0 +1,6 @@ +{ + "values": [ + "fantasysmp:witherite_chestplate", + "fantasysmp:dragonite_chestplate" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/foot_armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/foot_armor.json new file mode 100644 index 0000000..c83b646 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/enchantable/foot_armor.json @@ -0,0 +1,6 @@ +{ + "values": [ + "fantasysmp:witherite_boots", + "fantasysmp:dragonite_boots" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json new file mode 100644 index 0000000..2849aa9 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json @@ -0,0 +1,6 @@ +{ + "values": [ + "fantasysmp:witherite_helmet", + "fantasysmp:dragonite_helmet" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/leg_armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/leg_armor.json new file mode 100644 index 0000000..cf28d10 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/enchantable/leg_armor.json @@ -0,0 +1,6 @@ +{ + "values": [ + "fantasysmp:witherite_leggings", + "fantasysmp:dragonite_leggings" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/swords.json b/src/main/resources/data/minecraft/tags/item/swords.json new file mode 100644 index 0000000..b77d355 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/swords.json @@ -0,0 +1,6 @@ +{ + "values": [ + "fantasysmp:witherite_sword", + "fantasysmp:dragonite_sword" + ] +}