diff --git a/CHANGELOG.md b/CHANGELOG.md index 755ed5a8..66328ccb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [1.20.1-1.0.1] - 2023-8-30 + +### Added amethyst tools. + ## [1.20.1-1.0.0] - 2023-8-28 ### Added support for 1.20.1 but is Short term support as 1.19.4 is the LTS version. diff --git a/build.gradle.kts b/build.gradle.kts index ebdd7389..ca78583b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ plugins { project.group = "io.github.realyusufismail" -project.version = "1.20.1-1.0.0" +project.version = "1.20.1-1.0.1" base.archivesName.set("armourandtoolsmod") diff --git a/src/generated/resources/.cache/9f61bb65fbe4cfb8a15e0d3253c99409d3dd169b b/src/generated/resources/.cache/9f61bb65fbe4cfb8a15e0d3253c99409d3dd169b index 39f35823..43e5a1fd 100644 --- a/src/generated/resources/.cache/9f61bb65fbe4cfb8a15e0d3253c99409d3dd169b +++ b/src/generated/resources/.cache/9f61bb65fbe4cfb8a15e0d3253c99409d3dd169b @@ -1,8 +1,12 @@ -// 1.20.1 2023-08-28T05:16:02.617272 Item Models: armourandtoolsmod +// 1.20.1 2023-08-30T12:33:42.95803 Item Models: armourandtoolsmod +6fdab53e9321f76ef7edd0a135b6879656abdad7 assets/armourandtoolsmod/models/item/amethyst_axe.json f523d3f594a0d1a51fb553f028ab2b20eee793dd assets/armourandtoolsmod/models/item/amethyst_boots.json 8377e984c59ebdaa220b7d1c0973dfd4653e52fb assets/armourandtoolsmod/models/item/amethyst_chestplate.json 8895d7116f5e4183fe38d01164721842ede9d5f1 assets/armourandtoolsmod/models/item/amethyst_helmet.json f4b6c07eb577e733e4a793a0c685ef47485374c9 assets/armourandtoolsmod/models/item/amethyst_leggings.json +41fffc3ab7746fb4ae82224c996bf090dde016fb assets/armourandtoolsmod/models/item/amethyst_pickaxe.json +317b95cc5f931eae64ac43aaf9f37e74ff9a14b8 assets/armourandtoolsmod/models/item/amethyst_shovel.json +14de7fd5b5037fe3f9f5a8c51a941a497efb2b51 assets/armourandtoolsmod/models/item/amethyst_sword.json bcd1561c42adb01c5a4102f863dc885f29d4b9e4 assets/armourandtoolsmod/models/item/aqumarine.json 8bec48f2b18876bd67eff3dc3cec2a8662bd4cfe assets/armourandtoolsmod/models/item/aqumarine_boots.json e09597118a1e608b9e07e9432300aae376e8fa3a assets/armourandtoolsmod/models/item/aqumarine_chestplate.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 1d0a537d..bc63df45 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2023-08-28T05:16:02.6213181 Recipes +// 1.20.1 2023-08-30T12:33:42.9625594 Recipes 64b2fa52dbca9188c5fed6b3a1d1426c2b380ed1 data/armourandtoolsmod/advancements/recipes/building_blocks/aqumarine_block_recipe.json 7d54606f53db4f400123dfb6907c02f087b53786 data/armourandtoolsmod/advancements/recipes/building_blocks/custom_armour_crafting_table_recipe.json 9c72e5c5a44803c45a34320f73263008e4bada72 data/armourandtoolsmod/advancements/recipes/building_blocks/custom_tool_crafting_table_recipe.json @@ -150,6 +150,10 @@ d4d17e727ebd4324536f060377e79833e089f69b data/armourandtoolsmod/advancements/rec bed6f58facefe2b49dd593589643915ef6f6a1f7 data/armourandtoolsmod/advancements/recipes/misc/smelting_sapphire_leggings.json b15626440399c8d4ec922cffd9f4391ff8dc7de9 data/armourandtoolsmod/advancements/recipes/misc/smelting_sapphire_ore.json 8dfc7d5e8d8d0edff54402501e101b77b8141a4e data/armourandtoolsmod/advancements/recipes/misc/smelting_sapphire_shield.json +e9b479dce4a333e720dc29b6332122e7b592f0ca data/armourandtoolsmod/advancements/recipes/tools/amethyst_axe.json +64fbc2a7192aa157444bfae3b1e41b9b8bd4c42e data/armourandtoolsmod/advancements/recipes/tools/amethyst_pickaxe.json +d23584eced53cc0fa543f7749096db34a79e98e8 data/armourandtoolsmod/advancements/recipes/tools/amethyst_shovel.json +b87e233ec8c74794186dd3debae7b4461486a409 data/armourandtoolsmod/advancements/recipes/tools/amethyst_sword.json f68e9a943893fb67b0f564b6e9d7d9d61255cbf5 data/armourandtoolsmod/advancements/recipes/tools/aqumarine_shield.json 6eac8dae3a3283cc416749e6dc1f0262e3cc59e5 data/armourandtoolsmod/advancements/recipes/tools/aqumarine_trident.json ade7248ccfc70e02171c4e83bac6f8ce1c0da8a1 data/armourandtoolsmod/advancements/recipes/tools/enderite_axe.json @@ -166,10 +170,14 @@ cc5f00e3873a4f8451c76157adbc5c38214d19ce data/armourandtoolsmod/advancements/rec b5e712c3e077123f8871456be39256a865d5a913 data/armourandtoolsmod/advancements/recipes/tools/ruby_shovel.json a31c5cabe3ddd468f7e195fec1da6f7ed190fbec data/armourandtoolsmod/advancements/recipes/tools/ruby_sword.json 1fe632b3259504f6bceb0e4a72ddff92273f7bee data/armourandtoolsmod/advancements/recipes/tools/sapphire_shield.json +78da516c72de91179803d7068271bcde9500cee8 data/armourandtoolsmod/recipes/amethyst_axe.json 36968ac2704b6aba42cbae8bd74269a8ca416f6a data/armourandtoolsmod/recipes/amethyst_boots.json f6ab1e0d36c50e07935b2072de4731f32e2b9c64 data/armourandtoolsmod/recipes/amethyst_chestplate.json bea7ce15249ba10c57c55d5317f9ef7ba9690bc6 data/armourandtoolsmod/recipes/amethyst_helmet.json b9fe5e028726e2d8f40af5057827f67b042bfd23 data/armourandtoolsmod/recipes/amethyst_leggings.json +c618893ff6ccca28aec74287c696afc2f7a86756 data/armourandtoolsmod/recipes/amethyst_pickaxe.json +51046fd173379c47970cbe62f4b7d42afd51695b data/armourandtoolsmod/recipes/amethyst_shovel.json +372b46fc4dde30b0f749b8887b9dc279e83826cc data/armourandtoolsmod/recipes/amethyst_sword.json 1576f1a4728f4419a491d43ef95bd24c5396b1f5 data/armourandtoolsmod/recipes/aqumarine_block_recipe.json 2694ab0117a105b22ad8538756304a8b1a85177f data/armourandtoolsmod/recipes/aqumarine_boots.json 56c467a68cefbaba0f6fa802ddd58a3a5714aa94 data/armourandtoolsmod/recipes/aqumarine_chestplate.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 54223bd4..b61dff1f 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2023-08-28T05:16:02.6313285 Languages: en_us -936de8f330147a41bc87c3e919779ab26648fe98 assets/armourandtoolsmod/lang/en_us.json +// 1.20.1 2023-08-30T12:33:42.9741275 Languages: en_us +601874194d902031d40fcc5bf0372a7391ae9381 assets/armourandtoolsmod/lang/en_us.json diff --git a/src/generated/resources/assets/armourandtoolsmod/lang/en_us.json b/src/generated/resources/assets/armourandtoolsmod/lang/en_us.json index 95d81abd..33b3b37d 100644 --- a/src/generated/resources/assets/armourandtoolsmod/lang/en_us.json +++ b/src/generated/resources/assets/armourandtoolsmod/lang/en_us.json @@ -23,10 +23,14 @@ "container.custom_tool_crafting_table": "Tool Crafting Table", "container.custom_tool_crafting_table.description": "Craft your own custom tools!", "creativetab.armourandtoolsmod": "Armour and Item Mod", + "item.armourandtoolsmod.amethyst_axe": "Amethyst Axe", "item.armourandtoolsmod.amethyst_boots": "Amethyst Boots", "item.armourandtoolsmod.amethyst_chestplate": "Amethyst Chestplate", "item.armourandtoolsmod.amethyst_helmet": "Amethyst Helmet", "item.armourandtoolsmod.amethyst_leggings": "Amethyst Leggings", + "item.armourandtoolsmod.amethyst_pickaxe": "Amethyst Pickaxe", + "item.armourandtoolsmod.amethyst_shovel": "Amethyst Shovel", + "item.armourandtoolsmod.amethyst_sword": "Amethyst Sword", "item.armourandtoolsmod.aqumarine": "Aqumarine", "item.armourandtoolsmod.aqumarine_boots": "Aqumarine Boots", "item.armourandtoolsmod.aqumarine_chestplate": "Aqumarine Chestplate", diff --git a/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_axe.json b/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_axe.json new file mode 100644 index 00000000..cefb15e5 --- /dev/null +++ b/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "armourandtoolsmod:item/amethyst_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_pickaxe.json b/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_pickaxe.json new file mode 100644 index 00000000..2dad977d --- /dev/null +++ b/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "armourandtoolsmod:item/amethyst_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_shovel.json b/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_shovel.json new file mode 100644 index 00000000..30b5e20b --- /dev/null +++ b/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "armourandtoolsmod:item/amethyst_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_sword.json b/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_sword.json new file mode 100644 index 00000000..f75f3e80 --- /dev/null +++ b/src/generated/resources/assets/armourandtoolsmod/models/item/amethyst_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "armourandtoolsmod:item/amethyst_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_axe.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_axe.json new file mode 100644 index 00000000..85c940ba --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_axe.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:amethyst_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "armourandtoolsmod:amethyst_axe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "armourandtoolsmod:amethyst_axe" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_pickaxe.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_pickaxe.json new file mode 100644 index 00000000..8dce2471 --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_pickaxe.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:amethyst_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "armourandtoolsmod:amethyst_pickaxe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "armourandtoolsmod:amethyst_pickaxe" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_shovel.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_shovel.json new file mode 100644 index 00000000..d2190e7f --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_shovel.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:amethyst_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "armourandtoolsmod:amethyst_shovel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "armourandtoolsmod:amethyst_shovel" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_sword.json b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_sword.json new file mode 100644 index 00000000..e94d09ee --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/advancements/recipes/tools/amethyst_sword.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:amethyst_shard" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "armourandtoolsmod:amethyst_sword" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "armourandtoolsmod:amethyst_sword" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_axe.json b/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_axe.json new file mode 100644 index 00000000..e51f00df --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_axe.json @@ -0,0 +1,20 @@ +{ + "type": "armourandtoolsmod:custom_tool_crafter", + "category": "axe", + "key": { + "A": { + "item": "minecraft:amethyst_shard" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + " AA", + " SA", + " S " + ], + "result": { + "item": "armourandtoolsmod:amethyst_axe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_pickaxe.json b/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_pickaxe.json new file mode 100644 index 00000000..08f3ecb8 --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_pickaxe.json @@ -0,0 +1,20 @@ +{ + "type": "armourandtoolsmod:custom_tool_crafter", + "category": "pickaxe", + "key": { + "A": { + "item": "minecraft:amethyst_shard" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "AAA", + " S ", + " S " + ], + "result": { + "item": "armourandtoolsmod:amethyst_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_shovel.json b/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_shovel.json new file mode 100644 index 00000000..7ab488f3 --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_shovel.json @@ -0,0 +1,20 @@ +{ + "type": "armourandtoolsmod:custom_tool_crafter", + "category": "shovel", + "key": { + "A": { + "item": "minecraft:amethyst_shard" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + " A ", + " S ", + " S " + ], + "result": { + "item": "armourandtoolsmod:amethyst_shovel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_sword.json b/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_sword.json new file mode 100644 index 00000000..3e19e349 --- /dev/null +++ b/src/generated/resources/data/armourandtoolsmod/recipes/amethyst_sword.json @@ -0,0 +1,20 @@ +{ + "type": "armourandtoolsmod:custom_tool_crafter", + "category": "sword", + "key": { + "A": { + "item": "minecraft:amethyst_shard" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + " A ", + " A ", + " S " + ], + "result": { + "item": "armourandtoolsmod:amethyst_sword" + } +} \ No newline at end of file diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/ItemInit.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/ItemInit.kt index 24507e0b..361ac133 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/ItemInit.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/init/ItemInit.kt @@ -231,6 +231,15 @@ object ItemInit { Item.Properties().stacksTo(1).durability(600)) } + val AMETHYST_SWORD: ObjectHolderDelegate = + ITEMS.registerObject("amethyst_sword") { + CustomSwordItem( + CustomToolMaterial.AMETHYST_SWORD, + 8, + -2.5f, + Item.Properties().stacksTo(1).durability(600)) + } + // Pickaxes val RUBY_PICKAXE: ObjectHolderDelegate = ITEMS.registerSmeltableObject("ruby_pickaxe", RUBY) { @@ -250,6 +259,15 @@ object ItemInit { Item.Properties().stacksTo(1).durability(800)) } + val AMETHYST_PICKAXE: ObjectHolderDelegate = + ITEMS.registerObject("amethyst_pickaxe") { + PickaxeItem( + CustomToolMaterial.AMETHYST_PICKAXE, + 5, + -2.7f, + Item.Properties().stacksTo(1).durability(800)) + } + // Axes val RUBY_AXE: ObjectHolderDelegate = ITEMS.registerSmeltableObject("ruby_axe", RUBY) { @@ -269,6 +287,15 @@ object ItemInit { Item.Properties().stacksTo(1).durability(600)) } + val AMETHYST_AXE: ObjectHolderDelegate = + ITEMS.registerObject("amethyst_axe") { + AxeItem( + CustomToolMaterial.AMETHYST_AXE, + 7.5F, + -2.5f, + Item.Properties().stacksTo(1).durability(600)) + } + // Shovels val RUBY_SHOVEL: ObjectHolderDelegate = ITEMS.registerSmeltableObject("ruby_shovel", RUBY) { @@ -288,6 +315,15 @@ object ItemInit { Item.Properties().stacksTo(1).durability(600)) } + val AMETHYST_SHOVEL: ObjectHolderDelegate = + ITEMS.registerObject("amethyst_shovel") { + ShovelItem( + CustomToolMaterial.AMETHYST_SHOVEL, + 3.5F, + -3.0f, + Item.Properties().stacksTo(1).durability(600)) + } + // Hoes val RUBY_HOE: ObjectHolderDelegate = ITEMS.registerSmeltableObject("ruby_hoe", RUBY) { diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/material/CustomToolMaterial.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/material/CustomToolMaterial.kt index 5dc391e9..08698201 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/material/CustomToolMaterial.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/core/material/CustomToolMaterial.kt @@ -20,6 +20,7 @@ package io.github.realyusufismail.armourandtoolsmod.core.material import io.github.realyusufismail.armourandtoolsmod.core.init.ItemInit import java.util.function.Supplier +import net.minecraft.world.item.Items import net.minecraft.world.item.Tier import net.minecraft.world.item.crafting.Ingredient @@ -38,7 +39,11 @@ enum class CustomToolMaterial( ENDERITE_PICKAXE(4, 3000, 15, Supplier { Ingredient.of(ItemInit.ENDERITE.get()) }), ENDERITE_AXE(4, 3000, 15, Supplier { Ingredient.of(ItemInit.ENDERITE.get()) }), ENDERITE_SHOVEL(4, 3000, 15, Supplier { Ingredient.of(ItemInit.ENDERITE.get()) }), - ENDERITE_HOE(4, 3000, 15, Supplier { Ingredient.of(ItemInit.ENDERITE.get()) }); + ENDERITE_HOE(4, 3000, 15, Supplier { Ingredient.of(ItemInit.ENDERITE.get()) }), + AMETHYST_SWORD(4, 2500, 12, Supplier { Ingredient.of(Items.AMETHYST_SHARD) }), + AMETHYST_PICKAXE(4, 2500, 12, Supplier { Ingredient.of(Items.AMETHYST_SHARD) }), + AMETHYST_AXE(4, 2500, 12, Supplier { Ingredient.of(Items.AMETHYST_SHARD) }), + AMETHYST_SHOVEL(4, 2500, 12, Supplier { Ingredient.of(Items.AMETHYST_SHARD) }); private val harvestLevel = 0 private val maxUses = 0 diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/lang/ModEnLangProvider.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/lang/ModEnLangProvider.kt index db5527b0..6334d9c0 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/lang/ModEnLangProvider.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/lang/ModEnLangProvider.kt @@ -117,6 +117,10 @@ class ModEnLangProvider(gen: DataGenerator) : ModEnLangProviderSupport(gen, MOD_ addItem(ItemInit.ENDERITE_AXE, "Enderite Axe") addItem(ItemInit.ENDERITE_SHOVEL, "Enderite Shovel") addItem(ItemInit.ENDERITE_HOE, "Enderite Hoe") + addItem(ItemInit.AMETHYST_SWORD, "Amethyst Sword") + addItem(ItemInit.AMETHYST_PICKAXE, "Amethyst Pickaxe") + addItem(ItemInit.AMETHYST_AXE, "Amethyst Axe") + addItem(ItemInit.AMETHYST_SHOVEL, "Amethyst Shovel") // Shields addItem(ItemInit.RUBY_SHIELD, "Ruby Shield") diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/recipe/provider/ToolCraftingTableRecipeProvider.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/recipe/provider/ToolCraftingTableRecipeProvider.kt index f5354b5b..a0fecbf9 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/recipe/provider/ToolCraftingTableRecipeProvider.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/recipe/provider/ToolCraftingTableRecipeProvider.kt @@ -154,6 +154,54 @@ class ToolCraftingTableRecipeProvider( .unlockedBy(hasItem, has(TagsInit.ItemTagsInit.INGOTS_ENDERITE)) .save(consumer, modId("enderite_hoe")) + CustomToolCraftingTableRecipeBuilder.shaped( + CustomToolsCraftingBookCategory.SWORD, + RecipeCategory.TOOLS, + ItemInit.AMETHYST_SWORD.get()) + .define('A', Items.AMETHYST_SHARD) + .define('S', Items.STICK) + .pattern(" A ") + .pattern(" A ") + .pattern(" S ") + .unlockedBy(hasItem, has(Items.AMETHYST_SHARD)) + .save(consumer, modId("amethyst_sword")) + + CustomToolCraftingTableRecipeBuilder.shaped( + CustomToolsCraftingBookCategory.PICKAXE, + RecipeCategory.TOOLS, + ItemInit.AMETHYST_PICKAXE.get()) + .define('A', Items.AMETHYST_SHARD) + .define('S', Items.STICK) + .pattern("AAA") + .pattern(" S ") + .pattern(" S ") + .unlockedBy(hasItem, has(Items.AMETHYST_SHARD)) + .save(consumer, modId("amethyst_pickaxe")) + + CustomToolCraftingTableRecipeBuilder.shaped( + CustomToolsCraftingBookCategory.AXE, + RecipeCategory.TOOLS, + ItemInit.AMETHYST_AXE.get()) + .define('A', Items.AMETHYST_SHARD) + .define('S', Items.STICK) + .pattern(" AA") + .pattern(" SA") + .pattern(" S ") + .unlockedBy(hasItem, has(Items.AMETHYST_SHARD)) + .save(consumer, modId("amethyst_axe")) + + CustomToolCraftingTableRecipeBuilder.shaped( + CustomToolsCraftingBookCategory.SHOVEL, + RecipeCategory.TOOLS, + ItemInit.AMETHYST_SHOVEL.get()) + .define('A', Items.AMETHYST_SHARD) + .define('S', Items.STICK) + .pattern(" A ") + .pattern(" S ") + .pattern(" S ") + .unlockedBy(hasItem, has(Items.AMETHYST_SHARD)) + .save(consumer, modId("amethyst_shovel")) + // TRIEDENTs // TODO : For the trident later make it a drop from a custom mob rather than crafting diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/texture/ModItemStateProvider.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/texture/ModItemStateProvider.kt index 7615ec01..b4759f8a 100644 --- a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/texture/ModItemStateProvider.kt +++ b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/texture/ModItemStateProvider.kt @@ -102,6 +102,11 @@ class ModItemStateProvider(output: PackOutput, exFileHelper: ExistingFileHelper) tool(ItemInit.ENDERITE_SHOVEL.get()) tool(ItemInit.ENDERITE_HOE.get()) + tool(ItemInit.AMETHYST_SWORD.get()) + tool(ItemInit.AMETHYST_PICKAXE.get()) + tool(ItemInit.AMETHYST_AXE.get()) + tool(ItemInit.AMETHYST_SHOVEL.get()) + // Trident trident(ItemInit.AQUMARINE_TRIDENT.get()) diff --git a/src/main/resources/assets/armourandtoolsmod/textures/item/amathyst_shovel.png b/src/main/resources/assets/armourandtoolsmod/textures/item/amathyst_shovel.png deleted file mode 100644 index d85c854e..00000000 Binary files a/src/main/resources/assets/armourandtoolsmod/textures/item/amathyst_shovel.png and /dev/null differ diff --git a/src/main/resources/assets/armourandtoolsmod/textures/item/amathyst_pickaxe.png b/src/main/resources/assets/armourandtoolsmod/textures/item/amethyst_pickaxe.png similarity index 100% rename from src/main/resources/assets/armourandtoolsmod/textures/item/amathyst_pickaxe.png rename to src/main/resources/assets/armourandtoolsmod/textures/item/amethyst_pickaxe.png diff --git a/src/main/resources/assets/armourandtoolsmod/textures/item/amethyst_shovel.png b/src/main/resources/assets/armourandtoolsmod/textures/item/amethyst_shovel.png index e97dea29..d85c854e 100644 Binary files a/src/main/resources/assets/armourandtoolsmod/textures/item/amethyst_shovel.png and b/src/main/resources/assets/armourandtoolsmod/textures/item/amethyst_shovel.png differ