Some more work on deduplicating ic2 items/blocks

This commit is contained in:
modmuss50 2016-12-21 17:31:52 +00:00
parent bfcc3a2117
commit 5ff09a7eda
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
8 changed files with 321 additions and 204 deletions

View file

@ -12,6 +12,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;
@ -87,6 +88,10 @@ public class TechRebornDevCommand extends CommandBase {
e.printStackTrace();
sender.addChatMessage(new TextComponentString(e.getLocalizedMessage()));
}
} else if ("ores".equals(args[0])) {
for(String ore: OreDictionary.getOreNames()){
System.out.println(ore);
}
}
}
}

View file

@ -54,6 +54,10 @@ 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;
@ -122,9 +126,26 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
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"));
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),

View file

@ -3,6 +3,8 @@ 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;
@ -19,6 +21,38 @@ import techreborn.Core;
public class IC2Dict {
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"));
//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
try {
CraftingItemType.circuit.getName();
@ -80,4 +114,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

@ -1,28 +1,53 @@
package techreborn.init;
import ic2.core.ref.BlockName;
import ic2.core.ref.TeBlock;
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(BlockName.te.getItemStack(TeBlock.macerator.getName()), new ItemStack(ModBlocks.Grinder)),
ELECTRICAL_FURNACE(BlockName.te.getItemStack(TeBlock.electric_furnace.getName()), new ItemStack(ModBlocks.ElectricFurnace)),
IRON_FURNACE(BlockName.te.getItemStack(TeBlock.iron_furnace.getName()), new ItemStack(ModBlocks.ironFurnace)),
GENERATOR(BlockName.te.getItemStack(TeBlock.generator.getName()), new ItemStack(ModBlocks.Generator)),
EXTRACTOR(BlockName.te.getItemStack(TeBlock.extractor.getName()), new ItemStack(ModBlocks.Extractor)),
SOLAR_PANEL(BlockName.te.getItemStack(TeBlock.solar_generator.getName()), new ItemStack(ModBlocks.solarPanel)),
RECYCLER(BlockName.te.getItemStack(TeBlock.recycler.getName()), new ItemStack(ModBlocks.recycler)),
COMPRESSOR(BlockName.te.getItemStack(TeBlock.compressor.getName()), new ItemStack(ModBlocks.Compressor));
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"));
ItemStack ic2Stack;
ItemStack trStack;
IC2Duplicates(ItemStack trStack) {
this.trStack = trStack;
}
IC2Duplicates(ItemStack ic2Stack, ItemStack trStack) {
this.ic2Stack = ic2Stack;
this.trStack = trStack;
@ -32,9 +57,20 @@ public enum IC2Duplicates {
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;
}

View file

@ -97,7 +97,9 @@ public class ModRecipes {
addIc2ReplacementReicpes();
addExtractorRecipes();
addCompressorRecipes();
if (!IC2Duplicates.deduplicate()) {
addWireRecipes();
}
addScrapBoxloot();
}
@ -337,22 +339,22 @@ 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() {
@ -557,15 +559,17 @@ public class ModRecipes {
.addShapedOreRecipe(new ItemStack(ModBlocks.waterMill), "SWS", "WGW", "SWS", 'S', Items.STICK, 'W',
"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',
CraftingHelper.addShapedOreRecipe(IC2Duplicates.MVT.getStackBasedOnConfig(), "XGX", "XMX", "XGX", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'G',
ItemStandaloneCables.getCableByName("insulatedgold"));
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("refinedIron"), 'C', "circuitBasic", 'A',
@ -589,19 +593,18 @@ public class ModRecipes {
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(IC2Duplicates.BAT_BOX.getStackBasedOnConfig(), "WCW", "BBB", "WWW", 'W', "plankWood", 'B',
batteryStack, 'C', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.batBox), "WCW", "BBB", "WWW", 'W', "plankWood", 'B',
batteryStack, 'C', ItemStandaloneCables.getCableByName("insulatedcopper"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.mfe), "GEG", "EME", "GEG", 'M',
CraftingHelper.addShapedOreRecipe(IC2Duplicates.MFE.getStackBasedOnConfig(), "GEG", "EME", "GEG", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'E', crystalStack, 'G',
ItemStandaloneCables.getCableByName("insulatedgold"));
IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.mfsu), "LAL", "LML", "LOL", 'A',
"circuitAdvanced", 'L', lapcrystalStack, 'M', new ItemStack(ModBlocks.mfe),
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("refinediron"), 'E', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'C',
@ -609,6 +612,7 @@ public class ModRecipes {
// Mixed Metal Ingot Recipes :P
if(!IC2Duplicates.deduplicate()){
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 2), "RRR", "BBB", "TTT", 'R',
"ingotRefinedIron", 'B', "ingotBronze", 'T', "ingotTin");
@ -722,6 +726,7 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(ItemIngots.getIngotByName("mixedmetal", 9), "RRR", "BBB", "TTT", 'R',
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotAluminum");
}
if (!IC2Duplicates.deduplicate()) {
CraftingHelper
@ -729,14 +734,12 @@ public class ModRecipes {
BlockMachineFrame.getFrameByName("machine", 1), 'S', Blocks.STONE);
}
if (!IC2Duplicates.deduplicate()) {
CraftingHelper
.addShapedOreRecipe(IC2Duplicates.ELECTRICAL_FURNACE.getStackBasedOnConfig(), "XCX", "RFR", "XXX", 'C', "circuitBasic",
'F', IC2Duplicates.IRON_FURNACE.getStackBasedOnConfig(), 'R', Items.REDSTONE);
}
if (!IC2Duplicates.deduplicate()) {
CraftingHelper.addShapedOreRecipe(IC2Duplicates.IRON_FURNACE.getStackBasedOnConfig(), "III", "IXI", "III", 'I', "ingotIron");
@ -745,12 +748,11 @@ public class ModRecipes {
Blocks.FURNACE);
}
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("electronicCircuit"), "WWW", "SRS", "WWW", 'R',
"ingotRefinedIron", 'S', Items.REDSTONE, 'W', ItemStandaloneCables.getCableByName("insulatedcopper"));
"ingotRefinedIron", 'S', Items.REDSTONE, 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig());
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");
@ -761,7 +763,6 @@ public class ModRecipes {
"circuitBasic");
}
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron",
'E', IC2Duplicates.EXTRACTOR.getStackBasedOnConfig(), 'A', "machineBlockAdvanced", 'C', "circuitBasic");
@ -897,26 +898,30 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.scrapBox), "SSS", "SSS", "SSS", 'S',
ItemParts.getPartByName("scrap"));
if(!IC2Duplicates.deduplicate()){
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock"), "TTT", "WCW", 'T',
ItemParts.getPartByName("CoolantSimple"), 'W', ItemStandaloneCables.getCableByName("insulatedcopper"),
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',
IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
"circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Overclock", 2), " T ", "WCW", 'T',
ItemParts.getPartByName("NaKCoolantSimple"), 'W',
ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
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);
"blockGlass", 'W', IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig(), 'C',
"circuitBasic", 'T', IC2Duplicates.MVT.getStackBasedOnConfig());
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("EnergyStorage"), "PPP", "WBW", "PCP", 'P',
"plankWood", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
"plankWood", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
"circuitBasic", 'B', ModItems.reBattery);
CraftingHelper
@ -942,11 +947,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",
@ -999,7 +1004,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)) {
@ -1088,7 +1093,7 @@ public class ModRecipes {
CraftingHelper.addSmelting(BlockOre.getOreByName("Lead"), ItemIngots.getIngotByName("lead"), 1F);
CraftingHelper.addSmelting(BlockOre.getOreByName("Sheldonite"), ItemIngots.getIngotByName("platinum"), 1F);
CraftingHelper
.addSmelting(ItemIngots.getIngotByName("mixedMetal"), ItemIngots.getIngotByName("advancedAlloy"), 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);
@ -2156,8 +2161,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",
@ -2182,7 +2187,7 @@ public class ModRecipes {
}
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.PlasmaGenerator), "PPP", "PTP", "CGC", 'P',
ItemPlates.getPlateByName("tungstensteel"), 'T', getOre("hvTransformer"),
ItemPlates.getPlateByName("tungstensteel"), 'T', IC2Duplicates.HVT.getStackBasedOnConfig(),
'G', IC2Duplicates.GENERATOR.getStackBasedOnConfig(), 'C',
"circuitMaster");
@ -2931,7 +2936,6 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Platinum", 2),
null, null, 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(
new ItemStack(ModBlocks.ore, 1, 2),
new FluidStack(FluidRegistry.WATER, 1000),
@ -3210,7 +3214,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("sawDust"));
//Gems registration

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() {