Fixes some final issues with ic2 de-duplication, closes #875

This commit is contained in:
modmuss50 2017-01-05 21:22:33 +00:00
parent a0c3cc644a
commit 039cab23eb
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
2 changed files with 17 additions and 2 deletions

View file

@ -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();

View file

@ -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',