Remove last duplicated items.
This commit is contained in:
parent
5ff09a7eda
commit
936ee13686
4 changed files with 21 additions and 11 deletions
|
@ -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));
|
||||||
|
|
|
@ -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();
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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,6 +532,7 @@ public class ModRecipes {
|
||||||
"ingotTitanium", 'B', steelJackhammerStack, 'C', "circuitAdvanced",
|
"ingotTitanium", 'B', steelJackhammerStack, 'C', "circuitAdvanced",
|
||||||
'D', "diamondTR");
|
'D', "diamondTR");
|
||||||
|
|
||||||
|
if(!IC2Duplicates.deduplicate()){
|
||||||
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemDusts.getDustByName("coal"),
|
CraftingHelper.addShapelessOreRecipe(ItemParts.getPartByName("carbonfiber"), ItemDusts.getDustByName("coal"),
|
||||||
ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"));
|
ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"), ItemDusts.getDustByName("coal"));
|
||||||
|
|
||||||
|
@ -543,6 +544,8 @@ public class ModRecipes {
|
||||||
CraftingHelper
|
CraftingHelper
|
||||||
.addShapelessOreRecipe(ItemParts.getPartByName("carbonmesh"), ItemParts.getPartByName("carbonfiber"),
|
.addShapelessOreRecipe(ItemParts.getPartByName("carbonmesh"), ItemParts.getPartByName("carbonfiber"),
|
||||||
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',
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue