From f890ac7146b03c148bfaa2c59f6b3a09d7932120 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 19 Jul 2019 01:12:48 +0300 Subject: [PATCH] And leave behind those who don't know --- src/main/java/techreborn/init/TRContent.java | 10 +++ .../init/recipes/CraftingTableRecipes.java | 57 ------------------ .../tiles/storage/TileAdjustableSU.java | 12 +--- .../assets/techreborn/lang/en_us.json | 2 +- .../models/item/superconductor_upgrade.json | 6 ++ ...nductor.png => superconductor_upgrade.png} | Bin .../crafting_shaped/advanced_circuit.json | 25 ++++++++ .../advanced_machine_frame.json | 22 +++++++ .../crafting_shaped/basic_machine_frame.json | 16 +++++ .../recipes/crafting_shaped/carbon_fiber.json | 16 +++++ .../recipes/crafting_shaped/cell.json | 16 +++++ .../crafting_shaped/data_storage_chip.json | 22 +++++++ .../crafting_shaped/data_storage_core.json | 28 +++++++++ .../diamond_grinding_head.json | 23 +++++++ .../crafting_shaped/diamond_saw_blade.json | 20 ++++++ .../crafting_shaped/digital_display.json | 22 +++++++ .../crafting_shaped/electronic_circuit.json | 22 +++++++ .../crafting_shaped/energy_flow_chip.json | 26 ++++++++ .../energy_storage_upgrade.json | 25 ++++++++ .../helium_coolant_cell_180k.json | 19 ++++++ .../helium_coolant_cell_360k.json | 22 +++++++ .../helium_coolant_cell_60k.json | 19 ++++++ .../industrial_machine_frame.json | 22 +++++++ .../crafting_shaped/iridium_alloy_ingot.json | 22 +++++++ .../iridium_neutron_reflector.json | 19 ++++++ .../nak_coolant_cell_180k.json | 19 ++++++ .../nak_coolant_cell_360k.json | 22 +++++++ .../crafting_shaped/nak_coolant_cell_60k.json | 25 ++++++++ .../nak_coolant_cell_60k_alt.json | 25 ++++++++ .../crafting_shaped/neutron_reflector.json | 22 +++++++ .../crafting_shaped/overclocker_upgrade.json | 21 +++++++ .../overclocker_upgrade_alt.json | 22 +++++++ .../overclocker_upgrade_alt_alt.json | 22 +++++++ .../crafting_shaped/rubber_plank_slab.json | 15 +++++ .../crafting_shaped/rubber_plank_stair.json | 17 ++++++ .../crafting_shaped/superconductor.json | 26 ++++++++ .../superconductor_upgrade.json | 25 ++++++++ .../thick_neutron_reflector.json | 20 ++++++ .../crafting_shaped/transformer_upgrade.json | 25 ++++++++ .../tungsten_grinding_head.json | 23 +++++++ .../water_coolant_cell_10k.json | 20 ++++++ .../water_coolant_cell_30k.json | 19 ++++++ .../water_coolant_cell_60k.json | 22 +++++++ ...ridium_reinforced_stone_storage_block.json | 14 +++++ ...einforced_tungstensteel_storage_block.json | 14 +++++ ...orced_tungstensteel_storage_block_alt.json | 14 +++++ .../crafting_shapeless/rubber_planks.json | 13 ++++ .../solid_fuel_generator.json | 17 ++++++ 48 files changed, 888 insertions(+), 67 deletions(-) create mode 100644 src/main/resources/assets/techreborn/models/item/superconductor_upgrade.json rename src/main/resources/assets/techreborn/textures/item/upgrade/{superconductor.png => superconductor_upgrade.png} (100%) create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_circuit.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_frame.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_frame.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/carbon_fiber.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/cell.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/data_storage_chip.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/data_storage_core.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/diamond_grinding_head.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/diamond_saw_blade.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/digital_display.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/electronic_circuit.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/energy_flow_chip.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/energy_storage_upgrade.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_180k.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_360k.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_60k.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_frame.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_alloy_ingot.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_neutron_reflector.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_180k.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_360k.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_60k.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_60k_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/neutron_reflector.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_slab.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_stair.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor_upgrade.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/thick_neutron_reflector.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/transformer_upgrade.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/tungsten_grinding_head.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_10k.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_30k.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_60k.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_stone_storage_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block_alt.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shapeless/rubber_planks.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_shapeless/solid_fuel_generator.json diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 58ff99679..38128ef13 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -53,6 +53,7 @@ import techreborn.entities.EntityNukePrimed; import techreborn.items.DynamicCell; import techreborn.items.ItemUpgrade; import techreborn.utils.InitUtils; +import techreborn.tiles.storage.TileAdjustableSU; import javax.annotation.Nullable; import java.util.Arrays; @@ -723,6 +724,15 @@ public class TRContent { if (powerAcceptor != null) { powerAcceptor.extraPowerStoage += energyStoragePower; } + }), + SUPERCONDUCTOR((tile, handler, stack) -> { + TileAdjustableSU aesu = null; + if (tile instanceof TileAdjustableSU) { + aesu = (TileAdjustableSU) tile; + } + if (aesu != null) { + aesu.superconductors++; + } }); public String name; diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 7745467b8..cfe494fbb 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -35,61 +35,6 @@ public class CraftingTableRecipes extends RecipeMethods { registerCompressionRecipes(); registerMixedMetalIngotRecipes(); -// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "stone", "plateIridiumAlloy"); -// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("tungstensteel", 1), "plateIridium"); -// registerShapeless(BlockStorage2.getStorageBlockByName("iridium_reinforced_tungstensteel", 1), BlockStorage2.getStorageBlockByName("iridium_reinforced_stone", 1), "ingotTungstensteel"); - registerShapeless(getStack(TRContent.RUBBER_PLANKS, 4), getStack(TRContent.RUBBER_LOG)); - registerShaped(DynamicCell.getEmptyCell(16), " T ", "T T", " T ", 'T', "ingotTin"); - -// registerShaped(getMaterial("iridium_alloy", Type.INGOT), "IAI", "ADA", "IAI", 'I', "ingotIridium", 'D', "dustDiamond", 'A', "plateAdvancedAlloy"); - - - //Upgrades -// registerShaped(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P', "plankWood", 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic", 'B', "reBattery"); -// registerShaped(ItemUpgrades.getUpgradeByName("overclock"), "TTT", "WCW", 'T', TRIngredients.Parts.COOLANT_SIMPLE.getStack(), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic"); -// registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', TRIngredients.Parts.HELIUM_COOLANT_TRIPLE.getStack(), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic"); -// registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', TRIngredients.Parts.NAK_COOLANT_SIMPLE.getStack(), 'W', EnumCableType.ICOPPER.getStack(), 'C', "circuitBasic"); -// registerShaped(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G', "blockGlass", 'W', EnumCableType.IGOLD.getStack(), 'C', "circuitBasic", 'T', getStack(ModBlocks.MV_TRANSFORMER)); - - //Machines -// registerShapeless(getStack(TRContent.SOLID_FUEL_GENEREATOR), "reBattery", "machineBlockBasic", getStack(Blocks.FURNACE)); - - - // Machine Frames - registerShaped(getMaterial("machine", Type.MACHINE_FRAME), "AAA", "A A", "AAA", 'A', "ingotRefinedIron"); - registerShaped(getMaterial("advanced_machine", Type.MACHINE_FRAME), " C ", "AMA", " C ", 'A', "plateAdvancedAlloy", 'C', "plateCarbon", 'M', "machineBlockBasic"); - registerShaped(getMaterial("highly_advanced_machine", Type.MACHINE_FRAME), "CTC", "TBT", "CTC", 'C', "plateChrome", 'T', "plateTitanium", 'B', "machineBlockAdvanced"); - - - // Parts -// registerShaped(getMaterial("data_storage_circuit", Type.PART), "RGR", "LCL", "EEE", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic", 'E', "plateEmerald"); -// registerShaped(getMaterial("data_control_circuit", Type.PART), "ADA", "DID", "ADA", 'I', "ingotIridium", 'A', "circuitAdvanced", 'D', "circuitStorage"); -// registerShaped(getMaterial("energy_flow_circuit", 4, Type.PART), "ATA", "LIL", "ATA", 'T', "ingotTungsten", 'I', "plateIridiumAlloy", 'A', "circuitAdvanced", 'L', "lapotronCrystal"); -// registerShaped(getMaterial("data_orb", Type.PART), "DDD", "DSD", "DDD", 'D', "circuitStorage", 'S', "circuitElite"); -// registerShaped(getMaterial("diamond_saw_blade", 4, Type.PART), "DSD", "S S", "DSD", 'D', "dustDiamond", 'S', "ingotSteel"); -// registerShaped(getMaterial("diamond_grinding_head", 2, Type.PART), "DSD", "SGS", "DSD", 'S', "ingotSteel", 'D', "dustDiamond", 'G', "gemDiamond"); -// registerShaped(getMaterial("tungsten_grinding_head", 2, Type.PART), "TST", "SBS", "TST", 'S', "ingotSteel", 'T', "ingotTungsten", 'B', "blockSteel"); -// registerShaped(getMaterial("computer_monitor", Type.PART), "ADA", "DGD", "ADA", 'D', "dye", 'A', "ingotAluminum", 'G', "paneGlass"); -// registerShaped(getMaterial("coolant_simple", 2, Type.PART), " T ", "TWT", " T ", 'T', "ingotTin", 'W', getStack(Items.WATER_BUCKET)); -// registerShaped(getMaterial("coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART)); -// registerShaped(getMaterial("coolant_six", Type.PART), "TCT", "TPT", "TCT", 'T', "ingotTin", 'C', getMaterial("coolant_triple", Type.PART), 'P', "plateCopper"); -// registerShaped(getMaterial("helium_coolant_simple", Type.PART), " T ", "TCT", " T ", 'T', "ingotTin", 'C', getCell("helium")); -// registerShaped(getMaterial("helium_coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("helium_coolant_simple", Type.PART)); -// registerShaped(getMaterial("helium_coolant_six", Type.PART), "THT", "TCT", "THT", 'T', "ingotTin", 'C', "ingotCopper", 'H', getMaterial("helium_coolant_triple", Type.PART)); -// registerShaped(getMaterial("nak_coolant_simple", Type.PART), "TST", "PCP", "TST", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART), 'S', getCell("sodium"), 'P', getCell("potassium")); -// registerShaped(getMaterial("nak_coolant_simple", Type.PART), "TPT", "SCS", "TPT", 'T', "ingotTin", 'C', getMaterial("coolant_simple", Type.PART), 'S', getCell("sodium"), 'P', getCell("potassium")); -// registerShaped(getMaterial("nak_coolant_triple", Type.PART), "TTT", "CCC", "TTT", 'T', "ingotTin", 'C', getMaterial("nak_coolant_simple", Type.PART)); -// registerShaped(getMaterial("nak_coolant_six", Type.PART), "THT", "TCT", "THT", 'T', "ingotTin", 'C', "ingotCopper", 'H', getMaterial("nak_coolant_triple", Type.PART)); -// registerShaped(getMaterial("iridium_neutron_reflector", Type.PART), "PPP", "PIP", "PPP", 'P', getMaterial("thick_neutron_reflector", Type.PART), 'I', "ingotIridium"); -// registerShaped(getMaterial("thick_neutron_reflector", Type.PART), " P ", "PCP", " P ", 'P', getMaterial("neutron_reflector", Type.PART), 'C', getCell("Berylium")); -// registerShaped(getMaterial("neutron_reflector", Type.PART), "TCT", "CPC", "TCT", 'T', "dustTin", 'C', "dustCoal", 'P', "plateCopper"); -// registerShaped(getMaterial("super_conductor", 4, Type.PART), "CCC", "TIT", "EEE", 'E', "circuitMaster", 'C', getMaterial("heliumCoolantSimple", Type.PART), 'T', "ingotTungsten", 'I', "plateIridiumAlloy"); -// registerShaped(getMaterial("carbon_fiber", Type.PART), " C ", "C C", " C ", 'C', "dustCoal"); -// registerShaped(getMaterial("carbon_fiber", Type.PART), "CCC", "C C", "CCC", 'C', getCell("carbon")); -// registerShapeless(getMaterial("carbon_mesh", Type.PART), getMaterial("carbon_fiber", Type.PART), getMaterial("carbon_fiber", Type.PART)); -// registerShaped(getMaterial("electronic_circuit", Type.PART), "WWW", "SRS", "WWW", 'R', "ingotRefinedIron", 'S', Items.REDSTONE, 'W', EnumCableType.ICOPPER.getStack()); -// registerShaped(getMaterial("advanced_circuit", Type.PART), "RGR", "LCL", "RGR", 'R', "dustRedstone", 'G', "dustGlowstone", 'L', "gemLapis", 'C', "circuitBasic"); - //UU-Matter ItemStack uuStack = TRContent.Parts.UU_MATTER.getStack(); registerShaped(getStack(Blocks.LOG, 8), " U ", " ", " ", 'U', uuStack); @@ -128,8 +73,6 @@ public class CraftingTableRecipes extends RecipeMethods { // registerShaped(getMaterial("aluminum", 16, Type.DUST), " U ", " U ", "UUU", 'U', uuStack); // registerShaped(getMaterial("iridium", 1, Type.ORE), "UUU", " U ", "UUU", 'U', uuStack); - registerShaped(new ItemStack(TRContent.RUBBER_LOG_SLAB_HALF), "WWW", 'W', new ItemStack(TRContent.RUBBER_PLANKS)); - registerShaped(new ItemStack(TRContent.RUBBER_LOG_STAIR), "W ", "WW ", "WWW", 'W', new ItemStack(TRContent.RUBBER_PLANKS)); RebornCraftingHelper.addShapelessOreRecipe(new ItemStack(TRContent.MANUAL), "ingotRefinedIron", Items.BOOK); diff --git a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java index 7b67e76e9..9be50e1cb 100644 --- a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java +++ b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java @@ -51,24 +51,18 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro public RebornInventory inventory = new RebornInventory<>(4, "TileAdjustableSU", 64, this).withConfiguredAccess(); private int OUTPUT = 64; // The current output + public int superconductors = 0; public TileAdjustableSU() { super(TRTileEntities.ADJUSTABLE_SU, "ADJUSTABLE_SU", 4, TRContent.Machine.ADJUSTABLE_SU.block, EnumPowerTier.INSANE, maxInput, maxOutput, maxEnergy); } - int superconductors = 0; + @Override public void tick() { super.tick(); - superconductors = 0; - for (int i = 0; i < getUpgradeSlotCount(); i++) { - ItemStack stack = getUpgradeInvetory().getInvStack(i); - if(false){ //TODO 1.13 - superconductors++; - } - } if (OUTPUT > getMaxConfigOutput()) { OUTPUT = getMaxConfigOutput(); } @@ -191,6 +185,6 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro @Override public boolean isUpgradeValid(IUpgrade upgrade, ItemStack stack) { - return false; //TODO 1.13 + return stack.isItemEqual(new ItemStack(TRContent.Upgrades.SUPERCONDUCTOR.item)); } } diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index ea2674045..cabfd2f65 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -522,7 +522,7 @@ "item.techreborn.overclocker_upgrade": "Overclocker Upgrade", "item.techreborn.transformer_upgrade": "Transformer Upgrade", "item.techreborn.energy_storage_upgrade": "Energy Storage Upgrade", - + "item.techreborn.superconductor_upgrade": "Superconductor Upgrade", "item.techreborn.bronze_sword": "Bronze Sword", "item.techreborn.bronze_pickaxe": "Bronze Pickaxe", diff --git a/src/main/resources/assets/techreborn/models/item/superconductor_upgrade.json b/src/main/resources/assets/techreborn/models/item/superconductor_upgrade.json new file mode 100644 index 000000000..31556fa16 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/superconductor_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/upgrade/superconductor_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/item/upgrade/superconductor.png b/src/main/resources/assets/techreborn/textures/item/upgrade/superconductor_upgrade.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/upgrade/superconductor.png rename to src/main/resources/assets/techreborn/textures/item/upgrade/superconductor_upgrade.png diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_circuit.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_circuit.json new file mode 100644 index 000000000..1246e5484 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_circuit.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RGR", + "LCL", + "RGR" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "C": { + "item": "techreborn:electronic_circuit" + }, + "G": { + "item": "minecraft:glowstone_dust" + }, + "L": { + "item": "minecraft:lapis_lazuli" + } + }, + "result": { + "item": "techreborn:advanced_circuit" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_frame.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_frame.json new file mode 100644 index 000000000..50c4763a2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_frame.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " C ", + "AMA", + " C " + ], + "key": { + "A": { + "item": "techreborn:advanced_alloy_plate" + }, + "C": { + "item": "techreborn:carbon_plate" + }, + "M": { + "item": "techreborn:basic_machine_frame" + } + }, + "result": { + "item": "techreborn:advanced_machine_frame" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_frame.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_frame.json new file mode 100644 index 000000000..9e9b81427 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_frame.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "AAA", + "A A", + "AAA" + ], + "key": { + "A": { + "item": "techreborn:refined_iron_ingot" + } + }, + "result": { + "item": "techreborn:basic_machine_frame" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/carbon_fiber.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/carbon_fiber.json new file mode 100644 index 000000000..04dcdc68c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/carbon_fiber.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " C ", + "C C", + " C " + ], + "key": { + "C": { + "item": "techreborn:coal_dust" + } + }, + "result": { + "item": "techreborn:carbon_fiber" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cell.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/cell.json new file mode 100644 index 000000000..901c4f9c3 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/cell.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " T ", + "T T", + " T " + ], + "key": { + "T": { + "item": "techreborn:tin_ingot" + } + }, + "result": { + "item": "techreborn:cell" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/data_storage_chip.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/data_storage_chip.json new file mode 100644 index 000000000..00a26efa1 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/data_storage_chip.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ADA", + "DID", + "ADA" + ], + "key": { + "A": { + "item": "techreborn:advanced_circuit" + }, + "D": { + "item": "techreborn:data_storage_core" + }, + "I": { + "item": "techreborn:iridium_ingot" + } + }, + "result": { + "item": "techreborn:data_storage_chip" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/data_storage_core.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/data_storage_core.json new file mode 100644 index 000000000..b99307462 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/data_storage_core.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RGR", + "LCL", + "EEE" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "C": { + "item": "techreborn:electronic_circuit" + }, + "E": { + "item": "techreborn:emerald_plate" + }, + "G": { + "item": "minecraft:glowstone_dust" + }, + "L": { + "item": "minecraft:lapis_lazuli" + } + }, + "result": { + "item": "techreborn:data_storage_core" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/diamond_grinding_head.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/diamond_grinding_head.json new file mode 100644 index 000000000..025890f45 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/diamond_grinding_head.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "DSD", + "SGS", + "DSD" + ], + "key": { + "S": { + "item": "techreborn:steel_ingot" + }, + "D": { + "item": "techreborn:diamond_dust" + }, + "G": { + "item": "minecraft:diamond" + } + }, + "result": { + "item": "techreborn:diamond_grinding_head", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/diamond_saw_blade.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/diamond_saw_blade.json new file mode 100644 index 000000000..af86ff67c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/diamond_saw_blade.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "DSD", + "S S", + "DSD" + ], + "key": { + "S": { + "item": "techreborn:steel_ingot" + }, + "D": { + "item": "techreborn:diamond_dust" + } + }, + "result": { + "item": "techreborn:diamond_saw_blade", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/digital_display.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/digital_display.json new file mode 100644 index 000000000..332b7c899 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/digital_display.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ADA", + "DGD", + "ADA" + ], + "key": { + "A": { + "item": "techreborn:aluminum_ingot" + }, + "D": { + "item": "minecraft:ink_sac" + }, + "G": { + "item": "minecraft:glass_pane" + } + }, + "result": { + "item": "techreborn:digital_display" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/electronic_circuit.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/electronic_circuit.json new file mode 100644 index 000000000..935bbacd2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/electronic_circuit.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "WWW", + "SRS", + "WWW" + ], + "key": { + "R": { + "item": "techreborn:refined_iron_ingot" + }, + "W": { + "item": "techreborn:insulated_copper_cable" + }, + "S": { + "item": "minecraft:redstone" + } + }, + "result": { + "item": "techreborn:electronic_circuit" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/energy_flow_chip.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/energy_flow_chip.json new file mode 100644 index 000000000..67eeffe3d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/energy_flow_chip.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ATA", + "LIL", + "ATA" + ], + "key": { + "A": { + "item": "techreborn:advanced_circuit" + }, + "T": { + "item": "techreborn:tungsten_ingot" + }, + "I": { + "item": "techreborn:iridium_alloy_plate" + }, + "L": { + "item": "techreborn:lapotron_crystal" + } + }, + "result": { + "item": "techreborn:energy_flow_chip", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/energy_storage_upgrade.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/energy_storage_upgrade.json new file mode 100644 index 000000000..db5b42be4 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/energy_storage_upgrade.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PPP", + "WBW", + "PCP" + ], + "key": { + "P": { + "tag": "minecraft:planks" + }, + "B": { + "item": "techreborn:red_cell_battery" + }, + "C": { + "item": "techreborn:electronic_circuit" + }, + "W": { + "item": "techreborn:insulated_copper_cable" + } + }, + "result": { + "item": "techreborn:energy_storage_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_180k.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_180k.json new file mode 100644 index 000000000..a19806f96 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_180k.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "CCC", + "TTT" + ], + "key": { + "C": { + "item": "techreborn:helium_coolant_cell_60k" + }, + "T": { + "item": "techreborn:tin_ingot" + } + }, + "result": { + "item": "techreborn:helium_coolant_cell_180k" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_360k.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_360k.json new file mode 100644 index 000000000..7ff7a136a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_360k.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "THT", + "TCT", + "THT" + ], + "key": { + "C": { + "item": "techreborn:copper_ingot" + }, + "T": { + "item": "techreborn:tin_ingot" + }, + "H": { + "item": "techreborn:helium_coolant_cell_180k" + } + }, + "result": { + "item": "techreborn:helium_coolant_cell_360k" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_60k.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_60k.json new file mode 100644 index 000000000..209d52bd1 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/helium_coolant_cell_60k.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " T ", + "TCT", + " T " + ], + "key": { + "T": { + "item": "techreborn:tin_ingot" + }, + "C": { + "item": "techreborn:cell" + } + }, + "result": { + "item": "techreborn:helium_coolant_cell_60k" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_frame.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_frame.json new file mode 100644 index 000000000..0df88822b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_frame.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "CTC", + "TBT", + "CTC" + ], + "key": { + "B": { + "item": "techreborn:advanced_machine_frame" + }, + "C": { + "item": "techreborn:chrome_plate" + }, + "T": { + "item": "techreborn:titanium_plate" + } + }, + "result": { + "item": "techreborn:industrial_machine_frame" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_alloy_ingot.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_alloy_ingot.json new file mode 100644 index 000000000..05741b140 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_alloy_ingot.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "IAI", + "ADA", + "IAI" + ], + "key": { + "A": { + "item": "techreborn:advanced_alloy_plate" + }, + "D": { + "item": "techreborn:diamond_dust" + }, + "I": { + "item": "techreborn:iridium_ingot" + } + }, + "result": { + "item": "techreborn:iridium_alloy_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_neutron_reflector.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_neutron_reflector.json new file mode 100644 index 000000000..475fa6030 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_neutron_reflector.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PPP", + "PIP", + "PPP" + ], + "key": { + "P": { + "item": "techreborn:thick_neutron_reflector" + }, + "I": { + "item": "techreborn:iridium_ingot" + } + }, + "result": { + "item": "techreborn:iridium_neutron_reflector" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_180k.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_180k.json new file mode 100644 index 000000000..a1318e851 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_180k.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "CCC", + "TTT" + ], + "key": { + "C": { + "item": "techreborn:nak_coolant_cell_60k" + }, + "T": { + "item": "techreborn:tin_ingot" + } + }, + "result": { + "item": "techreborn:nak_coolant_cell_180k" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_360k.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_360k.json new file mode 100644 index 000000000..bde352028 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_360k.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "THT", + "TCT", + "THT" + ], + "key": { + "C": { + "item": "techreborn:copper_ingot" + }, + "T": { + "item": "techreborn:tin_ingot" + }, + "H": { + "item": "techreborn:nak_coolant_cell_180k" + } + }, + "result": { + "item": "techreborn:nak_coolant_cell_360k" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_60k.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_60k.json new file mode 100644 index 000000000..0dcf6c32e --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_60k.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TST", + "PCP", + "TST" + ], + "key": { + "C": { + "item": "techreborn:water_coolant_cell_10k" + }, + "T": { + "item": "techreborn:tin_ingot" + }, + "S": { + "item": "techreborn:cell" + }, + "P": { + "item": "techreborn:cell" + } + }, + "result": { + "item": "techreborn:nak_coolant_cell_60k" + } +} diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_60k_alt.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_60k_alt.json new file mode 100644 index 000000000..d6a890923 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/nak_coolant_cell_60k_alt.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TPT", + "SCS", + "TPT" + ], + "key": { + "C": { + "item": "techreborn:water_coolant_cell_10k" + }, + "T": { + "item": "techreborn:tin_ingot" + }, + "P": { + "item": "techreborn:cell" + }, + "S": { + "item": "techreborn:cell" + } + }, + "result": { + "item": "techreborn:nak_coolant_cell_60k" + } +} diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/neutron_reflector.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/neutron_reflector.json new file mode 100644 index 000000000..7ad9e20b2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/neutron_reflector.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TCT", + "CPC", + "TCT" + ], + "key": { + "P": { + "item": "techreborn:copper_plate" + }, + "C": { + "item": "techreborn:coal_dust" + }, + "T": { + "item": "techreborn:tin_dust" + } + }, + "result": { + "item": "techreborn:neutron_reflector" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade.json new file mode 100644 index 000000000..a8e4e789c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "WCW" + ], + "key": { + "C": { + "item": "techreborn:electronic_circuit" + }, + "T": { + "item": "techreborn:water_coolant_cell_10k" + }, + "W": { + "item": "techreborn:insulated_copper_cable" + } + }, + "result": { + "item": "techreborn:overclocker_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt.json new file mode 100644 index 000000000..15db3b52c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " T ", + "WCW" + ], + "key": { + "C": { + "item": "techreborn:electronic_circuit" + }, + "T": { + "item": "techreborn:helium_coolant_cell_180k" + }, + "W": { + "item": "techreborn:insulated_copper_cable" + } + }, + "result": { + "item": "techreborn:overclocker_upgrade", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt_alt.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt_alt.json new file mode 100644 index 000000000..95e0f6e43 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt_alt.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " T ", + "WCW" + ], + "key": { + "C": { + "item": "techreborn:electronic_circuit" + }, + "T": { + "item": "techreborn:nak_coolant_cell_60k" + }, + "W": { + "item": "techreborn:insulated_copper_cable" + } + }, + "result": { + "item": "techreborn:overclocker_upgrade", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_slab.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_slab.json new file mode 100644 index 000000000..67ffaa689 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_slab.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "WWW" + ], + "key": { + "W": { + "item": "techreborn:rubber_planks" + } + }, + "result": { + "item": "techreborn:rubber_plank_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_stair.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_stair.json new file mode 100644 index 000000000..f66d40521 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_stair.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "W ", + "WW ", + "WWW" + ], + "key": { + "W": { + "item": "techreborn:rubber_planks" + } + }, + "result": { + "item": "techreborn:rubber_plank_stair", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor.json new file mode 100644 index 000000000..4287414f7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "CCC", + "TIT", + "EEE" + ], + "key": { + "C": { + "item": "techreborn:helium_coolant_cell_60k" + }, + "T": { + "item": "techreborn:tungsten_ingot" + }, + "E": { + "item": "techreborn:energy_flow_chip" + }, + "I": { + "item": "techreborn:iridium_alloy_plate" + } + }, + "result": { + "item": "techreborn:superconductor", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor_upgrade.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor_upgrade.json new file mode 100644 index 000000000..c7f65288f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor_upgrade.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SOS", + "CMC", + "SOS" + ], + "key": { + "C": { + "item": "techreborn:superconductor_cable" + }, + "S": { + "item": "techreborn:superconductor" + }, + "M": { + "item": "techreborn:industrial_machine_frame" + }, + "O": { + "item": "techreborn:data_storage_chip" + } + }, + "result": { + "item": "techreborn:superconductor_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/thick_neutron_reflector.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/thick_neutron_reflector.json new file mode 100644 index 000000000..83a1d28d7 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/thick_neutron_reflector.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " P ", + "PCP", + " P " + ], + "key": { + "P": { + "item": "techreborn:neutron_reflector" + }, + "C": { + "item": "techreborn:cell" + } + + }, + "result": { + "item": "techreborn:thick_neutron_reflector" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/transformer_upgrade.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/transformer_upgrade.json new file mode 100644 index 000000000..7648ed495 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/transformer_upgrade.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "WTW", + "GCG" + ], + "key": { + "C": { + "item": "techreborn:electronic_circuit" + }, + "T": { + "item": "techreborn:mv_transformer" + }, + "G": { + "item": "minecraft:glass" + }, + "W": { + "item": "techreborn:insulated_gold_cable" + } + }, + "result": { + "item": "techreborn:transformer_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/tungsten_grinding_head.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/tungsten_grinding_head.json new file mode 100644 index 000000000..051b2e40a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/tungsten_grinding_head.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TST", + "SBS", + "TST" + ], + "key": { + "B": { + "item": "techreborn:steel_storage_block" + }, + "S": { + "item": "techreborn:steel_ingot" + }, + "T": { + "item": "techreborn:tungsten_ingot" + } + }, + "result": { + "item": "techreborn:tungsten_grinding_head", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_10k.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_10k.json new file mode 100644 index 000000000..05c21c91b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_10k.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " T ", + "TWT", + " T " + ], + "key": { + "T": { + "item": "techreborn:tin_ingot" + }, + "W": { + "item": "minecraft:water_bucket" + } + }, + "result": { + "item": "techreborn:water_coolant_cell_10k", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_30k.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_30k.json new file mode 100644 index 000000000..dbda2cbda --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_30k.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TTT", + "CCC", + "TTT" + ], + "key": { + "C": { + "item": "techreborn:water_coolant_cell_10k" + }, + "T": { + "item": "techreborn:tin_ingot" + } + }, + "result": { + "item": "techreborn:water_coolant_cell_30k" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_60k.json b/src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_60k.json new file mode 100644 index 000000000..52164dbae --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shaped/water_coolant_cell_60k.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "TCT", + "TPT", + "TCT" + ], + "key": { + "P": { + "item": "techreborn:copper_plate" + }, + "C": { + "item": "techreborn:water_coolant_cell_30k" + }, + "T": { + "item": "techreborn:tin_ingot" + } + }, + "result": { + "item": "techreborn:water_coolant_cell_60k" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_stone_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_stone_storage_block.json new file mode 100644 index 000000000..af5b13c17 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_stone_storage_block.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:stone" + }, + { + "item": "techreborn:iridium_alloy_plate" + } + ], + "result": { + "item": "techreborn:iridium_reinforced_stone_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block.json new file mode 100644 index 000000000..142272157 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:tungstensteel_storage_block" + }, + { + "item": "techreborn:iridium_plate" + } + ], + "result": { + "item": "techreborn:iridium_reinforced_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block_alt.json b/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block_alt.json new file mode 100644 index 000000000..973b98030 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block_alt.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:iridium_reinforced_stone_storage_block" + }, + { + "item": "techreborn:tungstensteel_ingot" + } + ], + "result": { + "item": "techreborn:iridium_reinforced_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/rubber_planks.json b/src/main/resources/data/techreborn/recipes/crafting_shapeless/rubber_planks.json new file mode 100644 index 000000000..aaa4e1b8d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shapeless/rubber_planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "planks", + "ingredients": [ + { + "item": "techreborn:rubber_log" + } + ], + "result": { + "item": "techreborn:rubber_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/solid_fuel_generator.json b/src/main/resources/data/techreborn/recipes/crafting_shapeless/solid_fuel_generator.json new file mode 100644 index 000000000..4747c9924 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_shapeless/solid_fuel_generator.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:red_cell_battery" + }, + { + "item": "techreborn:basic_machine_frame" + }, + { + "item": "minecraft:furnace" + } + ], + "result": { + "item": "techreborn:solid_fuel_generator" + } +}