diff --git a/src/main/java/pl/pabilo8/immersiveintelligence/common/crafting/IIRecipes.java b/src/main/java/pl/pabilo8/immersiveintelligence/common/crafting/IIRecipes.java index b9e229696..f115b746b 100644 --- a/src/main/java/pl/pabilo8/immersiveintelligence/common/crafting/IIRecipes.java +++ b/src/main/java/pl/pabilo8/immersiveintelligence/common/crafting/IIRecipes.java @@ -3,12 +3,12 @@ import blusunrize.immersiveengineering.api.ApiUtils; import blusunrize.immersiveengineering.api.IEApi; import blusunrize.immersiveengineering.api.crafting.*; +import blusunrize.immersiveengineering.api.energy.wires.WireType; import blusunrize.immersiveengineering.common.Config.IEConfig.Machines; import blusunrize.immersiveengineering.common.IEContent; -import blusunrize.immersiveengineering.common.blocks.metal.BlockTypes_MetalDecoration0; -import blusunrize.immersiveengineering.common.blocks.metal.BlockTypes_MetalDecoration2; -import blusunrize.immersiveengineering.common.blocks.metal.BlockTypes_MetalDevice0; -import blusunrize.immersiveengineering.common.blocks.metal.BlockTypes_MetalDevice1; +import blusunrize.immersiveengineering.common.blocks.BlockTypes_MetalsAll; +import blusunrize.immersiveengineering.common.blocks.BlockTypes_MetalsIE; +import blusunrize.immersiveengineering.common.blocks.metal.*; import blusunrize.immersiveengineering.common.blocks.stone.BlockTypes_StoneDecoration; import blusunrize.immersiveengineering.common.blocks.wooden.BlockTypes_WoodenDevice0; import blusunrize.immersiveengineering.common.crafting.RecipeRGBColouration; @@ -55,6 +55,9 @@ import pl.pabilo8.immersiveintelligence.common.IIConfigHandler.IIConfig.Overrides; import pl.pabilo8.immersiveintelligence.common.IIConfigHandler.IIConfig.Overrides.Railgun; import pl.pabilo8.immersiveintelligence.common.IIContent; +import pl.pabilo8.immersiveintelligence.common.block.data_device.BlockIIDataDevice; +import pl.pabilo8.immersiveintelligence.common.block.data_device.BlockIIDataDevice.IIBlockTypes_Connector; +import pl.pabilo8.immersiveintelligence.common.block.metal_device.BlockIIMetalDecoration.IIBlockTypes_MetalDecoration; import pl.pabilo8.immersiveintelligence.common.block.metal_device.BlockIIMetalDevice.IIBlockTypes_MetalDevice; import pl.pabilo8.immersiveintelligence.common.block.mines.BlockIIMine.IIBlockTypes_Mine; import pl.pabilo8.immersiveintelligence.common.block.simple.BlockIIConcreteDecoration.ConcreteDecorations; @@ -1192,7 +1195,8 @@ public static void addUpgradeRecipes() .withRequiredProgress(32000); //Printing Press - IIContent.UPGRADE_PRESS_PUNCHTAPES.withRequiredProgress(32000); + IIContent.UPGRADE_PRESS_PUNCHTAPES + .withRequiredProgress(32000); IIContent.UPGRADE_PRESS_BATCHING.withRequiredProgress(32000); IIContent.UPGRADE_PRESS_ENVELOPER.withRequiredProgress(32000); @@ -1225,8 +1229,9 @@ public static void addUpgradeRecipes() //Gates IIContent.UPGRADE_REDSTONE_ACTIVATION - .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration0, 4, BlockTypes_MetalDecoration0.LIGHT_ENGINEERING.getMeta()))) - .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration0, 2, BlockTypes_MetalDecoration0.RS_ENGINEERING.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration0, 2, BlockTypes_MetalDecoration0.LIGHT_ENGINEERING.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration0, 1, BlockTypes_MetalDecoration0.RS_ENGINEERING.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.itemWireCoil, 1, WireType.REDSTONE.getWireCoil().getMetadata()))) .withRequiredProgress(20000); IIContent.UPGRADE_RAZOR_WIRE .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration2, 6, BlockTypes_MetalDecoration2.RAZOR_WIRE.getMeta()))) @@ -1237,24 +1242,24 @@ public static void addUpgradeRecipes() .withCost(new IngredientStack(new ItemStack(IIContent.blockSandbags, 4))) //Sandbags .withCost(new IngredientStack(new ItemStack(IIContent.itemMachinegun, 2))) .withCost(new IngredientStack(new ItemStack(IIContent.blockMetalDevice, 2, IIBlockTypes_MetalDevice.AMMUNITION_CRATE.getMeta()))) - .withCost(new IngredientStack("circuitBasic", 4)) + .withCost(new IngredientStack("opticsBasic", 2)) .withRequiredProgress(40000); IIContent.UPGRADE_EMPLACEMENT_WEAPON_IROBSERVER - .withCost(new IngredientStack("blockGlassRed", 1)) - .withCost(new IngredientStack("blockGlass", 1)) + .withCost(new IngredientStack("lensInfrared", 1)) + .withCost(new IngredientStack("lens", 1)) .withCost(new IngredientStack("blockSteel", 2)) .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration0, 2, BlockTypes_MetalDecoration0.LIGHT_ENGINEERING.getMeta()))) - .withCost(new IngredientStack("circuitBasic", 6)) + .withCost(new IngredientStack("opticsBasic", 2)) .withRequiredProgress(40000); //Weapons - Advanced Tier IIContent.UPGRADE_EMPLACEMENT_WEAPON_AUTOCANNON .withCost(new IngredientStack(new ItemStack(IEContent.itemMaterial, 4, 14))) .withCost(new IngredientStack("blockSteel", 2)) - .withCost(new IngredientStack(new ItemStack(IEContent.itemMaterial, 3, 9))) + .withCost(new IngredientStack("gunpartAdvanced", 2)) .withCost(new IngredientStack(new ItemStack(IIContent.blockMetalDevice, 1, IIBlockTypes_MetalDevice.AMMUNITION_CRATE.getMeta()))) - .withCost(new IngredientStack("circuitAdvanced", 6)) + .withCost(new IngredientStack("opticsAdvanced", 6)) .withRequiredProgress(80000); IIContent.UPGRADE_EMPLACEMENT_WEAPON_HEAVY_CHEMTHROWER @@ -1262,7 +1267,7 @@ public static void addUpgradeRecipes() .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDevice1, 4, BlockTypes_MetalDevice1.FLUID_PIPE.getMeta()))) .withCost(new IngredientStack(new ItemStack(IEContent.itemMaterial, 2, 14))) .withCost(new IngredientStack("blockSteel", 1)) - .withCost(new IngredientStack("circuitAdvanced", 6)) + .withCost(new IngredientStack("opticsAdvanced", 6)) .withRequiredProgress(80000); IIContent.UPGRADE_EMPLACEMENT_WEAPON_HEAVY_RAILGUN @@ -1271,41 +1276,72 @@ public static void addUpgradeRecipes() .withCost(new IngredientStack("blockSteel", 1)) .withCost(new IngredientStack(new ItemStack(IEContent.itemMaterial, 2, 9))) .withCost(new IngredientStack(new ItemStack(IIContent.blockMetalDevice, 1, IIBlockTypes_MetalDevice.AMMUNITION_CRATE.getMeta()))) - .withCost(new IngredientStack("circuitAdvanced", 6)) + .withCost(new IngredientStack("opticsAdvanced", 1)) .withRequiredProgress(80000); IIContent.UPGRADE_EMPLACEMENT_WEAPON_TESLA .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDevice0, 8, BlockTypes_MetalDevice0.CAPACITOR_HV.getMeta()))) .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration0, 8, BlockTypes_MetalDecoration0.COIL_HV.getMeta()))) - .withCost(new IngredientStack("circuitAdvanced", 6)) .withRequiredProgress(120000); IIContent.UPGRADE_EMPLACEMENT_SPOTLIGHT_TOWER - .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDevice0, 2, BlockTypes_MetalDevice0.CAPACITOR_MV.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDevice0, 2, BlockTypes_MetalDevice0.CAPACITOR_HV.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration1, 5, BlockTypes_MetalDecoration1.STEEL_SCAFFOLDING_0.getMeta()))) + .withCost(new IngredientStack(IIContent.blockDataConnector.getStack(IIBlockTypes_Connector.PROGRAMMABLE_SPEAKER))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDevice1,1, BlockTypes_MetalDevice1.FLOODLIGHT.getMeta()))) + .withCost(new IngredientStack("opticsAdvanced", 1)) + .withCost(new IngredientStack(new ItemStack(IEContent.itemWireCoil, 5, 0))) + .withRequiredProgress(80000); + + IIContent.UPGRADE_EMPLACEMENT_SEARCHLIGHT + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDevice0, 1, BlockTypes_MetalDevice0.CAPACITOR_HV.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration1, 2, BlockTypes_MetalDecoration1.STEEL_SCAFFOLDING_0.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockSheetmetal,4,8))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockSheetmetal,1,3))) + .withCost(new IngredientStack(new ItemStack(IEContent.itemGraphiteElectrode,1))) + .withCost(new IngredientStack("opticsAdvanced", 1)) .withRequiredProgress(80000); IIContent.UPGRADE_EMPLACEMENT_WEAPON_MORTAR - .withCost(new IngredientStack((new ItemStack(IEContent.blockMetalDevice1, 2, BlockTypes_MetalDevice1.FLUID_PIPE.getMeta())))) + .withCost(new IngredientStack(new ItemStack(IEContent.itemMaterial, 2, 9))) + .withCost(new IngredientStack(new ItemStack(IIContent.itemMortar, 1))) + .withCost(new IngredientStack("opticsAdvanced", 2)) + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration1, 2, BlockTypes_MetalDecoration1.STEEL_SCAFFOLDING_0.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.itemWireCoil, 2, 1))) .withRequiredProgress(160000); IIContent.UPGRADE_EMPLACEMENT_WEAPON_LIGHT_HOWITZER - .withCost(new IngredientStack((new ItemStack(IEContent.blockMetalDevice1, 2, BlockTypes_MetalDevice1.FLUID_PIPE.getMeta())))) + .withCost(new IngredientStack((new ItemStack(IEContent.blockMetalDecoration0, 1, BlockTypes_MetalDecoration0.HEAVY_ENGINEERING.getMeta())))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockStorage, 2, BlockTypes_MetalsIE.STEEL.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockSheetmetal, 4, BlockTypes_MetalsAll.STEEL.getMeta()))) + .withCost(new IngredientStack("opticsAdvanced", 2)) + .withCost(new IngredientStack(new ItemStack(IEContent.itemWireCoil, 2, 1))) .withRequiredProgress(160000); IIContent.UPGRADE_EMPLACEMENT_WEAPON_MLRS - .withCost(new IngredientStack((new ItemStack(IEContent.blockMetalDevice1, 2, BlockTypes_MetalDevice1.FLUID_PIPE.getMeta())))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockSheetmetal, 6, BlockTypes_MetalsAll.STEEL.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration0, 2, BlockTypes_MetalDecoration0.LIGHT_ENGINEERING.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IEContent.itemWireCoil, 4, 4))) + .withCost(new IngredientStack("opticsAdvanced", 2)) + .withCost(new IngredientStack(new ItemStack(IEContent.itemMaterial, 2, 9))) .withRequiredProgress(160000); IIContent.UPGRADE_EMPLACEMENT_WEAPON_GUIDED_MISSILE_LAUNCHER - .withCost(new IngredientStack((new ItemStack(IEContent.blockMetalDevice1, 2, BlockTypes_MetalDevice1.FLUID_PIPE.getMeta())))) + .withCost(new IngredientStack(new ItemStack(IEContent.blockMetalDecoration1, 4, BlockTypes_MetalDecoration1.STEEL_SCAFFOLDING_0.getMeta()))) + .withCost(new IngredientStack(new ItemStack(IIContent.blockDataConnector, 1, IIBlockTypes_Connector.INSERTER.getMeta()))) + .withCost(new IngredientStack("opticsBasic", 1)) + .withCost(new IngredientStack("opticsAdvanced", 2)) + .withCost(new IngredientStack(new ItemStack(IIContent.blockMetalDecoration, 1, IIBlockTypes_MetalDecoration.COIL_DATA.getMeta()))) .withRequiredProgress(160000); //Weapons - Processor Tier IIContent.UPGRADE_EMPLACEMENT_WEAPON_CPDS .withCost(new IngredientStack(new ItemStack(IEContent.itemMaterial, 8, 14))) - .withCost(new IngredientStack(new ItemStack(IEContent.itemMaterial, 2, 9))) + .withCost(new IngredientStack(new ItemStack(IIContent.itemMaterial, 2, 14))) + .withCost(new IngredientStack(new ItemStack(IIContent.itemMaterial, 4, 39))) .withCost(new IngredientStack("blockSteel", 3)) - .withCost(new IngredientStack("circuitProcessor", 6)) + .withCost(new IngredientStack("opticsAdvanced", 3)) + .withCost(new IngredientStack("circuitProcessor", 4)) .withRequiredProgress(300000); } diff --git a/src/main/resources/assets/immersiveintelligence/recipes/decoration/harbor_support.json b/src/main/resources/assets/immersiveintelligence/recipes/decoration/harbor_support.json new file mode 100644 index 000000000..98e4747e4 --- /dev/null +++ b/src/main/resources/assets/immersiveintelligence/recipes/decoration/harbor_support.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " t ", + " t ", + " c " + ], + "key": { + "t": { + "item": "immersiveengineering:wooden_decoration", + "data": 0 + }, + "c": { + "item": "immersiveintelligence:concrete_decoration", + "data": 0 + } + }, + "result": { + "item": "immersiveintelligence:harbor_support", + "count": 4, + "data": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/immersiveintelligence/recipes/decoration/harbor_wooden_pier.json b/src/main/resources/assets/immersiveintelligence/recipes/decoration/harbor_wooden_pier.json new file mode 100644 index 000000000..ff2cc7627 --- /dev/null +++ b/src/main/resources/assets/immersiveintelligence/recipes/decoration/harbor_wooden_pier.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ttt", + " t " + ], + "key": { + "t": { + "type": "forge:ore_dict", + "ore": "plankTreatedWood" + } + }, + "result": { + "item": "immersiveintelligence:harbor", + "count": 4, + "data": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/immersiveintelligence/recipes/decoration/harbor_wooden_quay.json b/src/main/resources/assets/immersiveintelligence/recipes/decoration/harbor_wooden_quay.json new file mode 100644 index 000000000..1c4369096 --- /dev/null +++ b/src/main/resources/assets/immersiveintelligence/recipes/decoration/harbor_wooden_quay.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ttt", + "ccc" + ], + "key": { + "t": { + "type": "forge:ore_dict", + "ore": "plankTreatedWood" + }, + "c": { + "item": "immersiveintelligence:concrete_decoration", + "data": 0 + } + }, + "result": { + "item": "immersiveintelligence:harbor", + "count": 6, + "data": 1 + } +} \ No newline at end of file