From be83a964878496f9b37a7c4bd086499a30bc5be8 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 19 Oct 2018 18:32:20 +0200 Subject: [PATCH] added infused tools for now --- .../blocks/BlockAncientLeaves.java | 5 -- .../naturesaura/blocks/BlockAncientLog.java | 5 -- .../blocks/BlockAncientSapling.java | 5 -- .../blocks/BlockContainerImpl.java | 5 -- .../naturesaura/blocks/BlockGoldenLeaves.java | 5 -- .../ellpeck/naturesaura/blocks/BlockImpl.java | 5 -- .../ellpeck/naturesaura/items/ItemImpl.java | 5 -- .../ellpeck/naturesaura/items/ModItems.java | 13 +++++ .../naturesaura/items/tools/ItemAxeNA.java | 43 +++++++++++++++++ .../naturesaura/items/tools/ItemHoeNA.java | 45 ++++++++++++++++++ .../items/tools/ItemPickaxeNA.java | 43 +++++++++++++++++ .../naturesaura/items/tools/ItemShovelNA.java | 43 +++++++++++++++++ .../naturesaura/items/tools/ItemSwordNA.java | 44 +++++++++++++++++ .../naturesaura/reg/IModelProvider.java | 10 +++- .../assets/naturesaura/lang/en_US.lang | 5 ++ .../models/item/infused_iron_axe.json | 6 +++ .../models/item/infused_iron_hoe.json | 6 +++ .../models/item/infused_iron_pickaxe.json | 6 +++ .../models/item/infused_iron_shovel.json | 6 +++ .../models/item/infused_iron_sword.json | 6 +++ .../textures/items/infused_iron_axe.png | Bin 0 -> 505 bytes .../textures/items/infused_iron_hoe.png | Bin 0 -> 534 bytes .../textures/items/infused_iron_pickaxe.png | Bin 0 -> 534 bytes .../textures/items/infused_iron_shovel.png | Bin 0 -> 485 bytes .../textures/items/infused_iron_sword.png | Bin 0 -> 596 bytes 25 files changed, 275 insertions(+), 36 deletions(-) create mode 100644 src/main/java/de/ellpeck/naturesaura/items/tools/ItemAxeNA.java create mode 100644 src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoeNA.java create mode 100644 src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxeNA.java create mode 100644 src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java create mode 100644 src/main/java/de/ellpeck/naturesaura/items/tools/ItemSwordNA.java create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_iron_axe.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_iron_hoe.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_iron_shovel.json create mode 100644 src/main/resources/assets/naturesaura/models/item/infused_iron_sword.json create mode 100644 src/main/resources/assets/naturesaura/textures/items/infused_iron_axe.png create mode 100644 src/main/resources/assets/naturesaura/textures/items/infused_iron_hoe.png create mode 100644 src/main/resources/assets/naturesaura/textures/items/infused_iron_pickaxe.png create mode 100644 src/main/resources/assets/naturesaura/textures/items/infused_iron_shovel.png create mode 100644 src/main/resources/assets/naturesaura/textures/items/infused_iron_sword.png diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java index 7420adeb..ccfecec4 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java @@ -63,11 +63,6 @@ public class BlockAncientLeaves extends BlockLeaves implements } - @Override - public Map getModelLocations() { - return Collections.singletonMap(new ItemStack(this), new ModelVariant(new ResourceLocation(NaturesAura.MOD_ID, this.getBaseName()), "inventory")); - } - @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { return Collections.singletonList(new ItemStack(this, 1, 0)); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLog.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLog.java index ce94bed1..b5cd5201 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLog.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLog.java @@ -47,11 +47,6 @@ public class BlockAncientLog extends BlockLog implements IModItem, IModelProvide } - @Override - public Map getModelLocations() { - return Collections.singletonMap(new ItemStack(this), new ModelVariant(new ResourceLocation(NaturesAura.MOD_ID, this.getBaseName()), "inventory")); - } - @Override protected BlockStateContainer createBlockState() { return new BlockStateContainer(this, LOG_AXIS); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java index 461d49cf..fb62a49c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java @@ -55,11 +55,6 @@ public class BlockAncientSapling extends BlockBush implements IGrowable, IModIte } } - @Override - public Map getModelLocations() { - return Collections.singletonMap(new ItemStack(this), new ModelVariant(new ResourceLocation(NaturesAura.MOD_ID, this.getBaseName()), "inventory")); - } - @Override public String getBaseName() { return "ancient_sapling"; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java index 2595dbd6..04d3824d 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockContainerImpl.java @@ -76,11 +76,6 @@ public class BlockContainerImpl extends BlockContainer implements IModItem, IMod } - @Override - public Map getModelLocations() { - return Collections.singletonMap(new ItemStack(this), new ModelVariant(new ResourceLocation(NaturesAura.MOD_ID, this.getBaseName()), "inventory")); - } - @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.MODEL; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldenLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldenLeaves.java index 38cea2a9..681cdc82 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldenLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldenLeaves.java @@ -67,11 +67,6 @@ public class BlockGoldenLeaves extends BlockLeaves implements } - @Override - public Map getModelLocations() { - return Collections.singletonMap(new ItemStack(this), new ModelVariant(new ResourceLocation(NaturesAura.MOD_ID, this.getBaseName()), "inventory")); - } - @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { NonNullList drops = NonNullList.create(); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockImpl.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockImpl.java index 14b6a374..eb1fafd8 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockImpl.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockImpl.java @@ -51,11 +51,6 @@ public class BlockImpl extends Block implements IModItem, IModelProvider { } - @Override - public Map getModelLocations() { - return Collections.singletonMap(new ItemStack(this), new ModelVariant(new ResourceLocation(NaturesAura.MOD_ID, this.getBaseName()), "inventory")); - } - @Override public Block setSoundType(SoundType sound) { return super.setSoundType(sound); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemImpl.java b/src/main/java/de/ellpeck/naturesaura/items/ItemImpl.java index 23ef9b03..2e068927 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemImpl.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemImpl.java @@ -47,9 +47,4 @@ public class ItemImpl extends Item implements IModItem, IModelProvider { public void onPostInit(FMLPostInitializationEvent event) { } - - @Override - public Map getModelLocations() { - return Collections.singletonMap(new ItemStack(this), new ModelVariant(new ResourceLocation(NaturesAura.MOD_ID, this.getBaseName()), "inventory")); - } } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java index db47957c..dff6c1b0 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java @@ -1,6 +1,11 @@ package de.ellpeck.naturesaura.items; +import de.ellpeck.naturesaura.NaturesAura; +import de.ellpeck.naturesaura.items.tools.*; import net.minecraft.item.Item; +import net.minecraftforge.common.util.EnumHelper; + +import java.util.Locale; public final class ModItems { @@ -8,4 +13,12 @@ public final class ModItems { public static final Item GOLD_FIBER = new ItemGoldFiber(); public static final Item GOLD_LEAF = new ItemImpl("gold_leaf"); public static final Item INFUSED_IRON = new ItemImpl("infused_iron"); + + public static final Item.ToolMaterial TOOL_MATERIAL_INFUSED_IRON = + EnumHelper.addToolMaterial(NaturesAura.MOD_ID.toUpperCase(Locale.ROOT) + "_INFUSED_IRON", 3, 300, 6.25F, 2.25F, 16); + public static final Item INFUSED_PICKAXE = new ItemPickaxeNA("infused_iron_pickaxe", TOOL_MATERIAL_INFUSED_IRON); + public static final Item INFUSED_AXE = new ItemAxeNA("infused_iron_axe", TOOL_MATERIAL_INFUSED_IRON, 8.25F, -3.2F); + public static final Item INFUSED_SHOVEL = new ItemShovelNA("infused_iron_shovel", TOOL_MATERIAL_INFUSED_IRON); + public static final Item INFUSED_HOE = new ItemHoeNA("infused_iron_hoe", TOOL_MATERIAL_INFUSED_IRON); + public static final Item INFUSED_SWORD = new ItemSwordNA("infused_iron_sword", TOOL_MATERIAL_INFUSED_IRON); } diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemAxeNA.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemAxeNA.java new file mode 100644 index 00000000..d3901e55 --- /dev/null +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemAxeNA.java @@ -0,0 +1,43 @@ +package de.ellpeck.naturesaura.items.tools; + +import de.ellpeck.naturesaura.reg.IModItem; +import de.ellpeck.naturesaura.reg.IModelProvider; +import de.ellpeck.naturesaura.reg.ModRegistry; +import net.minecraft.item.ItemAxe; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +public class ItemAxeNA extends ItemAxe implements IModItem, IModelProvider { + private final String baseName; + + public ItemAxeNA(String baseName, ToolMaterial material, float damage, float speed) { + super(material, damage, speed); + this.baseName = baseName; + ModRegistry.addItemOrBlock(this); + } + + @Override + public String getBaseName() { + return this.baseName; + } + + @Override + public boolean shouldAddCreative() { + return true; + } + + @Override + public void onPreInit(FMLPreInitializationEvent event) { + + } + + @Override + public void onInit(FMLInitializationEvent event) { + + } + + @Override + public void onPostInit(FMLPostInitializationEvent event) { + } +} diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoeNA.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoeNA.java new file mode 100644 index 00000000..02759445 --- /dev/null +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemHoeNA.java @@ -0,0 +1,45 @@ +package de.ellpeck.naturesaura.items.tools; + +import de.ellpeck.naturesaura.reg.IModItem; +import de.ellpeck.naturesaura.reg.IModelProvider; +import de.ellpeck.naturesaura.reg.ModRegistry; +import net.minecraft.item.ItemHoe; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +public class ItemHoeNA extends ItemHoe implements IModItem, IModelProvider { + + private final String baseName; + + public ItemHoeNA(String baseName, ToolMaterial material) { + super(material); + this.baseName = baseName; + ModRegistry.addItemOrBlock(this); + } + + @Override + public String getBaseName() { + return this.baseName; + } + + @Override + public boolean shouldAddCreative() { + return true; + } + + @Override + public void onPreInit(FMLPreInitializationEvent event) { + + } + + @Override + public void onInit(FMLInitializationEvent event) { + + } + + @Override + public void onPostInit(FMLPostInitializationEvent event) { + + } +} diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxeNA.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxeNA.java new file mode 100644 index 00000000..b65a62eb --- /dev/null +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemPickaxeNA.java @@ -0,0 +1,43 @@ +package de.ellpeck.naturesaura.items.tools; + +import de.ellpeck.naturesaura.reg.IModItem; +import de.ellpeck.naturesaura.reg.IModelProvider; +import de.ellpeck.naturesaura.reg.ModRegistry; +import net.minecraft.item.ItemPickaxe; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +public class ItemPickaxeNA extends ItemPickaxe implements IModItem, IModelProvider { + private final String baseName; + + public ItemPickaxeNA(String baseName, ToolMaterial material) { + super(material); + this.baseName = baseName; + ModRegistry.addItemOrBlock(this); + } + + @Override + public String getBaseName() { + return this.baseName; + } + + @Override + public boolean shouldAddCreative() { + return true; + } + + @Override + public void onPreInit(FMLPreInitializationEvent event) { + + } + + @Override + public void onInit(FMLInitializationEvent event) { + + } + + @Override + public void onPostInit(FMLPostInitializationEvent event) { + } +} diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java new file mode 100644 index 00000000..83b14f5d --- /dev/null +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemShovelNA.java @@ -0,0 +1,43 @@ +package de.ellpeck.naturesaura.items.tools; + +import de.ellpeck.naturesaura.reg.IModItem; +import de.ellpeck.naturesaura.reg.IModelProvider; +import de.ellpeck.naturesaura.reg.ModRegistry; +import net.minecraft.item.ItemSpade; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +public class ItemShovelNA extends ItemSpade implements IModItem, IModelProvider { + private final String baseName; + + public ItemShovelNA(String baseName, ToolMaterial material) { + super(material); + this.baseName = baseName; + ModRegistry.addItemOrBlock(this); + } + + @Override + public String getBaseName() { + return this.baseName; + } + + @Override + public boolean shouldAddCreative() { + return true; + } + + @Override + public void onPreInit(FMLPreInitializationEvent event) { + + } + + @Override + public void onInit(FMLInitializationEvent event) { + + } + + @Override + public void onPostInit(FMLPostInitializationEvent event) { + } +} diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemSwordNA.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemSwordNA.java new file mode 100644 index 00000000..df2b2723 --- /dev/null +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemSwordNA.java @@ -0,0 +1,44 @@ +package de.ellpeck.naturesaura.items.tools; + +import de.ellpeck.naturesaura.reg.IModItem; +import de.ellpeck.naturesaura.reg.IModelProvider; +import de.ellpeck.naturesaura.reg.ModRegistry; +import net.minecraft.item.ItemSword; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + +public class ItemSwordNA extends ItemSword implements IModItem, IModelProvider { + private final String baseName; + + public ItemSwordNA(String baseName, ToolMaterial material) { + super(material); + this.baseName = baseName; + ModRegistry.addItemOrBlock(this); + } + + @Override + public String getBaseName() { + return this.baseName; + } + + @Override + public boolean shouldAddCreative() { + return true; + } + + @Override + public void onPreInit(FMLPreInitializationEvent event) { + + } + + @Override + public void onInit(FMLInitializationEvent event) { + + } + + @Override + public void onPostInit(FMLPostInitializationEvent event) { + + } +} diff --git a/src/main/java/de/ellpeck/naturesaura/reg/IModelProvider.java b/src/main/java/de/ellpeck/naturesaura/reg/IModelProvider.java index 4cb00e1f..ce434118 100644 --- a/src/main/java/de/ellpeck/naturesaura/reg/IModelProvider.java +++ b/src/main/java/de/ellpeck/naturesaura/reg/IModelProvider.java @@ -1,13 +1,21 @@ package de.ellpeck.naturesaura.reg; +import de.ellpeck.naturesaura.NaturesAura; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import java.util.Collections; import java.util.Map; public interface IModelProvider { - Map getModelLocations(); + default Map getModelLocations() { + ItemStack stack = this instanceof Item ? new ItemStack((Item) this) : new ItemStack((Block) this); + String name = ((IModItem) this).getBaseName(); + return Collections.singletonMap(stack, new ModelVariant(new ResourceLocation(NaturesAura.MOD_ID, name), "inventory")); + } class ModelVariant { diff --git a/src/main/resources/assets/naturesaura/lang/en_US.lang b/src/main/resources/assets/naturesaura/lang/en_US.lang index 559e61bd..52a40b91 100644 --- a/src/main/resources/assets/naturesaura/lang/en_US.lang +++ b/src/main/resources/assets/naturesaura/lang/en_US.lang @@ -14,6 +14,11 @@ item.naturesaura.eye.name=Environmental Eye item.naturesaura.gold_fiber.name=Brilliant Fiber item.naturesaura.gold_leaf.name=Gold Leaf item.naturesaura.infused_iron.name=Infused Iron +item.naturesaura.infused_iron_pickaxe.name=Botanist's Pickaxe +item.naturesaura.infused_iron_axe.name=Botanist's Handaxe +item.naturesaura.infused_iron_shovel.name=Botanist's Shovel +item.naturesaura.infused_iron_sword.name=Botanist's Blade +item.naturesaura.infused_iron_hoe.name=Botanist's Hoe container.naturesaura.tree_ritual.name=Tree Infusion container.naturesaura.altar.name=Natural Altar diff --git a/src/main/resources/assets/naturesaura/models/item/infused_iron_axe.json b/src/main/resources/assets/naturesaura/models/item/infused_iron_axe.json new file mode 100644 index 00000000..a397794a --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_iron_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "naturesaura:items/infused_iron_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_iron_hoe.json b/src/main/resources/assets/naturesaura/models/item/infused_iron_hoe.json new file mode 100644 index 00000000..689ccfee --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_iron_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "naturesaura:items/infused_iron_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json b/src/main/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json new file mode 100644 index 00000000..7bf2be69 --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "naturesaura:items/infused_iron_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_iron_shovel.json b/src/main/resources/assets/naturesaura/models/item/infused_iron_shovel.json new file mode 100644 index 00000000..e72b1e3b --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_iron_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "naturesaura:items/infused_iron_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/models/item/infused_iron_sword.json b/src/main/resources/assets/naturesaura/models/item/infused_iron_sword.json new file mode 100644 index 00000000..b022136c --- /dev/null +++ b/src/main/resources/assets/naturesaura/models/item/infused_iron_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "naturesaura:items/infused_iron_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_axe.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..33cb340b37e99495de9d20f19dcb9b98c429b713 GIT binary patch literal 505 zcmVN2bZe?^J zG%hhNF=Hy6O8@`?cS%G+R5(v{Qrk|#KoH%w(54pUVzFol@q$qi5L5(WDjFrx7$5vE zqff@fcYnaY>(kgXGG%M)NjAHk&bjPG0mWibIgXQ#mKBL?aaPaqCRq6-23JfP9ngr?sit<9>5h@O-oZUBDbyK=Km{f{#m zeqOK$QbbX-=vp8zI+7qZNFaCLhde_dhQi1owWk=t{T9cDNbl`e074>?Lf%QEhCL(6 z^k{=RFa0D*?Y5qcfSVBLX~qXW&4&#--7Qo1b--y#VVP2gjW-~t3TKF62KjCf(B*N1 z3Ahm?LSJH{D|w#BGirzpXOK~oMrF+iA|H0e2PQ*Xy7Gzk&zuIuvpU%>fs+@if;h4dQ{h>;FXFU@dk vH$1}N!XL=~C6&yn``4kLjWkPbX=Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E-_;&oJ#-z0f$LMK~y+TZBp4%0znL1Zk9t(R6t5mQ9!Om zL~bd4(HE~jQ%g&I_xR10j$~^V=&ISwOp;C~J613lv_hefMfm-Gv4rkv!{M;U=kxi* z1_A-Gg2f;rIZY!rPQo4~kiN=be(jB;0=*!!uEa$Ot)Cv8-#)6JZ8W~Rhz{dILdDE; z;W-$f0#_>aj9tqx2P5rHd>WhQQhlBWJO&HublIS2! zm_r)ZbEv(ZqWsiE>T<)KhYMvRStJsXJ;C;Rw$K7vW4Nv{k_U=m5n`Sdv-E{GAF@mARJ$RzAx8zjs0(S2P+GYbGo`Je8-4G{79-@-Qvy Y56s$FKhIl-`v3p{07*qoM6N<$f*En&?*IS* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_pickaxe.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..ba67f9b0de8237b0ae62506c7ad721ef45dbb7c6 GIT binary patch literal 534 zcmV+x0_pvUP)N2bZe?^J zG%hhNF=Hy6O8@`?lu1NER5(v{QprvNK@c5a7G_umA+iW45CK^vGJ=XM;z6TPzsG|I zG)5DRXAj1Iedaav&|r8;rK_i^UcIVmP1kiT7z}EGKtPiSg+dE&3FZ*YUx5s)LnWlI zHle>#Cok$58O7mFlZcL8#4onMI|%>?^RdoG`FhPj`?rVMcL&WM4?8b=$j*w0O%j5T z1cqTODmK8Vo3OozFy}am!fRPr@u`f&WojvbvebFkA!E)khTLNj`S+4P&OfN55He}p zO5@tg3HkdUE!4j{2sdqI5esmBSwu4WlXeC-y*#{%E4qfe4yvDRLEtxJKpMdXG04tW z-7JQ!EKJiBF{d3tc~*zj2+tL$55ux7e~eLc8xMmL&YKxXWy~c(<@o@1%UKfGwk>=K z%D(Lva8gT&VioLMe>+6{$ej}~fs$!dK-u?adl)p*qF540Wjxv4S58MJO*=WU?S3`s zZ+Kk+q3%n7PnC9ex+{uV#7=6Wx+{Wl|C?M4pXv(p0vvCX5&_P{|4Jg2Kvkg4SIv6Wt6)c^nh07*qoM6N<$f*r!ry8r+H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_shovel.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..9ada57d2a30340d90e9c9798c20414a966fa6bc3 GIT binary patch literal 485 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E-_;&oJ#-z0ai&wK~y+Tby3?+!axw+(o2Gcf)5g-q6P@G z5=&_ew#HXqynK_dnrPya@ehpnk)vnmwA-beWV5rgbIzWbRjpP_IgX=DNY1h><+?8K zSg5Z72}#Qmr5>zT|a@l zJQ~pWIVu+%6(tp5TYA=e&%y(`Ukxc8^_c90UUTnyE7Ct+ez-m*>^OIlfN&>n^@kXq z=M~Y0e78I#I4Dvj@TC9?$U#@Vn(VXfXxQgLA=fk`cCA~Nfx$M&rbV-sfu3*(PkL(ryp00000NkvXXu0mjf1Ix)} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/naturesaura/textures/items/infused_iron_sword.png b/src/main/resources/assets/naturesaura/textures/items/infused_iron_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..b2d5e4077920062710972b175363c5988dc055ea GIT binary patch literal 596 zcmV-a0;~OrP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y9E-_;&oJ#-z0mVr~K~y+TeN)>?LO~QAJ>EFxHARd}Pg;3P zQpya=tTe)U>aG6>x)c3CQ1%c#)+cm%2>LJu-MMzo@pyz5j5E&6UVE**=LiX_)jC`W zVYl0dD`RH}Z_+e(kz)B{_8ble&+u>d zjZEq16-rz!^6=GzWK1B4NOZeh&T8}yL=I+1d&sb4?Rtpp5j;u)wd!FO$Si!VQ{pkr1m?_6r<3ExT86?@?rZEZ|FK3|J44aa zIHCGDM|RW-f#y2#28vaCYH+sHZI)#R_re6pIG1%93pTzw0KS`VhukK;&jU>O9)K<2 zM^#nse=Q%ORyoEN8m}!n{yAX<$jp}wz<+K%6o9>6h|+#3N|kh&vmy`$?f3g!T#!Ke zgnwki$8l7NQ&IEkl5r71An5gadW+?Q(@A_qKPB%n++zg63V>iJ!vixCNa(dw^KQZb i5qkR{WH%%fMG?QsoTzsBY4kq;0000