Remove last duplicated items.

This commit is contained in:
modmuss50 2016-12-21 17:44:44 +00:00
parent 5ff09a7eda
commit 936ee13686
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
4 changed files with 21 additions and 11 deletions

View file

@ -137,6 +137,8 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
} }
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("rubber")); jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("rubber"));
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("rubberSap")); jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("rubberSap"));
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("electronicCircuit"));
jeiHelpers.getItemBlacklist().addItemToBlacklist(ItemParts.getPartByName("advancedCircuit"));
if(!Core.worldGen.config.rubberTreeConfig.shouldSpawn){ if(!Core.worldGen.config.rubberTreeConfig.shouldSpawn){
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberSapling)); jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberSapling));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberLog)); jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.rubberLog));

View file

@ -49,9 +49,12 @@ public class IC2Dict {
IC2Duplicates.UPGRADE_STORAGE.setIc2Stack(ItemName.upgrade.getItemStack("energy_storage")); IC2Duplicates.UPGRADE_STORAGE.setIc2Stack(ItemName.upgrade.getItemStack("energy_storage"));
IC2Duplicates.UPGRADE_TRANSFORMER.setIc2Stack(ItemName.upgrade.getItemStack("transformer")); IC2Duplicates.UPGRADE_TRANSFORMER.setIc2Stack(ItemName.upgrade.getItemStack("transformer"));
IC2Duplicates.MIXED_METAL.setIc2Stack(ItemName.ingot.getItemStack("alloy")); 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"));
//Rubber - ore dic: itemRubber, hidden from JEI //Rubber - ore dic: itemRubber, hidden from JEI
//Rubber Sap - only used to make rubber, 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 //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 { try {
CraftingItemType.circuit.getName(); CraftingItemType.circuit.getName();

View file

@ -39,7 +39,9 @@ public enum IC2Duplicates {
UPGRADE_OVERCLOCKER(ItemUpgrades.getUpgradeByName("Overclock")), UPGRADE_OVERCLOCKER(ItemUpgrades.getUpgradeByName("Overclock")),
UPGRADE_TRANSFORMER(ItemUpgrades.getUpgradeByName("Transformer")), UPGRADE_TRANSFORMER(ItemUpgrades.getUpgradeByName("Transformer")),
UPGRADE_STORAGE(ItemUpgrades.getUpgradeByName("EnergyStorage")), UPGRADE_STORAGE(ItemUpgrades.getUpgradeByName("EnergyStorage")),
MIXED_METAL(ItemIngots.getIngotByName("mixedMetal")); MIXED_METAL(ItemIngots.getIngotByName("mixedMetal")),
CARBON_FIBER(ItemParts.getPartByName("carbonfiber")),
CARBON_MESH(ItemParts.getPartByName("carbonmesh"));
ItemStack ic2Stack; ItemStack ic2Stack;
ItemStack trStack; ItemStack trStack;

View file

@ -361,7 +361,7 @@ public class ModRecipes {
RecipeHandler.addRecipe(new CompressorRecipe(ItemIngots.getIngotByName("advancedAlloy"), RecipeHandler.addRecipe(new CompressorRecipe(ItemIngots.getIngotByName("advancedAlloy"),
ItemPlates.getPlateByName("advancedAlloy"), 400, 20)); ItemPlates.getPlateByName("advancedAlloy"), 400, 20));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new CompressorRecipe(ItemParts.getPartByName("carbonmesh"), ItemPlates.getPlateByName("carbon"), 400, new CompressorRecipe(IC2Duplicates.CARBON_MESH.getStackBasedOnConfig(), ItemPlates.getPlateByName("carbon"), 400,
2)); 2));
for (String ore : OreUtil.oreNames) { for (String ore : OreUtil.oreNames) {
@ -532,17 +532,20 @@ public class ModRecipes {
"ingotTitanium", 'B', steelJackhammerStack, 'C', "circuitAdvanced", "ingotTitanium", 'B', steelJackhammerStack, 'C', "circuitAdvanced",
'D', "diamondTR"); 'D', "diamondTR");
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemDusts.getDustByName("coal"), if(!IC2Duplicates.deduplicate()){
ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal")); 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"), 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"), 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 CraftingHelper
.addShapedOreRecipe(ItemParts.getPartByName("computerMonitor"), "ADA", "DGD", "ADA", 'D', dyes, 'A', .addShapedOreRecipe(ItemParts.getPartByName("computerMonitor"), "ADA", "DGD", "ADA", 'D', dyes, 'A',