25w02a

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.2
-loader_version=0.16.9
+minecraft_version=25w02a
+yarn_mappings=25w02a+build.12
+loader_version=0.16.10
 
 # Mod Properties
 mod_version=6.5+1.21.4
 maven_group=github.mcdatapack.more_tools_and_armor
 archives_base_name=more_tools_and_armor
 
 # Dependencies
-fabric_version=0.110.3+1.21.4
+fabric_version=0.114.3+1.21.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/generated/.cache/84a6d60aa94f455b1bcbdd65d74b08431cd011e3

@@ -1,21 +1,21 @@
-// 1.21.4	2025-01-15T17:56:13.7285087	More Tools and Armor/World Generator
-ba4a3d02660a4b35609467e66050316855075971 data\more_tools_and_armor\worldgen\configured_feature\end_diamond_ore.json
-2e3896c37dac17b5e03a8c033309e0f62c7ce5a5 data\more_tools_and_armor\worldgen\placed_feature\end_iron_ore.json
-3cafae5754ee15fcf3db661feebde3439b35bd71 data\more_tools_and_armor\worldgen\placed_feature\end_lapis_lazuli_ore.json
-540e8a555759c0bf352f40aedc21fd35bd6e02b0 data\more_tools_and_armor\worldgen\configured_feature\end_emerald_ore.json
-6b5e06117445b82c513a6a42ae833b7ff4849d33 data\more_tools_and_armor\worldgen\placed_feature\end_copper_ore.json
-83cad043608778457e26ea0224fa10c2ebdd0110 data\more_tools_and_armor\worldgen\configured_feature\blackstone_emerald_ore.json
-0808056bd2b6228e1d87f95635770c447d09948a data\more_tools_and_armor\worldgen\configured_feature\end_lapis_lazuli_ore.json
-b2ff528f5dbd7b529f3ce1ef51092cfb5d3c997b data\more_tools_and_armor\worldgen\placed_feature\end_coal_ore.json
-77ef71f2b91096f2705bef27689ebee713949c01 data\more_tools_and_armor\worldgen\placed_feature\end_diamond_ore.json
-b7da8e0186661e5195f99de07ddd9b1668031301 data\more_tools_and_armor\worldgen\placed_feature\end_gold_ore.json
-b3ed81a59041b7c691813bf668dd6108ac70fdec data\more_tools_and_armor\worldgen\placed_feature\end_redstone_ore.json
-e513b48c685d5ba9a3dc9806604010a94db62284 data\more_tools_and_armor\worldgen\placed_feature\sculk_emerald_ore.json
-e2422cb3c0faa69ad47428ae006862b276221860 data\more_tools_and_armor\worldgen\configured_feature\end_redstone_ore.json
-24f0fad0871f4047bf76962af0a7d04e8a2490f8 data\more_tools_and_armor\worldgen\placed_feature\end_emerald_ore.json
-53c80e51d2e7922d979dd48692232db23c3d3e81 data\more_tools_and_armor\worldgen\configured_feature\end_coal_ore.json
-b800f10b3e031ba100daad42b389a597bb291f71 data\more_tools_and_armor\worldgen\configured_feature\sculk_emerald_ore.json
-b71cd95c5e29be6a02190c62264d9589f9e0c9a1 data\more_tools_and_armor\worldgen\configured_feature\end_copper_ore.json
-7ca72d3d6a48cc1d7dd54791c4f74ea00498ea65 data\more_tools_and_armor\worldgen\configured_feature\end_gold_ore.json
-84927bdc2d0806486576e18351b965d51cc7bf2c data\more_tools_and_armor\worldgen\configured_feature\end_iron_ore.json
-b436f2e45391c73bcdc5203b52ccaecf74011e54 data\more_tools_and_armor\worldgen\placed_feature\blackstone_emerald_ore.json
+// 25w02a	-999999999-01-01T00:00:00	More Tools and Armor/World Generator
+83cad043608778457e26ea0224fa10c2ebdd0110 data/more_tools_and_armor/worldgen/configured_feature/blackstone_emerald_ore.json
+53c80e51d2e7922d979dd48692232db23c3d3e81 data/more_tools_and_armor/worldgen/configured_feature/end_coal_ore.json
+b71cd95c5e29be6a02190c62264d9589f9e0c9a1 data/more_tools_and_armor/worldgen/configured_feature/end_copper_ore.json
+ba4a3d02660a4b35609467e66050316855075971 data/more_tools_and_armor/worldgen/configured_feature/end_diamond_ore.json
+540e8a555759c0bf352f40aedc21fd35bd6e02b0 data/more_tools_and_armor/worldgen/configured_feature/end_emerald_ore.json
+7ca72d3d6a48cc1d7dd54791c4f74ea00498ea65 data/more_tools_and_armor/worldgen/configured_feature/end_gold_ore.json
+84927bdc2d0806486576e18351b965d51cc7bf2c data/more_tools_and_armor/worldgen/configured_feature/end_iron_ore.json
+0808056bd2b6228e1d87f95635770c447d09948a data/more_tools_and_armor/worldgen/configured_feature/end_lapis_lazuli_ore.json
+e2422cb3c0faa69ad47428ae006862b276221860 data/more_tools_and_armor/worldgen/configured_feature/end_redstone_ore.json
+b800f10b3e031ba100daad42b389a597bb291f71 data/more_tools_and_armor/worldgen/configured_feature/sculk_emerald_ore.json
+b436f2e45391c73bcdc5203b52ccaecf74011e54 data/more_tools_and_armor/worldgen/placed_feature/blackstone_emerald_ore.json
+b2ff528f5dbd7b529f3ce1ef51092cfb5d3c997b data/more_tools_and_armor/worldgen/placed_feature/end_coal_ore.json
+6b5e06117445b82c513a6a42ae833b7ff4849d33 data/more_tools_and_armor/worldgen/placed_feature/end_copper_ore.json
+77ef71f2b91096f2705bef27689ebee713949c01 data/more_tools_and_armor/worldgen/placed_feature/end_diamond_ore.json
+24f0fad0871f4047bf76962af0a7d04e8a2490f8 data/more_tools_and_armor/worldgen/placed_feature/end_emerald_ore.json
+b7da8e0186661e5195f99de07ddd9b1668031301 data/more_tools_and_armor/worldgen/placed_feature/end_gold_ore.json
+2e3896c37dac17b5e03a8c033309e0f62c7ce5a5 data/more_tools_and_armor/worldgen/placed_feature/end_iron_ore.json
+3cafae5754ee15fcf3db661feebde3439b35bd71 data/more_tools_and_armor/worldgen/placed_feature/end_lapis_lazuli_ore.json
+b3ed81a59041b7c691813bf668dd6108ac70fdec data/more_tools_and_armor/worldgen/placed_feature/end_redstone_ore.json
+e513b48c685d5ba9a3dc9806604010a94db62284 data/more_tools_and_armor/worldgen/placed_feature/sculk_emerald_ore.json

src/main/generated/.cache/91e4197fccb647ee7b68ab341141e9299a425eca

@@ -1,11 +1,11 @@
-// 1.21.4	2025-01-15T17:56:13.7295079	More Tools and Armor/Tags for minecraft:item
-009937ca4540f639f0ddb674a89445d2694f6d24 data\minecraft\tags\item\axes.json
-82bb69039e14eec62f6a5c18e4b5d98e945104dc data\minecraft\tags\item\chest_armor.json
-8fd2e586820f6ef5060bf1b84783fe571754000c data\minecraft\tags\item\leg_armor.json
-bf84011b91a9751f6d4f6050a2886801e797de6f data\minecraft\tags\item\hoes.json
-58cb5609a7d35d5ac89565f8851df8cc9dffb3e3 data\minecraft\tags\item\shovels.json
-f630bd989c84903d40468712ea57713a52bb2ca2 data\minecraft\tags\item\foot_armor.json
-bd1e3e2daa73ebde5fb36b0a8e1c0c16eaa80f63 data\minecraft\tags\item\swords.json
-b583c45b54a5d28c1ce61f66c7003f9a60ce6cd7 data\minecraft\tags\item\pickaxes.json
-428137da383155c5d05c561dfea3c2674ad90203 data\minecraft\tags\item\piglin_safe_armor.json
-68e0ddcf896c67316514a07ef186cd8911c74cd1 data\minecraft\tags\item\head_armor.json
+// 25w02a	-999999999-01-01T00:00:00	More Tools and Armor/Tags for minecraft:item
+009937ca4540f639f0ddb674a89445d2694f6d24 data/minecraft/tags/item/axes.json
+82bb69039e14eec62f6a5c18e4b5d98e945104dc data/minecraft/tags/item/chest_armor.json
+f630bd989c84903d40468712ea57713a52bb2ca2 data/minecraft/tags/item/foot_armor.json
+68e0ddcf896c67316514a07ef186cd8911c74cd1 data/minecraft/tags/item/head_armor.json
+bf84011b91a9751f6d4f6050a2886801e797de6f data/minecraft/tags/item/hoes.json
+8fd2e586820f6ef5060bf1b84783fe571754000c data/minecraft/tags/item/leg_armor.json
+b583c45b54a5d28c1ce61f66c7003f9a60ce6cd7 data/minecraft/tags/item/pickaxes.json
+428137da383155c5d05c561dfea3c2674ad90203 data/minecraft/tags/item/piglin_safe_armor.json
+58cb5609a7d35d5ac89565f8851df8cc9dffb3e3 data/minecraft/tags/item/shovels.json
+bd1e3e2daa73ebde5fb36b0a8e1c0c16eaa80f63 data/minecraft/tags/item/swords.json

src/main/generated/.cache/a00350a95986d4600e04b5a29ac2dd5db3f2a009

@@ -1,17 +1,17 @@
-// 1.21.4	2025-01-15T17:56:13.7195083	More Tools and Armor/Tags for minecraft:block
-d87bd540822fe6fe9b31edfc7f285021b5d5d83c data\more_tools_and_armor\tags\block\needs_deepslate_emerald_tool.json
-35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\more_tools_and_armor\tags\block\incorrect_for_end_diamond_tool.json
-f2ade6868691dd545f2e305d3efccbc2f55ae809 data\minecraft\tags\block\incorrect_for_stone_tool.json
-fe24d63351b7f1564b74473e00d2f7e75bfd7cfe data\minecraft\tags\block\mineable\hoe.json
-066291c4f7fadd8129b77da738d09e4bb001c965 data\minecraft\tags\block\incorrect_for_netherite_tool.json
-289043a8751d2e095cf39eeb42d3365c1c06f514 data\more_tools_and_armor\tags\block\needs_netherite_tool.json
-1e2321bcf427759d08f2bbd999af0ee46df8dfcf data\minecraft\tags\block\needs_stone_tool.json
-35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\more_tools_and_armor\tags\block\incorrect_for_void_tool.json
-35240bdee97e83c35173f54aa993251c1c4edfbc data\minecraft\tags\block\mineable\pickaxe.json
-5e1208fea9bda562868864922908c034a09e92fe data\minecraft\tags\block\needs_iron_tool.json
-f2ade6868691dd545f2e305d3efccbc2f55ae809 data\minecraft\tags\block\incorrect_for_iron_tool.json
-f2ade6868691dd545f2e305d3efccbc2f55ae809 data\minecraft\tags\block\incorrect_for_diamond_tool.json
-35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\more_tools_and_armor\tags\block\incorrect_for_deepslate_emerald_tool.json
-35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\more_tools_and_armor\tags\block\incorrect_for_onethdenderite_tool.json
-f2ade6868691dd545f2e305d3efccbc2f55ae809 data\minecraft\tags\block\incorrect_for_wooden_tool.json
-f2ade6868691dd545f2e305d3efccbc2f55ae809 data\minecraft\tags\block\incorrect_for_gold_tool.json
+// 25w02a	-999999999-01-01T00:00:00	More Tools and Armor/Tags for minecraft:block
+f2ade6868691dd545f2e305d3efccbc2f55ae809 data/minecraft/tags/block/incorrect_for_diamond_tool.json
+f2ade6868691dd545f2e305d3efccbc2f55ae809 data/minecraft/tags/block/incorrect_for_gold_tool.json
+f2ade6868691dd545f2e305d3efccbc2f55ae809 data/minecraft/tags/block/incorrect_for_iron_tool.json
+066291c4f7fadd8129b77da738d09e4bb001c965 data/minecraft/tags/block/incorrect_for_netherite_tool.json
+f2ade6868691dd545f2e305d3efccbc2f55ae809 data/minecraft/tags/block/incorrect_for_stone_tool.json
+f2ade6868691dd545f2e305d3efccbc2f55ae809 data/minecraft/tags/block/incorrect_for_wooden_tool.json
+fe24d63351b7f1564b74473e00d2f7e75bfd7cfe data/minecraft/tags/block/mineable/hoe.json
+35240bdee97e83c35173f54aa993251c1c4edfbc data/minecraft/tags/block/mineable/pickaxe.json
+5e1208fea9bda562868864922908c034a09e92fe data/minecraft/tags/block/needs_iron_tool.json
+1e2321bcf427759d08f2bbd999af0ee46df8dfcf data/minecraft/tags/block/needs_stone_tool.json
+35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/more_tools_and_armor/tags/block/incorrect_for_deepslate_emerald_tool.json
+35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/more_tools_and_armor/tags/block/incorrect_for_end_diamond_tool.json
+35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/more_tools_and_armor/tags/block/incorrect_for_onethdenderite_tool.json
+35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/more_tools_and_armor/tags/block/incorrect_for_void_tool.json
+d87bd540822fe6fe9b31edfc7f285021b5d5d83c data/more_tools_and_armor/tags/block/needs_deepslate_emerald_tool.json
+289043a8751d2e095cf39eeb42d3365c1c06f514 data/more_tools_and_armor/tags/block/needs_netherite_tool.json

src/main/java/github/mcdatapack/more_tools_and_armor/init/ItemInit.java

@@ -2,7 +2,10 @@
 
 import github.mcdatapack.more_tools_and_armor.MoreToolsAndArmor;
 import github.mcdatapack.more_tools_and_armor.enums.ToolMaterials;
+import github.mcdatapack.more_tools_and_armor.item.ArmorItem;
 import github.mcdatapack.more_tools_and_armor.item.PaxelItem;
+import github.mcdatapack.more_tools_and_armor.item.PickaxeItem;
+import github.mcdatapack.more_tools_and_armor.item.SwordItem;
 import net.minecraft.item.*;
 import net.minecraft.item.equipment.EquipmentType;
 import net.minecraft.registry.Registries;

src/main/java/github/mcdatapack/more_tools_and_armor/item/ArmorItem.java

@@ -0,0 +1,11 @@
+package github.mcdatapack.more_tools_and_armor.item;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.equipment.ArmorMaterial;
+import net.minecraft.item.equipment.EquipmentType;
+
+public class ArmorItem extends Item {
+    public ArmorItem(ArmorMaterial material, EquipmentType equipmentType, Settings settings) {
+        super(settings.armor(material, equipmentType));
+    }
+}

src/main/java/github/mcdatapack/more_tools_and_armor/item/PaxelItem.java

@@ -31,7 +31,7 @@
 import static net.minecraft.item.HoeItem.createTillAction;
 import static net.minecraft.item.HoeItem.createTillAndDropAction;
 
-public class PaxelItem extends MiningToolItem {
+public class PaxelItem extends Item {
     protected static final Map<Block, Block> STRIPPED_BLOCKS = new ImmutableMap.Builder<Block, Block>()
             .put(Blocks.OAK_WOOD, Blocks.STRIPPED_OAK_WOOD)
             .put(Blocks.OAK_LOG, Blocks.STRIPPED_OAK_LOG)
@@ -80,7 +80,7 @@ public class PaxelItem extends MiningToolItem {
     );
 
     public PaxelItem(ToolMaterial toolMaterial, float attackDamage, float attackSpeed, Settings settings) {
-        super(toolMaterial, TagList.BlockTags.PAXEL_MINEABLE, attackDamage, attackSpeed, settings);
+        super(settings.tool(toolMaterial, TagList.BlockTags.PAXEL_MINEABLE, attackDamage, attackSpeed, true));
     }
 
     @Override

src/main/java/github/mcdatapack/more_tools_and_armor/item/PickaxeItem.java

@@ -0,0 +1,10 @@
+package github.mcdatapack.more_tools_and_armor.item;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ToolMaterial;
+
+public class PickaxeItem extends Item {
+    public PickaxeItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
+        super(settings.pickaxe(material, attackDamage, attackSpeed));
+    }
+}

src/main/java/github/mcdatapack/more_tools_and_armor/item/SwordItem.java

@@ -0,0 +1,10 @@
+package github.mcdatapack.more_tools_and_armor.item;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ToolMaterial;
+
+public class SwordItem extends Item {
+    public SwordItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
+        super(settings.sword(material, attackDamage, attackSpeed));
+    }
+}