From 039cab23eb957cf4ddedfdbcf3b74cc04e6ca41b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 5 Jan 2017 21:22:33 +0000 Subject: [PATCH] Fixes some final issues with ic2 de-duplication, closes #875 --- src/main/java/techreborn/init/IC2Dict.java | 9 +++++++++ src/main/java/techreborn/init/ModRecipes.java | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/init/IC2Dict.java b/src/main/java/techreborn/init/IC2Dict.java index 31cb21c46..6ceeace65 100644 --- a/src/main/java/techreborn/init/IC2Dict.java +++ b/src/main/java/techreborn/init/IC2Dict.java @@ -13,7 +13,10 @@ import ic2.core.ref.ItemName; import ic2.core.ref.TeBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import reborncore.api.recipe.RecipeHandler; import techreborn.Core; +import techreborn.api.recipe.machines.ExtractorRecipe; +import techreborn.items.ItemParts; /** * Created by modmuss50 on 16/07/2016. @@ -57,6 +60,12 @@ public class IC2Dict { //Rubber tree blocks, hidden when deduplication is on, and rubber tress are not set to gen, includes tree taps //Circuits are hidden in JEI + + //Adding ic2 sap to the extracor + RecipeHandler.addRecipe( + new ExtractorRecipe(ItemName.misc_resource.getItemStack("resin"), + ItemParts.getPartByName("rubber", 3), 400, 2)); + try { CraftingItemType.circuit.getName(); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 022e6974c..8e0e1b419 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -788,8 +788,14 @@ public class ModRecipes { CraftingHelper.addShapelessOreRecipe(IC2Duplicates.GENERATOR.getStackBasedOnConfig(), batteryStack, BlockMachineFrame.getFrameByName("machine", 1), Blocks.FURNACE); - CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("machine", 1), "AAA", "AXA", "AAA", 'A', - IC2Duplicates.REFINED_IRON.getStackBasedOnConfig()); + if(!IC2Duplicates.deduplicate()){ + CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("machine", 1), "AAA", "AXA", "AAA", 'A', + IC2Duplicates.REFINED_IRON.getStackBasedOnConfig()); + } else { + CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("machine", 1), "PIP", "IPI", "PIP", 'P', + IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'I', "ingotIron"); + } + CraftingHelper .addShapedOreRecipe(BlockMachineFrame.getFrameByName("advancedMachine", 1), "XCX", "AMA", "XCX", 'A',