From cdfe7e750c6dfd3ff06378574fe7ff9837001ba6 Mon Sep 17 00:00:00 2001 From: Alchemist Date: Tue, 10 Sep 2013 23:49:38 +0000 Subject: [PATCH] Lots of changes! --- common/crazypants/enderio/EnderIO.java | 8 +++- common/crazypants/enderio/ModObject.java | 4 +- .../enderio/machine/MachineRecipes.java | 21 +++++---- .../enderio/material/BlockMachineChassi.java | 1 - .../enderio/material/ItemBasicGear.java | 38 +++++++++++++++ .../enderio/material/ItemMJReader.java | 38 +++++++++++++++ .../enderio/material/MaterialRecipes.java | 44 +++++++++++++----- .../crazypants/enderio/power/Capacitors.java | 4 +- .../{machineFrame.png => machineChassi.png} | Bin .../enderio/textures/blocks/machineSide.png | Bin 622 -> 647 bytes .../enderio/textures/blocks/machineSide1.png | Bin 0 -> 622 bytes .../textures/blocks/stirlingGenFrontOff.png | Bin 667 -> 650 bytes .../enderio/textures/items/basicGear.png | Bin 0 -> 431 bytes .../enderio/textures/items/powderBronze.png | Bin 0 -> 412 bytes .../enderio/textures/items/powderCoal.png | Bin 0 -> 351 bytes .../enderio/textures/items/powderCopper.png | Bin 0 -> 407 bytes .../enderio/textures/items/powderLead.png | Bin 0 -> 446 bytes .../enderio/textures/items/powderSilver.png | Bin 0 -> 333 bytes .../enderio/textures/items/powderTin.png | Bin 0 -> 412 bytes 19 files changed, 131 insertions(+), 27 deletions(-) create mode 100644 common/crazypants/enderio/material/ItemBasicGear.java create mode 100644 common/crazypants/enderio/material/ItemMJReader.java rename resources/assets/enderio/textures/blocks/{machineFrame.png => machineChassi.png} (100%) create mode 100644 resources/assets/enderio/textures/blocks/machineSide1.png create mode 100644 resources/assets/enderio/textures/items/basicGear.png create mode 100644 resources/assets/enderio/textures/items/powderBronze.png create mode 100644 resources/assets/enderio/textures/items/powderCoal.png create mode 100644 resources/assets/enderio/textures/items/powderCopper.png create mode 100644 resources/assets/enderio/textures/items/powderLead.png create mode 100644 resources/assets/enderio/textures/items/powderSilver.png create mode 100644 resources/assets/enderio/textures/items/powderTin.png diff --git a/common/crazypants/enderio/EnderIO.java b/common/crazypants/enderio/EnderIO.java index 08b1c9bf..42817e08 100644 --- a/common/crazypants/enderio/EnderIO.java +++ b/common/crazypants/enderio/EnderIO.java @@ -15,8 +15,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.TickRegistry; -import cpw.mods.fml.relauncher.Side; import crazypants.enderio.conduit.BlockConduitBundle; import crazypants.enderio.conduit.ConduitRecipes; import crazypants.enderio.conduit.facade.BlockConduitFacade; @@ -47,9 +45,11 @@ import crazypants.enderio.machine.solar.BlockSolarPanel; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.BlockMachineChassi; import crazypants.enderio.material.ItemAlloy; +import crazypants.enderio.material.ItemBasicGear; import crazypants.enderio.material.ItemCapacitor; import crazypants.enderio.material.ItemFusedQuartzFrame; import crazypants.enderio.material.ItemIndustrialBinder; +import crazypants.enderio.material.ItemMJReader; import crazypants.enderio.material.ItemRedstoneInductor; import crazypants.enderio.material.ItemYetaWrench; import crazypants.enderio.material.MaterialRecipes; @@ -74,6 +74,7 @@ public class EnderIO { public static ItemFusedQuartzFrame itemFusedQuartzFrame; public static ItemRedstoneInductor itemRedstoneInductor; public static BlockMachineChassi blockMachineChassi; + public static ItemBasicGear itemBasicGear; // Enderface public static BlockEnderIO blockEnderIo; @@ -108,6 +109,7 @@ public class EnderIO { public static BlockLightNode blockLightNode; public static ItemYetaWrench itemYetaWench; + public static ItemMJReader itemMJReader; @EventHandler public void preInit(FMLPreInitializationEvent event) { @@ -132,6 +134,7 @@ public class EnderIO { itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); itemRedstoneInductor = ItemRedstoneInductor.create(); blockMachineChassi = BlockMachineChassi.create(); + itemBasicGear = ItemBasicGear.create(); blockEnderIo = BlockEnderIO.create(); itemEnderface = ItemEnderface.create(); @@ -165,6 +168,7 @@ public class EnderIO { blockLightNode = BlockLightNode.create(); itemYetaWench = ItemYetaWrench.create(); + itemMJReader = ItemMJReader.create(); } @EventHandler diff --git a/common/crazypants/enderio/ModObject.java b/common/crazypants/enderio/ModObject.java index af2d958f..d80df0e6 100644 --- a/common/crazypants/enderio/ModObject.java +++ b/common/crazypants/enderio/ModObject.java @@ -25,7 +25,8 @@ public enum ModObject { itemIndustrialBinder(++Config.IID, CATEGORY_ITEM, "Industrial Binder"), itemBasicCapacitor(++Config.IID, CATEGORY_ITEM, "Basic Capacitor"), itemAlloy(++Config.IID, CATEGORY_ITEM, "Alloy"), - itemRedstoneInductor(++Config.IID, CATEGORY_BLOCK, "Redstone Inductor"), + itemRedstoneInductor(++Config.IID, CATEGORY_ITEM, "Redstone Inductor"), + itemBasicGear(++Config.IID, CATEGORY_ITEM, "Basic Gear"), blockFusedQuartz(++Config.BID, CATEGORY_BLOCK, "Fused Quartz"), blockMachineChassi(++Config.BID, CATEGORY_BLOCK, "Machine Chassi"), @@ -51,6 +52,7 @@ public enum ModObject { blockCapacitorBank(++Config.BID, CATEGORY_BLOCK, "Capacitor Bank"), itemYetaWrench(++Config.IID, CATEGORY_ITEM, "Yeta Wrench"), + itemMJReader(++Config.IID, CATEGORY_ITEM, "MJ Reader (WIP)"), blockCustomSlab(++Config.BID, CATEGORY_BLOCK, "Painted Slab"), blockCustomDoubleSlab(++Config.BID, CATEGORY_BLOCK, "Painted Slab"), diff --git a/common/crazypants/enderio/machine/MachineRecipes.java b/common/crazypants/enderio/machine/MachineRecipes.java index 4b13ee2a..4601337b 100644 --- a/common/crazypants/enderio/machine/MachineRecipes.java +++ b/common/crazypants/enderio/machine/MachineRecipes.java @@ -1,22 +1,22 @@ package crazypants.enderio.machine; import static crazypants.enderio.ModObject.blockAlloySmelter; +import static crazypants.enderio.ModObject.blockCapacitorBank; +import static crazypants.enderio.ModObject.blockCrusher; import static crazypants.enderio.ModObject.blockElectricLight; import static crazypants.enderio.ModObject.blockPainter; import static crazypants.enderio.ModObject.blockReservoir; -import static crazypants.enderio.ModObject.blockCrusher; import static crazypants.enderio.ModObject.blockSolarPanel; import static crazypants.enderio.ModObject.blockStirlingGenerator; import static crazypants.enderio.ModObject.itemBasicCapacitor; import static crazypants.enderio.ModObject.itemIndustrialBinder; -import static crazypants.enderio.ModObject.blockCapacitorBank; +import static crazypants.enderio.ModObject.itemBasicGear; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.ModObject; import crazypants.enderio.material.Alloy; -import crazypants.enderio.material.ItemCapacitor; import crazypants.enderio.power.Capacitors; public class MachineRecipes { @@ -24,9 +24,11 @@ public class MachineRecipes { public static void addRecipes() { ItemStack industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0); ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0); - + ItemStack machineChassi = new ItemStack(ModObject.blockMachineChassi.actualId, 1, 0); ItemStack stirlingGen = new ItemStack(blockStirlingGenerator.actualId, 1, 0); - GameRegistry.addShapedRecipe(stirlingGen, "bbb", "bfb", "bcb", 'b', industialBinder, 'f', Block.furnaceIdle, 'c', capacitor); + ItemStack basicGear = new ItemStack(itemBasicGear.actualId, 1, 0); + + GameRegistry.addShapedRecipe(stirlingGen, " s ", "sfs", "gpg", 's', Block.stone, 'f', Block.furnaceIdle, 'p', Block.pistonBase, 'g', basicGear); ItemStack painter = new ItemStack(blockPainter.actualId, 1, 0); ItemStack red = new ItemStack(Item.dyePowder, 1, 1); @@ -43,15 +45,15 @@ public class MachineRecipes { GameRegistry.addShapedRecipe(alloySmelter, "bbb", "CfC", "bcb", 'b', industialBinder, 'f', Block.furnaceIdle, 'c', capacitor, 'C', Item.cauldron); ItemStack crusher = new ItemStack(blockCrusher.actualId, 1, 0); - GameRegistry.addShapedRecipe(crusher, "iii", "ipi", "ici", 'i', Item.ingotIron, 'c', capacitor, 'p', Block.pistonBase); + GameRegistry.addShapedRecipe(crusher, "f f", "imi", "ipi", 'i', Item.ingotIron, 'm', machineChassi, 'f', Item.flint, 'p', Block.pistonBase); ItemStack solarPanel = new ItemStack(blockSolarPanel.actualId, 1, 0); ItemStack activatedIron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_IRON.ordinal()); ItemStack activatedGold = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_GOLD.ordinal()); ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0); + ItemStack redstoneInductor = new ItemStack(ModObject.itemRedstoneInductor.actualId, 1, 0); - GameRegistry.addShapedRecipe(solarPanel, "qqq", "gig", "bcb", 'q', fusedQuartz, 'g', activatedGold, 'i', activatedIron, 'b', industialBinder, 'c', - capacitor); + GameRegistry.addShapedRecipe(solarPanel, "fff", "fdf", "cic", 'd', Block.daylightSensor, 'f', fusedQuartz, 'c', Item.coal, 'i', redstoneInductor); ItemStack electricLight = new ItemStack(blockElectricLight.actualId, 1, 0); ItemStack glowstone = new ItemStack(Item.glowstone); @@ -61,7 +63,8 @@ public class MachineRecipes { ItemStack capacitorBank = new ItemStack(blockCapacitorBank.actualId,1,0); GameRegistry.addShapedRecipe(capacitorBank , "bab", "aca", "bab", 'a', activtedCapacitor,'b', industialBinder, 'c', capacitor); - + //To-do: Sort this class + } } diff --git a/common/crazypants/enderio/material/BlockMachineChassi.java b/common/crazypants/enderio/material/BlockMachineChassi.java index 14a16209..635868fb 100644 --- a/common/crazypants/enderio/material/BlockMachineChassi.java +++ b/common/crazypants/enderio/material/BlockMachineChassi.java @@ -37,5 +37,4 @@ public class BlockMachineChassi extends Block { public void registerIcons(IconRegister iconRegister) { blockIcon = iconRegister.registerIcon("enderio:machineChassi"); } - } diff --git a/common/crazypants/enderio/material/ItemBasicGear.java b/common/crazypants/enderio/material/ItemBasicGear.java new file mode 100644 index 00000000..803e8ec4 --- /dev/null +++ b/common/crazypants/enderio/material/ItemBasicGear.java @@ -0,0 +1,38 @@ +package crazypants.enderio.material; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.Item; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class ItemBasicGear extends Item { + + public static ItemBasicGear create() { + ItemBasicGear result = new ItemBasicGear(); + result.init(); + return result; + } + + protected ItemBasicGear() { + super(ModObject.itemBasicGear.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemBasicGear.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemBasicGear.name); + GameRegistry.registerItem(this, ModObject.itemBasicGear.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:basicGear"); + } + +} diff --git a/common/crazypants/enderio/material/ItemMJReader.java b/common/crazypants/enderio/material/ItemMJReader.java new file mode 100644 index 00000000..2d15732f --- /dev/null +++ b/common/crazypants/enderio/material/ItemMJReader.java @@ -0,0 +1,38 @@ +package crazypants.enderio.material; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.Item; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class ItemMJReader extends Item { + + public static ItemMJReader create() { + ItemMJReader result = new ItemMJReader(); + result.init(); + return result; + } + + protected ItemMJReader() { + super(ModObject.itemMJReader.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemMJReader.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemMJReader.name); + GameRegistry.registerItem(this, ModObject.itemMJReader.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:mJReader"); + } + +} diff --git a/common/crazypants/enderio/material/MaterialRecipes.java b/common/crazypants/enderio/material/MaterialRecipes.java index 7838628f..fe9bed7c 100644 --- a/common/crazypants/enderio/material/MaterialRecipes.java +++ b/common/crazypants/enderio/material/MaterialRecipes.java @@ -15,7 +15,8 @@ import crazypants.enderio.machine.alloy.VanillaSmeltingRecipe; public class MaterialRecipes { - public static void addRecipes() { + +public static void addRecipes() { ItemStack industialBinder; if(Config.useAlternateBinderRecipe) { @@ -26,30 +27,36 @@ public class MaterialRecipes { industialBinder = new ItemStack(itemIndustrialBinder.actualId, 4, 0); GameRegistry.addSmelting(Block.gravel.blockID, industialBinder, 0); } - - industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0); - + ItemStack redstoneInductor = new ItemStack(ModObject.itemRedstoneInductor.actualId, 1, 0); + ItemStack basicGear = new ItemStack(ModObject.itemBasicGear.actualId, 1, 0); + ItemStack IndustrialBinder = new ItemStack(ModObject.itemIndustrialBinder.actualId, 1, 0); ItemStack basicCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0); - GameRegistry.addShapedRecipe(basicCapacitor, " ", "gwi", "RbR", 'b', industialBinder, 'g', new ItemStack(Item.ingotGold), 'i', new ItemStack( - Item.ingotIron), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth); - + ItemStack wrench = new ItemStack(ModObject.itemYetaWrench.actualId,1,0); ItemStack blueSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.BLUE_STEEL.ordinal()); - ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1); + ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 2); + ItemStack fusedQuartzFrame = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0); + ItemStack machineChassi = new ItemStack(ModObject.blockMachineChassi.actualId, 1, 0); + ItemStack mJReader = new ItemStack(ModObject.itemMJReader.actualId, 1, 0); + + //Basic Capacitor + GameRegistry.addShapedRecipe(basicCapacitor, " ", "rpr", " ", 'r', redstoneInductor, 'p', Item.paper); + + //Activated Capacitor GameRegistry.addShapedRecipe(activatedCapacitor, " ", "gwi", "RbR", 'b', blueSteel, 'g', new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_GOLD.ordinal()), 'i', new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_IRON.ordinal()), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth); - ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 2); + //Ender Capacitor GameRegistry.addShapedRecipe(enderCapacitor, " ", "gwi", "RbR", 'b', blueSteel, 'g', new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENDER_GOLD.ordinal()), 'i', new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENDER_IRON.ordinal()), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth); + int meta = 0; for (Alloy alloy : Alloy.values()) { ItemStack ingot = new ItemStack(ModObject.itemAlloy.actualId, 1, meta); IMachineRecipe recipe = new BasicAlloyRecipe(ingot, alloy.unlocalisedName, alloy.ingrediants); - ItemStack nugget = new ItemStack(ModObject.itemAlloy.actualId, 9, meta + Alloy.values().length); GameRegistry.addShapelessRecipe(nugget, ingot); nugget = nugget.copy(); @@ -63,12 +70,25 @@ public class MaterialRecipes { MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, new FusedQuartzRecipe()); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockAlloySmelter.unlocalisedName, new VanillaSmeltingRecipe()); - ItemStack fusedQuartzFrame = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0); + + //Industrial Binder - will be removed! GameRegistry.addShapedRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', industialBinder, 's', new ItemStack(Item.stick)); - ItemStack wrench = new ItemStack(ModObject.itemYetaWrench.actualId,1,0); + //Wrench GameRegistry.addShapedRecipe(wrench, "i i", " b ", " i ", 'b', industialBinder, 'i', new ItemStack(Item.ingotIron)); + + //Machine Chassi + GameRegistry.addShapedRecipe(machineChassi, "fff", "iri", "fff", 'f', Block.fenceIron, 'i', Item.ingotIron, 'r', redstoneInductor); + //Redstone Inductor + GameRegistry.addShapedRecipe(redstoneInductor, "grg", "gig", "grg", 'r', Item.redstone, 'g', Item.goldNugget, 'i', Item.ingotIron); + + //Basic Gear + GameRegistry.addShapedRecipe(basicGear, "scs", "c c", "scs", 's', Item.stick, 'c', Block.cobblestone); + + //MJ Reader + GameRegistry.addShapedRecipe(mJReader, "r r", "rir", "gxg", 'r', Item.redstone, 'i', Item.ingotIron, 'g', basicGear, 'x', redstoneInductor); + //TO-DO: Sort this class! } } diff --git a/common/crazypants/enderio/power/Capacitors.java b/common/crazypants/enderio/power/Capacitors.java index 40c47897..52143ff3 100644 --- a/common/crazypants/enderio/power/Capacitors.java +++ b/common/crazypants/enderio/power/Capacitors.java @@ -11,11 +11,11 @@ public enum Capacitors { ACTIVATED_CAPACITOR( new BasicCapacitor(40, 20000, 6), - "Activated Capacitor", "activatedCapacitor"), + "D-L Capacitor", "activatedCapacitor"), ENDER_CAPACITOR( new BasicCapacitor(100, 100000, 10), - "Ender Capacitor", "enderCapacitor"); + "Hybrid Capacitor", "enderCapacitor"); public final ICapacitor capacitor; public final String unlocalisedName; diff --git a/resources/assets/enderio/textures/blocks/machineFrame.png b/resources/assets/enderio/textures/blocks/machineChassi.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineFrame.png rename to resources/assets/enderio/textures/blocks/machineChassi.png diff --git a/resources/assets/enderio/textures/blocks/machineSide.png b/resources/assets/enderio/textures/blocks/machineSide.png index 04a000f36422b35b9ced5d0f98f31c113aa4e7e5..cc089c1b991df96e9229bd978c32ae6c717d4bcb 100644 GIT binary patch delta 562 zcmV-20?qyI1cwEXJPN=701m(bYSxJfkwz$g0s~1zK~y+Tl~Qes;xHKWzqlYGd%Eq} z+UDA(X|(T6U#?n$p(u)oEaI~NpPPDe->(cINuQa_Gs$SRS}mWSuIr1%Vm_b0KfkxP zH$uqYzgSKt6T>hxO&eir-8S9rs_vh_{_|$Xp%rcn9>m=)mR%~l#V%SgFufpw?mc^3!eqCZoP+H_9 z4gojIygcJo1@*xa2rz>~05}1bjF~*JHoQHbrgi0zUv`^n(hx>gz9*>YC z>dbJhc`g9Ll2Mo;acnT3<~b9BS0x%Kl(KDmAn>|km6-n2G5K%^i9(Vj$np2_xI3S_ z3vfXv@^Zn=46**Otar-<=C-AKuEE&Q0HwUHd0jeT=)^JEY$~N*v3|IYS7fMvhNVo( z>d;%98pv&x z71~fD;b1`Q_a-icQp59rrR%<8jdv}w6TK2jwWkw&lYtXjjA@pI(SEAH*bpmj+DV7k zf(jT7N`cYKGG3M}&ru|##Lhq+3xd~c{jcZ!2cu2Q(jEic#sB~S07*qoM6N<$f+-Og A)&Kwi delta 537 zcmV+!0_OdP1?~ipJPN@801m+cxRGn^kwz$g0qRLaK~y+TO_JHJ;xG_I{a1|ch+(;G zNq_|6ERN&Y@e&{qxby!nQwD@aYPI^|RJq(X2~xVv^0+8s#uCQjvfLGUNa^a3%=g=A z6itF~7De;@ZkZ%OdL(gKH0M)$yW0DJGQ+KMmRVEiwrCZ4`5Y>1>aN@7897uH1oCo! zfd&Kb9O$>ERiK&C+*xq~bH@3E*0uY2z#AHH5TG!?8%m%r8eaN(O*to2h>rjopG3F0 zdV9ka9J;;Ty2k_VB;_?Yb?xB+OH^qz>XStE7tn4PPLId2;{MXF41i#qDTynxcXank z0`K$RpYDE7SVgcYa8x$55hw_9C7F$`(V z3x7z9JvOHk=(b0Bf$sb7{f>Ms7XH0hi8@p)Yeb=xKfzkjb)s{%wY78H7!1D`YciV6 zfWjU$A~CIz#CI=n0>PZC+LpC#DJ5X?Yd-T~Y7RP=5-(Lf%>>pDRBMI zB7Og#rEs9cEAY)bxY*0^P<{re*~)`BD$P#U2#o8w^-@26pe^T(^zc)c2LHu&U= bc>518#}p)&9_#x60000N2bPDNB8 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/powderCopper.png b/resources/assets/enderio/textures/items/powderCopper.png new file mode 100644 index 0000000000000000000000000000000000000000..6533d8f125cd0aa8a4d2e3226044563978a6407d GIT binary patch literal 407 zcmV;I0cie-P)N2bPDNB8 zb~7$DE-^7j^FlWO009$8L_t(IPh(&h1$aZCPEYth2$K~|4f-PgF9fRnKjp9bzn)Y> zK$@S&X#anmXY~JNiZ0j?kQh-e0Xg|*sQUlcg+~A1Hdy|Dm2L3LYS2)Q1uhGR3CKcL(|5rK6{l6BZ{{Ll? z&i~h0`e4n^qcs0t4^jVr(og08E_cQMOYLQ`8v--ntiQ_tXOWu!UqoyDzaFgi|18k| zr-5QefiBw#G+-Gn13&=;GGrytnR`8z{vY!NY63d@5Ktq?=5@~U{}=4B literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/powderLead.png b/resources/assets/enderio/textures/items/powderLead.png new file mode 100644 index 0000000000000000000000000000000000000000..8e963d7d9239138fbeb826f7e16510e8b1649d1f GIT binary patch literal 446 zcmV;v0YUzWP)N2bPDNB8 zb~7$DE-^7j^FlWO00BBlL_t(IPh(&h1$aZi#?kG+wS((_vVzIc&HI0DY2E+Kf{OpP zPVS@`0@B>rG4cQW<(vQaPMr@n#2V-tqFe%Uc2QOH|0Qd8{y%=)(O8MCf4@K{ucnfky%vrKPju|e{4qn|M2+q|2|f5nd$KL7v#07*qoM6N<$f=Y+el>h($ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/powderSilver.png b/resources/assets/enderio/textures/items/powderSilver.png new file mode 100644 index 0000000000000000000000000000000000000000..2840801990ca03365809c44403f723ce144ac37c GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsOqGr zi(`m||Jz9?xtbjWT>e&1zh98d*VSdbh(k+H;a{*;Nb>~eq$@GXB8M)l-?c*W^soAM z-W%I^UxoRye713)mU`Wn<9cat=Bx{)b7xre73*<6+@!NnhkIM@VT-;CQObSE74yn- zoGg5UZ|+*Rdd2%{iR33X98KrdS`HhygoaAAF@Cl=y+2dR^MKtXm4zoC=L$&~sI}kT zCR$h=D54}a$4k(4B9G9G{KnZ+gFe*$kKy+@oT#>_>_c|vdj7WS&vvcL*~4@EueRBW+ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/powderTin.png b/resources/assets/enderio/textures/items/powderTin.png new file mode 100644 index 0000000000000000000000000000000000000000..1508387fe010ed18394e07b06e626900a64eb346 GIT binary patch literal 412 zcmV;N0b~A&P)N2bPDNB8 zb~7$DE-^7j^FlWO009_DL_t(IPwkRhPr^VHg!xbQ0^+~0<)RcV1rgeEF;eh?5QQe# zg782!kXXeZI__CxVj_}ad~}md_Tgk^&Nmy2{hy5lWJ!V~iue_#xEx2b-ayT=AqrcH z>?RTz+} zF%iBep?D;4*|~r_bm0z${7oS1c8zo30{aStoizdkh(PJbIv@UQz^qhJGK$a+bIe^` z@BWo8^-lL7ljY#@ISpww#dqJTP7!Eky{-NJ1vbm1{0000