diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 6c141800c..4f8b69203 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -463,6 +463,15 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 2, 2), new Object[] { " I ", "ICI", " I ", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 1), Character.valueOf('C'), "circuitBasic" })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 0), new Object[] { + "RCR", "iWi", "RCR", Character.valueOf('R'), "alloyBasic", Character.valueOf('C'), "circuitBasic", Character.valueOf('i'), "ingotIron", Character.valueOf('W'), "plankWood" + })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 1), new Object[] { + "ECE", "oWo", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), "circuitAdvanced", Character.valueOf('o'), "ingotOsmium", Character.valueOf('W'), "plankWood" + })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 2), new Object[] { + "RCR", "gWg", "RCR", Character.valueOf('R'), "alloyElite", Character.valueOf('C'), "circuitElite", Character.valueOf('g'), "ingotGold", Character.valueOf('W'), "plankWood" + })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { diff --git a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java index a64083a2a..357f748e8 100644 --- a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java +++ b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java @@ -5,7 +5,9 @@ import java.util.List; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FactoryTier; import mekanism.common.base.IFactory.RecipeType; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.tile.TileEntityFactory; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -80,7 +82,28 @@ public class ItemFactoryInstaller extends ItemMekanism if(type != null) { - + if(tile instanceof TileEntityElectricMachine) + { + ((TileEntityElectricMachine)tile).upgrade(type); + + if(!player.capabilities.isCreativeMode) + { + stack.stackSize = 0; + } + + return true; + } + else if(tile instanceof TileEntityAdvancedElectricMachine) + { + ((TileEntityAdvancedElectricMachine)tile).upgrade(type); + + if(!player.capabilities.isCreativeMode) + { + stack.stackSize = 0; + } + + return true; + } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 58b4fd41f..d66c93535 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -1,17 +1,24 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; +import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.Upgrade; +import mekanism.common.base.IFactory.RecipeType; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.AdvancedMachineRecipe; @@ -23,14 +30,10 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.StatUtils; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Method; - -import io.netty.buffer.ByteBuf; - import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; @@ -82,6 +85,66 @@ public abstract class TileEntityAdvancedElectricMachine