diff --git a/src/client/kotlin/dev/zxq5/client/FantasysmpDataGenerator.kt b/src/client/kotlin/dev/zxq5/client/FantasysmpDataGenerator.kt index 780b18f..e1b26bc 100644 --- a/src/client/kotlin/dev/zxq5/client/FantasysmpDataGenerator.kt +++ b/src/client/kotlin/dev/zxq5/client/FantasysmpDataGenerator.kt @@ -1,6 +1,13 @@ package dev.zxq5.client +import com.google.gson.JsonArray +import com.google.gson.JsonObject +import dev.zxq5.Fantasysmp +import dev.zxq5.ModItemTagProvider +import dev.zxq5.ModLanguageProvider import dev.zxq5.ModRecipeProvider +import dev.zxq5.items.template.CustomItemBuilder +import dev.zxq5.items.template.GenericGearSet import dev.zxq5.items.template.GenericItemSet import dev.zxq5.items.template.ModelSpec import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider @@ -10,13 +17,21 @@ import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput import net.minecraft.client.data.models.BlockModelGenerators import net.minecraft.client.data.models.ItemModelGenerators import net.minecraft.client.data.models.model.ModelTemplates +import net.minecraft.data.CachedOutput +import net.minecraft.data.DataProvider +import net.minecraft.data.PackOutput +import java.util.concurrent.CompletableFuture object FantasysmpDataGenerator : DataGeneratorEntrypoint { override fun onInitializeDataGenerator(fabricDataGenerator: FabricDataGenerator) { val pack = fabricDataGenerator.createPack() - pack.addProvider(::ModRecipeProvider) // main-safe, can live in either sourceSet -// pack.addProvider(::ModItemTagProvider) // main-safe - pack.addProvider(::ModModelProvider) // needs client, since ItemModelGenerators is client-only + pack.addProvider(::ModRecipeProvider) + pack.addProvider(::ModItemTagProvider) // TODO! fix impl. + pack.addProvider(::ModLanguageProvider) + + // runs only in the client as it requires client only libs! + pack.addProvider(::ModModelProvider) + pack.addProvider(::ModEquipmentAssetProvider) } } @@ -25,13 +40,48 @@ class ModModelProvider(output: FabricPackOutput) : FabricModelProvider(output) { override fun generateBlockStateModels(blockModels: BlockModelGenerators) {} override fun generateItemModels(itemModels: ItemModelGenerators) { - GenericItemSet.all.forEach { it.generateModels(itemModels) } + println("Generating item models") + GenericItemSet.all.forEach { + println("doing $it") + it.generateModels(itemModels) + } } } +class ModEquipmentAssetProvider(private val output: FabricPackOutput) : DataProvider { + override fun run(writer: CachedOutput): CompletableFuture<*> { + val futures = GenericItemSet.all + .filterIsInstance() + .map { set -> writeAsset(writer, set) } + return CompletableFuture.allOf(*futures.toTypedArray()) + } + + private fun writeAsset(writer: CachedOutput, set: GenericGearSet): CompletableFuture<*> { + val json = JsonObject() + val layersJson = JsonObject() + set.equipmentAssetSpec.layers.forEach { (layerType, layers) -> + val arr = JsonArray() + layers.forEach { layer -> + val entry = JsonObject() + entry.addProperty("texture", layer.texture) + if (!layer.usePlayerTexture) entry.addProperty("use_player_texture", false) + arr.add(entry) + } + layersJson.add(layerType, arr) + } + json.add("layers", layersJson) + + val path = output.outputFolder + .resolve("assets/${Fantasysmp.MOD_ID}/equipment/${set.materialName}.json") + + return DataProvider.saveStable(writer, json, path) + } + + override fun getName() = "Fantasysmp Equipment Assets" +} + // client sourceSet fun GenericItemSet.generateModels(itemModels: ItemModelGenerators) { - if (this !is GenericItemSet) return modelSpecs.forEach { (item, spec) -> when (spec) { ModelSpec.Generated -> itemModels.generateFlatItem(item, ModelTemplates.FLAT_ITEM) diff --git a/src/main/generated/assets/fantasysmp/equipment/dragonite.json b/src/main/generated/assets/fantasysmp/equipment/dragonite.json new file mode 100644 index 0000000..2822df9 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/equipment/dragonite.json @@ -0,0 +1,20 @@ +{ + "layers": { + "humanoid": [ + { + "texture": "fantasysmp:dragonite" + } + ], + "humanoid_leggings": [ + { + "texture": "fantasysmp:dragonite" + } + ], + "wings": [ + { + "texture": "fantasysmp:dragonite", + "use_player_texture": false + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/equipment/blazing.json b/src/main/generated/assets/fantasysmp/equipment/ender.json similarity index 57% rename from src/main/resources/assets/fantasysmp/equipment/blazing.json rename to src/main/generated/assets/fantasysmp/equipment/ender.json index 076e1bf..13b3894 100644 --- a/src/main/resources/assets/fantasysmp/equipment/blazing.json +++ b/src/main/generated/assets/fantasysmp/equipment/ender.json @@ -2,13 +2,13 @@ "layers": { "humanoid": [ { - "texture": "fantasysmp:blazing" + "texture": "fantasysmp:ender" } ], "humanoid_leggings": [ { - "texture": "fantasysmp:blazing" + "texture": "fantasysmp:ender" } ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/equipment/alchemist.json b/src/main/generated/assets/fantasysmp/equipment/witherite.json similarity index 56% rename from src/main/resources/assets/fantasysmp/equipment/alchemist.json rename to src/main/generated/assets/fantasysmp/equipment/witherite.json index 2c8c097..9145e43 100644 --- a/src/main/resources/assets/fantasysmp/equipment/alchemist.json +++ b/src/main/generated/assets/fantasysmp/equipment/witherite.json @@ -2,13 +2,13 @@ "layers": { "humanoid": [ { - "texture": "fantasysmp:alchemist" + "texture": "fantasysmp:witherite" } ], "humanoid_leggings": [ { - "texture": "fantasysmp:alchemist" + "texture": "fantasysmp:witherite" } ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/alchemist_boots.json b/src/main/generated/assets/fantasysmp/items/dragon_scale.json similarity index 50% rename from src/main/resources/assets/fantasysmp/items/alchemist_boots.json rename to src/main/generated/assets/fantasysmp/items/dragon_scale.json index b4aaa59..6c6fa54 100644 --- a/src/main/resources/assets/fantasysmp/items/alchemist_boots.json +++ b/src/main/generated/assets/fantasysmp/items/dragon_scale.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "fantasysmp:item/alchemist_boots" + "model": "fantasysmp:item/dragon_scale" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/alchemist_sword.json b/src/main/generated/assets/fantasysmp/items/dragonite_boots.json similarity index 50% rename from src/main/resources/assets/fantasysmp/items/alchemist_sword.json rename to src/main/generated/assets/fantasysmp/items/dragonite_boots.json index b0307d9..da6fe97 100644 --- a/src/main/resources/assets/fantasysmp/items/alchemist_sword.json +++ b/src/main/generated/assets/fantasysmp/items/dragonite_boots.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "fantasysmp:item/alchemist_sword" + "model": "fantasysmp:item/dragonite_boots" } -} +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/dragonite_chestplate.json b/src/main/generated/assets/fantasysmp/items/dragonite_chestplate.json new file mode 100644 index 0000000..97d6f05 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/dragonite_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/dragonite_chestplate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/alchemist_helmet.json b/src/main/generated/assets/fantasysmp/items/dragonite_helmet.json similarity index 50% rename from src/main/resources/assets/fantasysmp/items/alchemist_helmet.json rename to src/main/generated/assets/fantasysmp/items/dragonite_helmet.json index 9cf4c33..4150b33 100644 --- a/src/main/resources/assets/fantasysmp/items/alchemist_helmet.json +++ b/src/main/generated/assets/fantasysmp/items/dragonite_helmet.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "fantasysmp:item/alchemist_helmet" + "model": "fantasysmp:item/dragonite_helmet" } -} +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/dragonite_ingot.json b/src/main/generated/assets/fantasysmp/items/dragonite_ingot.json new file mode 100644 index 0000000..4b354b9 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/dragonite_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/dragonite_ingot" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/dragonite_leggings.json b/src/main/generated/assets/fantasysmp/items/dragonite_leggings.json new file mode 100644 index 0000000..d571e3a --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/dragonite_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/dragonite_leggings" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/dragonite_sword.json b/src/main/generated/assets/fantasysmp/items/dragonite_sword.json new file mode 100644 index 0000000..da1605a --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/dragonite_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/dragonite_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/ender_boots.json b/src/main/generated/assets/fantasysmp/items/ender_boots.json new file mode 100644 index 0000000..fe51e92 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/ender_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/ender_boots" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/ender_chestplate.json b/src/main/generated/assets/fantasysmp/items/ender_chestplate.json new file mode 100644 index 0000000..51a4d22 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/ender_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/ender_chestplate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/ender_helmet.json b/src/main/generated/assets/fantasysmp/items/ender_helmet.json new file mode 100644 index 0000000..67fb4c1 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/ender_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/ender_helmet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/ender_ingot.json b/src/main/generated/assets/fantasysmp/items/ender_ingot.json new file mode 100644 index 0000000..237794c --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/ender_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/ender_ingot" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/ender_leggings.json b/src/main/generated/assets/fantasysmp/items/ender_leggings.json new file mode 100644 index 0000000..8e4c170 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/ender_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/ender_leggings" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/ender_sword.json b/src/main/generated/assets/fantasysmp/items/ender_sword.json new file mode 100644 index 0000000..bf4fbca --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/ender_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/ender_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/witherite_axe.json b/src/main/generated/assets/fantasysmp/items/witherite_axe.json new file mode 100644 index 0000000..fabb24f --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/witherite_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/witherite_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/witherite_boots.json b/src/main/generated/assets/fantasysmp/items/witherite_boots.json new file mode 100644 index 0000000..0b5a585 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/witherite_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/witherite_boots" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/witherite_chestplate.json b/src/main/generated/assets/fantasysmp/items/witherite_chestplate.json new file mode 100644 index 0000000..86f4cfb --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/witherite_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/witherite_chestplate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/witherite_helmet.json b/src/main/generated/assets/fantasysmp/items/witherite_helmet.json new file mode 100644 index 0000000..e204673 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/witherite_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/witherite_helmet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/witherite_leggings.json b/src/main/generated/assets/fantasysmp/items/witherite_leggings.json new file mode 100644 index 0000000..00862e3 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/witherite_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/witherite_leggings" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/witherite_shield.json b/src/main/generated/assets/fantasysmp/items/witherite_shield.json new file mode 100644 index 0000000..1f13776 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/witherite_shield.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/witherite_shield" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/items/witherite_sword.json b/src/main/generated/assets/fantasysmp/items/witherite_sword.json new file mode 100644 index 0000000..0c64311 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/items/witherite_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "fantasysmp:item/witherite_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/lang/en_us.json b/src/main/generated/assets/fantasysmp/lang/en_us.json new file mode 100644 index 0000000..7b5319f --- /dev/null +++ b/src/main/generated/assets/fantasysmp/lang/en_us.json @@ -0,0 +1,40 @@ +{ + "item.fantasysmp.dragon_scale": "Dragon Scale", + "item.fantasysmp.dragonite_boots": "Dragonite Boots", + "item.fantasysmp.dragonite_boots.lore.line1": "Boots forged from the essence of dragons", + "item.fantasysmp.dragonite_chestplate": "Dragonite Chestplate", + "item.fantasysmp.dragonite_chestplate.lore.line1": "A chestplate forged from the essence of dragons", + "item.fantasysmp.dragonite_helmet": "Dragonite Helmet", + "item.fantasysmp.dragonite_helmet.lore.line1": "A helmet forged from the essence of dragons", + "item.fantasysmp.dragonite_ingot": "Dragonite Ingot", + "item.fantasysmp.dragonite_leggings": "Dragonite Leggings", + "item.fantasysmp.dragonite_leggings.lore.line1": "Leggings forged from the essence of dragons", + "item.fantasysmp.dragonite_sword": "Dragonite Sword", + "item.fantasysmp.dragonite_sword.lore.line1": "A sword forged from the essence of dragons", + "item.fantasysmp.ender_boots": "Ender Boots", + "item.fantasysmp.ender_boots.lore.line1": "Crafted from the essence of endermen", + "item.fantasysmp.ender_chestplate": "Ender Chestplate", + "item.fantasysmp.ender_chestplate.lore.line1": "Crafted from the essence of endermen", + "item.fantasysmp.ender_helmet": "Ender Helmet", + "item.fantasysmp.ender_helmet.lore.line1": "Crafted from the essence of endermen", + "item.fantasysmp.ender_ingot": "Ender Ingot", + "item.fantasysmp.ender_ingot.lore.line1": "Crafted from the essence of endermen", + "item.fantasysmp.ender_leggings": "Ender Leggings", + "item.fantasysmp.ender_leggings.lore.line1": "Crafted from the essence of endermen", + "item.fantasysmp.ender_sword": "Ender Sword", + "item.fantasysmp.ender_sword.lore.line1": "Crafted from the essence of endermen", + "item.fantasysmp.witherite_axe": "Witherite Axe", + "item.fantasysmp.witherite_axe.lore.line1": "An axe forged with the skulls of wither skeletons.", + "item.fantasysmp.witherite_boots": "Witherite Boots", + "item.fantasysmp.witherite_boots.lore.line1": "Boots forged with the skulls of wither skeletons.", + "item.fantasysmp.witherite_chestplate": "Witherite Chestplate", + "item.fantasysmp.witherite_chestplate.lore.line1": "A chestplate forged with the skulls of wither skeletons.", + "item.fantasysmp.witherite_helmet": "Witherite Helmet", + "item.fantasysmp.witherite_helmet.lore.line1": "A helmet forged with the skulls of wither skeletons.", + "item.fantasysmp.witherite_leggings": "Witherite Leggings", + "item.fantasysmp.witherite_leggings.lore.line1": "Leggings forged with the skulls of wither skeletons.", + "item.fantasysmp.witherite_shield": "Witherite Shield", + "item.fantasysmp.witherite_shield.lore.line1": "A shield forged with the skulls of wither skeletons.", + "item.fantasysmp.witherite_sword": "Witherite Sword", + "item.fantasysmp.witherite_sword.lore.line1": "A sword forged with the skulls of wither skeletons." +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/dragon_scale.json b/src/main/generated/assets/fantasysmp/models/item/dragon_scale.json new file mode 100644 index 0000000..17ee2e2 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/dragon_scale.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/dragon_scale" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/dragonite_boots.json b/src/main/generated/assets/fantasysmp/models/item/dragonite_boots.json new file mode 100644 index 0000000..f6f9a74 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/dragonite_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/dragonite_boots" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/dragonite_chestplate.json b/src/main/generated/assets/fantasysmp/models/item/dragonite_chestplate.json new file mode 100644 index 0000000..ad39bf9 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/dragonite_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/dragonite_chestplate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/dragonite_helmet.json b/src/main/generated/assets/fantasysmp/models/item/dragonite_helmet.json new file mode 100644 index 0000000..4034ea4 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/dragonite_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/dragonite_helmet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/dragonite_ingot.json b/src/main/generated/assets/fantasysmp/models/item/dragonite_ingot.json new file mode 100644 index 0000000..8e40c91 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/dragonite_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/dragonite_ingot" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/dragonite_leggings.json b/src/main/generated/assets/fantasysmp/models/item/dragonite_leggings.json new file mode 100644 index 0000000..62379c0 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/dragonite_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/dragonite_leggings" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/dragonite_sword.json b/src/main/generated/assets/fantasysmp/models/item/dragonite_sword.json new file mode 100644 index 0000000..30659fd --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/dragonite_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "fantasysmp:item/dragonite_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/ender_boots.json b/src/main/generated/assets/fantasysmp/models/item/ender_boots.json new file mode 100644 index 0000000..431a0e4 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/ender_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/ender_boots" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/ender_chestplate.json b/src/main/generated/assets/fantasysmp/models/item/ender_chestplate.json new file mode 100644 index 0000000..2fec55e --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/ender_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/ender_chestplate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/ender_helmet.json b/src/main/generated/assets/fantasysmp/models/item/ender_helmet.json new file mode 100644 index 0000000..da69545 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/ender_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/ender_helmet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/ender_ingot.json b/src/main/generated/assets/fantasysmp/models/item/ender_ingot.json new file mode 100644 index 0000000..ab2d972 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/ender_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/ender_ingot" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/ender_leggings.json b/src/main/generated/assets/fantasysmp/models/item/ender_leggings.json new file mode 100644 index 0000000..a1cd79f --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/ender_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/ender_leggings" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/ender_sword.json b/src/main/generated/assets/fantasysmp/models/item/ender_sword.json new file mode 100644 index 0000000..29ddf89 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/ender_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/ender_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/witherite_axe.json b/src/main/generated/assets/fantasysmp/models/item/witherite_axe.json new file mode 100644 index 0000000..12bc05b --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/witherite_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "fantasysmp:item/witherite_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/witherite_boots.json b/src/main/generated/assets/fantasysmp/models/item/witherite_boots.json new file mode 100644 index 0000000..ad9c11a --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/witherite_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/witherite_boots" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/witherite_chestplate.json b/src/main/generated/assets/fantasysmp/models/item/witherite_chestplate.json new file mode 100644 index 0000000..0dbdb46 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/witherite_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/witherite_chestplate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/witherite_helmet.json b/src/main/generated/assets/fantasysmp/models/item/witherite_helmet.json new file mode 100644 index 0000000..014f679 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/witherite_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/witherite_helmet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/witherite_leggings.json b/src/main/generated/assets/fantasysmp/models/item/witherite_leggings.json new file mode 100644 index 0000000..50b263d --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/witherite_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/witherite_leggings" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/witherite_shield.json b/src/main/generated/assets/fantasysmp/models/item/witherite_shield.json new file mode 100644 index 0000000..5dee843 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/witherite_shield.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fantasysmp:item/witherite_shield" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/fantasysmp/models/item/witherite_sword.json b/src/main/generated/assets/fantasysmp/models/item/witherite_sword.json new file mode 100644 index 0000000..815f2a2 --- /dev/null +++ b/src/main/generated/assets/fantasysmp/models/item/witherite_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "fantasysmp:item/witherite_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_boots.json b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_boots.json new file mode 100644 index 0000000..6ac2df9 --- /dev/null +++ b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_boots.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_addition": { + "conditions": { + "items": [ + { + "items": "fantasysmp:ender_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "fantasysmp:ender_boots" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_addition" + ] + ], + "rewards": { + "recipes": [ + "fantasysmp:ender_boots" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_chestplate.json b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_chestplate.json new file mode 100644 index 0000000..26d2f1f --- /dev/null +++ b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_chestplate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_addition": { + "conditions": { + "items": [ + { + "items": "fantasysmp:ender_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "fantasysmp:ender_chestplate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_addition" + ] + ], + "rewards": { + "recipes": [ + "fantasysmp:ender_chestplate" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_helmet.json b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_helmet.json new file mode 100644 index 0000000..b765fc6 --- /dev/null +++ b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_helmet.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_addition": { + "conditions": { + "items": [ + { + "items": "fantasysmp:ender_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "fantasysmp:ender_helmet" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_addition" + ] + ], + "rewards": { + "recipes": [ + "fantasysmp:ender_helmet" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_leggings.json b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_leggings.json new file mode 100644 index 0000000..a899d5f --- /dev/null +++ b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_leggings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_addition": { + "conditions": { + "items": [ + { + "items": "fantasysmp:ender_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "fantasysmp:ender_leggings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_addition" + ] + ], + "rewards": { + "recipes": [ + "fantasysmp:ender_leggings" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_sword.json b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_sword.json new file mode 100644 index 0000000..a5bdbc8 --- /dev/null +++ b/src/main/generated/data/fantasysmp/advancement/recipes/combat/ender_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_addition": { + "conditions": { + "items": [ + { + "items": "fantasysmp:ender_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "fantasysmp:ender_sword" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_addition" + ] + ], + "rewards": { + "recipes": [ + "fantasysmp:ender_sword" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/advancement/recipes/misc/ender_ingot.json b/src/main/generated/data/fantasysmp/advancement/recipes/misc/ender_ingot.json new file mode 100644 index 0000000..2b03c38 --- /dev/null +++ b/src/main/generated/data/fantasysmp/advancement/recipes/misc/ender_ingot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:ender_eye", + "minecraft:diamond" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "fantasysmp:ender_ingot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "fantasysmp:ender_ingot" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/recipe/ender_boots.json b/src/main/generated/data/fantasysmp/recipe/ender_boots.json new file mode 100644 index 0000000..d8733cf --- /dev/null +++ b/src/main/generated/data/fantasysmp/recipe/ender_boots.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smithing_transform", + "addition": "fantasysmp:ender_ingot", + "base": "minecraft:diamond_boots", + "result": { + "id": "fantasysmp:ender_boots" + }, + "template": "minecraft:netherite_upgrade_smithing_template" +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/recipe/ender_chestplate.json b/src/main/generated/data/fantasysmp/recipe/ender_chestplate.json new file mode 100644 index 0000000..a87047e --- /dev/null +++ b/src/main/generated/data/fantasysmp/recipe/ender_chestplate.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smithing_transform", + "addition": "fantasysmp:ender_ingot", + "base": "minecraft:diamond_chestplate", + "result": { + "id": "fantasysmp:ender_chestplate" + }, + "template": "minecraft:netherite_upgrade_smithing_template" +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/recipe/ender_helmet.json b/src/main/generated/data/fantasysmp/recipe/ender_helmet.json new file mode 100644 index 0000000..49cfa9e --- /dev/null +++ b/src/main/generated/data/fantasysmp/recipe/ender_helmet.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smithing_transform", + "addition": "fantasysmp:ender_ingot", + "base": "minecraft:diamond_helmet", + "result": { + "id": "fantasysmp:ender_helmet" + }, + "template": "minecraft:netherite_upgrade_smithing_template" +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/recipe/ender_ingot.json b/src/main/generated/data/fantasysmp/recipe/ender_ingot.json new file mode 100644 index 0000000..bc9f862 --- /dev/null +++ b/src/main/generated/data/fantasysmp/recipe/ender_ingot.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "D": "minecraft:diamond", + "E": "minecraft:ender_eye" + }, + "pattern": [ + "EDE", + "DED", + "EDE" + ], + "result": { + "id": "fantasysmp:ender_ingot" + } +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/recipe/ender_leggings.json b/src/main/generated/data/fantasysmp/recipe/ender_leggings.json new file mode 100644 index 0000000..14d5c26 --- /dev/null +++ b/src/main/generated/data/fantasysmp/recipe/ender_leggings.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smithing_transform", + "addition": "fantasysmp:ender_ingot", + "base": "minecraft:diamond_leggings", + "result": { + "id": "fantasysmp:ender_leggings" + }, + "template": "minecraft:netherite_upgrade_smithing_template" +} \ No newline at end of file diff --git a/src/main/generated/data/fantasysmp/recipe/ender_sword.json b/src/main/generated/data/fantasysmp/recipe/ender_sword.json new file mode 100644 index 0000000..37f0688 --- /dev/null +++ b/src/main/generated/data/fantasysmp/recipe/ender_sword.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smithing_transform", + "addition": "fantasysmp:ender_ingot", + "base": "minecraft:diamond_sword", + "result": { + "id": "fantasysmp:ender_sword" + }, + "template": "minecraft:netherite_upgrade_smithing_template" +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/axes.json b/src/main/generated/data/minecraft/tags/item/axes.json similarity index 100% rename from src/main/resources/data/minecraft/tags/item/axes.json rename to src/main/generated/data/minecraft/tags/item/axes.json diff --git a/src/main/generated/data/minecraft/tags/item/chest_armor.json b/src/main/generated/data/minecraft/tags/item/chest_armor.json new file mode 100644 index 0000000..2569b95 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/item/chest_armor.json @@ -0,0 +1,7 @@ +{ + "values": [ + "fantasysmp:witherite_chestplate", + "fantasysmp:dragonite_chestplate", + "fantasysmp:ender_chestplate" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/foot_armor.json b/src/main/generated/data/minecraft/tags/item/foot_armor.json new file mode 100644 index 0000000..8c2a475 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/item/foot_armor.json @@ -0,0 +1,7 @@ +{ + "values": [ + "fantasysmp:witherite_boots", + "fantasysmp:dragonite_boots", + "fantasysmp:ender_boots" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/head_armor.json b/src/main/generated/data/minecraft/tags/item/head_armor.json new file mode 100644 index 0000000..addebae --- /dev/null +++ b/src/main/generated/data/minecraft/tags/item/head_armor.json @@ -0,0 +1,7 @@ +{ + "values": [ + "fantasysmp:witherite_helmet", + "fantasysmp:dragonite_helmet", + "fantasysmp:ender_helmet" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/leg_armor.json b/src/main/generated/data/minecraft/tags/item/leg_armor.json new file mode 100644 index 0000000..bb5d32d --- /dev/null +++ b/src/main/generated/data/minecraft/tags/item/leg_armor.json @@ -0,0 +1,7 @@ +{ + "values": [ + "fantasysmp:witherite_leggings", + "fantasysmp:dragonite_leggings", + "fantasysmp:ender_leggings" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/swords.json b/src/main/generated/data/minecraft/tags/item/swords.json new file mode 100644 index 0000000..39cd165 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/item/swords.json @@ -0,0 +1,7 @@ +{ + "values": [ + "fantasysmp:witherite_sword", + "fantasysmp:dragonite_sword", + "fantasysmp:ender_sword" + ] +} \ No newline at end of file diff --git a/src/main/kotlin/dev/zxq5/Fantasysmp.kt b/src/main/kotlin/dev/zxq5/Fantasysmp.kt index a63abed..2912d73 100644 --- a/src/main/kotlin/dev/zxq5/Fantasysmp.kt +++ b/src/main/kotlin/dev/zxq5/Fantasysmp.kt @@ -1,15 +1,18 @@ package dev.zxq5 -import dev.zxq5.items.template.GenericItemSet -import dev.zxq5.items.template.ItemTagAdder import dev.zxq5.items.ModItems +import dev.zxq5.items.template.GenericItemSet import net.fabricmc.api.ModInitializer import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput +import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider import net.minecraft.core.HolderLookup +import net.minecraft.core.registries.BuiltInRegistries +import net.minecraft.core.registries.Registries import net.minecraft.data.recipes.RecipeOutput import net.minecraft.data.recipes.RecipeProvider +import net.minecraft.resources.ResourceKey import org.slf4j.LoggerFactory import java.util.concurrent.CompletableFuture @@ -34,9 +37,7 @@ class ModRecipeProvider( ): RecipeProvider { return object : RecipeProvider(registries, exporter) { override fun buildRecipes() { - print("GENERATING ALL RECIPES") GenericItemSet.all.forEach { - print("GENERATING RECIPES FOR" + it.items.toString()) it.generateRecipes(registries, exporter) } } @@ -49,7 +50,25 @@ class ModRecipeProvider( class ModItemTagProvider(output: FabricPackOutput, registriesFuture: CompletableFuture) : FabricTagsProvider.ItemTagsProvider(output, registriesFuture) { override fun addTags(provider: HolderLookup.Provider) { - val adder = ItemTagAdder(this) - GenericItemSet.all.forEach { it.generateItemTags(adder) } + GenericItemSet.all.forEach { + it.generateItemTags(provider).forEach { (item, keys) -> + keys.forEach { key -> + builder(key) + .add(ResourceKey.create(Registries.ITEM, BuiltInRegistries.ITEM.getKey(item))) + } + } + } + } +} + +class ModLanguageProvider( + output: FabricPackOutput, registriesFuture: CompletableFuture) : + FabricLanguageProvider(output, registriesFuture) { + + override fun generateTranslations( + registryLookup: HolderLookup.Provider, + translationBuilder: TranslationBuilder + ) { + GenericItemSet.all.forEach { it.generateTranslations(translationBuilder) } } } \ No newline at end of file diff --git a/src/main/kotlin/dev/zxq5/items/FantasysmpItemRegistry.kt b/src/main/kotlin/dev/zxq5/items/FantasysmpItemRegistry.kt index 7f3a80e..a5121b9 100644 --- a/src/main/kotlin/dev/zxq5/items/FantasysmpItemRegistry.kt +++ b/src/main/kotlin/dev/zxq5/items/FantasysmpItemRegistry.kt @@ -1,10 +1,10 @@ package dev.zxq5.items import dev.zxq5.Fantasysmp -import dev.zxq5.items.template.GenericItemSet import dev.zxq5.items.sets.Dragonite import dev.zxq5.items.sets.Ender import dev.zxq5.items.sets.Witherite +import dev.zxq5.items.template.GenericItemSet import net.fabricmc.fabric.api.creativetab.v1.FabricCreativeModeTab import net.minecraft.core.Registry import net.minecraft.core.registries.BuiltInRegistries diff --git a/src/main/kotlin/dev/zxq5/items/sets/Dragonite.kt b/src/main/kotlin/dev/zxq5/items/sets/Dragonite.kt index 21082b0..bd109c2 100644 --- a/src/main/kotlin/dev/zxq5/items/sets/Dragonite.kt +++ b/src/main/kotlin/dev/zxq5/items/sets/Dragonite.kt @@ -1,11 +1,12 @@ package dev.zxq5.items.sets +import dev.zxq5.Fantasysmp import dev.zxq5.items.template.ArmorSet +import dev.zxq5.items.template.EquipmentLayer import dev.zxq5.items.template.GenericGearSet -import dev.zxq5.items.ModItems.register -import dev.zxq5.items.template.registerItem -import dev.zxq5.items.template.provideDelegate +import dev.zxq5.items.template.ModelSpec import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents +import net.minecraft.ChatFormatting import net.minecraft.core.component.DataComponents import net.minecraft.core.particles.ParticleTypes import net.minecraft.core.particles.PowerParticleOption @@ -16,7 +17,6 @@ import net.minecraft.util.Unit import net.minecraft.world.InteractionHand import net.minecraft.world.InteractionResult import net.minecraft.world.damagesource.DamageSource -import net.minecraft.world.damagesource.DamageSources import net.minecraft.world.damagesource.DamageTypes import net.minecraft.world.entity.Entity import net.minecraft.world.entity.player.Player @@ -24,9 +24,8 @@ import net.minecraft.world.item.Item import net.minecraft.world.item.Items import net.minecraft.world.item.ToolMaterial import net.minecraft.world.item.component.UseCooldown -import net.minecraft.world.item.equipment.* +import net.minecraft.world.item.equipment.ArmorType import net.minecraft.world.level.Level -import kotlin.getValue object Dragonite: GenericGearSet() { @@ -34,9 +33,24 @@ object Dragonite: GenericGearSet() { override val materialDefinition get() = super.materialDefinition.copy(assetId = materialKey) - val SCALE by registerItem("dragon_scale", ::Item) + override val equipmentAssetSpec = super.equipmentAssetSpec.copy( + layers = super.equipmentAssetSpec.layers + ("wings" to listOf( + EquipmentLayer( + "${Fantasysmp.MOD_ID}:dragonite", + usePlayerTexture = false + ) + )) + ) + + const val LORE = " forged from the essence of dragons" + override val lore_style = ChatFormatting.DARK_PURPLE + + val SCALE by registerItem("dragon_scale", ::Item) { + name("Dragon Scale") + } val INGOT by registerItem("dragonite_ingot", ::Item) { + name("Dragonite Ingot") shapedRecipe("SBS", "CXC", "SBS", key=mapOf( 'S' to Items.SHULKER_SHELL, 'X' to SCALE, @@ -46,42 +60,58 @@ object Dragonite: GenericGearSet() { } val SWORD by registerItem("dragonite_sword", ::DragoniteSword) { + name("Dragonite Sword") + lore("A sword$LORE") + model(ModelSpec.Handheld) properties { enchantable(armorMaterial.enchantmentValue) .component(DataComponents.USE_COOLDOWN, UseCooldown(2f)) .sword(ToolMaterial.NETHERITE, 3F, -2.4F) } smithingUpgrade(Items.END_CRYSTAL, Items.NETHERITE_SWORD, INGOT) + tags("swords") } val HELMET by registerItem("dragonite_helmet", ::Item) { + name("Dragonite Helmet") + lore("A helmet$LORE") properties { humanoidArmor(armorMaterial, ArmorType.HELMET) } smithingUpgrade(Items.DRAGON_HEAD, Items.NETHERITE_HELMET, INGOT) + tags("head_armor") } val CHESTPLATE by registerItem("dragonite_chestplate", ::Item) { + name("Dragonite Chestplate") + lore("A chestplate$LORE") properties { humanoidArmor(armorMaterial, ArmorType.CHESTPLATE) .component(DataComponents.GLIDER, Unit.INSTANCE) .component(DataComponents.UNBREAKABLE, Unit.INSTANCE) } smithingUpgrade(Items.ELYTRA, Items.NETHERITE_CHESTPLATE, INGOT) + tags("chest_armor") } val LEGGINGS by registerItem("dragonite_leggings", ::Item) { + name("Dragonite Leggings") + lore("Leggings$LORE") properties { humanoidArmor(armorMaterial, ArmorType.LEGGINGS) } smithingUpgrade(Items.CRYING_OBSIDIAN, Items.NETHERITE_LEGGINGS, INGOT) + tags("leg_armor") } val BOOTS by registerItem("dragonite_boots", ::Item) { + name("Dragonite Boots") + lore("Boots$LORE") properties { humanoidArmor(armorMaterial, ArmorType.BOOTS) } smithingUpgrade(Items.CRYING_OBSIDIAN, Items.NETHERITE_BOOTS, INGOT) + tags("foot_armor") } override val armorSet: ArmorSet = ArmorSet(HELMET, CHESTPLATE, LEGGINGS, BOOTS) diff --git a/src/main/kotlin/dev/zxq5/items/sets/Ender.kt b/src/main/kotlin/dev/zxq5/items/sets/Ender.kt index 9f25e91..f8a060b 100644 --- a/src/main/kotlin/dev/zxq5/items/sets/Ender.kt +++ b/src/main/kotlin/dev/zxq5/items/sets/Ender.kt @@ -3,9 +3,8 @@ package dev.zxq5.items.sets import dev.zxq5.items.template.ArmorSet import dev.zxq5.items.template.GearMaterialDef import dev.zxq5.items.template.GenericGearSet -import dev.zxq5.items.template.provideDelegate -import dev.zxq5.items.template.registerItem import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents +import net.minecraft.ChatFormatting import net.minecraft.core.BlockPos import net.minecraft.core.component.DataComponents import net.minecraft.core.particles.ParticleTypes @@ -32,7 +31,13 @@ object Ender: GenericGearSet() { override val materialDefinition get() = GearMaterialDef.DIAMOND.copy(assetId = materialKey) + const val LORE = "Crafted from the essence of endermen" + override val lore_style: ChatFormatting + get() = ChatFormatting.AQUA + val ENDER_INGOT by registerItem("ender_ingot", ::Item) { + name("Ender Ingot") + lore(LORE) shapedRecipe("EDE", "DED", "EDE", key=mapOf( 'E' to Items.ENDER_EYE, 'D' to Items.DIAMOND, @@ -40,40 +45,55 @@ object Ender: GenericGearSet() { } val SWORD by registerItem("ender_sword", ::EnderSword) { + name("Ender Sword") + lore(LORE) properties { enchantable(armorMaterial.enchantmentValue) .component(DataComponents.USE_COOLDOWN, UseCooldown(3f)) .sword(ToolMaterial.DIAMOND, 3F, -2.4F) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.DIAMOND_SWORD, ENDER_INGOT) + tags("swords") } val HELMET by registerItem("ender_helmet", ::Item) { + name("Ender Helmet") + lore(LORE) properties { humanoidArmor(armorMaterial, ArmorType.HELMET) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.DIAMOND_HELMET, ENDER_INGOT) + tags("head_armor") } val CHESTPLATE by registerItem("ender_chestplate", ::Item) { + name("Ender Chestplate") + lore(LORE) properties { humanoidArmor(armorMaterial, ArmorType.CHESTPLATE) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.DIAMOND_CHESTPLATE, ENDER_INGOT) + tags("chest_armor") } val LEGGINGS by registerItem("ender_leggings", ::Item) { + name("Ender Leggings") + lore(LORE) properties { humanoidArmor(armorMaterial, ArmorType.LEGGINGS) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.DIAMOND_LEGGINGS, ENDER_INGOT) + tags("leg_armor") } val BOOTS by registerItem("ender_boots", ::Item) { + name("Ender Boots") + lore(LORE) properties { humanoidArmor(armorMaterial, ArmorType.BOOTS) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.DIAMOND_BOOTS, ENDER_INGOT) + tags("foot_armor") } override val armorSet: ArmorSet = ArmorSet(HELMET, CHESTPLATE, LEGGINGS, BOOTS) diff --git a/src/main/kotlin/dev/zxq5/items/sets/Witherite.kt b/src/main/kotlin/dev/zxq5/items/sets/Witherite.kt index d013aff..468574c 100644 --- a/src/main/kotlin/dev/zxq5/items/sets/Witherite.kt +++ b/src/main/kotlin/dev/zxq5/items/sets/Witherite.kt @@ -2,9 +2,9 @@ package dev.zxq5.items.sets import dev.zxq5.items.template.ArmorSet import dev.zxq5.items.template.GenericGearSet -import dev.zxq5.items.template.registerItem -import dev.zxq5.items.template.provideDelegate +import dev.zxq5.items.template.ModelSpec import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents +import net.minecraft.ChatFormatting import net.minecraft.core.component.DataComponents import net.minecraft.sounds.SoundEvents import net.minecraft.world.InteractionHand @@ -31,7 +31,14 @@ object Witherite: GenericGearSet() { override val materialDefinition get() = super.materialDefinition.copy(assetId = materialKey) + const val LORE = " forged with the skulls of wither skeletons." + + override val lore_style + get() = ChatFormatting.BLACK + val SHIELD by registerItem("witherite_shield", ::Item) { + name("Witherite Shield") + lore("A shield$LORE") properties { component(DataComponents.BLOCKS_ATTACKS, BlocksAttacks( 0.25f, // 5 tick warmup @@ -54,49 +61,69 @@ object Witherite: GenericGearSet() { } val SWORD by registerItem("witherite_sword", ::WitheriteSword) { + name("Witherite Sword") + lore("A sword$LORE") + model(ModelSpec.Handheld) properties { enchantable(armorMaterial.enchantmentValue) .component(DataComponents.USE_COOLDOWN, UseCooldown(2f)) .sword(ToolMaterial.NETHERITE, 3F, -2.4F) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.NETHERITE_SWORD, Items.WITHER_SKELETON_SKULL) + tags("swords") } val AXE by registerItem("witherite_axe", ::WitheriteWeapon) { + name("Witherite Axe") + lore("An axe$LORE") + model(ModelSpec.Handheld) properties { enchantable(armorMaterial.enchantmentValue) .component(DataComponents.USE_COOLDOWN, UseCooldown(2f)) .axe(ToolMaterial.NETHERITE, 3F, -3F) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.NETHERITE_AXE, Items.WITHER_SKELETON_SKULL) + tags("axes") } val HELMET by registerItem("witherite_helmet", ::Item) { + name("Witherite Helmet") + lore("A helmet$LORE") properties { humanoidArmor(armorMaterial, ArmorType.HELMET) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.NETHERITE_HELMET, Items.WITHER_SKELETON_SKULL) + tags("head_armor") } val CHESTPLATE by registerItem("witherite_chestplate", ::Item) { + name("Witherite Chestplate") + lore("A chestplate$LORE") properties { humanoidArmor(armorMaterial, ArmorType.CHESTPLATE) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.NETHERITE_CHESTPLATE, Items.WITHER_SKELETON_SKULL) + tags("chest_armor") } val LEGGINGS by registerItem("witherite_leggings", ::Item) { + name("Witherite Leggings") + lore("Leggings$LORE") properties { humanoidArmor(armorMaterial, ArmorType.LEGGINGS) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.NETHERITE_LEGGINGS, Items.WITHER_SKELETON_SKULL) + tags("leg_armor") } val BOOTS by registerItem("witherite_boots", ::Item) { + name("Witherite Boots") + lore("Boots$LORE") properties { humanoidArmor(armorMaterial, ArmorType.BOOTS) } smithingUpgrade(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.NETHERITE_BOOTS, Items.WITHER_SKELETON_SKULL) + tags("foot_armor") } override val armorSet: ArmorSet = ArmorSet(HELMET, CHESTPLATE, LEGGINGS, BOOTS) diff --git a/src/main/kotlin/dev/zxq5/items/template/GenericGearSet.kt b/src/main/kotlin/dev/zxq5/items/template/GenericGearSet.kt index 067d2ac..683bee9 100644 --- a/src/main/kotlin/dev/zxq5/items/template/GenericGearSet.kt +++ b/src/main/kotlin/dev/zxq5/items/template/GenericGearSet.kt @@ -1,5 +1,6 @@ package dev.zxq5.items.template +import dev.zxq5.Fantasysmp import dev.zxq5.util.resourceKey import net.minecraft.core.Holder import net.minecraft.resources.ResourceKey @@ -19,6 +20,14 @@ abstract class GenericGearSet: GenericItemSet() { abstract val armorSet: ArmorSet + open val equipmentAssetSpec: EquipmentAssetSpec + get() = EquipmentAssetSpec( + layers = mapOf( + "humanoid" to listOf(EquipmentLayer("${Fantasysmp.MOD_ID}:$materialName")), + "humanoid_leggings" to listOf(EquipmentLayer("${Fantasysmp.MOD_ID}:$materialName")), + ) + ) + open val materialKey: ResourceKey get() = materialName.resourceKey() @@ -33,7 +42,7 @@ abstract class GenericGearSet: GenericItemSet() { materialDefinition.toArmorMaterial() } - fun fullSetEquippedBy(p: Player) = + open fun fullSetEquippedBy(p: Player) = p.getItemBySlot(EquipmentSlot.HEAD).item == armorSet.helmet && p.getItemBySlot(EquipmentSlot.CHEST).item == armorSet.chestplate && p.getItemBySlot(EquipmentSlot.LEGS).item == armorSet.leggings && diff --git a/src/main/kotlin/dev/zxq5/items/template/GenericItemSet.kt b/src/main/kotlin/dev/zxq5/items/template/GenericItemSet.kt index 5513eb8..96e5cd6 100644 --- a/src/main/kotlin/dev/zxq5/items/template/GenericItemSet.kt +++ b/src/main/kotlin/dev/zxq5/items/template/GenericItemSet.kt @@ -1,27 +1,29 @@ package dev.zxq5.items.template +import dev.zxq5.Fantasysmp import dev.zxq5.items.ModItems -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider +import dev.zxq5.util.mcItemTag +import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider +import net.minecraft.ChatFormatting import net.minecraft.advancements.criterion.InventoryChangeTrigger import net.minecraft.advancements.criterion.ItemPredicate import net.minecraft.core.HolderGetter import net.minecraft.core.HolderLookup +import net.minecraft.core.component.DataComponents import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.core.registries.Registries -import net.minecraft.data.recipes.RecipeCategory -import net.minecraft.data.recipes.RecipeOutput -import net.minecraft.data.recipes.RecipeProvider -import net.minecraft.data.recipes.ShapedRecipeBuilder -import net.minecraft.data.recipes.SmithingTransformRecipeBuilder +import net.minecraft.data.recipes.* +import net.minecraft.network.chat.Component import net.minecraft.tags.TagKey import net.minecraft.world.item.Item +import net.minecraft.world.item.component.ItemLore import net.minecraft.world.item.crafting.Ingredient -import kotlin.collections.component1 -import kotlin.collections.component2 import kotlin.reflect.KProperty + abstract class GenericItemSet { // list of all items part of the class + open val lore_style = ChatFormatting.GRAY abstract val items: List open fun onLoad() {} @@ -29,15 +31,28 @@ abstract class GenericItemSet { private val itemRecipes = mutableMapOf>() private val itemTags = mutableMapOf>>() private val itemModels = mutableMapOf() + private val itemTranslations = mutableMapOf() + val modelSpecs: Map get() = itemModels - internal fun registerDatagen(item: Item, recipes: List, tags: List>, model: ModelSpec) { + internal fun registerDatagen( + item: Item, + recipes: List, + tags: List>, + model: ModelSpec, + translations: Map + ) { itemRecipes[item] = recipes itemTags[item] = tags itemModels[item] = model + itemTranslations.putAll(translations) } - open fun generateItemTags(tags: ItemTagAdder) { - itemTags.forEach { (item, tagList) -> tagList.forEach { tags.add(it, item) } } + open fun generateItemTags(provider: HolderLookup.Provider): Map>> { + return itemTags + } + + open fun generateTranslations(builder: FabricLanguageProvider.TranslationBuilder) { + itemTranslations.forEach { (key, value) -> builder.add(key, value) } } open fun generateRecipes(registries: HolderLookup.Provider, exporter: RecipeOutput) { @@ -68,12 +83,20 @@ abstract class GenericItemSet { } } } - } + }; init { register(this) } + fun registerItem( + name: String, + itemFactory: (Item.Properties) -> T, + block: CustomItemBuilder.() -> Unit = {}, + ): CustomItemBuilder { + return CustomItemBuilder(this, name, itemFactory).apply(block) + } + companion object { private val _all = mutableListOf() @@ -84,6 +107,13 @@ abstract class GenericItemSet { } +data class EquipmentLayer(val texture: String, val usePlayerTexture: Boolean = true) + +data class EquipmentAssetSpec( + val layers: Map> // "humanoid", "humanoid_leggings", "wings", etc. +) + + class CustomItemBuilder( private val owner: GenericItemSet, val name: String, @@ -92,12 +122,35 @@ class CustomItemBuilder( private var properties = Item.Properties() private val recipes = mutableListOf() private val tags = mutableListOf>() - private var modelSpec: ModelSpec = ModelSpec.None + private val translations = mutableMapOf() + private var modelSpec: ModelSpec = ModelSpec.Generated fun model(spec: ModelSpec) { modelSpec = spec } + fun name(displayName: String) { + translations["item.${Fantasysmp.MOD_ID}.$name"] = displayName + } + + fun lore(vararg lines: String, style: ChatFormatting = owner.lore_style) { + val components = lines.mapIndexed { index, line -> + val key = "item.${Fantasysmp.MOD_ID}.$name.lore.line${index + 1}" + translations[key] = line + Component.translatable(key).withStyle(style) + } + properties = properties.component(DataComponents.LORE, ItemLore(components)) + } + + fun lore(vararg lines: Pair) { + val components = lines.mapIndexed { index, (line, style) -> + val key = "item.${Fantasysmp.MOD_ID}.$name.lore.line${index + 1}" + translations[key] = line + Component.translatable(key).withStyle(style) + } + properties = properties.component(DataComponents.LORE, ItemLore(components)) + } + fun properties(block: Item.Properties.() -> Item.Properties) { properties = properties.block() } @@ -110,21 +163,25 @@ class CustomItemBuilder( recipes += RecipeSpec.Shaped(pattern.toList(), key) } + fun tags(vararg tag: String) { + tag.forEach { + tags += mcItemTag(it) + } + } + fun tags(vararg tag: TagKey) { tags += tag } internal fun build(): T { val item = ModItems.register(name, itemFactory, properties) - owner.registerDatagen(item, recipes, tags, modelSpec) + owner.registerDatagen(item, recipes, tags, modelSpec, translations) return item } -} -class ItemTagAdder(private val provider: FabricTagsProvider.ItemTagsProvider) { - fun add(tag: TagKey, vararg items: Item) { - provider.apply { items.forEach { add(tag, it) } } - } + operator fun provideDelegate( + thisRef: Any?, property: KProperty<*> + ): Lazy = lazy { build() } } sealed interface RecipeSpec { @@ -138,14 +195,4 @@ sealed interface ModelSpec { data object None : ModelSpec // handwritten JSON already exists, skip auto-gen } -fun GenericItemSet.registerItem( - name: String, - itemFactory: (Item.Properties) -> T, - block: CustomItemBuilder.() -> Unit = {}, -): CustomItemBuilder = CustomItemBuilder(this, name, itemFactory).apply(block) - -operator fun CustomItemBuilder.provideDelegate( - thisRef: Any?, property: KProperty<*> -): Lazy = lazy { build() } - operator fun Lazy.getValue(thisRef: Any?, property: KProperty<*>): T = value \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/equipment/crimson.json b/src/main/resources/assets/fantasysmp/equipment/crimson.json deleted file mode 100644 index d069a8e..0000000 --- a/src/main/resources/assets/fantasysmp/equipment/crimson.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "layers": { - "humanoid": [ - { - "texture": "fantasysmp:crimson" - } - ], - "humanoid_leggings": [ - { - "texture": "fantasysmp:crimson" - } - ] - } -} diff --git a/src/main/resources/assets/fantasysmp/equipment/dragonite.json b/src/main/resources/assets/fantasysmp/equipment/dragonite.json deleted file mode 100644 index 680bcaf..0000000 --- a/src/main/resources/assets/fantasysmp/equipment/dragonite.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "layers": { - "humanoid": [ - { - "texture": "fantasysmp:dragonite" - } - ], - "humanoid_leggings": [ - { - "texture": "fantasysmp:dragonite" - } - ], - "wings": [ - { - "texture": "fantasysmp:dragonite", - "use_player_texture": false - } - ] - } -} diff --git a/src/main/resources/assets/fantasysmp/equipment/ender.json b/src/main/resources/assets/fantasysmp/equipment/ender.json deleted file mode 100644 index 689d7d8..0000000 --- a/src/main/resources/assets/fantasysmp/equipment/ender.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "layers": { - "humanoid": [ - { - "texture": "fantasysmp:ender" - } - ], - "humanoid_leggings": [ - { - "texture": "fantasysmp:ender" - } - ] - } -} diff --git a/src/main/resources/assets/fantasysmp/equipment/mechanist.json b/src/main/resources/assets/fantasysmp/equipment/mechanist.json deleted file mode 100644 index 110375d..0000000 --- a/src/main/resources/assets/fantasysmp/equipment/mechanist.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "layers": { - "humanoid": [ - { - "texture": "fantasysmp:mechanist" - } - ], - "humanoid_leggings": [ - { - "texture": "fantasysmp:mechanist" - } - ] - } -} diff --git a/src/main/resources/assets/fantasysmp/equipment/poseidon.json b/src/main/resources/assets/fantasysmp/equipment/poseidon.json deleted file mode 100644 index 93617cb..0000000 --- a/src/main/resources/assets/fantasysmp/equipment/poseidon.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "layers": { - "humanoid": [ - { - "texture": "fantasysmp:poseidon" - } - ], - "humanoid_leggings": [ - { - "texture": "fantasysmp:poseidon" - } - ] - } -} diff --git a/src/main/resources/assets/fantasysmp/equipment/true_netherite.json b/src/main/resources/assets/fantasysmp/equipment/true_netherite.json deleted file mode 100644 index e98c330..0000000 --- a/src/main/resources/assets/fantasysmp/equipment/true_netherite.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "layers": { - "humanoid": [ - { - "texture": "fantasysmp:true_netherite" - } - ], - "humanoid_leggings": [ - { - "texture": "fantasysmp:true_netherite" - } - ] - } -} diff --git a/src/main/resources/assets/fantasysmp/equipment/witherite.json b/src/main/resources/assets/fantasysmp/equipment/witherite.json deleted file mode 100644 index 9ee21e6..0000000 --- a/src/main/resources/assets/fantasysmp/equipment/witherite.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "layers": { - "humanoid": [ - { - "texture": "fantasysmp:witherite" - } - ], - "humanoid_leggings": [ - { - "texture": "fantasysmp:witherite" - } - ] - } -} diff --git a/src/main/resources/assets/fantasysmp/icon.png b/src/main/resources/assets/fantasysmp/icon.png old mode 100644 new mode 100755 index bf6eb5d..045387e Binary files a/src/main/resources/assets/fantasysmp/icon.png and b/src/main/resources/assets/fantasysmp/icon.png differ diff --git a/src/main/resources/assets/fantasysmp/items/alchemist_chestplate.json b/src/main/resources/assets/fantasysmp/items/alchemist_chestplate.json deleted file mode 100644 index 3efc70d..0000000 --- a/src/main/resources/assets/fantasysmp/items/alchemist_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/alchemist_chestplate" - } -} diff --git a/src/main/resources/assets/fantasysmp/items/alchemist_leggings.json b/src/main/resources/assets/fantasysmp/items/alchemist_leggings.json deleted file mode 100644 index 5cea846..0000000 --- a/src/main/resources/assets/fantasysmp/items/alchemist_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/alchemist_leggings" - } -} diff --git a/src/main/resources/assets/fantasysmp/items/blazing_boots.json b/src/main/resources/assets/fantasysmp/items/blazing_boots.json deleted file mode 100644 index 6053640..0000000 --- a/src/main/resources/assets/fantasysmp/items/blazing_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/blazing_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/blazing_chestplate.json b/src/main/resources/assets/fantasysmp/items/blazing_chestplate.json deleted file mode 100644 index d2a891d..0000000 --- a/src/main/resources/assets/fantasysmp/items/blazing_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/blazing_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/blazing_helmet.json b/src/main/resources/assets/fantasysmp/items/blazing_helmet.json deleted file mode 100644 index a5e2664..0000000 --- a/src/main/resources/assets/fantasysmp/items/blazing_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/blazing_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/blazing_leggings.json b/src/main/resources/assets/fantasysmp/items/blazing_leggings.json deleted file mode 100644 index f81d198..0000000 --- a/src/main/resources/assets/fantasysmp/items/blazing_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/blazing_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/blazing_sword.json b/src/main/resources/assets/fantasysmp/items/blazing_sword.json deleted file mode 100644 index 1222fc9..0000000 --- a/src/main/resources/assets/fantasysmp/items/blazing_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/blazing_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/crimson_sword.json b/src/main/resources/assets/fantasysmp/items/crimson_sword.json deleted file mode 100644 index 5dc32bd..0000000 --- a/src/main/resources/assets/fantasysmp/items/crimson_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/crimson_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragon_scale.json b/src/main/resources/assets/fantasysmp/items/dragon_scale.json deleted file mode 100644 index d7d0123..0000000 --- a/src/main/resources/assets/fantasysmp/items/dragon_scale.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/dragon_scale" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragonite_boots.json b/src/main/resources/assets/fantasysmp/items/dragonite_boots.json deleted file mode 100644 index 5fcfdda..0000000 --- a/src/main/resources/assets/fantasysmp/items/dragonite_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/dragonite_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragonite_chestplate.json b/src/main/resources/assets/fantasysmp/items/dragonite_chestplate.json deleted file mode 100644 index cdb1acf..0000000 --- a/src/main/resources/assets/fantasysmp/items/dragonite_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/dragonite_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragonite_helmet.json b/src/main/resources/assets/fantasysmp/items/dragonite_helmet.json deleted file mode 100644 index 43f09a8..0000000 --- a/src/main/resources/assets/fantasysmp/items/dragonite_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/dragonite_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragonite_ingot.json b/src/main/resources/assets/fantasysmp/items/dragonite_ingot.json deleted file mode 100644 index 2d7599e..0000000 --- a/src/main/resources/assets/fantasysmp/items/dragonite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/dragonite_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragonite_leggings.json b/src/main/resources/assets/fantasysmp/items/dragonite_leggings.json deleted file mode 100644 index a2e417f..0000000 --- a/src/main/resources/assets/fantasysmp/items/dragonite_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/dragonite_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/dragonite_sword.json b/src/main/resources/assets/fantasysmp/items/dragonite_sword.json deleted file mode 100644 index bd03da7..0000000 --- a/src/main/resources/assets/fantasysmp/items/dragonite_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/dragonite_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/ender_boots.json b/src/main/resources/assets/fantasysmp/items/ender_boots.json deleted file mode 100644 index f3a156c..0000000 --- a/src/main/resources/assets/fantasysmp/items/ender_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/ender_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/ender_chestplate.json b/src/main/resources/assets/fantasysmp/items/ender_chestplate.json deleted file mode 100644 index 856e28d..0000000 --- a/src/main/resources/assets/fantasysmp/items/ender_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/ender_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/ender_helmet.json b/src/main/resources/assets/fantasysmp/items/ender_helmet.json deleted file mode 100644 index 21bf193..0000000 --- a/src/main/resources/assets/fantasysmp/items/ender_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/ender_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/ender_leggings.json b/src/main/resources/assets/fantasysmp/items/ender_leggings.json deleted file mode 100644 index a202973..0000000 --- a/src/main/resources/assets/fantasysmp/items/ender_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/ender_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/ender_sword.json b/src/main/resources/assets/fantasysmp/items/ender_sword.json deleted file mode 100644 index 2e33816..0000000 --- a/src/main/resources/assets/fantasysmp/items/ender_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/ender_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/lightning_sword.json b/src/main/resources/assets/fantasysmp/items/lightning_sword.json deleted file mode 100644 index 652ac31..0000000 --- a/src/main/resources/assets/fantasysmp/items/lightning_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/lightning_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/poseidons_boots.json b/src/main/resources/assets/fantasysmp/items/poseidons_boots.json deleted file mode 100644 index cc22f41..0000000 --- a/src/main/resources/assets/fantasysmp/items/poseidons_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/poseidons_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/poseidons_chestplate.json b/src/main/resources/assets/fantasysmp/items/poseidons_chestplate.json deleted file mode 100644 index cf42006..0000000 --- a/src/main/resources/assets/fantasysmp/items/poseidons_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/poseidons_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/poseidons_helmet.json b/src/main/resources/assets/fantasysmp/items/poseidons_helmet.json deleted file mode 100644 index 967b577..0000000 --- a/src/main/resources/assets/fantasysmp/items/poseidons_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/poseidons_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/poseidons_leggings.json b/src/main/resources/assets/fantasysmp/items/poseidons_leggings.json deleted file mode 100644 index af57cc1..0000000 --- a/src/main/resources/assets/fantasysmp/items/poseidons_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/poseidons_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/poseidons_trident.json b/src/main/resources/assets/fantasysmp/items/poseidons_trident.json deleted file mode 100644 index a1c8fa1..0000000 --- a/src/main/resources/assets/fantasysmp/items/poseidons_trident.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/poseidons_trident" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/stevens_wrath.json b/src/main/resources/assets/fantasysmp/items/stevens_wrath.json deleted file mode 100644 index bf5d702..0000000 --- a/src/main/resources/assets/fantasysmp/items/stevens_wrath.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/stevens_wrath" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/true_netherite_boots.json b/src/main/resources/assets/fantasysmp/items/true_netherite_boots.json deleted file mode 100644 index fa99ec3..0000000 --- a/src/main/resources/assets/fantasysmp/items/true_netherite_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/true_netherite_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/true_netherite_chestplate.json b/src/main/resources/assets/fantasysmp/items/true_netherite_chestplate.json deleted file mode 100644 index b59fbf8..0000000 --- a/src/main/resources/assets/fantasysmp/items/true_netherite_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/true_netherite_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/true_netherite_helmet.json b/src/main/resources/assets/fantasysmp/items/true_netherite_helmet.json deleted file mode 100644 index 358e995..0000000 --- a/src/main/resources/assets/fantasysmp/items/true_netherite_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/true_netherite_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/true_netherite_leggings.json b/src/main/resources/assets/fantasysmp/items/true_netherite_leggings.json deleted file mode 100644 index a677e11..0000000 --- a/src/main/resources/assets/fantasysmp/items/true_netherite_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/true_netherite_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/true_netherite_sword.json b/src/main/resources/assets/fantasysmp/items/true_netherite_sword.json deleted file mode 100644 index f91117b..0000000 --- a/src/main/resources/assets/fantasysmp/items/true_netherite_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/true_netherite_sword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/witherite_axe.json b/src/main/resources/assets/fantasysmp/items/witherite_axe.json deleted file mode 100644 index a58e24a..0000000 --- a/src/main/resources/assets/fantasysmp/items/witherite_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/witherite_axe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/witherite_boots.json b/src/main/resources/assets/fantasysmp/items/witherite_boots.json deleted file mode 100644 index e1573d4..0000000 --- a/src/main/resources/assets/fantasysmp/items/witherite_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/witherite_boots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/witherite_chestplate.json b/src/main/resources/assets/fantasysmp/items/witherite_chestplate.json deleted file mode 100644 index 5f20cd2..0000000 --- a/src/main/resources/assets/fantasysmp/items/witherite_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/witherite_chestplate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/witherite_helmet.json b/src/main/resources/assets/fantasysmp/items/witherite_helmet.json deleted file mode 100644 index f2c8524..0000000 --- a/src/main/resources/assets/fantasysmp/items/witherite_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/witherite_helmet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/witherite_leggings.json b/src/main/resources/assets/fantasysmp/items/witherite_leggings.json deleted file mode 100644 index e0eb31c..0000000 --- a/src/main/resources/assets/fantasysmp/items/witherite_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/witherite_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/witherite_shield.json b/src/main/resources/assets/fantasysmp/items/witherite_shield.json deleted file mode 100644 index 1b6cd0f..0000000 --- a/src/main/resources/assets/fantasysmp/items/witherite_shield.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "on_false": { - "type": "minecraft:special", - "base": "minecraft:item/shield", - "model": { - "type": "fantasysmp:witherite_shield" - } - }, - "on_true": { - "type": "minecraft:special", - "base": "minecraft:item/shield_blocking", - "model": { - "type": "fantasysmp:witherite_shield" - } - }, - "property": "minecraft:using_item", - "transformation": { - "left_rotation": [ - 0.0, - 0.0, - 0.0, - 1.0 - ], - "right_rotation": [ - 0.0, - 0.0, - 0.0, - 1.0 - ], - "scale": [ - 1.0, - -1.0, - -1.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/fantasysmp/items/witherite_sword.json b/src/main/resources/assets/fantasysmp/items/witherite_sword.json deleted file mode 100644 index 4bcaccd..0000000 --- a/src/main/resources/assets/fantasysmp/items/witherite_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fantasysmp:item/witherite_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 deleted file mode 100644 index 185b461..0000000 --- a/src/main/resources/assets/fantasysmp/lang/en_us.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "item.fantasysmp.witherite_sword": "Witherite Sword", - "item.fantasysmp.witherite_helmet": "Witherite Helmet", - "item.fantasysmp.witherite_chestplate": "Witherite Chestplate", - "item.fantasysmp.witherite_leggings": "Witherite Leggings", - "item.fantasysmp.witherite_boots": "Witherite Boots", - "item.fantasysmp.witherite_axe": "Witherite Axe", - "item.fantasysmp.witherite_shield": "Witherite Shield", - "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/alchemist_boots.json b/src/main/resources/assets/fantasysmp/models/item/alchemist_boots.json deleted file mode 100644 index dcf8a37..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/alchemist_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_boots", - "textures": { - "layer0": "fantasysmp:item/alchemist_boots" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/alchemist_chestplate.json b/src/main/resources/assets/fantasysmp/models/item/alchemist_chestplate.json deleted file mode 100644 index eacd2cd..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/alchemist_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_chestplate", - "textures": { - "layer0": "fantasysmp:item/alchemist_chestplate" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/alchemist_helmet.json b/src/main/resources/assets/fantasysmp/models/item/alchemist_helmet.json deleted file mode 100644 index cba14e9..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/alchemist_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_helmet", - "textures": { - "layer0": "fantasysmp:item/alchemist_helmet" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/alchemist_leggings.json b/src/main/resources/assets/fantasysmp/models/item/alchemist_leggings.json deleted file mode 100644 index 95773eb..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/alchemist_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_leggings", - "textures": { - "layer0": "fantasysmp:item/alchemist_leggings" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/alchemist_sword.json b/src/main/resources/assets/fantasysmp/models/item/alchemist_sword.json deleted file mode 100644 index 76c6e2c..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/alchemist_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_sword", - "textures": { - "layer0": "fantasysmp:item/alchemist_sword" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/blazing_boots.json b/src/main/resources/assets/fantasysmp/models/item/blazing_boots.json deleted file mode 100644 index 00903d4..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/blazing_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_boots", - "textures": { - "layer0": "fantasysmp:item/blazing_boots" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/blazing_chestplate.json b/src/main/resources/assets/fantasysmp/models/item/blazing_chestplate.json deleted file mode 100644 index 613298d..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/blazing_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_chestplate", - "textures": { - "layer0": "fantasysmp:item/blazing_chestplate" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/blazing_helmet.json b/src/main/resources/assets/fantasysmp/models/item/blazing_helmet.json deleted file mode 100644 index 21d3205..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/blazing_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_helmet", - "textures": { - "layer0": "fantasysmp:item/blazing_helmet" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/blazing_leggings.json b/src/main/resources/assets/fantasysmp/models/item/blazing_leggings.json deleted file mode 100644 index 5446f40..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/blazing_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_leggings", - "textures": { - "layer0": "fantasysmp:item/blazing_leggings" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/blazing_sword.json b/src/main/resources/assets/fantasysmp/models/item/blazing_sword.json deleted file mode 100644 index 07446a0..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/blazing_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_sword", - "textures": { - "layer0": "fantasysmp:item/blazing_sword" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/crimson_sword.json b/src/main/resources/assets/fantasysmp/models/item/crimson_sword.json deleted file mode 100644 index 06dd5ce..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/crimson_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_sword", - "textures": { - "layer0": "fantasysmp:item/crimson_sword" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/dragon_scale.json b/src/main/resources/assets/fantasysmp/models/item/dragon_scale.json deleted file mode 100644 index 1ba3f4b..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/dragon_scale.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_ingot", - "textures": { - "layer0": "fantasysmp:item/dragon_scale" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/dragonite_boots.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_boots.json deleted file mode 100644 index f98b91c..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/dragonite_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_boots", - "textures": { - "layer0": "fantasysmp:item/dragonite_boots" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/dragonite_chestplate.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_chestplate.json deleted file mode 100644 index 9ee4813..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/dragonite_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_chestplate", - "textures": { - "layer0": "fantasysmp:item/dragonite_chestplate" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/dragonite_helmet.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_helmet.json deleted file mode 100644 index 98dc202..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/dragonite_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_helmet", - "textures": { - "layer0": "fantasysmp:item/dragonite_helmet" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/dragonite_ingot.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_ingot.json deleted file mode 100644 index bd9e6a7..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/dragonite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_ingot", - "textures": { - "layer0": "fantasysmp:item/dragonite_ingot" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/dragonite_leggings.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_leggings.json deleted file mode 100644 index 66994b6..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/dragonite_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_leggings", - "textures": { - "layer0": "fantasysmp:item/dragonite_leggings" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/dragonite_sword.json b/src/main/resources/assets/fantasysmp/models/item/dragonite_sword.json deleted file mode 100644 index 59afadc..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/dragonite_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_sword", - "textures": { - "layer0": "fantasysmp:item/dragonite_sword" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/ender_boots.json b/src/main/resources/assets/fantasysmp/models/item/ender_boots.json deleted file mode 100644 index 252e0ca..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/ender_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_boots", - "textures": { - "layer0": "fantasysmp:item/ender_boots" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/ender_chestplate.json b/src/main/resources/assets/fantasysmp/models/item/ender_chestplate.json deleted file mode 100644 index b8ebc4c..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/ender_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_chestplate", - "textures": { - "layer0": "fantasysmp:item/ender_chestplate" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/ender_helmet.json b/src/main/resources/assets/fantasysmp/models/item/ender_helmet.json deleted file mode 100644 index faccf09..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/ender_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_helmet", - "textures": { - "layer0": "fantasysmp:item/ender_helmet" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/ender_leggings.json b/src/main/resources/assets/fantasysmp/models/item/ender_leggings.json deleted file mode 100644 index 0ea5c88..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/ender_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_leggings", - "textures": { - "layer0": "fantasysmp:item/ender_leggings" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/ender_sword.json b/src/main/resources/assets/fantasysmp/models/item/ender_sword.json deleted file mode 100644 index cd09d61..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/ender_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/diamond_sword", - "textures": { - "layer0": "fantasysmp:item/ender_sword" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/lightning_sword.json b/src/main/resources/assets/fantasysmp/models/item/lightning_sword.json deleted file mode 100644 index 3eb342f..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/lightning_sword.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "item/netherite_sword", - "textures": { - "layer0": "fantasysmp:item/lightning_sword" - } -} - diff --git a/src/main/resources/assets/fantasysmp/models/item/poseidons_boots.json b/src/main/resources/assets/fantasysmp/models/item/poseidons_boots.json deleted file mode 100644 index b0b7048..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/poseidons_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_boots", - "textures": { - "layer0": "fantasysmp:item/poseidons_boots" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/poseidons_chestplate.json b/src/main/resources/assets/fantasysmp/models/item/poseidons_chestplate.json deleted file mode 100644 index be0102f..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/poseidons_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_chestplate", - "textures": { - "layer0": "fantasysmp:item/poseidons_chestplate" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/poseidons_helmet.json b/src/main/resources/assets/fantasysmp/models/item/poseidons_helmet.json deleted file mode 100644 index f10a057..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/poseidons_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_helmet", - "textures": { - "layer0": "fantasysmp:item/poseidons_helmet" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/poseidons_leggings.json b/src/main/resources/assets/fantasysmp/models/item/poseidons_leggings.json deleted file mode 100644 index b9c188c..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/poseidons_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_leggings", - "textures": { - "layer0": "fantasysmp:item/poseidons_leggings" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/poseidons_trident.json b/src/main/resources/assets/fantasysmp/models/item/poseidons_trident.json deleted file mode 100644 index f3cee1b..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/poseidons_trident.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/trident", - "textures": { - "layer0": "fantasysmp:item/poseidons_trident" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/stevens_wrath.json b/src/main/resources/assets/fantasysmp/models/item/stevens_wrath.json deleted file mode 100644 index 0242ba8..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/stevens_wrath.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "item/netherite_sword", - "display": { - "thirdperson_righthand": { - "rotation": [ 0, -90, 55 ], - "translation": [ 0, 12, -1 ], - "scale": [ 2.0, 2.0, 1.25 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 90, -55 ], - "translation": [ 0, 12, -1 ], - "scale": [ 2.0, 2.0, 1.25 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 40 ], - "translation": [ 1.13, 3.2, 1.13 ], - "scale": [ 1.5, 1.5, 1.5 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -40 ], - "translation": [ 1.13, 3.2, 1.13 ], - "scale": [ 1.5, 1.5, 1.5 ] - } - }, - "textures": { - "layer0": "fantasysmp:item/stevens_wrath" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/true_netherite_boots.json b/src/main/resources/assets/fantasysmp/models/item/true_netherite_boots.json deleted file mode 100644 index 22e417d..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/true_netherite_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_boots", - "textures": { - "layer0": "fantasysmp:item/true_netherite_boots" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/true_netherite_chestplate.json b/src/main/resources/assets/fantasysmp/models/item/true_netherite_chestplate.json deleted file mode 100644 index 85c9d30..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/true_netherite_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_chestplate", - "textures": { - "layer0": "fantasysmp:item/true_netherite_chestplate" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/true_netherite_helmet.json b/src/main/resources/assets/fantasysmp/models/item/true_netherite_helmet.json deleted file mode 100644 index 6bb94d7..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/true_netherite_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_helmet", - "textures": { - "layer0": "fantasysmp:item/true_netherite_helmet" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/true_netherite_leggings.json b/src/main/resources/assets/fantasysmp/models/item/true_netherite_leggings.json deleted file mode 100644 index 9968dee..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/true_netherite_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_leggings", - "textures": { - "layer0": "fantasysmp:item/true_netherite_leggings" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/true_netherite_sword.json b/src/main/resources/assets/fantasysmp/models/item/true_netherite_sword.json deleted file mode 100644 index 0e60334..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/true_netherite_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_sword", - "textures": { - "layer0": "fantasysmp:item/true_netherite_sword" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/witherite_axe.json b/src/main/resources/assets/fantasysmp/models/item/witherite_axe.json deleted file mode 100644 index bc50046..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/witherite_axe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_axe", - "textures": { - "layer0": "fantasysmp:item/witherite_axe" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/witherite_boots.json b/src/main/resources/assets/fantasysmp/models/item/witherite_boots.json deleted file mode 100644 index d77f39b..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/witherite_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_boots", - "textures": { - "layer0": "fantasysmp:item/witherite_boots" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/witherite_chestplate.json b/src/main/resources/assets/fantasysmp/models/item/witherite_chestplate.json deleted file mode 100644 index d758f93..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/witherite_chestplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_chestplate", - "textures": { - "layer0": "fantasysmp:item/witherite_chestplate" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/witherite_helmet.json b/src/main/resources/assets/fantasysmp/models/item/witherite_helmet.json deleted file mode 100644 index b4203a2..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/witherite_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_helmet", - "textures": { - "layer0": "fantasysmp:item/witherite_helmet" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/witherite_leggings.json b/src/main/resources/assets/fantasysmp/models/item/witherite_leggings.json deleted file mode 100644 index 8a8f7fc..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/witherite_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_leggings", - "textures": { - "layer0": "fantasysmp:item/witherite_leggings" - } -} diff --git a/src/main/resources/assets/fantasysmp/models/item/witherite_sword.json b/src/main/resources/assets/fantasysmp/models/item/witherite_sword.json deleted file mode 100644 index 788fc77..0000000 --- a/src/main/resources/assets/fantasysmp/models/item/witherite_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/netherite_sword", - "textures": { - "layer0": "fantasysmp:item/witherite_sword" - } -} diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/armor.json deleted file mode 100644 index 6a91eff..0000000 --- a/src/main/resources/data/minecraft/tags/item/enchantable/armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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 deleted file mode 100644 index 31aec6d..0000000 --- a/src/main/resources/data/minecraft/tags/item/enchantable/chest_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "fantasysmp:witherite_chestplate", - "fantasysmp:dragonite_chestplate" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/durability.json b/src/main/resources/data/minecraft/tags/item/enchantable/durability.json deleted file mode 100644 index 6a91eff..0000000 --- a/src/main/resources/data/minecraft/tags/item/enchantable/durability.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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/foot_armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/foot_armor.json deleted file mode 100644 index c83b646..0000000 --- a/src/main/resources/data/minecraft/tags/item/enchantable/foot_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 2849aa9..0000000 --- a/src/main/resources/data/minecraft/tags/item/enchantable/head_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index cf28d10..0000000 --- a/src/main/resources/data/minecraft/tags/item/enchantable/leg_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index b77d355..0000000 --- a/src/main/resources/data/minecraft/tags/item/swords.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "fantasysmp:witherite_sword", - "fantasysmp:dragonite_sword" - ] -} diff --git a/src/main/resources/data/minecraft/tags/item/trimmable_armor.json b/src/main/resources/data/minecraft/tags/item/trimmable_armor.json deleted file mode 100644 index 6a91eff..0000000 --- a/src/main/resources/data/minecraft/tags/item/trimmable_armor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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