diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index bf494c736..5d8501c8c 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -198,6 +198,12 @@ public class ModRecipes { 'A', "ingot" + name.substring(0, 1).toUpperCase() + name.substring(1)); } + CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ElectricFurnace), + "XCX", "RFR", "XXX", + 'C', ItemParts.getPartByName("electronicCircuit"), + 'F', new ItemStack(ModBlocks.ironFurnace), + 'R', Items.redstone); + CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFurnace), "III", "IXI", "III", 'I', "ingotIron"); @@ -457,7 +463,6 @@ public class ModRecipes { } static void addShapelessRecipes() { - for (String name : ArrayUtils.addAll(BlockStorage.types, BlockStorage2.types)) { ItemStack item = null; try { @@ -476,7 +481,6 @@ public class ModRecipes { GameRegistry.addShapelessRecipe(BlockStorage.getStorageBlockByName(name), item, item, item, item, item, item, item, item, item); GameRegistry.addShapelessRecipe(item, BlockStorage.getStorageBlockByName(name, 9)); - } GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog); @@ -493,7 +497,7 @@ public class ModRecipes { CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.quantumTank), "EPE", "PCP", "EPE", 'P', "platePlatinum", - 'E', "circuitMaster", + 'E', ItemParts.getPartByName("advancedCircuit"), 'C', ModBlocks.quantumChest); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.digitalChest), @@ -509,16 +513,15 @@ public class ModRecipes { 'C', ItemParts.getPartByName("computerMonitor")); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloySmelter), - "IHI", "CFC", "IHI", - 'I', "plateInvar", - 'C', "circuitBasic", - 'H', new ItemStack(ModItems.parts, 1, 17), - 'F', ModBlocks.AlloyFurnace); + "XCX", "FMF", "XXX", + 'C', ItemParts.getPartByName("electronicCircuit"), + 'F', new ItemStack(ModBlocks.ElectricFurnace), + 'M', BlockMachineFrame.getFrameByName("machine", 1)); CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LesuStorage), "LLL", "LCL", "LLL", 'L', "blockLapis", - 'C', "circuitBasic"); + 'C', ItemParts.getPartByName("electronicCircuit")); TechRebornAPI.addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil"), "NCN", "C C", "NCN", diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index d4cc95494..8490b306c 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -1,25 +1,15 @@ package techreborn.tiles.teir1; import ic2.api.tile.IWrenchable; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.item.ItemTool; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import net.minecraftforge.fml.common.registry.GameRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory;