From fe0772773c106b3decd3dbf81e0576bf40dad135 Mon Sep 17 00:00:00 2001 From: Alchemist Date: Tue, 10 Sep 2013 15:04:11 +0000 Subject: [PATCH 1/6] Added machine chassi and redstone inductor --- common/crazypants/enderio/EnderIO.java | 6 +++ common/crazypants/enderio/ModObject.java | 2 + .../enderio/material/BlockMachineChassi.java | 38 +++++++++++++++++++ .../material/ItemRedstoneInductor.java | 38 +++++++++++++++++++ 4 files changed, 84 insertions(+) create mode 100644 common/crazypants/enderio/material/BlockMachineChassi.java create mode 100644 common/crazypants/enderio/material/ItemRedstoneInductor.java diff --git a/common/crazypants/enderio/EnderIO.java b/common/crazypants/enderio/EnderIO.java index 4c8f8a29..08b1c9bf 100644 --- a/common/crazypants/enderio/EnderIO.java +++ b/common/crazypants/enderio/EnderIO.java @@ -45,10 +45,12 @@ import crazypants.enderio.machine.power.BlockCapacitorBank; import crazypants.enderio.machine.reservoir.BlockReservoir; 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.ItemCapacitor; import crazypants.enderio.material.ItemFusedQuartzFrame; import crazypants.enderio.material.ItemIndustrialBinder; +import crazypants.enderio.material.ItemRedstoneInductor; import crazypants.enderio.material.ItemYetaWrench; import crazypants.enderio.material.MaterialRecipes; @@ -70,6 +72,8 @@ public class EnderIO { public static ItemAlloy itemAlloy; public static BlockFusedQuartz blockFusedQuartz; public static ItemFusedQuartzFrame itemFusedQuartzFrame; + public static ItemRedstoneInductor itemRedstoneInductor; + public static BlockMachineChassi blockMachineChassi; // Enderface public static BlockEnderIO blockEnderIo; @@ -126,6 +130,8 @@ public class EnderIO { itemAlloy = ItemAlloy.create(); blockFusedQuartz = BlockFusedQuartz.create(); itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); + itemRedstoneInductor = ItemRedstoneInductor.create(); + blockMachineChassi = BlockMachineChassi.create(); blockEnderIo = BlockEnderIO.create(); itemEnderface = ItemEnderface.create(); diff --git a/common/crazypants/enderio/ModObject.java b/common/crazypants/enderio/ModObject.java index 32278179..af2d958f 100644 --- a/common/crazypants/enderio/ModObject.java +++ b/common/crazypants/enderio/ModObject.java @@ -25,7 +25,9 @@ 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"), blockFusedQuartz(++Config.BID, CATEGORY_BLOCK, "Fused Quartz"), + blockMachineChassi(++Config.BID, CATEGORY_BLOCK, "Machine Chassi"), // Stirling Gen blockStirlingGenerator(++Config.BID, CATEGORY_BLOCK, "Stirling Generator"), diff --git a/common/crazypants/enderio/material/BlockMachineChassi.java b/common/crazypants/enderio/material/BlockMachineChassi.java new file mode 100644 index 00000000..26654f9d --- /dev/null +++ b/common/crazypants/enderio/material/BlockMachineChassi.java @@ -0,0 +1,38 @@ +package crazypants.enderio.material; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.ItemBlock; +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 BlockMachineChassi extends ItemBlock { + + public static BlockMachineChassi create() { + BlockMachineChassi result = new BlockMachineChassi(); + result.init(); + return result; + } + + protected BlockMachineChassi() { + super(ModObject.blockMachineChassi.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.blockMachineChassi.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.blockMachineChassi.name); + GameRegistry.registerItem(this, ModObject.blockMachineChassi.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:machineChassi"); + } + +} diff --git a/common/crazypants/enderio/material/ItemRedstoneInductor.java b/common/crazypants/enderio/material/ItemRedstoneInductor.java new file mode 100644 index 00000000..fffde0fd --- /dev/null +++ b/common/crazypants/enderio/material/ItemRedstoneInductor.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 ItemRedstoneInductor extends Item { + + public static ItemRedstoneInductor create() { + ItemRedstoneInductor result = new ItemRedstoneInductor(); + result.init(); + return result; + } + + protected ItemRedstoneInductor() { + super(ModObject.itemRedstoneInductor.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemRedstoneInductor.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemRedstoneInductor.name); + GameRegistry.registerItem(this, ModObject.itemRedstoneInductor.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:redstoneInductor"); + } + +} From b14d856ba70cf8cffc60b26fd6a1d0b57fbf7b8e Mon Sep 17 00:00:00 2001 From: Alchemist Date: Tue, 10 Sep 2013 15:17:33 +0000 Subject: [PATCH 2/6] Fixed chassi code --- .../enderio/material/BlockMachineChassi.java | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/common/crazypants/enderio/material/BlockMachineChassi.java b/common/crazypants/enderio/material/BlockMachineChassi.java index 26654f9d..14a16209 100644 --- a/common/crazypants/enderio/material/BlockMachineChassi.java +++ b/common/crazypants/enderio/material/BlockMachineChassi.java @@ -1,7 +1,8 @@ package crazypants.enderio.material; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.item.ItemBlock; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; @@ -9,30 +10,32 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -public class BlockMachineChassi extends ItemBlock { +public class BlockMachineChassi extends Block { - public static BlockMachineChassi create() { - BlockMachineChassi result = new BlockMachineChassi(); - result.init(); - return result; + public static BlockMachineChassi create() { + BlockMachineChassi result = new BlockMachineChassi(); + result.init(); + return result; } - protected BlockMachineChassi() { - super(ModObject.blockMachineChassi.id); - setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.blockMachineChassi.unlocalisedName); - setMaxStackSize(64); + private BlockMachineChassi() { + super(ModObject.blockMachineChassi.id, Material.iron); + setHardness(0.5F); + setStepSound(Block.soundStoneFootstep); + setUnlocalizedName(ModObject.blockMachineChassi.unlocalisedName); + setCreativeTab(EnderIOTab.tabEnderIO); } - protected void init() { - LanguageRegistry.addName(this, ModObject.blockMachineChassi.name); - GameRegistry.registerItem(this, ModObject.blockMachineChassi.unlocalisedName); + + private void init() { + LanguageRegistry.addName(this, ModObject.blockMachineChassi.name); + GameRegistry.registerBlock(this, ModObject.blockMachineChassi.unlocalisedName); } @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - itemIcon = iconRegister.registerIcon("enderio:machineChassi"); + blockIcon = iconRegister.registerIcon("enderio:machineChassi"); } } From cdfe7e750c6dfd3ff06378574fe7ff9837001ba6 Mon Sep 17 00:00:00 2001 From: Alchemist Date: Tue, 10 Sep 2013 23:49:38 +0000 Subject: [PATCH 3/6] 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 Date: Tue, 10 Sep 2013 23:51:42 +0000 Subject: [PATCH 4/6] Fixed missing import? --- common/crazypants/enderio/EnderIO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/crazypants/enderio/EnderIO.java b/common/crazypants/enderio/EnderIO.java index 42817e08..78765e18 100644 --- a/common/crazypants/enderio/EnderIO.java +++ b/common/crazypants/enderio/EnderIO.java @@ -15,6 +15,8 @@ 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; From 396de9187c24f014f3cda82933709254a7a45cb8 Mon Sep 17 00:00:00 2001 From: Alchemist Date: Wed, 11 Sep 2013 11:29:55 +0000 Subject: [PATCH 5/6] Fixed Stirling Generator side texture. --- .../enderio/textures/blocks/machineSide.png | Bin 647 -> 622 bytes .../enderio/textures/blocks/machineSide1.png | Bin 622 -> 0 bytes .../enderio/textures/blocks/stirlingGenSide.png | Bin 0 -> 647 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 resources/assets/enderio/textures/blocks/machineSide1.png create mode 100644 resources/assets/enderio/textures/blocks/stirlingGenSide.png diff --git a/resources/assets/enderio/textures/blocks/machineSide.png b/resources/assets/enderio/textures/blocks/machineSide.png index cc089c1b991df96e9229bd978c32ae6c717d4bcb..04a000f36422b35b9ced5d0f98f31c113aa4e7e5 100644 GIT binary patch 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_#x60000(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 diff --git a/resources/assets/enderio/textures/blocks/machineSide1.png b/resources/assets/enderio/textures/blocks/machineSide1.png deleted file mode 100644 index 04a000f36422b35b9ced5d0f98f31c113aa4e7e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmV-!0+IcRP)N2bPDNB8 zb~7$DE-^7j^FlWO00HVrL_t(IPfe29uHrBdMEzHc?ucQzY)OCw;w+Bi*zpn|5V-UI zFH;7DMryVC;Z(WYHVIO?&GNV?V#X52;ERiK&C+*xq~ zbH@3E*0uY2z#AHH5TG!?8%m%r8eaN(O*to2h>rjopG3F0dV9ka9J;;Ty2k_VB;_?Y zb?xB+OH^qz>XStE7tn4PPLId2;{MXF41i#qDTynxcXank0`K$RpYDE7SVgcYa8x$5 z5hw_9C7<@L?wmZI)#akEJ!EzmqAVkmFib^#ta(x~3~9{^e@KfxHm4Klwnuq^?)&fk zj(jZ^{=Ha<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^7j^FlWO00IL^L_t(IPnA+_i{daC^uM?uB73^++1lpXrfIbAO<%5Bf}tpi zh%Dl=|DT(Ba^J5EAxWQ^%rnVowOTEopRVhR#bQ36zdygXw>Lt_-@jN+CKJOjG))^} zYuz^8?W*pd!2a`Q$DtK&3?9VYE|y&?yTva;i=5T%SgFufpw?mc^3!eqCZoP+H_94gojIygcJo1@*xa2rz>~ z05}1bjF~*JHoQHbXa>30EvHq~EcgqCk zwxxTn!Pw9MrM#|rT{>at#4*`yDy3erez=ZTWT=LvOv>ueTbvt|x=CF3ebx6x*SSdo z<||f>Le)3d9ICjf!FN&Ay+SojQ#Xo$v~9E9?iK4lC+HR0P$J=AKE`(CU^MIx6 zzG97cEwU565=ynF6MU0_6IzUEmW9!Ns=(L~D{k6Jhu4A%7!68+(aSPkmMqUvB&5X7 hKnsG`YyGe1{Rg8>%+ekM+{OR^002ovPDHLkV1lh{DI5R* literal 0 HcmV?d00001 From f81cbdf3aa564c21b58723d96422c45e8e5d06d9 Mon Sep 17 00:00:00 2001 From: Alchemist Date: Thu, 12 Sep 2013 21:49:20 +0000 Subject: [PATCH 6/6] "Textures everywhere!" Renamed Hypercube to tesseract! --- common/crazypants/enderio/ModObject.java | 4 ++-- .../assets/enderio/textures/blocks/add.png | Bin 333 -> 0 bytes .../textures/blocks/alloySmelterFrontOn.png | Bin 678 -> 777 bytes .../blocks/alloySmelterFrontOn.png.mcmeta | 13 +++++++++++++ .../textures/blocks/furnaceSmeltingOff.png | Bin 622 -> 642 bytes .../textures/blocks/furnaceSmeltingOn.png | Bin 527 -> 672 bytes .../textures/blocks/vanillaFurnace.pdn | Bin 6464 -> 0 bytes .../enderio/textures/gui/alloySmelter.png | Bin 2516 -> 2712 bytes .../enderio/textures/gui/capacitorBank.png | Bin 1811 -> 1822 bytes .../assets/enderio/textures/gui/crusher.png | Bin 2231 -> 2449 bytes .../assets/enderio/textures/gui/hyperCube.png | Bin 1827 -> 1919 bytes .../assets/enderio/textures/gui/painter.png | Bin 2464 -> 2657 bytes .../textures/gui/stirlingGenerator.png | Bin 2248 -> 2178 bytes .../enderio/textures/items/ingotCopper.png | Bin 0 -> 530 bytes .../enderio/textures/items/ingotElectrum.png | Bin 0 -> 611 bytes .../enderio/textures/items/ingotLead.png | Bin 0 -> 443 bytes .../enderio/textures/items/ingotSilver.png | Bin 0 -> 565 bytes .../enderio/textures/items/ingotTin.png | Bin 0 -> 461 bytes .../enderio/textures/items/powderIron.png | Bin 0 -> 415 bytes .../enderio/textures/items/powdergold.png | Bin 0 -> 445 bytes .../enderio/textures/items/upgradeBlank.png | Bin 0 -> 250 bytes .../textures/items/upgradeEfficieny.png | Bin 0 -> 281 bytes .../textures/items/upgradeEnergy_1.png | Bin 0 -> 335 bytes .../textures/items/upgradeEnergy_2.png | Bin 0 -> 333 bytes .../textures/items/upgradeEnergy_3.png | Bin 0 -> 343 bytes .../assets/enderio/textures/misc/add.png | Bin 0 -> 434 bytes .../assets/enderio/textures/misc/delete.png | Bin 0 -> 499 bytes .../assets/enderio/textures/misc/private.png | Bin 0 -> 549 bytes .../assets/enderio/textures/misc/public.png | Bin 0 -> 548 bytes .../assets/enderio/textures/misc/remove.png | Bin 0 -> 255 bytes .../assets/enderio/textures/misc/set.png | Bin 0 -> 555 bytes 31 files changed, 15 insertions(+), 2 deletions(-) delete mode 100644 resources/assets/enderio/textures/blocks/add.png create mode 100644 resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png.mcmeta delete mode 100644 resources/assets/enderio/textures/blocks/vanillaFurnace.pdn create mode 100644 resources/assets/enderio/textures/items/ingotCopper.png create mode 100644 resources/assets/enderio/textures/items/ingotElectrum.png create mode 100644 resources/assets/enderio/textures/items/ingotLead.png create mode 100644 resources/assets/enderio/textures/items/ingotSilver.png create mode 100644 resources/assets/enderio/textures/items/ingotTin.png create mode 100644 resources/assets/enderio/textures/items/powderIron.png create mode 100644 resources/assets/enderio/textures/items/powdergold.png create mode 100644 resources/assets/enderio/textures/items/upgradeBlank.png create mode 100644 resources/assets/enderio/textures/items/upgradeEfficieny.png create mode 100644 resources/assets/enderio/textures/items/upgradeEnergy_1.png create mode 100644 resources/assets/enderio/textures/items/upgradeEnergy_2.png create mode 100644 resources/assets/enderio/textures/items/upgradeEnergy_3.png create mode 100644 resources/assets/enderio/textures/misc/add.png create mode 100644 resources/assets/enderio/textures/misc/delete.png create mode 100644 resources/assets/enderio/textures/misc/private.png create mode 100644 resources/assets/enderio/textures/misc/public.png create mode 100644 resources/assets/enderio/textures/misc/remove.png create mode 100644 resources/assets/enderio/textures/misc/set.png diff --git a/common/crazypants/enderio/ModObject.java b/common/crazypants/enderio/ModObject.java index b2ef3474..37995f1d 100644 --- a/common/crazypants/enderio/ModObject.java +++ b/common/crazypants/enderio/ModObject.java @@ -16,7 +16,7 @@ public enum ModObject { itemRedstoneConduit(++Config.IID, CATEGORY_ITEM, "Redstone Conduit"), // Power - itemPowerConduit(++Config.IID, CATEGORY_ITEM, "Power Conduit"), + itemPowerConduit(++Config.IID, CATEGORY_ITEM, "Energy Conduit"), // Liquid itemLiquidConduit(++Config.IID, CATEGORY_ITEM, "Liquid Conduit"), @@ -59,7 +59,7 @@ public enum ModObject { blockCrusher(++Config.BID, CATEGORY_BLOCK,"SAG Mill"), - blockHyperCube(++Config.BID, CATEGORY_BLOCK,"Hyper Cube"); + blockHyperCube(++Config.BID, CATEGORY_BLOCK,"Tesseract"); public final String unlocalisedName; public final String name; diff --git a/resources/assets/enderio/textures/blocks/add.png b/resources/assets/enderio/textures/blocks/add.png deleted file mode 100644 index 093b2958cf62d10343c422d8f3d8a4dab76984d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvjD@T^vI!{F5^>G8S++bC@V>ocYn-jAv>a^B%T6KhHNbd73@=md_^Q zvx#wey}^QnJ!}ms7eAir=h2XuEhWO7wkP$#fy?(C49qNfm~X`!B|Mn+T%gC7?{LGW zbRLNvKMYxtCm%LYcq_=v=C_ag;Eg8+JPyYfewX;ie!n3>Kzg>+4#pP@Dldy>KivOX zm4j`gV^Tn-#ewXGOQ~)DqmD})lsKYxlVKq@&;O_2jGGKQd^a)PFbI+2d%!lKUs{6U YM`GEFemj;8Kz}fJy85}Sb4q9e06{KwivR!s diff --git a/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png b/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png index 09b5cb22bf09f61bb8568e174c0d534ba3b30907..a42ba1d9144cb6890412f09988590f80bf9d1311 100644 GIT binary patch delta 706 zcmV;z0zLhv1&Icb7Z*SX0ssI2oF8Dp00001b5ch_0Itp)>5(BD3c~;Z4#NS*Z>VIE zMk#-INkld5*H*8LqxwlL>g4 zOr}sMJUl!s4~KL*jq&68v6hQqYP#EEebQWa^ZJ@frE4~sHGMQv!A`G0hkExSS zi9`ZZs^gI6dFz*#NF)L_CZ^lXM$J3BbAL#UjCjNi= zD-pmxKa;!JGGSoO1eA%xoc6XG=H=?*(FvL}Q{VOpJeis#C% ztGKQ@^$;0rwS+y;1z!<2ykV`N>(tl{}v|0mI&1SPB!vK%&LUb4Yj!>9F zZ%U;S6oJ62D#-M%-GX|sVGlNrQO~>p)oK+QIYr`RsnTq~q-W$(qtSrV`F#E->OF-R z+U+)|AaIgYX*H?N^${Fc30sTBBAol>;qb^3r^r~R+U*kZQJ+uka}dkrGKGKd&v+Z4 zUat$9iolFavo;tI(wNs&;U|dccW&r5@OE|Hu0Q1$4U~Zui4KeLn>K(xrpB+z+h% o`MqDdS`W8=>DDh@>zBR(4jmFvK$sVeeEm zirP>V-Hdkn1%il*V^P5uL2)b=jb^;$qUL@xiAIf4RAxS>U)5jeYhU}+Cm*_w(@N=K zao8t&?c2&G(J*J0tvHV2d8+3rt~+;Z$uuXL$}eUES>{A(D9ij}K2}xH&`EKf&FQo~ zUE&J^?Dg^J@AqE3vwt@mD_R3EmhlcBXSPM!atU6gQfV|APft(V^SN9u!~S$T?sju` zt&RuOCo>3=x3^NMRIAml&x8uaVv*TIF#LTC*EOa>p#YcR`(%dU{`EDJ$$$;V>X3XR z0@(AJ5b(W32!;!dAUhd;usdI_GrE4I>rYz7`(H!=d;XvxIe)NVAYuXf(q}`5hlEYJ zd!I4_{!ST(NfI58OqKHqx9TkkO2KWcLp=<%Akc%rScOo=-EGkia$#2Jh8x|=mPMQ- zDV|G23-|Ubd|zh)k+Wq1sQeBPkoRRVr|xKkIN35~+eS<_o6Y5N`FtJ{K_4g!p1EFW zzK^_LMpNnxhkv4BRIAmwZG%S-DSAl%K`KqD53N=Ui9nDH17!Nl50M^h^n)MAs5jmn z-EJ2d1zi<1wKL$*(hGKp<2Vdmuh;*fK2nN-=Xp>;5LC4@98h1FLL797UYpG(hWqab zIGQTx8tQb%W5PaK(aO7t*lxEe{dmL2JNo^;Y#I<|?mIX=Q6#LfWE$9K*|abT_E9!X sd9K+6B0-c*$noWtC5cyhVB>(#5*)d~RRJCNj|?O^13 zFlI9t^EnLP$9U#Ja~uq&CSE2ZbaWlf5E%XpyXzI<^^U{+F7f7a z!Qy{-#Qd;_x7)$pZUh1S^ZLkhV}fZANMgBMMy*yuc)OukEJ|D|l>~mcll?-Wfc51p zDjy1*?j|$H!E1HB`j*m zUa!P7e;-B!RDgRIP^`OOOl)f!U7t^PqF_R5OzO`Pf-PoYM8N78e1?m?(se#eZ1j4< zsJjky&qFGeLOPvBCX*2Z**v}pPMi`s7yH|LiwT~)T^bAVEOvssHw?(=_8 zRh0;)qPEfR#{@j*?siRA7#XHK{rbRf`o?IrTH@81-b`~ij0yO`XpSw9M|WJAbDd(Y x)-xvPXgXMBb1*=YRCK9e<r7-+33#{{W{y4ZjN~K3D(%002ovPDHLkV1nL32P*&o delta 536 zcmV+z0_XjL1?~ipBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wDSzEbL_t(IPpwi- zOF}^ueH3j2S1Lh)iY6k8^zbVaL?wMLDgzPJa1m%mppjyWtSl)ke?Ya9#J`a11R)5b zZNH_{ooUKGToiTSFwA{(&fItAO8){#(gJabs1>E(frPV%IvoyYX5e%Zd@q}TC1xt8jbv*UayCl%maY{^7%ZP%_iRq*$^(53%i8^4ye@~YTLmZ z8`9}?A|8*U(P;4BVwz8|PzT9m5;EPakYJhk)ui2SBbUpKHh*BDrBW#ri$zp7HgH#~ z;dXl)y^|AkIvo_KyKcA3FY$OhqYZ+=AnNrxGMNn478h~m_v3ti9z_b3g;}XokWQ!h zs|eW;3Jb5*LcibV91I3{==Jb;e2gaw?*97v{hObRg=`3BP@}f1)ha(AZoxE><*`f2 zpRTX-97aCln{|QD=i|bUd^6djLAtrT5!F( zJ2#59D5!{_NQ>ea?Ji60a=>;>(i$g>Ah-~9p%C}_8tTebzk%S!XFB=s4YAsFQgEoh z3eH#O4yDojk1G%e!0-37d_EsM9uM4ZH|y8^Jrd7Z#4;H~)3P|{kjm$gE){Y8HUUPX z5$b>SI$Et3DwPT*lL?z^oga7+@5-;=S#|N;=ys8PDXRd7!+~P4h}mq0a=DD{cFS5U z77Vdkt*EwJu-R;|SS2#dn zPt6^C?e*|F7@+-g$O-bbx|)ExPVpNe7R7&id&A*yz<$4H2m|^(uAL>$8PTij6bO(^ zCb^00^_u&kC<>b^?KT6b^CT*drt(FM^9sm_8E-ZloK7d!`FzIZa$ymKnn#l$V?lqU zRBBa(l25mQ`FxJ!@yMcHBoYZWYd+jT^O5w4CqpI5r4kV@eqru09lqXolX&r@=F*D1{NoHH&RKG1fU?+xP)LTr2=xf9LFXA&6#34 zolX`*?mn|3kqCD`CssY2POAVi(jGR@KF}Wg6`7ODGh%WE5$Orx$47)kinwTcQpu`- cfBB<-1GC6&()OowiDQOa>?1)TbK~@&ZM)?vl4Xeq*-a^^t$g&Jcl90>gkj-Y1NF-1$m-&v)sZnkMG+Ig-gFJI3R2q|<5C zYBfwI6YTeUJ_i6)ftQiW4ZW}YDi(|AbUN7WcHC9~kjZ4w>-Cua8SLqJJYqZ^ivjd# zgTVlnWwCCz8_wr5E|&{z+s1S{h2uD!q*N-20rh$v+wB&HVSn&@^!t4d=yto@+G@4J za5&_t1OTe4;&3?N@p!PF&nI557w-2vub!P$tyaZ=&1Qr3dd&`$#ovFWQo(Y$n+a07*qoM6N<$f?FfiBme*a diff --git a/resources/assets/enderio/textures/blocks/vanillaFurnace.pdn b/resources/assets/enderio/textures/blocks/vanillaFurnace.pdn deleted file mode 100644 index 1b2dc6e72bfe025a5a2f745b05a71868db5f50c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6464 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 E7dtX-Z~y=R diff --git a/resources/assets/enderio/textures/gui/alloySmelter.png b/resources/assets/enderio/textures/gui/alloySmelter.png index 01e30cfff8a9f69c449bca198487a4347b884c45..6b1679e3c819efa298c89eda7abd9fbdad342fa7 100644 GIT binary patch literal 2712 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 diff --git a/resources/assets/enderio/textures/gui/capacitorBank.png b/resources/assets/enderio/textures/gui/capacitorBank.png index 55ea93ad694663fe684b461d96c3013f8d9ffdfe..24eacaa8d901beccefc81d44adf131959b1316e1 100644 GIT binary patch literal 1822 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~68b@QYEetCBgY=CFO}lsSE*$nRz98 zey$-3WyX4@dWMGXpPkGZ7?_$oT^vIy;@;jlo!4w2(vtW*>eD~|H%{vVR$50}W!Syn z)tO*qUo5daZ}0Zb)!*y(-jzT9{Bhmxb@f-G*KWUlV;6$Utf}eg3kuO(C33g7CMt35hOh{2n;oL-%A4*z?7H>EvVmc% z=#R$@spUH!EpS@$?eF^Mndj{M`hlVm=S5_bzy7yNwGG|!C2D>CDyFON_vedSe2lpJ z>HB|0hc8MFU#{=}=-*JlYN2q4VIHGEgToFc0S@y9kp>2qL!v+);}QlI1%Y)y90jdZYK ZdawBBF5CQ{S670{EKgTImvv4FO#rs-B4Ypm literal 1811 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5D>38$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&di49pAxJ|V6^aUOF6b93|V?(Sp9j{X1tA1E>kMnhnPgurb-v)7-L15RjOeSEA?V z8lq5UtY@lcXkhTAXdwdwQ8(3DdA zFjGbL#@hA2_sPB4_g+4J?fkyiyVm!!M>E;fJvy^^mt5`t#SH0ybfpl zkhz(m;?I$p?xH}IEC)iDGgSQ5VzA2?ZKg;ysqj0)h zC{U#UL-<^#2VYk+{MZu70CqSRP$koYRly8<>O>jln{i`x>}UC}etHcI{}?N3|4ARP z|CqWN=(%r94;BRPe%C$Q?#fSw^IUWO{bP)%XFLD3^3=h(^@rQJ8?K5mtkz`+i)L7} ujUghJalY1-)vUe=nY490TPID7gvGE0ny|Q#uoxG1kfn$iC^0Y~f`Q1+qm{C#pb%>iVjqquA#I@* zL3CJTKtz@($|5Ba5OD#NDiw-_1X=_a0sYK==^?8Y;LPs0$6og%Iz#+Y^B6d78>tRRB~#pnotEkGr_IgoK13 z2$GPHkeQiTx^dlQ`npz2lY6$N&m7E${h3%Zz%Z&%DD3I!!7vO@`DC9u@ZadbPI+4H z>Y#A<2C(tB{eL#VUQ*wP-|CvfK4ED9=(Mgnl;rs?0uQd`GDErSl&`tRVpHQlU~FPC z*Cv1&O#8;s#>vLsp0(iRg8wk@e7!w`dC@Z^g49|&EoNfO(y2-8+rmvZQXI8|)hyjg zeb4OIH>E~BZ`4TS3>BAfhK{CNexS4FyQmSI_;V$NYtRhZfV(_f4fw5y9@g3P{>;72 zzXBO~pHpVipbwk!pR?lE}s{b0DyDWdVmJJh49?K#U0Rp)7HV8NM}PQGhKX;v@a zBr{~NB=%?_8V|IgApk==fwLx04h4@<=3Zz>p4T<0O!Pk`h3-EYg>Be^Xfq~e!=c^S z2Fvo9ju;Syjl$C(%G^=ks<;!awerRWbuIRnuWIHh2kf3jcKy=OCIs)_D-|D?mp>|$ zt|ODnQ;)XhxErJA%D<(|-+<2dzK2XR2zKmjKfs1PAb$;4RXhDTB0`fHF!o5)(aDKn z_ms0C_dq!O1H{`aX%GKZCr9o?B@Tmujz1|9w0jF0q>m?_KII3VZW(_7$hCeq7nW02 z-aG)xXHlR|qa5w$!y)79R|RZ)V;iBUy8nd9sAE~Ty4}09y!cIG7Z3ETTk7IAkaHsO zO+rF|BJ!ZBRReG3xcGHta$dDSN2Y6-yeI1jj4oZ8iL5A7lXNtQRS@Yh!$65K;n8^& zBe)N;hUlIgh?5l+Grs*Rz0F~&X0vKlsV_Y!rO9WM+F5bq@`5AcDU0h<=#JZw^U=V& zlwd1(ReH7pkVzj-3w9iDmx;BqcwZoVU7sWop;G{J<>a;Xi%VMd4bpuzVi=GmBt!?% z-%mk|Ep!9v470(NMs8BNbcE{Q`464EVws}1uSTq&K?yZLiCevDrE6|E@5`x2yW9NC zZZ2n4XiqFbNZg_`2x;htcOwYf?P^OH|O^ zr*cKZ+F6##njT^1<&r3uCi5-y%y4pxHL9GaZV<2G98^~L^@+id+Haax7DXd%47v~9 z$mug~j9#0JE>Wreu2suq?#0PGKpSi7)a*)^73fj&M_S+(>|&TdsO(zB5soy9bu1XZ zc|SRS6d4>vlFUmRUE_{CoG7?EB{1%#;UImze*|ailCM0%e7bW7mPj$9wyFRTZ=Wm~s7^aJ#p$UI=N8>=*~}=bu@-KYaM~BeOi1B>D9jsb zo~W9&CJw|W^_mf{QEd4sL8u2i!XW71RDvr)G5&hT4j(p^y1Eg4nE~DnUdYM60R%&h A{{R30 literal 2231 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP@Koyz}(zCG&D3LBO^02Gb<}AJ3BikCnq;IH!m+QKR>^;w6vU`QKtZVz*NBqf{Irtt#G+J&fW*wa5hJyShH1A{L`3xOq! zw5N+>NJZS+TfITI93)yFZqd@%*7)bn|Fz3@KU5Kvba&chcDnMu3{_uvx)_#o2yAx{wcFCg`jkCjE2Dzl|Jw=+Lv=K)8cu zd6jNn4@bexifK{j-)v%+@C$xDGxi^YmH*oGGJb{vyFeh_&v0S>%4^2E+Zj5RuljmM z&%WXFB>PnU3%i(Yq#14EP1fB1?P{>*zLdhc`;rUd_ZuFl{JW1KYQOG*4gbzEztB2e zx_RC180MZ#+s(fX8EjvLZvHou;X}5UcZ3*2Ib+6ezuMgs<#`?M8-IIiB*Umz)~b5I zozcI6pJ^GxNx=;VAp2K*K=@`RbTQ!F1bKhSS-^Q>jmwUl%ASL>V zM>kymv{z?t`GI{k+NWb*{+8NsyH)()r5~{g`(J-%T@nB5k#2B<{bO~8 zk_zj;G7j@K4@{9i@SMBcYR}vt<{Ud zF67rIzrEH6l!5@O_g6vcAYjM8^Jk*1CrLP5k6k7dcl+X;T`xVd7~XE#*fRU)K4qAy zhI7?hVQdD5OR*;-Uwb4m#Fo$Ws>pROezi<_CF7RM$At2p{l;O9N4aYHTIEj0PaHsF zE>y0+#;_oJeK6YdrLo;(xW85kb$ zewf0vK>N|-v|y%&br+JKUwHMppW$KV1mEYA<2JMK&kSeCxW(46EO!u6&lqCA^H;4| U+?9VZ;uFYsp00i_>zopr0ODW)L;wH) diff --git a/resources/assets/enderio/textures/gui/hyperCube.png b/resources/assets/enderio/textures/gui/hyperCube.png index 0959931c6c60301b19ae9e90c7f7e45efbee8812..a5572e166079a4ec53a500d64f1b705e90d46c42 100644 GIT binary patch literal 1919 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6C&-Bsf2h|p48~48=Yt3H0waKn5FKYizPga#F5Ppy$ ztG$7B9n+S5e;z9^u%F3ij6NXwK%j*Ciq-?E65d^G$4xZYPcRlayw&Ysd&*$xz&C+; zS#F`Dhk#HE%fcvD7DXuYA-jr-qi2B7nzN2kNs|_+XmENp0V#{$Yc^=;aCIMARIrw5 z5tIp{`sYa>VTxejzM__xTd32(x`9FL0EnN^cyjuR21NswwgUlcnG!g78o_J<2`1-+ zj1N<1WeD&tIv6GP>6(O;OEZY$Xwt!UQ31#~|Njt+OxxiC3BK!E4DAmMAnd~rg&%(i z-oN4ddHc0_5=sXm82L7^uKLaRShnEr(NHE6a~F$*H4VBCcnUbIShA}ZU7tTsj=z0@ z^998h0wo;Rv>u2_+;1v~0DAiggXMy6Vl2)@4KfB{pl|>RIPk3qePCnx;HjNl_-hxY zKfmPq-NhJ>S*}>B{N)hiwgd63a~S!rHvmnu2wT9?ewS&T=g#j5@wUy{`IWr_xzdjthIL oI(HU3I30Z^B{L}5^Y1an?>^D4QJZ2D2Fw%;p00i_>zopr0ACAn4FCWD literal 1827 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP@Koyz}(!tySw|?v19-L{|AbUg3%BdAt7+v&+IiQqm%^s1p^cRNCphS-`Q1x z(au@m5n0T@z;_UY8Fx&~ehUR|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz|`*P;uum9_x7@3o{Xn}>%lnP%KysSmzBx8NEUhdCJTw4*WA#{QqNF)_q*xV z-~0ameD(GE{gS)apI?b%>Ww$e*q;6F-}(O6yBX}3m6_IEU2s>-;W``Jf{&}&-m-xb zWURDA!?E>JTckmplH3Fasr^|O@<5ymTN@cO{;YD`4J!ABtR^+)EsuajG}Jpsn?cM4 z+04ury4d0V66I$CiZ-m{<#EuKV*#lEg-VzW2Z*`LY(p_aUCq_$|E)M4+>ihJ?>$on z%$WBw4cGQFU05y(SN!c9W5!=?hT14biWOa}t-Ct?sv|=^AJA1Lcf*gXebZ%VX5E+g zpQ++6PusWuE$OwVC!S<{VQa>)_c+^v?>88}$VoTcOJ=@Mox@Po&+G7hBUL2%*mu02 Y?>yspiOQOUWKfWJy85}Sb4q9e09}G0H~;_u diff --git a/resources/assets/enderio/textures/gui/painter.png b/resources/assets/enderio/textures/gui/painter.png index d17a0af92b074783badc80779e43a4344b88a474..3c79ee023fbe8359940d0c6afcdcc99e8176c64f 100644 GIT binary patch delta 1616 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 F1OS=pq2T}k literal 2248 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP@Koyz}(zCG&D3LBO^02Gb<}AJ3BikCnq;IH!m+QKR>^;w6waqx~8V)hL7w2 zZ4Cea%XfEoA3JvJ|Ns9$?W15c1cq)1WKQ^a6O>U(g8YJk>3JjrhT!k)s=%1!Ebxdd zW?)EGzYeh?<3nFg+^(WmKVkXtj~B8-9d}RZ^8TxMd%26B zv9GVK?`4xYZK~BN>_*wk($=U8OPupe_-FN9j=}V;J>OXqp7iK{pPsTMoDXy7=RaHU z>Q~~6H$ooqx0DvMEJ$C!fTh5X;ib@vH{Q`HA@UC9QVvyr`_&fe8m;1caOLK^ZdYRkgq z52QZzZ)KNQ%xuHPRPpD+rusMLj<@Yi9B$bg9oSQ!&~W-+A>)?%h=$bv8yK>0rI%l2 z{B!FPS0&>Eo(0lf(d)L0Wiwp3A6LA00x0|G&Id_>STAk{GrZWM%TSUL&+sCDJ>vrV z0#2atg-@DmCrmeYm|qwCQSoo1w7Zy#ngR8}&^@ck&|Zn*yKEX%FuF%7N< zw?;GU*^-|-yO=fO`_tLk+ZihI;%|Su5cgj$U{f@M4Bt1k8)-FMQ{JeBA4t^GbNFvE zU5=IY$L2a_hxYgC3=BI&55(9soZo--!o%MyO%B{;2YNB%=ajG$+(5<*#uD|K)z|O* zI`7W1;B#3v>xKHiYkR+!u>j@3;6mkYU=;`jAHM$ovSYh)D`Uz1)YT96%AQ@DFRRJB zKs$HsgQGQf1!2k@p1&1?u^Ak8T3g1sb1}czcRK7~we_s%`&L0x4&k?=4tD?Cr3_Qn zaPGD)jLpzcR9>{FPlRm+NE&F^HKqmC>!VrUzt766eeIFSPJyOfG!7l z1_Bn`xf`<{=*Cw-=_F>GDGW1aec5w0gdrj8%N^4v`|6oCOm{Sm^}Ds1$v-ljA)}3# z;p_&+1(IeACWqM?(rz$Z;E`sSmB{R1oHOu}VloM{{xP0US@Ha%-IsWf|2$p&T-G@y GGywp9l?ki> diff --git a/resources/assets/enderio/textures/items/ingotCopper.png b/resources/assets/enderio/textures/items/ingotCopper.png new file mode 100644 index 0000000000000000000000000000000000000000..f2a6bef48087abf84ed9434e1abe9923d0af673c GIT binary patch literal 530 zcmV+t0`2{YP)N2bPDNB8 zb~7$DE-^7j^FlWO00E9kL_t(IPoD>-RgeV=qn1F1|hI;`w~OzvuKk8m(5V zDJNyYTwJnX)GdOOKkc7_G1&kmZUgT7B-{in1(E^*w=ghHU}C_A&k+YwLv}pV_XA0; zddxWzMUWYf*BEX3B8b8FP#R7Sk|1b9tXIOd--3%SlPXc*h|i1^Zw}ew_L9YsE z!wWUXgA$(lCCt?8G3^vERjb1!#b2X?B1qEaEw34mv?)$a3?*n~Xh}9=-X&s|;KNou z_L}wBrR>Q1UjajR0V_5-Omt2w!i^&42;!Xij5zfgaO5GlB@He+E0m}c-1@D`*)F?H zSfn2qZ4+_QF5;Nhs7J&BHLurIV&w-c5Nyi=B5ncaomE(9GGL#YGGTD-2cD=-pF0!v zBJqFNbO~6chH!(Zj+ot)4P{>@^&YTM+07*qoM6N<$f}ktdcK`qY literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/ingotElectrum.png b/resources/assets/enderio/textures/items/ingotElectrum.png new file mode 100644 index 0000000000000000000000000000000000000000..3ff1dead6fcff249ed170e3917f7ff0c55bdf38e GIT binary patch literal 611 zcmV-p0-XJcP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0005fNklXHz~Ti>e2_koWtRKKhKx*oPvTSQ*~8E1geVpufU;N8=)E-R&^2Mx9S)h3jQ4u+^h`B z6yCCu*@pqXOh9_IC!9k-W=D(@}TU=HuN?(g`OAV-7AH73SWVLw-*6R4TxV z?|=slJiQy`e4pUW6G>OhPH$TYhucfIbE%S>gX_6+(#K%G;B3lAve`{yx0edH25eYE z_V#wBhNEO|SR6@uxqL!!^|X&`1Aen=bI)EEU3=Ej(c&W6Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0003hNkl;?*1W|Uk$u>a0D3v zPG%uSeo!xA3ju=Drxfw>4MA35p5*YO#m^Eo9?z4<2vPouxY!_iS(gd36=u(wkS0|L zA-nI&hG0<$cnxlru(&QG?oSO9Cwc?NXNJty_6{@(2=|1Zfdzhy=bkl-ibd8d$~@S>r5$_h6$Llc+;(}gG=`g zSGU75gel|{3a$t^Cd1D}0h>53Lr}r$x!Ek+)xq~b0j9MtsZR3e>+jdD_ZGH<<2(QW002ovPDHLkV1mw-vuXeU literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/ingotSilver.png b/resources/assets/enderio/textures/items/ingotSilver.png new file mode 100644 index 0000000000000000000000000000000000000000..f8dee05611cd09d153c2e835aea2b403e195f7c2 GIT binary patch literal 565 zcmV-50?Pe~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0004`NkljZxkT7HyU;X!B(ZdMFZlvl3}A6eXLitlg%yeE#HdXlw=5 zORxi9&UrYW@ArESKa1tRSvH#up+^;VI2;Js?RGM`9Gltf{U#zs08XcqgHnl$t1Et- zopE@4%-3?6t?ce?lTJOc@8t9Ry1e9fv&qkTy{npePU(A zw;aVI$8HRAg#tp`d;3Ts4gFn`xzsxIAJWXH(#$13;SEmXRx}1>4X>;twbXrrM~yI~ zYGiiz@r87vi-~sKnWZ&6!5C6NXRrnLNt11;qwY+Ie;97Pbwr)PH>vYn3DK{F8Bij4 z{C}$6g8rQ-Ve&$K!|2p&`sMJ$pu0@&O?uQUKgH#1QrlNMr(x=H00000NkvXXu0mjf Ddh7d$ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/ingotTin.png b/resources/assets/enderio/textures/items/ingotTin.png new file mode 100644 index 0000000000000000000000000000000000000000..d8818987d459ec59b7a9e6acfcd1d67d6e4cb030 GIT binary patch literal 461 zcmV;;0W$uHP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0003zNkldU})sdts!FABIpVFv#~5FvDDSMoB;*9LA1DwJ8+m8_a2)#4;8v5#Q|3&c+_0@+hZpY1c00000NkvXXu0mjf Da<9kk literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/powderIron.png b/resources/assets/enderio/textures/items/powderIron.png new file mode 100644 index 0000000000000000000000000000000000000000..bbc13dd692d6a50868e05ebc363986bc01f628f8 GIT binary patch literal 415 zcmV;Q0bu@#P)N2bPDNB8 zb~7$DE-^7j^FlWO00A3GL_t(IPwkRHO9DX{hW%HGg;?0CnTLq5QZcn{TX)@DU0K)E zU0YmD!>p+2W>B{d{lebn8wdi^%0s6HhG7oRGcWIaKHvYE+kg;Q0_}xrBCsWkI6W>P z@>>bP!`cZRJqP!;1zR~nBDC_eBm|#nGM)!6UT-eAgk+X@fbDQ-zJ%bqn8R($#LH!$ z3npC~<9Zc6UEz}5X!vUh!D=cAPgn8aH1Na{5Pa7*aosR5GIb1%66|8(Ewd?1OGuz) z_TaMkSC+v+4%IZ4pu#0%c6U_?*+g`93X)L!URgoETEc+6dd^O-ETf|w&W1n!I=1Xb zJQzSFyN{-nhr^(zltX$$_#XZ|Fk5Ru?5wZy(ozgwXqf&4dIuYl$NfZD8002ov JPDHLkV1nufr0oCz literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/powdergold.png b/resources/assets/enderio/textures/items/powdergold.png new file mode 100644 index 0000000000000000000000000000000000000000..d4fe0bfc6b49fcd7290429fd2d93701d3cafa512 GIT binary patch literal 445 zcmV;u0Yd(XP)N2bPDNB8 zb~7$DE-^7j^FlWO00B8kL_t(IPh(&h1$aZCAYJ@_eyZ4ivVy5JU;6*k8`l3HUN-#? zGKeHYDoW)3e|Q=8|Ksbz|8E{Af(C; zb3pI^yJ!CYzkSRGYAy%U@1KW*U2yNL`TvW1HU4j$BlkZ$njg~;P-vgoulxVyJ@^0b zUql0)9tSkc7ihb~|3_DB{@*@n`v1Z%wf`Gu%V0ME6v`l1oZ74N|H*YzpsjZBSh#UQ z=l`+Is{c36mHVF?CxAajKrR6pw11-}IN*+N*Z9AEnezXlRFVIA2|~n2XMU>a|DtrU n|HbK|{|i%a1RP0;gI0q|KvkKZE{-7<{>cdvAqnT^SpHw`KcDZ|Fj$ulH6-o1YPyZ`b<1y);I z+loSWclJEyv@b)&!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsA{UG zi(`m|e{zCENW!@}mj9Rg&*wXKd6{o>@(hWNcduXn?!SCdfmLSNE`gkN|K}fed2YXZ z-?4f#T~ULyz$riPU%c3OyFt=8ZGl9=#KwpJtrXnM7Hr-;*@D?&R-#^mBvTRNMYac@ zm^|4o9N~_Qjh%87$ei$o^+}0Cn2x~Y2_KF*)z{lw%yX2O@@T`uXV22^G+HP~3NuVv Xb?3kW;T-`$2QqlN`njxgN@xNAc#>vk literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/upgradeEnergy_1.png b/resources/assets/enderio/textures/items/upgradeEnergy_1.png new file mode 100644 index 0000000000000000000000000000000000000000..18c6cf32aae1b4fdc9587dd696dee974a5007035 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvnxZT^vI!{F4(TLK4o+vHZW>e?H%_%gcP5lV?bDynFrncmL&!3am2A zb_wLH`#=A%%X9nP`;OI{=}!Hx(`A%!=i&#zCbEN_b#Cr<1+#iBn}!hEM?x1lrtkhAt=Y8zTVzqmV?BUM;jhKdzN;m(LzB| am|;546PD=ryeoh{VeoYIb6Mw<&;$VGKzY>w literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/upgradeEnergy_2.png b/resources/assets/enderio/textures/items/upgradeEnergy_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4589c7c7cc34856d507a1b74afdd73a27d9eaf7a GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvjD@T^vI!{F4(TLK4o+vHZW>e?H%_%gcP5lV?bDynFrncmL&!3am2A zb_wLH`#=A%%X9nP`;OI{=}!Hx(`A%!=i= z1`p-tnXl{Fn5X~eiTd_mG9>q4TO*I+J%;RZ5$6*|49{3o#7jy`1^ZYxh&P;TmtK&; z`kg6|ZNm!fg)9m;emWR7B{F!kCmg+Du+U-2jfQ{!>IzI64K$7>9zJ{a><;Ea2O~9x YTCaz1)|*`d1_c9yr>mdKI;Vst03oM)ga7~l literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/upgradeEnergy_3.png b/resources/assets/enderio/textures/items/upgradeEnergy_3.png new file mode 100644 index 0000000000000000000000000000000000000000..ff00719339f4c29f8b823823aa9a7337f1083723 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvl;)T^vI!{F4(TLK4o+vHZW>e?H%_%gcP5lV?bDynFrncmL&!3am2A zb_wLH`#=A%%X9nP`;OI{=}!Hx(`A%!=iSNUr*4)w5T|gDA-i0}*`aMx4#OF4o>kla`_BGxfUTso zRIrbAgLuQacIgEftZBlz4Bfkgycn8HnU8W*F;3$<(6uqqsnKI26 jn>~AWA^W3-6d#6U#yfFmPpmZs`iQ~P)z4*}Q$iB}c-w+M literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/misc/add.png b/resources/assets/enderio/textures/misc/add.png new file mode 100644 index 0000000000000000000000000000000000000000..af81473dedd5de40cfef0acd8ffdf76802e0b523 GIT binary patch literal 434 zcmV;j0ZsmiP)N2bPDNB8 zb~7$DE-^7j^FlWO00AyZL_t(IPqmZjO2beTgil|g58zT`m(;rAU$+{mwN^z$L`3}I ztGOd;t3KYCuki#ctt3AT3`w|m=FFUXuGxP)<<^vH-5FIoB~{wf;y;KcmAO{^DA2~8 zY4_FCelxA#n&ysYvkT0hR@8hnb^50Lchly*Y4N<4T>#52fCz4uFT?QySSD|H7!0f; zu>E8@_%wAtOgqn}m8-fI&Z=6v2(^0M5S+9p5UB{Z9ufl90SN2bPDNB8 zb~7$DE-^7j^FlWO00D1FL_t(IPtB9dO2a@DhR@3T{eFErw+d2H#Lys$AO-10QA*v2 zSSZDkr3j@9k%*)=iSILhhc?iOH5)euer9s!{FgH!BLD8$9}`oa6q60+QQI5;S-1KQ zXt_4XJmjtgfG^ra638Z9+JxCz+6suy|ti>!jRnjp6 z6(D8|@lyqs5m;jdFOUnE`;Lpz*eUr9krwD65~{#1LOU3M zDm51)OT^=HTKcUyd?$Jxu@mBYxHYH+ng9`B6J*J$QVEeJhYiTLLroRlpBUwlyEtW^ pdy!|{bY+A?jTFbfIsfI4{szE}-@mH4$A|y`002ovPDHLkV1ltp%ZUI0 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/misc/private.png b/resources/assets/enderio/textures/misc/private.png new file mode 100644 index 0000000000000000000000000000000000000000..95a7e3329e0731a04bc58b611abe661d70f7c850 GIT binary patch literal 549 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kx3zPx;Tbd_^+M#+>gmor1g7kjR?2f5xtBn37%^LmBn0?7$>T^CNxgn zw_&%3V29!j?;ifrIX7MEcdSz_ob>+uoZ|h~Ck@Wj%Q2kE|53PHUx4Z8+s}_rJZ(Jt zaLUiZ31V~d^eLT5AFLxud8O?=3Dl?lW?uynJA zM=FF}FzwvKJ=X$sFZ7h{6X}@8dFP35g}~Vgz37i6bq&8C>D`*?Yx4N?incVxN_E8@ zUpyj8ygFYPKCs%~dVCV=`cmt-EVDb@)h-(xS-e-U^a|W%6Pc6T@%FnmYmN8gF zx~yF`^|PPsiN4noRwP>Y_ur6U#T+koL$42h2NS_lx+_ZFe_Esbl3HbZ9=)J(H4*Q8Q&z2 jhL_nGpNX#!-^1vBKZfaW)!hzYEHZey`njxgN@xNA2y5PV literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/misc/public.png b/resources/assets/enderio/textures/misc/public.png new file mode 100644 index 0000000000000000000000000000000000000000..bd6386870f6eb8a89dc00861b2a40d8a2f1608a6 GIT binary patch literal 548 zcmV+<0^9wGP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0004#NklXa6h-+TKgEI(y9gLH zw!|7SQZ12yC`AE*p*S$Wzzkh5hF~u-e$@8fN%Vnn&=)6JFSGYq=OkC9`j5{a2!Z19 zpX2z{3x~@s@uyvGj}PfAFOf`T5KE>Ii6tdy)>U#5jY|VcC7RKWq9o3y!SRA(fo8O$ zC`hI=$QLV$1)9;0qTn)}MY-NoEYOU0eiih*sZ`zgQ6PE^xX+pJEZXr_ImB!E08a%g z+T0GVNQgci3goh^a}?Z>=9`GQUoHrndJ!@A5&Hlbt6G8< m=|7rvB74f;-o7*c5_|$^8B4GIJJ@Id0000!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsH)o2 z#WBRf|Lw%PTn!35ZtPdHzq|7b1!nGD^0wjBhjkx}9xj;uxcIlo&v04xUv5k~h0kqf z7gwH_eR5rMM>OZ|ObP0l+XkKMC?|` literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/misc/set.png b/resources/assets/enderio/textures/misc/set.png new file mode 100644 index 0000000000000000000000000000000000000000..8ca7a2a5f209060d49312ad23913ada8be7d976f GIT binary patch literal 555 zcmV+`0@VG9P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0004+Nkl31OSN(pvc00 zcv_~-t1bT=*wOk1?dY?z%TpQ!;&Z%pL~ txUBOpm6-`5iu3vW!bgQTfRJxKus_g`o?08!+^PTo002ovPDHLkV1lb8@iqVe literal 0 HcmV?d00001