Skip to content

Commit

Permalink
25w04a
Browse files Browse the repository at this point in the history
  • Loading branch information
@MC-datapack
MC-datapack committed Jan 24, 2025
1 parent 1d07be9 commit 1f389ad
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 45 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=25w03a
yarn_mappings=25w03a+build.1
minecraft_version=25w04a
yarn_mappings=25w04a+build.6
loader_version=0.16.10

# Mod Properties
mod_version=6.5+1.21.4
mod_version=6.5+25w04a
maven_group=github.mcdatapack.more_tools_and_armor
archives_base_name=more_tools_and_armor

# Dependencies
fabric_version=0.114.4+1.21.5
fabric_version=0.115.1+1.21.5
2 changes: 1 addition & 1 deletion src/main/generated/.cache/2837a7a12b76bb31a3279e481c39f97f1bf11d86
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 25w03a -999999999-01-01T00:00:00 More Tools and Armor/Model Definitions
// 25w04a -999999999-01-01T00:00:00 More Tools and Armor/Model Definitions
d223256062471beb2d4c052c7f91edcec43686bb assets/more_tools_and_armor/blockstates/blackstone_emerald_block.json
1158428a3fe5ef68997822002441ddd3af3dd154 assets/more_tools_and_armor/blockstates/blackstone_emerald_ore.json
145c4ab62d8f3ff6268a4f9d3c3f257eacd5e81e assets/more_tools_and_armor/blockstates/deepslate_emerald_block.json
Expand Down
2 changes: 1 addition & 1 deletion src/main/generated/.cache/84a6d60aa94f455b1bcbdd65d74b08431cd011e3
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 25w03a -999999999-01-01T00:00:00 More Tools and Armor/World Generator
// 25w04a -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/generated/.cache/91e4197fccb647ee7b68ab341141e9299a425eca
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 25w03a -999999999-01-01T00:00:00 More Tools and Armor/Tags for minecraft:item
// 25w04a -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/generated/.cache/a00350a95986d4600e04b5a29ac2dd5db3f2a009
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 25w03a -999999999-01-01T00:00:00 More Tools and Armor/Tags for minecraft:block
// 25w04a -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
Expand Down
74 changes: 38 additions & 36 deletions ...thub/mcdatapack/more_tools_and_armor/datagen/provider/MoreToolsAndArmorModelProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
import net.minecraft.client.data.BlockStateModelGenerator;
import net.minecraft.client.data.ItemModelGenerator;
import net.minecraft.client.data.Models;
import net.minecraft.util.Identifier;

import static github.mcdatapack.more_tools_and_armor.init.ItemInit.*;
import static github.mcdatapack.more_tools_and_armor.init.ItemInit.ONETHDENDERITE_PAXEL;
import static net.minecraft.client.data.ItemModelGenerator.getTrimAssetIdPrefix;

public class MoreToolsAndArmorModelProvider extends FabricModelProvider {
public MoreToolsAndArmorModelProvider(FabricDataOutput output) {
Expand Down Expand Up @@ -56,80 +58,80 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
itemModelGenerator.register(ItemInit.BUDDING_AMETHYST_PICKAXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.BUDDING_AMETHYST_SHOVEL, Models.HANDHELD);
itemModelGenerator.register(ItemInit.BUDDING_AMETHYST_HOE, Models.HANDHELD);
itemModelGenerator.registerArmor(ItemInit.BUDDING_AMETHYST_HELMET, CustomEquipmentModels.BUDDING_AMETHYST, "helmet",false);
itemModelGenerator.registerArmor(ItemInit.BUDDING_AMETHYST_CHESTPLATE, CustomEquipmentModels.BUDDING_AMETHYST, "chestplate",false);
itemModelGenerator.registerArmor(ItemInit.BUDDING_AMETHYST_LEGGINGS, CustomEquipmentModels.BUDDING_AMETHYST, "leggings",false);
itemModelGenerator.registerArmor(ItemInit.BUDDING_AMETHYST_BOOTS, CustomEquipmentModels.BUDDING_AMETHYST, "boots",false);
itemModelGenerator.registerArmor(ItemInit.BUDDING_AMETHYST_HELMET, CustomEquipmentModels.BUDDING_AMETHYST, getTrimAssetIdPrefix("helmet"),false);
itemModelGenerator.registerArmor(ItemInit.BUDDING_AMETHYST_CHESTPLATE, CustomEquipmentModels.BUDDING_AMETHYST, getTrimAssetIdPrefix("chestplate"),false);
itemModelGenerator.registerArmor(ItemInit.BUDDING_AMETHYST_LEGGINGS, CustomEquipmentModels.BUDDING_AMETHYST, getTrimAssetIdPrefix("leggings"),false);
itemModelGenerator.registerArmor(ItemInit.BUDDING_AMETHYST_BOOTS, CustomEquipmentModels.BUDDING_AMETHYST, getTrimAssetIdPrefix("boots"),false);

itemModelGenerator.register(ItemInit.COPPER_SWORD, Models.HANDHELD);
itemModelGenerator.register(ItemInit.COPPER_AXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.COPPER_PICKAXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.COPPER_SHOVEL, Models.HANDHELD);
itemModelGenerator.register(ItemInit.COPPER_HOE, Models.HANDHELD);
itemModelGenerator.registerArmor(ItemInit.COPPER_HELMET, CustomEquipmentModels.COPPER, "helmet",false);
itemModelGenerator.registerArmor(ItemInit.COPPER_CHESTPLATE,CustomEquipmentModels.COPPER, "chestplate",false);
itemModelGenerator.registerArmor(ItemInit.COPPER_LEGGINGS, CustomEquipmentModels.COPPER, "leggings",false);
itemModelGenerator.registerArmor(ItemInit.COPPER_BOOTS, CustomEquipmentModels.COPPER, "boots",false);
itemModelGenerator.registerArmor(ItemInit.COPPER_HELMET, CustomEquipmentModels.COPPER, getTrimAssetIdPrefix("helmet"),false);
itemModelGenerator.registerArmor(ItemInit.COPPER_CHESTPLATE,CustomEquipmentModels.COPPER, getTrimAssetIdPrefix("chestplate"),false);
itemModelGenerator.registerArmor(ItemInit.COPPER_LEGGINGS, CustomEquipmentModels.COPPER, getTrimAssetIdPrefix("leggings"),false);
itemModelGenerator.registerArmor(ItemInit.COPPER_BOOTS, CustomEquipmentModels.COPPER, getTrimAssetIdPrefix("boots"),false);

itemModelGenerator.register(ItemInit.EMERALD_SWORD, Models.HANDHELD);
itemModelGenerator.register(ItemInit.EMERALD_AXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.EMERALD_PICKAXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.EMERALD_SHOVEL, Models.HANDHELD);
itemModelGenerator.register(ItemInit.EMERALD_HOE, Models.HANDHELD);
itemModelGenerator.registerArmor(ItemInit.EMERALD_HELMET, CustomEquipmentModels.EMERALD, "helmet",false);
itemModelGenerator.registerArmor(ItemInit.EMERALD_CHESTPLATE,CustomEquipmentModels.EMERALD, "chestplate",false);
itemModelGenerator.registerArmor(ItemInit.EMERALD_LEGGINGS, CustomEquipmentModels.EMERALD, "leggings",false);
itemModelGenerator.registerArmor(ItemInit.EMERALD_BOOTS, CustomEquipmentModels.EMERALD, "boots",false);
itemModelGenerator.registerArmor(ItemInit.EMERALD_HELMET, CustomEquipmentModels.EMERALD, getTrimAssetIdPrefix("helmet"),false);
itemModelGenerator.registerArmor(ItemInit.EMERALD_CHESTPLATE,CustomEquipmentModels.EMERALD, getTrimAssetIdPrefix("chestplate"),false);
itemModelGenerator.registerArmor(ItemInit.EMERALD_LEGGINGS, CustomEquipmentModels.EMERALD, getTrimAssetIdPrefix("leggings"),false);
itemModelGenerator.registerArmor(ItemInit.EMERALD_BOOTS, CustomEquipmentModels.EMERALD, getTrimAssetIdPrefix("boots"),false);

itemModelGenerator.register(ItemInit.OBSIDIAN_SWORD, Models.HANDHELD);
itemModelGenerator.register(ItemInit.OBSIDIAN_AXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.OBSIDIAN_PICKAXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.OBSIDIAN_SHOVEL, Models.HANDHELD);
itemModelGenerator.register(ItemInit.OBSIDIAN_HOE, Models.HANDHELD);
itemModelGenerator.registerArmor(ItemInit.OBSIDIAN_HELMET, CustomEquipmentModels.OBSIDIAN, "helmet",false);
itemModelGenerator.registerArmor(ItemInit.OBSIDIAN_CHESTPLATE,CustomEquipmentModels.OBSIDIAN, "chestplate",false);
itemModelGenerator.registerArmor(ItemInit.OBSIDIAN_LEGGINGS, CustomEquipmentModels.OBSIDIAN, "leggings",false);
itemModelGenerator.registerArmor(ItemInit.OBSIDIAN_BOOTS, CustomEquipmentModels.OBSIDIAN, "boots",false);
itemModelGenerator.registerArmor(ItemInit.OBSIDIAN_HELMET, CustomEquipmentModels.OBSIDIAN, getTrimAssetIdPrefix("helmet"),false);
itemModelGenerator.registerArmor(ItemInit.OBSIDIAN_CHESTPLATE,CustomEquipmentModels.OBSIDIAN, getTrimAssetIdPrefix("chestplate"),false);
itemModelGenerator.registerArmor(ItemInit.OBSIDIAN_LEGGINGS, CustomEquipmentModels.OBSIDIAN, getTrimAssetIdPrefix("leggings"),false);
itemModelGenerator.registerArmor(ItemInit.OBSIDIAN_BOOTS, CustomEquipmentModels.OBSIDIAN, getTrimAssetIdPrefix("boots"),false);

itemModelGenerator.register(ItemInit.DEEPSLATE_EMERALD_SWORD, Models.HANDHELD);
itemModelGenerator.register(ItemInit.DEEPSLATE_EMERALD_AXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.DEEPSLATE_EMERALD_PICKAXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.DEEPSLATE_EMERALD_SHOVEL, Models.HANDHELD);
itemModelGenerator.register(ItemInit.DEEPSLATE_EMERALD_HOE, Models.HANDHELD);
itemModelGenerator.registerArmor(ItemInit.DEEPSLATE_EMERALD_HELMET, CustomEquipmentModels.DEEPSLATE_EMERALD, "helmet",false);
itemModelGenerator.registerArmor(ItemInit.DEEPSLATE_EMERALD_CHESTPLATE,CustomEquipmentModels.DEEPSLATE_EMERALD, "chestplate",false);
itemModelGenerator.registerArmor(ItemInit.DEEPSLATE_EMERALD_LEGGINGS, CustomEquipmentModels.DEEPSLATE_EMERALD, "leggings",false);
itemModelGenerator.registerArmor(ItemInit.DEEPSLATE_EMERALD_BOOTS, CustomEquipmentModels.DEEPSLATE_EMERALD, "boots",false);
itemModelGenerator.registerArmor(ItemInit.DEEPSLATE_EMERALD_HELMET, CustomEquipmentModels.DEEPSLATE_EMERALD, getTrimAssetIdPrefix("helmet"),false);
itemModelGenerator.registerArmor(ItemInit.DEEPSLATE_EMERALD_CHESTPLATE,CustomEquipmentModels.DEEPSLATE_EMERALD, getTrimAssetIdPrefix("chestplate"),false);
itemModelGenerator.registerArmor(ItemInit.DEEPSLATE_EMERALD_LEGGINGS, CustomEquipmentModels.DEEPSLATE_EMERALD, getTrimAssetIdPrefix("leggings"),false);
itemModelGenerator.registerArmor(ItemInit.DEEPSLATE_EMERALD_BOOTS, CustomEquipmentModels.DEEPSLATE_EMERALD, getTrimAssetIdPrefix("boots"),false);

itemModelGenerator.register(ItemInit.END_DIAMOND_SWORD, Models.HANDHELD);
itemModelGenerator.register(ItemInit.END_DIAMOND_AXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.END_DIAMOND_PICKAXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.END_DIAMOND_SHOVEL, Models.HANDHELD);
itemModelGenerator.register(ItemInit.END_DIAMOND_HOE, Models.HANDHELD);
itemModelGenerator.registerArmor(ItemInit.END_DIAMOND_HELMET, CustomEquipmentModels.END_DIAMOND, "helmet",false);
itemModelGenerator.registerArmor(ItemInit.END_DIAMOND_CHESTPLATE,CustomEquipmentModels.END_DIAMOND, "chestplate",false);
itemModelGenerator.registerArmor(ItemInit.END_DIAMOND_LEGGINGS, CustomEquipmentModels.END_DIAMOND, "leggings",false);
itemModelGenerator.registerArmor(ItemInit.END_DIAMOND_BOOTS, CustomEquipmentModels.END_DIAMOND, "boots",false);
itemModelGenerator.registerArmor(ItemInit.END_DIAMOND_HELMET, CustomEquipmentModels.END_DIAMOND, getTrimAssetIdPrefix("helmet"),false);
itemModelGenerator.registerArmor(ItemInit.END_DIAMOND_CHESTPLATE,CustomEquipmentModels.END_DIAMOND, getTrimAssetIdPrefix("chestplate"),false);
itemModelGenerator.registerArmor(ItemInit.END_DIAMOND_LEGGINGS, CustomEquipmentModels.END_DIAMOND, getTrimAssetIdPrefix("leggings"),false);
itemModelGenerator.registerArmor(ItemInit.END_DIAMOND_BOOTS, CustomEquipmentModels.END_DIAMOND, getTrimAssetIdPrefix("boots"),false);

itemModelGenerator.register(ItemInit.VOID_SWORD, Models.HANDHELD);
itemModelGenerator.register(ItemInit.VOID_AXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.VOID_PICKAXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.VOID_SHOVEL, Models.HANDHELD);
itemModelGenerator.register(ItemInit.VOID_HOE, Models.HANDHELD);
itemModelGenerator.registerArmor(ItemInit.VOID_HELMET, CustomEquipmentModels.VOID, "helmet",false);
itemModelGenerator.registerArmor(ItemInit.VOID_CHESTPLATE,CustomEquipmentModels.VOID, "chestplate",false);
itemModelGenerator.registerArmor(ItemInit.VOID_LEGGINGS, CustomEquipmentModels.VOID, "leggings",false);
itemModelGenerator.registerArmor(ItemInit.VOID_BOOTS, CustomEquipmentModels.VOID, "boots",false);
itemModelGenerator.registerArmor(ItemInit.VOID_HELMET, CustomEquipmentModels.VOID, getTrimAssetIdPrefix("helmet"),false);
itemModelGenerator.registerArmor(ItemInit.VOID_CHESTPLATE,CustomEquipmentModels.VOID, getTrimAssetIdPrefix("chestplate"),false);
itemModelGenerator.registerArmor(ItemInit.VOID_LEGGINGS, CustomEquipmentModels.VOID, getTrimAssetIdPrefix("leggings"),false);
itemModelGenerator.registerArmor(ItemInit.VOID_BOOTS, CustomEquipmentModels.VOID, getTrimAssetIdPrefix("boots"),false);

itemModelGenerator.register(ItemInit.ONETHDENDERITE_SWORD, Models.HANDHELD);
itemModelGenerator.register(ItemInit.ONETHDENDERITE_AXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.ONETHDENDERITE_PICKAXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.ONETHDENDERITE_SHOVEL, Models.HANDHELD);
itemModelGenerator.register(ItemInit.ONETHDENDERITE_HOE, Models.HANDHELD);
itemModelGenerator.registerArmor(ItemInit.ONETHDENDERITE_HELMET, CustomEquipmentModels.ONETHDENDERITE, "helmet",false);
itemModelGenerator.registerArmor(ItemInit.ONETHDENDERITE_CHESTPLATE,CustomEquipmentModels.ONETHDENDERITE, "chestplate",false);
itemModelGenerator.registerArmor(ItemInit.ONETHDENDERITE_LEGGINGS, CustomEquipmentModels.ONETHDENDERITE, "leggings",false);
itemModelGenerator.registerArmor(ItemInit.ONETHDENDERITE_BOOTS, CustomEquipmentModels.ONETHDENDERITE, "boots",false);
itemModelGenerator.registerArmor(ItemInit.ONETHDENDERITE_HELMET, CustomEquipmentModels.ONETHDENDERITE, getTrimAssetIdPrefix("helmet"),false);
itemModelGenerator.registerArmor(ItemInit.ONETHDENDERITE_CHESTPLATE,CustomEquipmentModels.ONETHDENDERITE, getTrimAssetIdPrefix("chestplate"),false);
itemModelGenerator.registerArmor(ItemInit.ONETHDENDERITE_LEGGINGS, CustomEquipmentModels.ONETHDENDERITE, getTrimAssetIdPrefix("leggings"),false);
itemModelGenerator.registerArmor(ItemInit.ONETHDENDERITE_BOOTS, CustomEquipmentModels.ONETHDENDERITE, getTrimAssetIdPrefix("boots"),false);

itemModelGenerator.register(OLED_INGOT, Models.GENERATED);
itemModelGenerator.register(OLED_UPGRADE_SMITHING_TEMPLATE, Models.GENERATED);
Expand All @@ -139,10 +141,10 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) {
itemModelGenerator.register(ItemInit.OLED_PICKAXE, Models.HANDHELD);
itemModelGenerator.register(ItemInit.OLED_SHOVEL, Models.HANDHELD);
itemModelGenerator.register(ItemInit.OLED_HOE, Models.HANDHELD);
itemModelGenerator.registerArmor(ItemInit.OLED_HELMET, CustomEquipmentModels.OLED, "helmet", false);
itemModelGenerator.registerArmor(ItemInit.OLED_CHESTPLATE, CustomEquipmentModels.OLED, "chestplate", false);
itemModelGenerator.registerArmor(ItemInit.OLED_LEGGINGS, CustomEquipmentModels.OLED, "leggings", false);
itemModelGenerator.registerArmor(ItemInit.OLED_BOOTS, CustomEquipmentModels.OLED, "boots", false);
itemModelGenerator.registerArmor(ItemInit.OLED_HELMET, CustomEquipmentModels.OLED, getTrimAssetIdPrefix("helmet"), false);
itemModelGenerator.registerArmor(ItemInit.OLED_CHESTPLATE, CustomEquipmentModels.OLED, getTrimAssetIdPrefix("chestplate"), false);
itemModelGenerator.registerArmor(ItemInit.OLED_LEGGINGS, CustomEquipmentModels.OLED, getTrimAssetIdPrefix("leggings"), false);
itemModelGenerator.registerArmor(ItemInit.OLED_BOOTS, CustomEquipmentModels.OLED, getTrimAssetIdPrefix("boots"), false);

itemModelGenerator.register(WOODEN_PAXEL, Models.HANDHELD);
itemModelGenerator.register(STONE_PAXEL, Models.HANDHELD);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/github/mcdatapack/more_tools_and_armor/item/PaxelItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class PaxelItem extends Item {
);

public PaxelItem(ToolMaterial toolMaterial, float attackDamage, float attackSpeed, Settings settings) {
super(settings.tool(toolMaterial, TagList.BlockTags.PAXEL_MINEABLE, attackDamage, attackSpeed, true));
super(settings.tool(toolMaterial, TagList.BlockTags.PAXEL_MINEABLE, attackDamage, attackSpeed, 0.0F));
}

@Override
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/fabric.mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
},
"depends": {
"fabricloader": ">=0.16.9",
"minecraft": ">=25w04a",
"java": ">=21",
"fabric-api": "*"
},
Expand Down

0 comments on commit 1f389ad

Please sign in to comment.