diff --git a/src/main/java/org/betterx/betterend/BetterEnd.java b/src/main/java/org/betterx/betterend/BetterEnd.java index 8ddc8ca0..5d5aad6c 100644 --- a/src/main/java/org/betterx/betterend/BetterEnd.java +++ b/src/main/java/org/betterx/betterend/BetterEnd.java @@ -46,6 +46,7 @@ public class BetterEnd implements ModInitializer { EndTags.register(); EndBlocks.ensureStaticallyLoaded(); EndItems.ensureStaticallyLoaded(); + EndTemplates.ensureStaticallyLoaded(); EndEnchantments.register(); EndPotions.register(); InfusionRecipe.register(); diff --git a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java index 3f278f92..45f1458c 100644 --- a/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java +++ b/src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java @@ -17,6 +17,7 @@ import org.betterx.betterend.item.tool.EndHammerItem; import org.betterx.betterend.item.tool.EndPickaxe; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; +import org.betterx.betterend.registry.EndTemplates; import org.betterx.worlds.together.tag.v3.TagManager; import net.minecraft.tags.BlockTags; @@ -76,13 +77,15 @@ public class MetalMaterial { public final Item boots; public final TagKey alloyingOre; + public final SmithingTemplateItem swordHandleTemplate; public static MetalMaterial makeNormal( String name, MapColor color, Tier material, ArmorMaterial armor, - int anvilAndToolLevel + int anvilAndToolLevel, + SmithingTemplateItem swordHandleTemplate ) { return new MetalMaterial( name, @@ -91,7 +94,8 @@ public class MetalMaterial { EndItems.makeEndItemSettings(), material, armor, - anvilAndToolLevel + anvilAndToolLevel, + swordHandleTemplate ); } @@ -102,7 +106,8 @@ public class MetalMaterial { float resistance, Tier material, ArmorMaterial armor, - int anvilAndToolLevel + int anvilAndToolLevel, + SmithingTemplateItem swordHandleTemplate ) { return new MetalMaterial( name, @@ -114,7 +119,8 @@ public class MetalMaterial { EndItems.makeEndItemSettings(), material, armor, - anvilAndToolLevel + anvilAndToolLevel, + swordHandleTemplate ); } @@ -123,7 +129,8 @@ public class MetalMaterial { MapColor color, Tier material, ArmorMaterial armor, - int anvilAndToolLevel + int anvilAndToolLevel, + SmithingTemplateItem swordHandleTemplate ) { return new MetalMaterial( name, @@ -132,7 +139,8 @@ public class MetalMaterial { EndItems.makeEndItemSettings(), material, armor, - anvilAndToolLevel + anvilAndToolLevel, + swordHandleTemplate ); } @@ -143,7 +151,8 @@ public class MetalMaterial { float resistance, Tier material, ArmorMaterial armor, - int anvilAndToolLevel + int anvilAndToolLevel, + SmithingTemplateItem swordHandleTemplate ) { return new MetalMaterial( name, @@ -155,7 +164,8 @@ public class MetalMaterial { EndItems.makeEndItemSettings(), material, armor, - anvilAndToolLevel + anvilAndToolLevel, + swordHandleTemplate ); } @@ -166,7 +176,8 @@ public class MetalMaterial { Properties itemSettings, Tier material, ArmorMaterial armor, - int anvilAndToolLevel + int anvilAndToolLevel, + SmithingTemplateItem swordHandleTemplate ) { BlockBehaviour.Properties lanternProperties = FabricBlockSettings.copyOf(settings) .hardness(1) @@ -174,7 +185,7 @@ public class MetalMaterial { .lightLevel((bs) -> 15) .sound(SoundType.LANTERN); final int level = material.getLevel(); - + this.swordHandleTemplate = swordHandleTemplate; rawOre = hasOre ? EndItems.registerEndItem(name + "_raw", new ModelProviderItem(itemSettings)) : null; ore = hasOre ? EndBlocks.registerBlock(name + "_ore", new BaseOreBlock(() -> rawOre, 1, 3, 1)) : null; alloyingOre = hasOre ? TagManager.ITEMS.makeTag(BetterEnd.MOD_ID, name + "_alloying") : null; @@ -416,30 +427,37 @@ public class MetalMaterial { // Tools from parts BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_hammer"), hammer) + .setTemplate(EndTemplates.HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(block) .setAddition(Items.STICK) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_axe"), axe) + .setTemplate(EndTemplates.HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(axeHead) .setAddition(Items.STICK) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_pickaxe"), pickaxe) + .setTemplate(EndTemplates.HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(pickaxeHead) .setAddition(Items.STICK) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_hoe"), hoe) + .setTemplate(EndTemplates.HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(hoeHead) .setAddition(Items.STICK) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_sword_handle"), swordHandle) - .setPrimaryInputAndUnlock(ingot) - .setAddition(Items.STICK) + .setTemplate(this.swordHandleTemplate) + .setPrimaryInputAndUnlock(Items.STICK) + .setAddition(ingot) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_sword"), sword) + .setTemplate(EndTemplates.TOOL_ASSEMBLY) .setPrimaryInputAndUnlock(swordBlade) .setAddition(swordHandle) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID(name + "_shovel"), shovel) + .setTemplate(EndTemplates.HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(shovelHead) .setAddition(Items.STICK) .build(); diff --git a/src/main/java/org/betterx/betterend/recipe/SmithingRecipes.java b/src/main/java/org/betterx/betterend/recipe/SmithingRecipes.java index 84c0f98e..42ca5f8a 100644 --- a/src/main/java/org/betterx/betterend/recipe/SmithingRecipes.java +++ b/src/main/java/org/betterx/betterend/recipe/SmithingRecipes.java @@ -4,76 +4,96 @@ import org.betterx.bclib.recipes.BCLRecipeBuilder; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndItems; +import org.betterx.betterend.registry.EndTemplates; import net.minecraft.world.item.Items; public class SmithingRecipes { public static void register() { - BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_sword_handle"), EndItems.AETERNIUM_SWORD_HANDLE) - .setPrimaryInputAndUnlock(EndBlocks.TERMINITE.ingot) - .setAddition(EndItems.LEATHER_WRAPPED_STICK) - .build(); - - BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_sword"), EndItems.AETERNIUM_SWORD) - .setPrimaryInputAndUnlock(EndItems.AETERNIUM_SWORD_BLADE) - .setAddition(EndItems.AETERNIUM_SWORD_HANDLE) - .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_pickaxe"), EndItems.AETERNIUM_PICKAXE) + .setTemplate(EndTemplates.LEATHER_HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(EndItems.AETERNIUM_PICKAXE_HEAD) .setAddition(EndItems.LEATHER_WRAPPED_STICK) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_axe"), EndItems.AETERNIUM_AXE) + .setTemplate(EndTemplates.LEATHER_HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(EndItems.AETERNIUM_AXE_HEAD) .setAddition(EndItems.LEATHER_WRAPPED_STICK) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_shovel"), EndItems.AETERNIUM_SHOVEL) + .setTemplate(EndTemplates.LEATHER_HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(EndItems.AETERNIUM_SHOVEL_HEAD) .setAddition(EndItems.LEATHER_WRAPPED_STICK) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_hoe"), EndItems.AETERNIUM_HOE) + .setTemplate(EndTemplates.LEATHER_HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(EndItems.AETERNIUM_HOE_HEAD) .setAddition(EndItems.LEATHER_WRAPPED_STICK) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_hammer"), EndItems.AETERNIUM_HAMMER) + .setTemplate(EndTemplates.LEATHER_HANDLE_ATTACHMENT) .setPrimaryInputAndUnlock(EndItems.AETERNIUM_HAMMER_HEAD) .setAddition(EndItems.LEATHER_WRAPPED_STICK) .build(); - BCLRecipeBuilder.smithing(BetterEnd.makeID("netherite_hammer"), EndItems.NETHERITE_HAMMER) - .setPrimaryInputAndUnlock(EndItems.DIAMOND_HAMMER) - .setAddition(Items.NETHERITE_INGOT) + BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_sword"), EndItems.AETERNIUM_SWORD) + .setTemplate(EndTemplates.TOOL_ASSEMBLY) + .setPrimaryInputAndUnlock(EndItems.AETERNIUM_SWORD_BLADE) + .setAddition(EndItems.AETERNIUM_SWORD_HANDLE) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_helmet"), EndItems.AETERNIUM_HELMET) + .setTemplate(EndTemplates.PLATE_UPGRADE) .setPrimaryInputAndUnlock(EndBlocks.TERMINITE.helmet) .setAddition(EndItems.AETERNIUM_FORGED_PLATE) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_chestplate"), EndItems.AETERNIUM_CHESTPLATE) + .setTemplate(EndTemplates.PLATE_UPGRADE) .setPrimaryInputAndUnlock(EndBlocks.TERMINITE.chestplate) .setAddition(EndItems.AETERNIUM_FORGED_PLATE) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_leggings"), EndItems.AETERNIUM_LEGGINGS) + .setTemplate(EndTemplates.PLATE_UPGRADE) .setPrimaryInputAndUnlock(EndBlocks.TERMINITE.leggings) .setAddition(EndItems.AETERNIUM_FORGED_PLATE) .build(); BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_boots"), EndItems.AETERNIUM_BOOTS) + .setTemplate(EndTemplates.PLATE_UPGRADE) .setPrimaryInputAndUnlock(EndBlocks.TERMINITE.boots) .setAddition(EndItems.AETERNIUM_FORGED_PLATE) .build(); - BCLRecipeBuilder.smithing(BetterEnd.makeID("thallasium_anvil_updrade"), EndBlocks.TERMINITE.anvilBlock.asItem()) - .setPrimaryInputAndUnlock(EndBlocks.THALLASIUM.anvilBlock.asItem()) - .setAddition(EndBlocks.TERMINITE.block) + BCLRecipeBuilder.smithing(BetterEnd.makeID("aeternium_sword_handle"), EndItems.AETERNIUM_SWORD_HANDLE) + .setTemplate(EndTemplates.TERMINITE_UPGRADE) + .setPrimaryInputAndUnlock(EndItems.LEATHER_WRAPPED_STICK) + .setAddition(EndBlocks.TERMINITE.ingot) .build(); - BCLRecipeBuilder.smithing(BetterEnd.makeID("terminite_anvil_updrade"), EndBlocks.AETERNIUM_ANVIL.asItem()) - .setPrimaryInputAndUnlock(EndBlocks.TERMINITE.anvilBlock.asItem()) + + BCLRecipeBuilder.smithing(BetterEnd.makeID("thallasium_anvil_updrade"), EndBlocks.TERMINITE.anvilBlock) + .setTemplate(EndTemplates.TERMINITE_UPGRADE) + .setPrimaryInputAndUnlock(EndBlocks.THALLASIUM.anvilBlock) + .setAddition(EndBlocks.TERMINITE.ingot) + .build(); + + BCLRecipeBuilder.smithing(BetterEnd.makeID("terminite_anvil_updrade"), EndBlocks.AETERNIUM_ANVIL) + .setTemplate(EndTemplates.AETERNIUM_UPGRADE) + .setPrimaryInputAndUnlock(EndBlocks.TERMINITE.anvilBlock) .setAddition(EndItems.AETERNIUM_INGOT) .build(); + BCLRecipeBuilder.smithing(BetterEnd.makeID("armored_elytra"), EndItems.ARMORED_ELYTRA) + .setTemplate(EndTemplates.AETERNIUM_UPGRADE) .setPrimaryInputAndUnlock(Items.ELYTRA) .setAddition(EndItems.AETERNIUM_INGOT) .build(); + + + BCLRecipeBuilder.smithing(BetterEnd.makeID("netherite_hammer"), EndItems.NETHERITE_HAMMER) + .setTemplate(EndTemplates.NETHERITE_UPGRADE) + .setPrimaryInputAndUnlock(EndItems.DIAMOND_HAMMER) + .setAddition(Items.NETHERITE_INGOT) + .build(); } } diff --git a/src/main/java/org/betterx/betterend/registry/EndBlocks.java b/src/main/java/org/betterx/betterend/registry/EndBlocks.java index 6333dd08..f03d92f4 100644 --- a/src/main/java/org/betterx/betterend/registry/EndBlocks.java +++ b/src/main/java/org/betterx/betterend/registry/EndBlocks.java @@ -611,7 +611,8 @@ public class EndBlocks { MapColor.COLOR_BLUE, EndToolMaterial.THALLASIUM, EndArmorMaterial.THALLASIUM, - EndToolMaterial.THALLASIUM.getLevel() + EndToolMaterial.THALLASIUM.getLevel(), + EndTemplates.THALLASIUM_UPGRADE ); public static final MetalMaterial TERMINITE = MetalMaterial.makeOreless( @@ -621,7 +622,8 @@ public class EndBlocks { 9F, EndToolMaterial.TERMINITE, EndArmorMaterial.TERMINITE, - EndToolMaterial.TERMINITE.getLevel() + EndToolMaterial.TERMINITE.getLevel(), + EndTemplates.TERMINITE_UPGRADE ); public static final Block AETERNIUM_BLOCK = registerBlock("aeternium_block", new AeterniumBlock()); public static final Block CHARCOAL_BLOCK = registerBlock("charcoal_block", new CharcoalBlock()); diff --git a/src/main/java/org/betterx/betterend/registry/EndTemplates.java b/src/main/java/org/betterx/betterend/registry/EndTemplates.java new file mode 100644 index 00000000..7624622d --- /dev/null +++ b/src/main/java/org/betterx/betterend/registry/EndTemplates.java @@ -0,0 +1,108 @@ +package org.betterx.betterend.registry; + +import org.betterx.bclib.recipes.SmithingTemplates; +import org.betterx.betterend.BetterEnd; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.SmithingTemplateItem; + +import java.util.List; + +public class EndTemplates { + static final ResourceLocation EMPTY_SLOT_STICK = BetterEnd.makeID("item/empty_slot_stick"); + static final ResourceLocation EMPTY_SLOT_HANDLE = BetterEnd.makeID("item/empty_slot_handle"); + static final ResourceLocation EMPTY_SLOT_SWORD_HANDLE = BetterEnd.makeID("item/empty_slot_sword_handle"); + static final ResourceLocation EMPTY_SLOT_SWORD_BLADE = BetterEnd.makeID("item/empty_slot_sword_blade"); + static final ResourceLocation EMPTY_SLOT_PLATE = BetterEnd.makeID("item/empty_slot_plate"); + static final ResourceLocation EMPTY_SLOT_HAMMER = BetterEnd.makeID("item/empty_slot_hammer"); + + static final ResourceLocation EMPTY_SLOT_HAMMER_HEAD = BetterEnd.makeID("item/empty_slot_hammer_head"); + static final ResourceLocation EMPTY_SLOT_PICKAXE_HEAD = BetterEnd.makeID("item/empty_slot_pickaxe_head"); + static final ResourceLocation EMPTY_SLOT_AXE_HEAD = BetterEnd.makeID("item/empty_slot_axe_head"); + static final ResourceLocation EMPTY_SLOT_HOE_HEAD = BetterEnd.makeID("item/empty_slot_hoe_head"); + static final ResourceLocation EMPTY_SLOT_SHOVEL_HEAD = BetterEnd.makeID("item/empty_slot_shovel_head"); + static final ResourceLocation EMPTY_SLOT_ANVIL = BetterEnd.makeID("item/empty_slot_anvil"); + static final ResourceLocation EMPTY_SLOT_ELYTRA = BetterEnd.makeID("item/empty_slot_elytra"); + + + public static final SmithingTemplateItem HANDLE_ATTACHMENT = EndItems + .getItemRegistry() + .registerSmithingTemplateItem( + BetterEnd.makeID("handle_attachment"), + List.of( + EMPTY_SLOT_HAMMER_HEAD, + EMPTY_SLOT_PICKAXE_HEAD, + EMPTY_SLOT_AXE_HEAD, + EMPTY_SLOT_HOE_HEAD, + EMPTY_SLOT_SHOVEL_HEAD + ), + List.of(EMPTY_SLOT_STICK) + ); + public static final SmithingTemplateItem LEATHER_HANDLE_ATTACHMENT = EndItems + .getItemRegistry() + .registerSmithingTemplateItem( + BetterEnd.makeID("leather_handle_attachment"), + List.of( + EMPTY_SLOT_HAMMER_HEAD, + EMPTY_SLOT_PICKAXE_HEAD, + EMPTY_SLOT_AXE_HEAD, + EMPTY_SLOT_HOE_HEAD, + EMPTY_SLOT_SHOVEL_HEAD + ), + List.of(EMPTY_SLOT_HANDLE) + ); + + public static final SmithingTemplateItem TOOL_ASSEMBLY = EndItems + .getItemRegistry() + .registerSmithingTemplateItem( + BetterEnd.makeID("tool_assembly"), + List.of( + EMPTY_SLOT_SWORD_BLADE + ), + List.of(EMPTY_SLOT_SWORD_HANDLE) + ); + + public static final SmithingTemplateItem PLATE_UPGRADE = EndItems + .getItemRegistry() + .registerSmithingTemplateItem( + BetterEnd.makeID("plate_upgrade"), + SmithingTemplates.ARMOR, + List.of(EMPTY_SLOT_PLATE) + ); + + public static final SmithingTemplateItem THALLASIUM_UPGRADE = EndItems + .getItemRegistry() + .registerSmithingTemplateItem( + BetterEnd.makeID("thallasium_upgrade"), + List.of(EMPTY_SLOT_STICK), + List.of(SmithingTemplates.EMPTY_SLOT_INGOT) + ); + + public static final SmithingTemplateItem TERMINITE_UPGRADE = EndItems + .getItemRegistry() + .registerSmithingTemplateItem( + BetterEnd.makeID("terminite_upgrade"), + List.of(EMPTY_SLOT_ANVIL, EMPTY_SLOT_STICK), + List.of(SmithingTemplates.EMPTY_SLOT_INGOT) + ); + + public static final SmithingTemplateItem AETERNIUM_UPGRADE = EndItems + .getItemRegistry() + .registerSmithingTemplateItem( + BetterEnd.makeID("aeternium_upgrade"), + List.of(EMPTY_SLOT_ANVIL, EMPTY_SLOT_ELYTRA), + List.of(SmithingTemplates.EMPTY_SLOT_INGOT) + ); + + + public static final SmithingTemplateItem NETHERITE_UPGRADE = EndItems + .getItemRegistry() + .registerSmithingTemplateItem( + BetterEnd.makeID("netherite_upgrade"), + List.of(EMPTY_SLOT_HAMMER), + List.of(SmithingTemplates.EMPTY_SLOT_INGOT) + ); + + public static void ensureStaticallyLoaded() { + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index c9aca382..a78f2d6b 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -784,6 +784,38 @@ "item.betterend.shadow_berry_raw": "Shadow Berry", "item.betterend.silk_fiber": "Silk Fiber", "item.betterend.silk_moth_matrix": "Silk Moth Matrix", + "item.betterend.smithing_template.aeternium_upgrade.additions_slot_description": "Add Aeternium Ingot", + "item.betterend.smithing_template.aeternium_upgrade.applies_to": "Elytra or Terminite Anvils", + "item.betterend.smithing_template.aeternium_upgrade.base_slot_description": "Add Elytra or Terminite Anvil", + "item.betterend.smithing_template.aeternium_upgrade.ingredients": "Aeternium Ingots", + "item.betterend.smithing_template.handle_attachment.additions_slot_description": "Add a Stick", + "item.betterend.smithing_template.handle_attachment.applies_to": "Thallasium or Terminite Tool Heads", + "item.betterend.smithing_template.handle_attachment.base_slot_description": "Add Thallasium or Terminite Tool Heads", + "item.betterend.smithing_template.handle_attachment.ingredients": "Sticks", + "item.betterend.smithing_template.leather_handle_attachment.additions_slot_description": "Add a Leather Wrapped Stick", + "item.betterend.smithing_template.leather_handle_attachment.applies_to": "Aeternium Tool Heads", + "item.betterend.smithing_template.leather_handle_attachment.base_slot_description": "Add a Aeternium Tool Head", + "item.betterend.smithing_template.leather_handle_attachment.ingredients": "Leather Wrapped Sticks", + "item.betterend.smithing_template.netherite_upgrade.additions_slot_description": "Add a Netehrite Ingot", + "item.betterend.smithing_template.netherite_upgrade.applies_to": "Diamond Hammer", + "item.betterend.smithing_template.netherite_upgrade.base_slot_description": "Add a Diamond Hammer", + "item.betterend.smithing_template.netherite_upgrade.ingredients": "Netherite Ingots", + "item.betterend.smithing_template.plate_upgrade.additions_slot_description": "Add a forged Aeternium Plate", + "item.betterend.smithing_template.plate_upgrade.applies_to": "Terminite Armor", + "item.betterend.smithing_template.plate_upgrade.base_slot_description": "Add a Terminite Piece", + "item.betterend.smithing_template.plate_upgrade.ingredients": "Forged Aeternium Plates", + "item.betterend.smithing_template.terminite_upgrade.additions_slot_description": "Add a Terminite Ingot", + "item.betterend.smithing_template.terminite_upgrade.applies_to": "Stick or Thalasium Anvil", + "item.betterend.smithing_template.terminite_upgrade.base_slot_description": "Add a Stick or a Thalasium Anvil ", + "item.betterend.smithing_template.terminite_upgrade.ingredients": "Terminite Ingots", + "item.betterend.smithing_template.thallasium_upgrade.additions_slot_description": "Add a Thallasium Ingot", + "item.betterend.smithing_template.thallasium_upgrade.applies_to": "Stick", + "item.betterend.smithing_template.thallasium_upgrade.base_slot_description": "Add a Stick", + "item.betterend.smithing_template.thallasium_upgrade.ingredients": "Thallasium Ingots", + "item.betterend.smithing_template.tool_assembly.additions_slot_description": "Add a Sword Handle", + "item.betterend.smithing_template.tool_assembly.applies_to": "Sword Blades", + "item.betterend.smithing_template.tool_assembly.base_slot_description": "Add a Sword Blade", + "item.betterend.smithing_template.tool_assembly.ingredients": "Sword Handles", "item.betterend.spawn_egg_cubozoa": "Cubozoa Spawn Egg", "item.betterend.spawn_egg_dragonfly": "Dragonfly Spawn Egg", "item.betterend.spawn_egg_end_fish": "End Fish Spawn Egg", @@ -839,8 +871,9 @@ "item.minecraft.splash_potion.effect.long_end_veil": "Splash Potion Of End Veil", "item.minecraft.tipped_arrow.effect.end_veil": "Arrow Of End Veil", "item.minecraft.tipped_arrow.effect.long_end_veil": "Arrow Of End Veil", - "itemGroup.betterend.end_blocks": "Better End: Blocks", - "itemGroup.betterend.end_items": "Better End: Items", + "itemGroup.betterend.blocks": "BetterEnd: Blocks", + "itemGroup.betterend.items": "BetterEnd: Items", + "itemGroup.betterend.plants": "BetterEnd: Plants", "message.betterend.anvil_damage": "§cDamage", "message.betterend.fail_spawn": "§c§lYou need to hold 6 Amber Gems to set your spawn point", "message.betterend.set_spawn": "§b§lYour spawn point is set here", @@ -860,5 +893,13 @@ "tag.betterend.umbrella_tree_logs": "Umbrella Logs", "tooltip.armor.crystalite_boots": "Effect: Swiftness I", "tooltip.armor.crystalite_chest": "Effect: Dig Speed I", - "tooltip.armor.crystalite_set": "Set bonus: Regeneration I" + "tooltip.armor.crystalite_set": "Set bonus: Regeneration I", + "upgrade.betterend.aeternium_upgrade": "Aeternium Upgrade", + "upgrade.betterend.handle_attachment": "Combine with Handle", + "upgrade.betterend.leather_handle_attachment": "Combine with Leather Handle", + "upgrade.betterend.netherite_upgrade": "Netehrite Hammer Upgrade", + "upgrade.betterend.plate_upgrade": "Aeternium Plating", + "upgrade.betterend.terminite_upgrade": "Terminite Upgrade", + "upgrade.betterend.thallasium_upgrade": "Thallasium Sword Handle", + "upgrade.betterend.tool_assembly": "Assemble Sword" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_upgrade_smithing_template.json b/src/main/resources/assets/betterend/models/item/aeternium_upgrade_smithing_template.json new file mode 100755 index 00000000..89b4eb5f --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_upgrade_smithing_template.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/aeternium_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/handle_attachment_smithing_template.json b/src/main/resources/assets/betterend/models/item/handle_attachment_smithing_template.json new file mode 100755 index 00000000..3939f26b --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/handle_attachment_smithing_template.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/handle_attachment_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/leather_handle_attachment_smithing_template.json b/src/main/resources/assets/betterend/models/item/leather_handle_attachment_smithing_template.json new file mode 100755 index 00000000..d9c08a9f --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/leather_handle_attachment_smithing_template.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/leather_handle_attachment_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/netherite_upgrade_smithing_template.json b/src/main/resources/assets/betterend/models/item/netherite_upgrade_smithing_template.json new file mode 100755 index 00000000..be86d2ec --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/netherite_upgrade_smithing_template.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/plate_upgrade_smithing_template.json b/src/main/resources/assets/betterend/models/item/plate_upgrade_smithing_template.json new file mode 100755 index 00000000..2328d34e --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/plate_upgrade_smithing_template.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/plate_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_upgrade_smithing_template.json b/src/main/resources/assets/betterend/models/item/terminite_upgrade_smithing_template.json new file mode 100755 index 00000000..13db2644 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/terminite_upgrade_smithing_template.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/terminite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/thallasium_upgrade_smithing_template.json b/src/main/resources/assets/betterend/models/item/thallasium_upgrade_smithing_template.json new file mode 100755 index 00000000..d3ddb59c --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/thallasium_upgrade_smithing_template.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/thallasium_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/tool_assembly_smithing_template.json b/src/main/resources/assets/betterend/models/item/tool_assembly_smithing_template.json new file mode 100755 index 00000000..2f715d23 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/tool_assembly_smithing_template.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/tool_assembly_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_upgrade_smithing_template.png b/src/main/resources/assets/betterend/textures/item/aeternium_upgrade_smithing_template.png new file mode 100644 index 00000000..69b07964 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/aeternium_upgrade_smithing_template.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_anvil.png b/src/main/resources/assets/betterend/textures/item/empty_slot_anvil.png new file mode 100644 index 00000000..455e2fd2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_anvil.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_axe_head.png b/src/main/resources/assets/betterend/textures/item/empty_slot_axe_head.png new file mode 100644 index 00000000..6a3ffce3 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_axe_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_elytra.png b/src/main/resources/assets/betterend/textures/item/empty_slot_elytra.png new file mode 100644 index 00000000..57aa2d69 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_elytra.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_hammer.png b/src/main/resources/assets/betterend/textures/item/empty_slot_hammer.png new file mode 100644 index 00000000..cb1676e4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_hammer.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_hammer_head.png b/src/main/resources/assets/betterend/textures/item/empty_slot_hammer_head.png new file mode 100644 index 00000000..35157d75 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_hammer_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_handle.png b/src/main/resources/assets/betterend/textures/item/empty_slot_handle.png new file mode 100644 index 00000000..0ab0d226 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_handle.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_hoe_head.png b/src/main/resources/assets/betterend/textures/item/empty_slot_hoe_head.png new file mode 100644 index 00000000..89104ff3 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_hoe_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_pickaxe_head.png b/src/main/resources/assets/betterend/textures/item/empty_slot_pickaxe_head.png new file mode 100644 index 00000000..0950a464 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_pickaxe_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_plate.png b/src/main/resources/assets/betterend/textures/item/empty_slot_plate.png new file mode 100644 index 00000000..2e301e31 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_plate.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_shovel_head.png b/src/main/resources/assets/betterend/textures/item/empty_slot_shovel_head.png new file mode 100644 index 00000000..5e604002 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_shovel_head.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_stick.png b/src/main/resources/assets/betterend/textures/item/empty_slot_stick.png new file mode 100755 index 00000000..cca15d1d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_stick.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_sword_blade.png b/src/main/resources/assets/betterend/textures/item/empty_slot_sword_blade.png new file mode 100644 index 00000000..62e6bb5a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_sword_blade.png differ diff --git a/src/main/resources/assets/betterend/textures/item/empty_slot_sword_handle.png b/src/main/resources/assets/betterend/textures/item/empty_slot_sword_handle.png new file mode 100644 index 00000000..26993a3e Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/empty_slot_sword_handle.png differ diff --git a/src/main/resources/assets/betterend/textures/item/handle_attachment_smithing_template.png b/src/main/resources/assets/betterend/textures/item/handle_attachment_smithing_template.png new file mode 100644 index 00000000..a33fcbec Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/handle_attachment_smithing_template.png differ diff --git a/src/main/resources/assets/betterend/textures/item/leather_handle_attachment_smithing_template.png b/src/main/resources/assets/betterend/textures/item/leather_handle_attachment_smithing_template.png new file mode 100644 index 00000000..e7602497 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/leather_handle_attachment_smithing_template.png differ diff --git a/src/main/resources/assets/betterend/textures/item/netherite_upgrade_smithing_template.png b/src/main/resources/assets/betterend/textures/item/netherite_upgrade_smithing_template.png new file mode 100644 index 00000000..62e9ca69 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/netherite_upgrade_smithing_template.png differ diff --git a/src/main/resources/assets/betterend/textures/item/plate_upgrade_smithing_template.png b/src/main/resources/assets/betterend/textures/item/plate_upgrade_smithing_template.png new file mode 100644 index 00000000..818d8507 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/plate_upgrade_smithing_template.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_upgrade_smithing_template.png b/src/main/resources/assets/betterend/textures/item/terminite_upgrade_smithing_template.png new file mode 100644 index 00000000..32e12c9a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/terminite_upgrade_smithing_template.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_upgrade_smithing_template.png b/src/main/resources/assets/betterend/textures/item/thallasium_upgrade_smithing_template.png new file mode 100644 index 00000000..1381fa74 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/thallasium_upgrade_smithing_template.png differ diff --git a/src/main/resources/assets/betterend/textures/item/tool_assembly_smithing_template.png b/src/main/resources/assets/betterend/textures/item/tool_assembly_smithing_template.png new file mode 100644 index 00000000..043e29e4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/tool_assembly_smithing_template.png differ