Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
This commit is contained in:
modmuss50 2016-12-26 23:49:42 +00:00
commit 0922e0b886
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
10 changed files with 456 additions and 233 deletions

View file

@ -13,6 +13,7 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.api.fuel.FluidPowerManager;
import reborncore.api.recipe.RecipeHandler;
import techreborn.dev.JsonGenerator;
@ -88,6 +89,10 @@ public class TechRebornDevCommand extends CommandBase {
e.printStackTrace();
sender.sendMessage(new TextComponentString(e.getLocalizedMessage()));
}
} else if ("ores".equals(args[0])) {
for(String ore: OreDictionary.getOreNames()){
System.out.println(ore);
}
}
}
}

View file

@ -53,10 +53,15 @@ import techreborn.compat.jei.scrapbox.ScrapboxRecipeHandler;
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory;
import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeHandler;
import techreborn.config.ConfigTechReborn;
import techreborn.init.IC2Duplicates;
import techreborn.init.ModBlocks;
import techreborn.init.ModFluids;
import techreborn.init.ModItems;
import techreborn.items.ItemParts;
import techreborn.parts.TechRebornParts;
import techreborn.parts.powerCables.EnumCableType;
import techreborn.parts.powerCables.ItemCables;
import techreborn.world.TechRebornWorldGen;
import javax.annotation.Nonnull;
import java.util.ArrayList;
@ -124,6 +129,31 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidOil));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.missingRecipe));
if(IC2Duplicates.deduplicate()){
for(IC2Duplicates duplicate : IC2Duplicates.values()){
if(duplicate.hasIC2Stack()){
jeiHelpers.getItemBlacklist().addItemToBlacklist(duplicate.getTrStack());
}
}
if(TechRebornParts.cables != null){
for (int i = 0; i < EnumCableType.values().length; i++) {
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(TechRebornParts.cables, 1, i));
}
}
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("rubber"));
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("rubberSap"));
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("electronicCircuit"));
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("advancedCircuit"));
if(!Core.worldGen.config.rubberTreeConfig.shouldSpawn){
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberSapling));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberLog));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberPlanks));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberLeaves));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.treeTap));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModItems.electricTreetap));
}
}
registry.addRecipeCategories(new AlloySmelterRecipeCategory(guiHelper),
new AssemblingMachineRecipeCategory(guiHelper), new BlastFurnaceRecipeCategory(guiHelper),
new CentrifugeRecipeCategory(guiHelper), new ChemicalReactorRecipeCategory(guiHelper),

View file

@ -21,8 +21,8 @@ public class FusionReactorRecipeWrapper extends BlankRecipeWrapper {
public void getIngredients(
@Nonnull
IIngredients ingredients) {
ingredients.setOutputs(ItemStack.class, Arrays.asList(baseRecipe.getTopInput(), baseRecipe.getBottomInput()));
ingredients.setInput(ItemStack.class, baseRecipe.getOutput());
ingredients.setInputs(ItemStack.class, Arrays.asList(baseRecipe.getTopInput(), baseRecipe.getBottomInput()));
ingredients.setOutput(ItemStack.class, baseRecipe.getOutput());
}
public ItemStack getTopInput() {

View file

@ -92,6 +92,7 @@ public class ConfigTechReborn {
public static boolean ExpensiveSolar;
public static boolean ExpensiveWatermill;
public static boolean ExpensiveWindmill;
public static boolean removeDuplices;
// UU
public static boolean HideUuRecipes;
public static boolean UUrecipesIridiamOre;
@ -407,6 +408,10 @@ public class ConfigTechReborn {
ExpensiveWindmill = config
.get(CATEGORY_CRAFTING, "Expensive Windmill", true, "Allow TechReborn to change the Windmill recipe")
.getBoolean(true);
removeDuplices = config
.get(CATEGORY_CRAFTING, "Remove Duplicates when IC2 is installed", false, "This atempts to fully intergrate TR with ic2 recipes (Beta)")
.getBoolean(false);
// Uu
HideUuRecipes = config.get(CATEGORY_UU, "Hide UU Recipes", true, "Hide UU Recipes from JEI/NEI")
.getBoolean(true);

View file

@ -1,5 +1,18 @@
package techreborn.init;
import ic2.core.block.BlockIC2Fence;
import ic2.core.block.BlockTexGlass;
import ic2.core.block.type.ResourceBlock;
import ic2.core.block.wiring.CableType;
import ic2.core.item.block.ItemCable;
import ic2.core.item.type.CraftingItemType;
import ic2.core.item.type.MiscResourceType;
import ic2.core.item.type.NuclearResourceType;
import ic2.core.ref.BlockName;
import ic2.core.ref.ItemName;
import ic2.core.ref.TeBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.Core;
/**
@ -9,6 +22,42 @@ public class IC2Dict {
//TODO IC2
public static void init() {
IC2Duplicates.GRINDER.setIc2Stack(BlockName.te.getItemStack(TeBlock.macerator.getName()));
IC2Duplicates.ELECTRICAL_FURNACE.setIc2Stack(BlockName.te.getItemStack(TeBlock.electric_furnace.getName()));
IC2Duplicates.IRON_FURNACE.setIc2Stack(BlockName.te.getItemStack(TeBlock.iron_furnace.getName()));
IC2Duplicates.GENERATOR.setIc2Stack(BlockName.te.getItemStack(TeBlock.generator.getName()));
IC2Duplicates.EXTRACTOR.setIc2Stack(BlockName.te.getItemStack(TeBlock.extractor.getName()));
IC2Duplicates.SOLAR_PANEL.setIc2Stack(BlockName.te.getItemStack(TeBlock.solar_generator.getName()));
IC2Duplicates.RECYCLER.setIc2Stack(BlockName.te.getItemStack(TeBlock.recycler.getName()));
IC2Duplicates.COMPRESSOR.setIc2Stack(BlockName.te.getItemStack(TeBlock.compressor.getName()));
IC2Duplicates.BAT_BOX.setIc2Stack(BlockName.te.getItemStack(TeBlock.batbox.getName()));
IC2Duplicates.MFE.setIc2Stack(BlockName.te.getItemStack(TeBlock.mfe.getName()));
IC2Duplicates.MFSU.setIc2Stack(BlockName.te.getItemStack(TeBlock.mfsu.getName()));
IC2Duplicates.LVT.setIc2Stack(BlockName.te.getItemStack(TeBlock.lv_transformer.getName()));
IC2Duplicates.MVT.setIc2Stack(BlockName.te.getItemStack(TeBlock.mv_transformer.getName()));
IC2Duplicates.HVT.setIc2Stack(BlockName.te.getItemStack(TeBlock.hv_transformer.getName()));
IC2Duplicates.CABLE_COPPER.setIc2Stack(getIC2Cable(CableType.copper, 0));
IC2Duplicates.CABLE_GOLD.setIc2Stack(getIC2Cable(CableType.gold, 0));
IC2Duplicates.CABLE_ICOPPER.setIc2Stack(getIC2Cable(CableType.copper, 1));
IC2Duplicates.CABLE_IGOLD.setIc2Stack(getIC2Cable(CableType.gold, 1));
IC2Duplicates.CABLE_HV.setIc2Stack(getIC2Cable(CableType.tin, 0));
IC2Duplicates.CABLE_IHV.setIc2Stack(getIC2Cable(CableType.tin, 1));
IC2Duplicates.CABLE_IIHV.setIc2Stack(getIC2Cable(CableType.tin, 2));
IC2Duplicates.CABLE_GLASSFIBER.setIc2Stack(getIC2Cable(CableType.glass, 0));
IC2Duplicates.UPGRADE_OVERCLOCKER.setIc2Stack(ItemName.upgrade.getItemStack("overclocker"));
IC2Duplicates.UPGRADE_STORAGE.setIc2Stack(ItemName.upgrade.getItemStack("energy_storage"));
IC2Duplicates.UPGRADE_TRANSFORMER.setIc2Stack(ItemName.upgrade.getItemStack("transformer"));
IC2Duplicates.MIXED_METAL.setIc2Stack(ItemName.ingot.getItemStack("alloy"));
IC2Duplicates.CARBON_FIBER.setIc2Stack(ItemName.crafting.getItemStack("carbon_fibre"));
IC2Duplicates.CARBON_MESH.setIc2Stack(ItemName.crafting.getItemStack("carbon_mesh"));
IC2Duplicates.REFINED_IRON.setIc2Stack(ItemName.plate.getItemStack("iron"));
//Rubber - ore dic: itemRubber, hidden from JEI
//Rubber Sap - only used to make rubber, hidden from JEI
//Rubber tree blocks, hidden when deduplication is on, and rubber tress are not set to gen, includes tree taps
//Circuits are hidden in JEI
try {
// CraftingItemType.circuit.getName();
//
@ -70,4 +119,15 @@ public class IC2Dict {
error.printStackTrace();
}
}
public static ItemStack getIC2Cable(CableType type, int insulation){
if(insulation > type.maxInsulation){
return null;
}
ItemCable itemCable = ItemName.cable.getInstance();
return itemCable.getCable(type, insulation);
}
}

View file

@ -0,0 +1,95 @@
package techreborn.init;
import net.minecraft.item.ItemStack;
import techreborn.compat.CompatManager;
import techreborn.config.ConfigTechReborn;
import techreborn.items.ItemIngots;
import techreborn.items.ItemParts;
import techreborn.items.ItemUpgrades;
import techreborn.parts.powerCables.EnumStandaloneCableType;
import techreborn.parts.powerCables.ItemStandaloneCables;
/**
* Created by Mark on 18/12/2016.
*/
public enum IC2Duplicates {
GRINDER(new ItemStack(ModBlocks.Grinder)),
ELECTRICAL_FURNACE(new ItemStack(ModBlocks.ElectricFurnace)),
IRON_FURNACE(new ItemStack(ModBlocks.ironFurnace)),
GENERATOR(new ItemStack(ModBlocks.Generator)),
EXTRACTOR(new ItemStack(ModBlocks.Extractor)),
SOLAR_PANEL(new ItemStack(ModBlocks.solarPanel)),
RECYCLER(new ItemStack(ModBlocks.recycler)),
COMPRESSOR(new ItemStack(ModBlocks.Compressor)),
BAT_BOX(new ItemStack(ModBlocks.batBox)),
MFE(new ItemStack(ModBlocks.mfe)),
MFSU(new ItemStack(ModBlocks.mfsu)),
LVT(new ItemStack(ModBlocks.lvt)),
MVT(new ItemStack(ModBlocks.mvt)),
HVT(new ItemStack(ModBlocks.hvt)),
CABLE_COPPER(EnumStandaloneCableType.COPPER.getStack()),
CABLE_GLASSFIBER(EnumStandaloneCableType.GLASSFIBER.getStack()),
CABLE_GOLD(EnumStandaloneCableType.GOLD.getStack()),
CABLE_HV(EnumStandaloneCableType.HV.getStack()),
CABLE_ICOPPER(EnumStandaloneCableType.ICOPPER.getStack()),
CABLE_IGOLD(EnumStandaloneCableType.IGOLD.getStack()),
CABLE_IHV(EnumStandaloneCableType.IHV.getStack()),
CABLE_IIHV(EnumStandaloneCableType.TIN.getStack()),
UPGRADE_OVERCLOCKER(ItemUpgrades.getUpgradeByName("Overclock")),
UPGRADE_TRANSFORMER(ItemUpgrades.getUpgradeByName("Transformer")),
UPGRADE_STORAGE(ItemUpgrades.getUpgradeByName("EnergyStorage")),
MIXED_METAL(ItemIngots.getIngotByName("mixedMetal")),
CARBON_FIBER(ItemParts.getPartByName("carbonfiber")),
CARBON_MESH(ItemParts.getPartByName("carbonmesh")),
REFINED_IRON(ItemIngots.getIngotByName("refinedIron"));
ItemStack ic2Stack;
ItemStack trStack;
IC2Duplicates(ItemStack trStack) {
this.trStack = trStack;
}
IC2Duplicates(ItemStack ic2Stack, ItemStack trStack) {
this.ic2Stack = ic2Stack;
this.trStack = trStack;
}
public ItemStack getIc2Stack() {
if(!CompatManager.isIC2Loaded){
throw new RuntimeException("IC2 isnt loaded");
}
if(ic2Stack == null){
throw new RuntimeException("IC2 stack wasnt set ");
}
return ic2Stack;
}
public void setIc2Stack(ItemStack ic2Stack) {
this.ic2Stack = ic2Stack;
}
public boolean hasIC2Stack(){
return ic2Stack != null;
}
public ItemStack getTrStack() {
return trStack;
}
public ItemStack getStackBasedOnConfig() {
if(deduplicate()){
return getIc2Stack();
}
return getTrStack();
}
public static boolean deduplicate(){
if(!CompatManager.isIC2Loaded){
return false;
}
return ConfigTechReborn.removeDuplices;
}
}

View file

@ -100,7 +100,9 @@ public class ModRecipes {
addIc2ReplacementReicpes();
addExtractorRecipes();
addCompressorRecipes();
addWireRecipes();
if (!IC2Duplicates.deduplicate()) {
addWireRecipes();
}
addScrapBoxloot();
addFluidGeneratorRecipes();
}
@ -324,7 +326,7 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("tin", 9), "CCC", 'C', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("gold", 12), "CCC", 'C', "ingotGold");
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("hv", 12), "CCC", 'C', "ingotRefinedIron");
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("hv", 12), "CCC", 'C', IC2Duplicates.REFINED_IRON.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 4), "GGG", "SDS", "GGG", 'G',
@ -341,32 +343,34 @@ public class ModRecipes {
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("glassfiber", 8), "GGG", "SDS", "GGG", 'G',
"blockGlass", 'S', "ingotElectrum", 'D', "diamondTR");
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedcopper"), "materialRubber",
CraftingHelper.addShapelessOreRecipe(IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), "itemRubber",
ItemStandaloneCables.getCableByName("copper"));
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedgold"), "materialRubber",
"materialRubber", ItemStandaloneCables.getCableByName("gold"));
CraftingHelper.addShapelessOreRecipe(ItemStandaloneCables.getCableByName("insulatedhv"), "materialRubber",
"materialRubber", ItemStandaloneCables.getCableByName("hv"));
CraftingHelper.addShapelessOreRecipe(IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig(), "itemRubber",
"itemRubber", ItemStandaloneCables.getCableByName("gold"));
CraftingHelper.addShapelessOreRecipe(IC2Duplicates.CABLE_IHV.getStackBasedOnConfig(), "itemRubber",
"itemRubber", ItemStandaloneCables.getCableByName("hv"));
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("insulatedcopper", 6), "RRR", "III", "RRR", 'R',
"materialRubber", 'I', "ingotCopper");
"itemRubber", 'I', "ingotCopper");
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("insulatedgold", 4), "RRR", "RIR", "RRR", 'R',
"materialRubber", 'I', "ingotGold");
"itemRubber", 'I', "ingotGold");
CraftingHelper
.addShapedOreRecipe(ItemStandaloneCables.getCableByName("insulatedhv", 4), "RRR", "RIR", "RRR", 'R',
"materialRubber", 'I', "ingotRefinedIron");
.addShapedOreRecipe(IC2Duplicates.CABLE_IHV.getStackBasedOnConfig(), "RRR", "RIR", "RRR", 'R',
"itemRubber", 'I', "ingotRefinedIron");
}
private static void addCompressorRecipes() {
RecipeHandler.addRecipe(new CompressorRecipe(ItemIngots.getIngotByName("advanced_alloy"),
ItemPlates.getPlateByName("advanced_alloy"), 400, 20));
RecipeHandler.addRecipe(
new CompressorRecipe(ItemParts.getPartByName("carbonmesh"), ItemPlates.getPlateByName("carbon"), 400,
new CompressorRecipe(IC2Duplicates.CARBON_MESH.getStackBasedOnConfig(), ItemPlates.getPlateByName("carbon"), 400,
2));
for (String ore : OreUtil.oreNames) {
if (OreUtil.doesOreExistAndValid("plate" + OreUtil.capitalizeFirstLetter(ore)) && OreUtil.doesOreExistAndValid("ingot" + OreUtil.capitalizeFirstLetter(ore))) {
RecipeHandler.addRecipe(
new CompressorRecipe(OreUtil.getStackFromName("ingot" + OreUtil.capitalizeFirstLetter(ore), 9), OreUtil.getStackFromName("plate" + OreUtil.capitalizeFirstLetter(ore), 1), 300,
4));
@ -487,7 +491,7 @@ public class ModRecipes {
.addShapedOreRecipe(DynamicCell.getEmptyCell(16), " T ", "T T", " T ", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFence, 6), " ", "RRR", "RRR", 'R',
ItemIngots.getIngotByName("refined_iron"));
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig());
if (ConfigTechReborn.enableGemArmorAndTools) {
addGemToolRecipes(new ItemStack(ModItems.rubySword), new ItemStack(ModItems.rubyPickaxe),
@ -533,17 +537,20 @@ public class ModRecipes {
"ingotTitanium", 'B', steelJackhammerStack, 'C', "circuitAdvanced",
'D', "diamondTR");
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemDusts.getDustByName("coal"),
ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"));
if(!IC2Duplicates.deduplicate()){
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemDusts.getDustByName("coal"),
ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"));
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemCells.getCellByName("carbon"),
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"),
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"),
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"));
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemCells.getCellByName("carbon"),
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"),
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"),
ItemCells.getCellByName("carbon"), ItemCells.getCellByName("carbon"));
CraftingHelper
.addShapelessOreRecipe(ItemParts.getPartByName("carbonmesh"), ItemParts.getPartByName("carbonfiber"),
ItemParts.getPartByName("carbonfiber"));
}
CraftingHelper
.addShapelessOreRecipe(ItemParts.getPartByName("carbonmesh"), ItemParts.getPartByName("carbonfiber"),
ItemParts.getPartByName("carbonfiber"));
CraftingHelper
.addShapedOreRecipe(ItemParts.getPartByName("computerMonitor"), "ADA", "DGD", "ADA", 'D', dyes, 'A',
@ -554,24 +561,26 @@ public class ModRecipes {
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.windMill, 2), "IXI", "XGX", "IXI", 'I', "ingotIron", 'G',
ModBlocks.generator);
IC2Duplicates.GENERATOR.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.waterMill), "SWS", "WGW", "SWS", 'S', Items.STICK, 'W',
"plankWood", 'G', ModBlocks.generator);
"plankWood", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.HVT), "XHX", "XMX", "XHX", 'M', ModBlocks.MVT, 'H',
ItemStandaloneCables.getCableByName("insulatedhv"));
if (!IC2Duplicates.deduplicate()) {
CraftingHelper.addShapedOreRecipe(IC2Duplicates.HVT.getStackBasedOnConfig(), "XHX", "XMX", "XHX", 'M', IC2Duplicates.MVT.getStackBasedOnConfig(), 'H',
IC2Duplicates.CABLE_IHV.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MVT), "XGX", "XMX", "XGX", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'G',
ItemStandaloneCables.getCableByName("insulatedgold"));
CraftingHelper.addShapedOreRecipe(IC2Duplicates.MVT.getStackBasedOnConfig(), "XGX", "XMX", "XGX", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'G',
IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LVT), "PWP", "CCC", "PPP", 'P', "plankWood", 'C',
"ingotCopper", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"));
CraftingHelper.addShapedOreRecipe(IC2Duplicates.LVT.getStackBasedOnConfig(), "PWP", "CCC", "PPP", 'P', "plankWood", 'C',
"ingotCopper", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig());
}
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 0), "RRR", "CAC", "RRR", 'R',
ItemIngots.getIngotByName("refined_iron"), 'C', "circuitBasic", 'A',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), "RRR", "CAC", "RRR", 'R',
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'C', "circuitBasic", 'A',
BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 1), "RRR", "CAC", "RRR", 'R',
@ -586,173 +595,188 @@ public class ModRecipes {
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator), "III", "IRI", "CGC", 'I', "ingotInvar",
'R', ModBlocks.reinforcedglass, 'G', ModBlocks.generator, 'C',
'R', ModBlocks.reinforcedglass, 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig(), 'C',
"circuitBasic");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.recycler), "XEX", "DCD", "GDG", 'D', Blocks.DIRT, 'C',
ModBlocks.compressor, 'G', Items.GLOWSTONE_DUST, 'E', "circuitBasic");
if (!IC2Duplicates.deduplicate()) {
CraftingHelper.addShapedOreRecipe(IC2Duplicates.RECYCLER.getStackBasedOnConfig(), "XEX", "DCD", "GDG", 'D', Blocks.DIRT, 'C',
IC2Duplicates.COMPRESSOR.getStackBasedOnConfig(), 'G', Items.GLOWSTONE_DUST, 'E', "circuitBasic");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.batBox), "WCW", "BBB", "WWW", 'W', "plankWood", 'B',
batteryStack, 'C', ItemStandaloneCables.getCableByName("insulatedcopper"));
CraftingHelper.addShapedOreRecipe(IC2Duplicates.BAT_BOX.getStackBasedOnConfig(), "WCW", "BBB", "WWW", 'W', "plankWood", 'B',
batteryStack, 'C', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MFE), "GEG", "EME", "GEG", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'E', crystalStack, 'G',
ItemStandaloneCables.getCableByName("insulatedgold"));
CraftingHelper.addShapedOreRecipe(IC2Duplicates.MFE.getStackBasedOnConfig(), "GEG", "EME", "GEG", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'E', crystalStack, 'G',
IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MFSU), "LAL", "LML", "LOL", 'A',
"circuitAdvanced", 'L', lapcrystalStack, 'M', new ItemStack(ModBlocks.MFE),
'O', BlockMachineFrame.getFrameByName("advancedMachine", 1));
CraftingHelper.addShapedOreRecipe(IC2Duplicates.MFSU.getStackBasedOnConfig(), "LAL", "LML", "LOL", 'A',
"circuitAdvanced", 'L', lapcrystalStack, 'M', IC2Duplicates.MFE.getStackBasedOnConfig(),
'O', BlockMachineFrame.getFrameByName("advancedMachine", 1));
}
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialElectrolyzer), "RER", "CEC", "RER", 'R',
ItemIngots.getIngotByName("refined_iron"), 'E', new ItemStack(ModBlocks.extractor), 'C',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialElectrolyzer), "RER", "CEC", "RER", 'R',
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'E', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'C',
"circuitAdvanced");
// Mixed Metal Ingot Recipes :P
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotTin");
if(!IC2Duplicates.deduplicate()){
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 3), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotNickel",
.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 4), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R', "ingotInvar",
'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTitanium", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotTin");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 5), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 9), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 6), "RRR", "BBB", "TTT", 'R',
"ingotTungsten", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 9), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotAluminum");
}
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotTin");
if (!IC2Duplicates.deduplicate()) {
CraftingHelper
.addShapedOreRecipe(IC2Duplicates.COMPRESSOR.getStackBasedOnConfig(), "SXS", "SCS", "SMS", 'C', "circuitBasic", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'S', Blocks.STONE);
}
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotZinc");
if (!IC2Duplicates.deduplicate()) {
CraftingHelper
.addShapedOreRecipe(IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig(), "XCX", "RFR", "XXX", 'C', "circuitBasic",
'F', IC2Duplicates.IRON_FURNACE.getStackBasedOnConfig(), 'R', Items.REDSTONE);
}
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotTin");
if (!IC2Duplicates.deduplicate()) {
CraftingHelper.addShapedOreRecipe(IC2Duplicates.IRON_FURNACE.getStackBasedOnConfig(), "III", "IXI", "III", 'I', "ingotIron");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 8), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotZinc");
CraftingHelper
.addShapedOreRecipe(IC2Duplicates.IRON_FURNACE.getStackBasedOnConfig(), "XIX", "IXI", "IFI", 'I', "ingotIron", 'F',
Blocks.FURNACE);
}
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBronze", 'T', "ingotAluminum");
if(!IC2Duplicates.deduplicate()){
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("electronicCircuit"), "WWW", "SRS", "WWW", 'R',
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'S', Items.REDSTONE, 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig());
}
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixed_metal", 9), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.compressor), "SXS", "SCS", "SMS", 'C', "circuitBasic", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'S', Blocks.STONE);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.electricFurnace), "XCX", "RFR", "XXX", 'C', "circuitBasic",
'F', new ItemStack(ModBlocks.ironFurnace), 'R', Items.REDSTONE);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFurnace), "III", "IXI", "III", 'I', "ingotIron");
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.ironFurnace), "XIX", "IXI", "IFI", 'I', "ingotIron", 'F',
Blocks.FURNACE);
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("electronicCircuit"), "WWW", "SRS", "WWW", 'R',
"ingotRefinedIron", 'S', Items.REDSTONE, 'W', ItemStandaloneCables.getCableByName("insulatedcopper"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.reBattery), "XWX", "TRT", "TRT", 'T', "ingotTin", 'R',
Items.REDSTONE, 'W', ItemStandaloneCables.getCableByName("insulatedcopper"));
Items.REDSTONE, 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.wrench), "BAB", "BBB", "ABA", 'B', "ingotBronze");
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.extractor), "TMT", "TCT", "XXX", 'T', ModItems.treeTap, 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'C',
"circuitBasic");
if (!IC2Duplicates.deduplicate()) {
CraftingHelper
.addShapedOreRecipe(IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), "TMT", "TCT", "XXX", 'T', ModItems.treeTap, 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'C',
"circuitBasic");
}
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron",
'E', new ItemStack(ModBlocks.extractor), 'A', "machineBlockAdvanced", 'C', "circuitBasic");
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "RCR", "AEA", "RCR", 'R', IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(),
'E', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'A', "machineBlockAdvanced", 'C', "circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("advancedCircuit"), "RGR", "LCL", "RGR", 'R',
Items.REDSTONE, 'G', Items.GLOWSTONE_DUST, 'L', "dyeBlue", 'C', "circuitBasic");
@ -765,11 +789,11 @@ public class ModRecipes {
.addShapedOreRecipe(new ItemStack(ModItems.lapotronCrystal), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E',
"energyCrystal", 'C', "circuitBasic");
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModBlocks.generator), batteryStack,
CraftingHelper.addShapelessOreRecipe(IC2Duplicates.GENERATOR.getStackBasedOnConfig(), batteryStack,
BlockMachineFrame.getFrameByName("machine", 1), Blocks.FURNACE);
CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("machine", 1), "AAA", "AXA", "AAA", 'A',
ItemIngots.getIngotByName("refined_iron"));
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(BlockMachineFrame.getFrameByName("advancedMachine", 1), "XCX", "AMA", "XCX", 'A',
@ -880,26 +904,30 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.scrapBox), "SSS", "SSS", "SSS", 'S',
ItemParts.getPartByName("scrap"));
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("overclock"), "TTT", "WCW", 'T',
ItemParts.getPartByName("CoolantSimple"), 'W', ItemStandaloneCables.getCableByName("insulatedcopper"),
'C', "circuitBasic");
if(!IC2Duplicates.deduplicate()){
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock"), "TTT", "WCW", 'T',
ItemParts.getPartByName("CoolantSimple"), 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(),
'C', "circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T',
ItemParts.getPartByName("heliumCoolantSimple"), 'W',
ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
"circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
ItemParts.getPartByName("heliumCoolantSimple"), 'W',
IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
"circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T',
ItemParts.getPartByName("NaKCoolantSimple"), 'W',
ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
"circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
ItemParts.getPartByName("NaKCoolantSimple"), 'W',
IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
"circuitBasic");
}
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G',
"blockGlass", 'W', ItemStandaloneCables.getCableByName("insulatedgold"), 'C',
"circuitBasic", 'T', ModBlocks.MVT);
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P',
"plankWood", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Transformer"), "GGG", "WTW", "GCG", 'G',
"blockGlass", 'W', IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig(), 'C',
"circuitBasic", 'T', IC2Duplicates.MVT.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("EnergyStorage"), "PPP", "WBW", "PCP", 'P',
"plankWood", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
"circuitBasic", 'B', ModItems.reBattery);
CraftingHelper
@ -925,11 +953,11 @@ public class ModRecipes {
ItemCells.getCellByName("potassium"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.advancedDrill), "ODO", "AOA", 'O',
ItemUpgrades.getUpgradeByName("overclock"), 'D', diamondDrillStack, 'A', "circuitAdvanced");
IC2Duplicates.UPGRADE_OVERCLOCKER.getStackBasedOnConfig(), 'D', diamondDrillStack, 'A', "circuitAdvanced");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.advancedChainsaw), "ODO", "AOA", 'O',
ItemUpgrades.getUpgradeByName("overclock"), 'D', diamondChainsawStack, 'A', "circuitAdvanced");
IC2Duplicates.UPGRADE_OVERCLOCKER.getStackBasedOnConfig(), 'D', diamondChainsawStack, 'A', "circuitAdvanced");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.advancedJackhammer), "ODO", "AOA", 'O',
ItemUpgrades.getUpgradeByName("overclock"), 'D', diamondJackhammerStack, 'A', "circuitAdvanced");
IC2Duplicates.UPGRADE_OVERCLOCKER.getStackBasedOnConfig(), 'D', diamondJackhammerStack, 'A', "circuitAdvanced");
CraftingHelper
.addShapedOreRecipe(ItemParts.getPartByName("dataControlCircuit"), "ADA", "DID", "ADA", 'I', "ingotIridium",
@ -982,7 +1010,7 @@ public class ModRecipes {
CraftingHelper.addShapelessRecipe(new ItemStack(ModBlocks.rubberPlanks, 4), ModBlocks.rubberLog);
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.frequencyTransmitter),
ItemStandaloneCables.getCableByName("insulatedcopper"), "circuitBasic");
IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), "circuitBasic");
for (String name : ItemDustsSmall.types) {
if (name.equals(ModItems.META_PLACEHOLDER)) {
@ -1027,8 +1055,8 @@ public class ModRecipes {
.addShapedOreRecipe(new ItemStack(ModBlocks.digitalChest), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D',
ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloySmelter), "XCX", "FMF", "XXX", 'C',
"circuitBasic", 'F', new ItemStack(ModBlocks.electricFurnace), 'M',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloySmelter), "XCX", "FMF", "XXX", 'C',
"circuitBasic", 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig(), 'M',
BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper
@ -1078,14 +1106,16 @@ public class ModRecipes {
CraftingHelper.addSmelting(ItemDusts.getDustByName("iron", 1), new ItemStack(Items.IRON_INGOT), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.GOLD_INGOT), 1F);
CraftingHelper.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F);
CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refined_iron"), 1F);
if(!IC2Duplicates.deduplicate()){
CraftingHelper.addSmelting(new ItemStack(Items.IRON_INGOT), ItemIngots.getIngotByName("refinediron"), 1F);
}
CraftingHelper.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F);
CraftingHelper.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Silver"), ItemIngots.getIngotByName("silver"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Lead"), ItemIngots.getIngotByName("lead"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Sheldonite"), ItemIngots.getIngotByName("platinum"), 1F);
CraftingHelper
.addSmelting(ItemIngots.getIngotByName("mixed_metal"), ItemIngots.getIngotByName("advanced_alloy"), 1F);
.addSmelting(IC2Duplicates.MIXED_METAL.getStackBasedOnConfig(), ItemIngots.getIngotByName("advancedAlloy"), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("nickel", 1), ItemIngots.getIngotByName("nickel"), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("platinum", 1), ItemIngots.getIngotByName("platinum"), 1F);
CraftingHelper.addSmelting(ItemDusts.getDustByName("zinc", 1), ItemIngots.getIngotByName("zinc"), 1F);
@ -1178,7 +1208,6 @@ public class ModRecipes {
if (OreUtil.doesOreExistAndValid("ingotPurpleAlloy") && OreUtil.doesOreExistAndValid("dustInfusedTeslatite")) {
ItemStack purpleAlloyStack = OreDictionary.getOres("ingotPurpleAlloy").get(0);
purpleAlloyStack.setCount(1);
purpleAlloyStack.setCount(1);
ItemStack infusedTeslatiteStack = OreDictionary.getOres("ingotPurpleAlloy").get(0);
infusedTeslatiteStack.setCount(8);
RecipeHandler.addRecipe(new AlloySmelterRecipe(ItemIngots.getIngotByName("redAlloy", 1),
@ -1999,7 +2028,7 @@ public class ModRecipes {
}
static void addIc2Recipes() {
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manual), ItemIngots.getIngotByName("refined_iron"),
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manual), IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(),
Items.BOOK);
CraftingHelper
@ -2018,7 +2047,7 @@ public class ModRecipes {
"lapotronCrystal", 'P', "plateIridium");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialSawmill), "PAP", "SSS", "ACA", 'P',
ItemIngots.getIngotByName("refined_iron"), 'A', "circuitAdvanced",
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'A', "circuitAdvanced",
'S', ItemParts.getPartByName("diamondSawBlade"), 'C',
"machineBlockAdvanced");
@ -2027,12 +2056,12 @@ public class ModRecipes {
ModItems.lapotronicOrb, 'A', "machineBlockAdvanced");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.matterFabricator), "ETE", "AOA", "ETE", 'E',
"circuitMaster", 'T', ModBlocks.extractor, 'A',
"circuitMaster", 'T', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'A',
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'O', ModItems.lapotronicOrb);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.heatGenerator), "III", "IHI", "CGC", 'I', "plateIron", 'H',
new ItemStack(Blocks.IRON_BARS), 'C', "circuitBasic", 'G', ModBlocks.generator);
new ItemStack(Blocks.IRON_BARS), 'C', "circuitBasic", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.gasTurbine), "IAI", "WGW", "IAI", 'I', "ingotInvar", 'A',
@ -2049,19 +2078,19 @@ public class ModRecipes {
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.semiFluidGenerator), "III", "IHI", "CGC", 'I', "plateIron",
'H', ModBlocks.reinforcedglass, 'C', "circuitBasic", 'G',
ModBlocks.generator);
IC2Duplicates.GENERATOR.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.semiFluidGenerator), "AAA", "AHA", "CGC", 'A',
"plateAluminum", 'H', ModBlocks.reinforcedglass, 'C', "circuitBasic", 'G',
ModBlocks.generator);
IC2Duplicates.GENERATOR.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.dieselGenerator), "III", "I I", "CGC", 'I', "refinedIron",
'C', "circuitBasic", 'G', ModBlocks.generator);
.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "III", "I I", "CGC", 'I', IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(),
'C', "circuitBasic", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.dieselGenerator), "AAA", "A A", "CGC", 'A', "ingotAluminum",
'C', "circuitBasic", 'G', ModBlocks.generator);
.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "AAA", "A A", "CGC", 'A', "ingotAluminum",
'C', "circuitBasic", 'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig());
// CraftingHelper.addShapedOreRecipe(new
// ItemStack(ModBlocks.magicalAbsorber),
@ -2088,42 +2117,44 @@ public class ModRecipes {
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "SCS", "BEB", "SCS", 'S', "plateSteel", 'C',
"circuitAdvanced", 'B', "machineBlockAdvanced", 'E',
getOre("ic2Extractor"));
IC2Duplicates.EXTRACTOR.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.blastFurnace), "CHC", "HBH", "FHF", 'H',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.BlastFurnace), "CHC", "HBH", "FHF", 'H',
ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', ModBlocks.electricFurnace);
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialGrinder), "ECP", "GGG", "CBC", 'E',
ModBlocks.industrialElectrolyzer, 'P', ModBlocks.extractor, 'C',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialGrinder), "ECP", "GGG", "CBC", 'E',
ModBlocks.IndustrialElectrolyzer, 'P', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'C',
"circuitAdvanced", 'B', "machineBlockAdvanced",
'G', ModBlocks.grinder);
'G', IC2Duplicates.GRINDER.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.implosionCompressor), "ABA", "CPC", "ABA", 'A',
ItemIngots.getIngotByName("advanced_alloy"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', ModBlocks.compressor);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ImplosionCompressor), "ABA", "CPC", "ABA", 'A',
ItemIngots.getIngotByName("advancedAlloy"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.vacuumFreezer), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C',
"circuitAdvanced", 'G', ModBlocks.reinforcedglass, 'P',
ModBlocks.extractor);
IC2Duplicates.EXTRACTOR.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.distillationTower), "CMC", "PBP", "EME", 'E',
ModBlocks.industrialElectrolyzer, 'M', "circuitMaster", 'B',
"machineBlockAdvanced", 'C', ModBlocks.centrifuge, 'P',
ModBlocks.extractor);
IC2Duplicates.EXTRACTOR.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloyFurnace), "III", "F F", "III", 'I',
ItemIngots.getIngotByName("refined_iron"), 'F', new ItemStack(ModBlocks.ironFurnace));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloyFurnace), "III", "F F", "III", 'I',
IC2Duplicates.REFINED_IRON.getStackBasedOnConfig(), 'F', IC2Duplicates.IRON_FURNACE.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.chemicalReactor), "IMI", "CPC", "IEI", 'I', "ingotInvar",
'C', "circuitAdvanced", 'M', ModBlocks.extractor, 'P',
ModBlocks.compressor, 'E', ModBlocks.extractor);
.addShapedOreRecipe(new ItemStack(ModBlocks.ChemicalReactor), "IMI", "CPC", "IEI", 'I', "ingotInvar",
'C', "circuitAdvanced", 'M', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'P',
IC2Duplicates.COMPRESSOR.getStackBasedOnConfig(), 'E', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.rollingMachine), "PCP", "MBM", "PCP", 'P', Blocks.PISTON,
'C', "circuitAdvanced", 'M', ModBlocks.compressor, 'B',
.addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), "PCP", "MBM", "PCP", 'P', Blocks.PISTON,
'C', "circuitAdvanced", 'M', IC2Duplicates.COMPRESSOR.getStackBasedOnConfig(), 'B',
BlockMachineFrame.getFrameByName("machine", 1));
// CraftingHelper.addShapedOreRecipe(new
@ -2149,8 +2180,8 @@ public class ModRecipes {
// 'C', "circuitMaster",
// 'M', new ItemStack(ModItems.parts, 1, 39));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LESU), " L ", "CBC", " M ", 'L', ModBlocks.LVT, 'C',
"circuitAdvanced", 'M', ModBlocks.MVT, 'B', ModBlocks.LESUStorage);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Lesu), " L ", "CBC", " M ", 'L', IC2Duplicates.LVT.getStackBasedOnConfig(), 'C',
"circuitAdvanced", 'M', IC2Duplicates.MVT.getStackBasedOnConfig(), 'B', ModBlocks.LesuStorage);
CraftingHelper
.addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC",
@ -2171,9 +2202,14 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.quantumChest), "DCD", "ATA", "DQD", 'D',
ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"), 'A',
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.digitalChest, 'T',
ModBlocks.compressor);
IC2Duplicates.COMPRESSOR.getStackBasedOnConfig());
}
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.PlasmaGenerator), "PPP", "PTP", "CGC", 'P',
ItemPlates.getPlateByName("tungstensteel"), 'T', IC2Duplicates.HVT.getStackBasedOnConfig(),
'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig(), 'C',
"circuitMaster");
// Smetling
CraftingHelper
.addSmelting(ItemDusts.getDustByName("copper", 1), getOre("ingotCopper"),
@ -2911,21 +2947,7 @@ public class ModRecipes {
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(
new ItemStack(ModBlocks.ore, 1, 1),
new FluidStack(FluidRegistry.WATER, 1000),
OreDictionary.getOres("oreIridium").get(0),
ItemDustsSmall.getSmallDustByName("Platinum", 2),
null, null, 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(
new ItemStack(ModBlocks.ore, 1, 1),
new FluidStack(ModFluids.fluidMercury, 1000),
OreDictionary.getOres("oreIridium").get(0),
ItemDustsSmall.getSmallDustByName("Platinum", 2),
null, null, 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(
new ItemStack(ModBlocks.ore, 1, 1),
new FluidStack(ModFluids.fluidMercury, 1000),
OreDictionary.getOres("oreIridium").get(0),
OreDictionary.getOres("ingotIridium").get(0),
ItemDustsSmall.getSmallDustByName("Platinum", 2),
null, null, 100, 120));
@ -3169,7 +3191,7 @@ public class ModRecipes {
Item drill = OreDictionary.getOres("drillBasic").get(0).getItem();
ItemStack drillStack = new ItemStack(drill, 1, OreDictionary.WILDCARD_VALUE);
if (ConfigTechReborn.ExpensiveMacerator)
if (ConfigTechReborn.ExpensiveMacerator && !IC2Duplicates.deduplicate())
CraftingHelper
.addShapedOreRecipe(getOre("ic2Macerator"), "FDF", "DMD", "FCF", 'F',
Items.FLINT, 'D', Items.DIAMOND, 'M', "machineBlockBasic", 'C',
@ -3187,12 +3209,12 @@ public class ModRecipes {
"diamondTR", 'T', "ingotTitanium", 'B', drillStack, 'C',
"circuitAdvanced");
if (ConfigTechReborn.ExpensiveSolar)
if (ConfigTechReborn.ExpensiveSolar && !IC2Duplicates.deduplicate())
CraftingHelper
.addShapedOreRecipe(OreDictionary.getOres("ic2SolarPanel").get(0).copy(), "PPP", "SZS", "CGC", 'P',
"paneGlass", 'S', ItemPlates.getPlateByName("carbon"), 'Z',
.addShapedOreRecipe(IC2Duplicates.SOLAR_PANEL.getStackBasedOnConfig(), "PPP", "SZS", "CGC", 'P',
"paneGlass", 'S', ItemPlates.getPlateByName("silicon"), 'Z',
"plateCarbon", 'G',
"ic2Generator", 'C',
IC2Duplicates.GENERATOR.getStackBasedOnConfig(), 'C',
"circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("iridium_alloy"), "IAI", "ADA", "IAI", 'I',
@ -3207,7 +3229,7 @@ public class ModRecipes {
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.lithiumBattery, 1, OreDictionary.WILDCARD_VALUE), " C ",
"PFP", "PFP", 'F', ItemCells.getCellByName("lithium"), 'P', "plateAluminum", 'C',
"insulatedGoldCableItem");
IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig());
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModItems.lapotronpack, 1, OreDictionary.WILDCARD_VALUE), "FOF", "SPS",

View file

@ -75,6 +75,7 @@ public class OreDict {
OreDictionary.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
OreDictionary.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
OreDictionary.registerOre("itemRubber", ItemParts.getPartByName("rubber"));
OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("saw_dust"));
for (String type : ItemGems.types) {

View file

@ -1,5 +1,6 @@
package techreborn.parts.powerCables;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import reborncore.api.power.EnumPowerTier;
@ -38,4 +39,8 @@ public enum EnumStandaloneCableType implements IStringSerializable {
public String getName() {
return friendlyName.toLowerCase();
}
public ItemStack getStack(){
return ItemStandaloneCables.getCableByName(getName());
}
}

View file

@ -40,7 +40,7 @@ public class TechRebornWorldGen implements IWorldGenerator {
public File configFile;
public File hConfigFile;
public boolean jsonInvalid = false;
WorldGenConfig config;
public WorldGenConfig config;
WorldGenConfig defaultConfig;
private void init() {