From a1a900c941db094144a61367bea4433a6d3cde65 Mon Sep 17 00:00:00 2001 From: SpeeeDCraft <52341158+SpeeeDCraft@users.noreply.github.com> Date: Mon, 13 Nov 2023 21:07:43 +0700 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B0=D0=BC=D0=BE=D1=87=D0=BA=D0=B0,=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B1=D0=B5=D1=80=D0=B8=20=D0=BC=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=20=D0=BE=D1=82=D1=81=D1=8E=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/server_scripts/tfc/constants.js | 345 ++++++++++++++++++------- kubejs/server_scripts/tfc/data.js | 160 +++++++----- kubejs/server_scripts/tfc/recipes.js | 5 + 3 files changed, 345 insertions(+), 165 deletions(-) diff --git a/kubejs/server_scripts/tfc/constants.js b/kubejs/server_scripts/tfc/constants.js index c5e93f960..0f1aafa91 100644 --- a/kubejs/server_scripts/tfc/constants.js +++ b/kubejs/server_scripts/tfc/constants.js @@ -4,6 +4,19 @@ const defaultProperty = [ "ingot" ] +const dustProperty = [ + "nugget", + "dust", + "dust_small", + "dust_tiny", +] + +const oreProperty = [ + "poor_raw", + "normal_raw", + "rich_raw" +] + const partProperty = [ "double_ingot", "sheet", @@ -73,105 +86,249 @@ const utilityProperty = [ "unfinished_lamp" ] -const itemTypeToHeat = { - "anvil" : { heat_capacity : 40.0, useTag : false, hasGTVariant : null }, - "axe_head" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "axe_head" }, - "axe" : { heat_capacity : 2.857, useTag : false, hasGTVariant : "axe" }, - "bars" : { heat_capacity : 0.714, useTag : false, hasGTVariant : null }, - "block_slab" : { heat_capacity : 0.0, useTag : false, hasGTVariant : null }, - "block_stairs" : { heat_capacity : 0.0, useTag : false, hasGTVariant : null }, - "block" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "material_blocks/block" }, - "boots" : { heat_capacity : 11.429, useTag : false, hasGTVariant : null }, - "chain" : { heat_capacity : 0.171, useTag : false, hasGTVariant : null }, - "chestplate" : { heat_capacity : 22.857, useTag : false, hasGTVariant : null }, - "chisel_head" : { heat_capacity : 2.857, useTag : false, hasGTVariant : null }, - "chisel" : { heat_capacity : 2.857, useTag : false, hasGTVariant : null }, - "double_ingot" : { heat_capacity : 5.714, useTag : false, hasGTVariant : null }, - "double_sheet" : { heat_capacity : 11.429, useTag : true, hasGTVariant : "plates/double" }, - "fish_hook" : { heat_capacity : 5.714, useTag : false, hasGTVariant : null }, - "fishing_rod" : { heat_capacity : 5.714, useTag : false, hasGTVariant : null }, - "greaves" : { heat_capacity : 17.143, useTag : false, hasGTVariant : null }, - "hammer_head" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "hammer_heads" }, - "hammer" : { heat_capacity : 2.857, useTag : false, hasGTVariant : "hammer" }, - "helmet" : { heat_capacity : 17.143, useTag : false, hasGTVariant : null }, - "hoe_head" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "hoe_heads" }, - "hoe" : { heat_capacity : 2.857, useTag : false, hasGTVariant : "hoe" }, - "horse_armor" : { heat_capacity : 34.286, useTag : false, hasGTVariant : null }, - "ingot" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "ingots" }, - "javelin_head" : { heat_capacity : 2.857, useTag : false, hasGTVariant : null }, - "javelin" : { heat_capacity : 2.857, useTag : false, hasGTVariant : null }, - "knife_blade" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "knife_heads" }, - "knife" : { heat_capacity : 2.857, useTag : false, hasGTVariant : "knife" }, - "lamp" : { heat_capacity : 2.857, useTag : false, hasGTVariant : null }, - "mace_head" : { heat_capacity : 5.714, useTag : false, hasGTVariant : null }, - "mace" : { heat_capacity : 5.714, useTag : false, hasGTVariant : null }, - "pickaxe_head" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "pickaxe_heads" }, - "pickaxe" : { heat_capacity : 2.857, useTag : false, hasGTVariant : "pickaxe" }, - "propick_head" : { heat_capacity : 2.857, useTag : false, hasGTVariant : null }, - "propick" : { heat_capacity : 2.857, useTag : false, hasGTVariant : null }, - "rod" : { heat_capacity : 1.429, useTag : true, hasGTVariant : "rods" }, - "saw_blade" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "saw_heads" }, - "saw" : { heat_capacity : 2.857, useTag : false, hasGTVariant : "saw" }, - "scythe_blade" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "scythe_heads" }, - "scythe" : { heat_capacity : 2.857, useTag : false, hasGTVariant : "scythe" }, - "shears" : { heat_capacity : 5.714, useTag : false, hasGTVariant : null }, - "sheet" : { heat_capacity : 5.714, useTag : true, hasGTVariant : "plates" }, - "shield" : { heat_capacity : 11.429, useTag : false, hasGTVariant : null }, - "shovel_head" : { heat_capacity : 2.857, useTag : true, hasGTVariant : "shovel_heads" }, - "shovel" : { heat_capacity : 2.857, useTag : false, hasGTVariant : "shovel" }, - "sword_blade" : { heat_capacity : 5.714, useTag : true, hasGTVariant : "sword_heads" }, - "sword" : { heat_capacity : 5.714, useTag : false, hasGTVariant : "sword" }, - "trapdoor" : { heat_capacity : 5.714, useTag : false, hasGTVariant : null }, - "tuyere" : { heat_capacity : 11.429, useTag : false, hasGTVariant : null }, - "unfinished_boots" : { heat_capacity : 5.714, useTag : false, hasGTVariant : null }, - "unfinished_chestplate" : { heat_capacity : 11.429, useTag : false, hasGTVariant : null }, - "unfinished_greaves" : { heat_capacity : 11.429, useTag : false, hasGTVariant : null }, - "unfinished_helmet" : { heat_capacity : 11.429, useTag : false, hasGTVariant : null }, - "unfinished_lamp" : { heat_capacity : 2.857, useTag : false, hasGTVariant : null } +const ItemHeats = { + "nugget": { heat_capacity : 0.124, metal_amount: { + "bismuth": { metalName: "bismuth", amount: 16 }, + "cassiterite": { metalName: "tin", amount: 16 }, + "copper": { metalName: "copper", amount: 16 }, + "garnierite": { metalName: "nickel", amount: 14 }, + "gold": { metalName: "gold", amount: 16 }, + "hematite": { metalName: "iron", amount: 13 }, + "iron": { metalName: "iron", amount: 16 }, + "limonite": { metalName: "iron", amount: 14 }, + "magnetite": { metalName: "iron", amount: 14 }, + "malachite": { metalName: "copper", amount: 13 }, + "nickel": { metalName: "nickel", amount: 16 }, + "pyrite": { metalName: "iron", amount: 12 }, + "silver": { metalName: "silver", amount: 16 }, + "sphalerite": { metalName: "tin", amount: 16 }, + "tetrahedrite": { metalName: "copper", amount: 14 }, + "tin": { metalName: "tin", amount: 16 }, + }, input: (name) => { return { tag: `forge:nuggets/${name}` } }, output : { item: 'gtceu:%s_nugget' } }, + + "dust": { heat_capacity : 1.429, metal_amount: { + "bismuth": { metalName: "bismuth", amount: 144 }, + "cassiterite": { metalName: "tin", amount: 144 }, + "copper": { metalName: "copper", amount: 144 }, + "garnierite": { metalName: "nickel", amount: 126 }, + "gold": { metalName: "gold", amount: 144 }, + "hematite": { metalName: "iron", amount: 117 }, + "iron": { metalName: "iron", amount: 144 }, + "limonite": { metalName: "iron", amount: 126 }, + "magnetite": { metalName: "iron", amount: 126 }, + "malachite": { metalName: "copper", amount: 117 }, + "nickel": { metalName: "nickel", amount: 144 }, + "pyrite": { metalName: "iron", amount: 123 }, + "silver": { metalName: "silver", amount: 144 }, + "sphalerite": { metalName: "tin", amount: 144 }, + "tetrahedrite": { metalName: "copper", amount: 126 }, + "tin": { metalName: "tin", amount: 144 }, + }, input : { tag: 'forge:dusts/%s' }, output : { item: 'gtceu:%s_dust' } }, + + + "dust_small": { heat_capacity : 0.714, metal_amount: { + "bismuth": { metalName: "bismuth", amount: 36 }, + "cassiterite": { metalName: "tin", amount: 36 }, + "copper": { metalName: "copper", amount: 36 }, + "garnierite": { metalName: "nickel", amount: 31 }, + "gold": { metalName: "gold", amount: 36 }, + "hematite": { metalName: "iron", amount: 29 }, + "iron": { metalName: "iron", amount: 36 }, + "limonite": { metalName: "iron", amount: 31 }, + "magnetite": { metalName: "iron", amount: 31 }, + "malachite": { metalName: "copper", amount: 29 }, + "nickel": { metalName: "nickel", amount: 36 }, + "pyrite": { metalName: "iron", amount: 27 }, + "silver": { metalName: "silver", amount: 36 }, + "sphalerite": { metalName: "tin", amount: 36 }, + "tetrahedrite": { metalName: "copper", amount: 31 }, + "tin": { metalName: "tin", amount: 36 }, + }, input : { tag: 'forge:dusts/small/%s' }, output : { item: 'gtceu:%s_dust_small' } }, + + + "dust_tiny": { heat_capacity : 0.357, metal_amount: { + "bismuth": { metalName: "bismuth", amount: 16 }, + "cassiterite": { metalName: "tin", amount: 16 }, + "copper": { metalName: "copper", amount: 16 }, + "garnierite": { metalName: "nickel", amount: 14 }, + "gold": { metalName: "gold", amount: 16 }, + "hematite": { metalName: "iron", amount: 13 }, + "iron": { metalName: "iron", amount: 16 }, + "limonite": { metalName: "iron", amount: 14 }, + "magnetite": { metalName: "iron", amount: 14 }, + "malachite": { metalName: "copper", amount: 13 }, + "nickel": { metalName: "nickel", amount: 16 }, + "pyrite": { metalName: "iron", amount: 12 }, + "silver": { metalName: "silver", amount: 16 }, + "sphalerite": { metalName: "tin", amount: 16 }, + "tetrahedrite": { metalName: "copper", amount: 14 }, + "tin": { metalName: "tin", amount: 16 }, + }, input : { tag: 'forge:dusts/tiny/%s' }, output : { item: 'gtceu:%s_dust_tiny' } }, + + + "poor_raw": { heat_capacity : 1.429, metal_amount: { + "bismuth": { metalName: "bismuth", amount: 24 }, + "cassiterite": { metalName: "tin", amount: 24 }, + "copper": { metalName: "copper", amount: 24 }, + "garnierite": { metalName: "nickel", amount: 21 }, + "gold": { metalName: "gold", amount: 24 }, + "hematite": { metalName: "iron", amount: 18 }, + "iron": { metalName: "iron", amount: 24 }, + "limonite": { metalName: "iron", amount: 21 }, + "magnetite": { metalName: "iron", amount: 21 }, + "malachite": { metalName: "copper", amount: 18 }, + "nickel": { metalName: "nickel", amount: 24 }, + "pyrite": { metalName: "iron", amount: 18 }, + "silver": { metalName: "silver", amount: 24 }, + "sphalerite": { metalName: "tin", amount: 24 }, + "tetrahedrite": { metalName: "copper", amount: 21 }, + "tin": { metalName: "tin", amount: 24 }, + }, input : { tag: 'forge:poor_raw_materials/%s' }, output : { item: 'gtceu:poor_raw_%s' } }, + + + "normal_raw": { heat_capacity : 1.429, metal_amount: { + "bismuth": { metalName: "bismuth", amount: 36 }, + "cassiterite": { metalName: "tin", amount: 36 }, + "copper": { metalName: "copper", amount: 36 }, + "garnierite": { metalName: "nickel", amount: 31 }, + "gold": { metalName: "gold", amount: 36 }, + "hematite": { metalName: "iron", amount: 29 }, + "iron": { metalName: "iron", amount: 36 }, + "limonite": { metalName: "iron", amount: 31 }, + "magnetite": { metalName: "iron", amount: 31 }, + "malachite": { metalName: "copper", amount: 29 }, + "nickel": { metalName: "nickel", amount: 36 }, + "pyrite": { metalName: "iron", amount: 27 }, + "silver": { metalName: "silver", amount: 36 }, + "sphalerite": { metalName: "tin", amount: 36 }, + "tetrahedrite": { metalName: "copper", amount: 31 }, + "tin": { metalName: "tin", amount: 36 }, + }, input : { tag: 'forge:raw_materials/%s' }, output : { item: 'gtceu:raw_%s' } }, + + + "rich_raw": { heat_capacity : 1.429, metal_amount: { + "bismuth": { metalName: "bismuth", amount: 48 }, + "cassiterite": { metalName: "tin", amount: 48 }, + "copper": { metalName: "copper", amount: 48 }, + "garnierite": { metalName: "nickel", amount: 42 }, + "gold": { metalName: "gold", amount: 48 }, + "hematite": { metalName: "iron", amount: 39 }, + "iron": { metalName: "iron", amount: 48 }, + "limonite": { metalName: "iron", amount: 42 }, + "magnetite": { metalName: "iron", amount: 42 }, + "malachite": { metalName: "copper", amount: 39 }, + "nickel": { metalName: "nickel", amount: 48 }, + "pyrite": { metalName: "iron", amount: 36 }, + "silver": { metalName: "silver", amount: 48 }, + "sphalerite": { metalName: "tin", amount: 48 }, + "tetrahedrite": { metalName: "copper", amount: 42 }, + "tin": { metalName: "tin", amount: 48 }, + }, input : { tag: 'forge:rich_raw_materials/%s' }, output : { item: 'gtceu:rich_raw_%s' } }, + + "block_slab": { heat_capacity : null }, + "block_stairs": { heat_capacity : null }, + + "block": { heat_capacity : 2.857, metal_amount: 1296, input : { tag: 'forge:storage_blocks/%s' }, output : { item: 'gtceu:%s_block' } }, + "anvil": { heat_capacity : 40.0, metal_amount: 2016, input : { item: 'tfc:metal/anvil/%s' }, output : { item: 'tfc:metal/anvil/%s' } }, + "chain": { heat_capacity : 0.171, metal_amount: 9, input : { item: 'tfc:metal/chain/%s' }, output : { item: 'tfc:metal/chain/%s' } }, + "bars": { heat_capacity : 0.714, metal_amount: 36, input : { item: 'tfc:metal/bars/%s' }, output : { item: 'tfc:metal/bars/%s' } }, + "trapdoor": { heat_capacity : 5.714, metal_amount: 288, input : { item: 'tfc:metal/trapdoor/%s' }, output : { item: 'tfc:metal/trapdoor/%s' } }, + "lamp": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'tfc:metal/lamp/%s' }, output : { item: 'tfc:metal/lamp/%s' } }, + "unfinished_lamp": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'tfc:metal/unfinished_lamp/%s' }, output : { item: 'tfc:metal/unfinished_lamp/%s' } }, + + "helmet": { heat_capacity : 17.143, metal_amount: 864, input : { item: 'tfc:metal/helmet/%s' }, output : { item: 'tfc:metal/helmet/%s' } }, + "chestplate": { heat_capacity : 22.857, metal_amount: 1152, input : { item: 'tfc:metal/chestplate/%s' }, output : { item: 'tfc:metal/chestplate/%s' } }, + "greaves": { heat_capacity : 17.143, metal_amount: 864, input : { item: 'tfc:metal/greaves/%s' }, output : { item: 'tfc:metal/greaves/%s' } }, + "boots": { heat_capacity : 11.429, metal_amount: 576, input : { item: 'tfc:metal/boots/%s' }, output : { item: 'tfc:metal/boots/%s' } }, + "unfinished_boots": { heat_capacity : 5.714, metal_amount: 288, input : { item: 'tfc:metal/unfinished_boots/%s' }, output : { item: 'tfc:metal/unfinished_boots/%s' } }, + "unfinished_chestplate": { heat_capacity : 11.429, metal_amount: 576, input : { item: 'tfc:metal/unfinished_chestplate/%s' }, output : { item: 'tfc:metal/unfinished_chestplate/%s' } }, + "unfinished_greaves": { heat_capacity : 11.429, metal_amount: 576, input : { item: 'tfc:metal/unfinished_greaves/%s' }, output : { item: 'tfc:metal/unfinished_greaves/%s' } }, + "unfinished_helmet": { heat_capacity : 11.429, metal_amount: 576, input : { item: 'tfc:metal/unfinished_helmet/%s' }, output : { item: 'tfc:metal/unfinished_helmet/%s' } }, + + "horse_armor": { heat_capacity : 34.286, metal_amount: 1728, input : { item: 'tfc:metal/horse_armor/%s' }, output : { item: 'tfc:metal/horse_armor/%s' } }, + + "sword_blade": { heat_capacity : 5.714, metal_amount: 288, input : { tag: 'forge:sword_heads/%s' }, output : { item: 'gtceu:%s_sword_head' } }, + "sword": { heat_capacity : 5.714, metal_amount: 288, input : { item: 'gtceu:%s_sword' }, output : { item: 'gtceu:%s_sword' } }, + "pickaxe_head": { heat_capacity : 2.857, metal_amount: 144, input : { tag: 'forge:pickaxe_heads/%s' }, output : { tag: 'forge:pickaxe_heads/%s' } }, + "pickaxe": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'gtceu:%s_pickaxe' }, output : { item: 'gtceu:%s_pickaxe' } }, + "axe_head": { heat_capacity : 2.857, metal_amount: 144, input : { tag: 'forge:axe_heads/%s' }, output : { item: 'gtceu:%s_axe_head' } }, + "axe": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'gtceu:%s_axe' }, output : { item: 'gtceu:%s_axe' } }, + "shovel_head": { heat_capacity : 2.857, metal_amount: 144, input : { tag: 'forge:shovel_heads/%s' }, output : { item: 'gtceu:%s_shovel_head' } }, + "shovel": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'gtceu:%s_shovel' }, output : { item: 'gtceu:%s_shovel' } }, + "hammer_head": { heat_capacity : 2.857, metal_amount: 144, input : { tag: 'forge:hammer_heads/%s' }, output : { item: 'gtceu:%s_hammer_head' } }, + "hammer": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'gtceu:%s_hammer' }, output : { item: 'gtceu:%s_hammer' } }, + "hoe_head": { heat_capacity : 2.857, metal_amount: 144, input : { tag: 'forge:hoe_heads/%s' }, output : { item: 'gtceu:%s_hoe_head' } }, + "hoe": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'gtceu:%s_hoe' }, output : { item: 'gtceu:%s_hoe' } }, + "knife_blade": { heat_capacity : 2.857, metal_amount: 144, input : { tag: 'forge:knife_heads/%s' }, output : { item: 'gtceu:%s_knife_head' } }, + "knife": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'gtceu:%s_knife' }, output : { item: 'gtceu:%s_knife' } }, + "saw_blade": { heat_capacity : 2.857, metal_amount: 144, input : { tag: 'forge:saw_heads/%s' }, output : { item: 'gtceu:%s_saw_head' } }, + "saw": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'gtceu:%s_saw' }, output : { item: 'gtceu:%s_saw' } }, + "scythe_blade": { heat_capacity : 2.857, metal_amount: 144, input : { tag: 'forge:scythe_heads/%s' }, output : { item: 'gtceu:%s_scythe_head' } }, + "scythe": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'gtceu:%s_scythe' }, output : { item: 'gtceu:%s_scythe' } }, + "chisel_head": { heat_capacity : 2.857, input : { item: 'tfc:metal/chisel_head/%s' }, output : { item: 'tfc:metal/chisel_head/%s' }, }, + "chisel": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'tfc:metal/chisel/%s' }, output : { item: 'tfc:metal/chisel/%s' } }, + "javelin_head": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'tfc:metal/javelin_head/%s' }, output : { item: 'tfc:metal/javelin_head/%s' } }, + "javelin": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'tfc:metal/javelin/%s' }, output : { item: 'tfc:metal/javelin/%s' } }, + "propick_head": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'tfc:metal/propick_head/%s' }, output : { item: 'tfc:metal/propick_head/%s' } }, + "propick": { heat_capacity : 2.857, metal_amount: 144, input : { item: 'tfc:metal/propick/%s' }, output : { item: 'tfc:metal/propick/%s' } }, + "mace_head": { heat_capacity : 5.714, metal_amount: 288, input : { item: 'tfc:metal/mace_head/%s' }, output : { item: 'tfc:metal/mace_head/%s' } }, + "mace": { heat_capacity : 5.714, metal_amount: 288, input : { item: 'tfc:metal/mace/%s' }, output : { item: 'tfc:metal/mace/%s' } }, + "fish_hook": { heat_capacity : 5.714, metal_amount: 288, input : { item: 'tfc:metal/fish_hook/%s' }, output : { item: 'tfc:metal/fish_hook/%s' } }, + "fishing_rod": { heat_capacity : 5.714, metal_amount: 288, input : { item: 'tfc:metal/fishing_rod/%s' }, output : { item: 'tfc:metal/fishing_rod/%s' } }, + "tuyere": { heat_capacity : 11.429, metal_amount: 576, input : { item: 'tfc:metal/tuyere/%s' }, output : { item: 'tfc:metal/tuyere/%s' } }, + "shears": { heat_capacity : 5.714, metal_amount: 288, input : { item: 'tfc:metal/shears/%s' }, output : { item: 'tfc:metal/shears/%s' } }, + "shield": { heat_capacity : 11.429, metal_amount: 576, input : { item: 'tfc:metal/shield/%s' }, output : { item: 'tfc:metal/shield/%s' } }, + + "ingot": { heat_capacity : 2.857, metal_amount: 144, input : { tag: 'forge:ingots/%s' }, output : { item: Item.getId(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Bronze, 1)) } }, + "double_ingot": { heat_capacity : 5.714, metal_amount: 288, input : { tag: 'forge:double_ingots/%s' }, output : { item: 'tfc:metal/double_ingot/%s' } }, + "sheet": { heat_capacity : 5.714, metal_amount: 288, input : { tag: 'forge:plates/%s' }, output : { item: 'gtceu:%s_plate' } }, + "double_sheet": { heat_capacity : 11.429, metal_amount: 576, input : { tag: 'forge:plates/double/%s' }, output : { item: 'gtceu:%s_double_plate' } }, + "rod": { heat_capacity : 1.429, metal_amount: 72, input : { tag: 'forge:rods/%s' }, output : { item: 'gtceu:%s_rod' } }, } -const metalToSpecs = { - "bismuth" : { forging_temperature: 162, welding_temperature: 216, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) }, - "brass" : { forging_temperature: 558, welding_temperature: 744, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty) }, - "gold" : { forging_temperature: 636, welding_temperature: 848, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) }, - "nickel" : { forging_temperature: 872, welding_temperature: 1162, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) }, - "rose_gold" : { forging_temperature: 576, welding_temperature: 768, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty) }, - "silver" : { forging_temperature: 577, welding_temperature: 769, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) }, - "tin" : { forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty) }, - "zinc" : { forging_temperature: 252, welding_temperature: 336, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty) }, - "sterling_silver": { forging_temperature: 570, welding_temperature: 760, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty) }, - "copper" : { forging_temperature: 648, welding_temperature: 864, hasOre: true, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, - "bismuth_bronze" : { forging_temperature: 591, welding_temperature: 788, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, - "bronze" : { forging_temperature: 570, welding_temperature: 760, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, - "black_bronze" : { forging_temperature: 642, welding_temperature: 856, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, - "wrought_iron" : { forging_temperature: 921, welding_temperature: 1228, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, - "cast_iron" : { forging_temperature: 921, welding_temperature: 1228, hasOre: true, customName: "iron", props: [].concat(defaultProperty, partProperty) }, - "pig_iron" : { forging_temperature: 921, welding_temperature: 1228, hasOre: false, customName: null, props: defaultProperty}, - "steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, - "high_carbon_black_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty }, - "high_carbon_red_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty }, - "high_carbon_blue_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty }, - "weak_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty }, - "weak_red_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty }, - "weak_blue_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: defaultProperty }, - "black_steel" : { forging_temperature: 891, welding_temperature: 1188, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, - "red_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, - "blue_steel" : { forging_temperature: 924, welding_temperature: 1232, hasOre: false, customName: null, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty) }, - "unknown" : { forging_temperature: 240, welding_temperature: 320, hasOre: false, customName: null, props: defaultProperty }, - "cassiterite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []}, - "garnierite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []}, - "hematite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []}, - "limonite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []}, - "magnetite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []}, - "malachite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []}, - "pyrite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []}, - "sphalerite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []}, - "tetrahedrite" : {forging_temperature: 138, welding_temperature: 184, hasOre: true, customName: null, props: []} +const Metals = { + "bismuth" : { forging_temp: 162, welding_temp: 216, melt_temp: 270, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) }, + "brass" : { forging_temp: 558, welding_temp: 744, melt_temp: 930, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) }, + "gold" : { forging_temp: 636, welding_temp: 848, melt_temp: 1060, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) }, + "nickel" : { forging_temp: 872, welding_temp: 1162, melt_temp: 1453, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) }, + "rose_gold" : { forging_temp: 576, welding_temp: 768, melt_temp: 960, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) }, + "silver" : { forging_temp: 577, welding_temp: 769, melt_temp: 961, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) }, + "tin" : { forging_temp: 138, welding_temp: 184, melt_temp: 230, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) }, + "zinc" : { forging_temp: 252, welding_temp: 336, melt_temp: 420, props: [].concat(defaultProperty, partProperty, dustProperty) }, + "sterling_silver": { forging_temp: 570, welding_temp: 760, melt_temp: 950, props: [].concat(defaultProperty, partProperty, dustProperty) }, + "copper" : { forging_temp: 648, welding_temp: 864, melt_temp: 1080, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, oreProperty, dustProperty) }, + "bismuth_bronze" : { forging_temp: 591, welding_temp: 788, melt_temp: 985, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty) }, + "bronze" : { forging_temp: 570, welding_temp: 760, melt_temp: 950, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty) }, + "black_bronze" : { forging_temp: 642, welding_temp: 856, melt_temp: 1070, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty) }, + "wrought_iron" : { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, oreProperty, dustProperty) }, + "cast_iron" : { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, customName: "iron", props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty) }, + "pig_iron" : { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, props: defaultProperty}, + "steel" : { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty) }, + "high_carbon_black_steel" : { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, props: defaultProperty }, + "high_carbon_red_steel" : { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, props: defaultProperty }, + "high_carbon_blue_steel" : { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, props: defaultProperty }, + "weak_steel" : { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: defaultProperty }, + "weak_red_steel" : { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: defaultProperty }, + "weak_blue_steel" : { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: defaultProperty }, + "black_steel" : { forging_temp: 891, welding_temp: 1188, melt_temp: 1485, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty) }, + "red_steel" : { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty) }, + "blue_steel" : { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty) }, + "unknown" : { forging_temp: 240, welding_temp: 320, melt_temp: 400, props: defaultProperty }, + "cassiterite" : { forging_temp: 138, welding_temp: 184, melt_temp: 230, props: [].concat(oreProperty, dustProperty) }, + "garnierite" : { forging_temp: 138, welding_temp: 184, melt_temp: 1453, props: [].concat(oreProperty, dustProperty) }, + "hematite" : { forging_temp: 138, welding_temp: 184, melt_temp: 1535, props: [].concat(oreProperty, dustProperty) }, + "limonite" : { forging_temp: 138, welding_temp: 184, melt_temp: 1535, props: [].concat(oreProperty, dustProperty) }, + "magnetite" : { forging_temp: 138, welding_temp: 184, melt_temp: 1535, props: [].concat(oreProperty, dustProperty) }, + "malachite" : { forging_temp: 138, welding_temp: 184, melt_temp: 1080, props: [].concat(oreProperty, dustProperty) }, + "pyrite" : { forging_temp: 138, welding_temp: 184, melt_temp: 1535, props: [].concat(oreProperty, dustProperty) }, + "sphalerite" : { forging_temp: 138, welding_temp: 184, melt_temp: 420, props: [].concat(oreProperty, dustProperty) }, + "tetrahedrite" : { forging_temp: 138, welding_temp: 184, melt_temp: 1080, props: [].concat(oreProperty, dustProperty) } } -const asd = [ -] +const asdas = { + "1": { cock: 1, dead: (dead) => {}} +} const removeAllTagsItems = [ 'tfc:ore/amethyst', diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 5532974b5..4201d8cef 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -1,80 +1,98 @@ // priority: 0 -const registerTFCData = (event) => { - - const emptyJson = { - conditions: [ - { type: "forge:false" } - ] - } +const emptyJson = { + conditions: [ + { type: "forge:false" } + ] +} - const itemJson = (itemName, heat_capacity_input, forging_temperature_input, welding_temperature_input) => { - return { - ingredient: { - item: itemName - }, - heat_capacity: heat_capacity_input, - forging_temperature: forging_temperature_input, - welding_temperature: welding_temperature_input - } - } - - const tagJson = (tagName, heat_capacity_input, forging_temperature_input, welding_temperature_input) => { - return { - ingredient: { - tag: tagName - }, - heat_capacity: heat_capacity_input, - forging_temperature: forging_temperature_input, - welding_temperature: welding_temperature_input - } - } - - for (const [metal, metalSpecs] of Object.entries(metalToSpecs)) { - - let metalName = (metalSpecs.customName != null) ? metalSpecs.customName : metal - - metalSpecs.props.forEach(propName => { - let json - let property = itemTypeToHeat[propName] - - if (property.useTag) json = tagJson(`forge:${property.hasGTVariant}/${metalName}`, property.heat_capacity, metalSpecs.forging_temperature, metalSpecs.welding_temperature) +const registerTFCItemHeats = (event) => { + for (const [tfcMetalName, metalSpecifications] of Object.entries(Metals)) { + metalSpecifications.props.forEach(propertyName => { + let itemType = ItemHeats[propertyName] + let path = `tfc:tfc/item_heats/metal/${tfcMetalName}_${propertyName}` + let metalName = (metalSpecifications.customName != undefined) ? metalSpecifications.customName : tfcMetalName + + if (itemType.heat_capacity == null) { + event.addJson(path, emptyJson) + } else { - let itemName - - if (property.hasGTVariant != null) itemName = `gtceu:${metalName}_${propName}` - else itemName = `tfc:metal/${propName}/${metal}` + let ingredient - json = itemJson(itemName, property.heat_capacity, metalSpecs.forging_temperature, metalSpecs.welding_temperature) + if (itemType.input.item != undefined) ingredient = { item: itemType.input.item.replace('%s', metalName) } + else ingredient = { tag: itemType.input.tag.replace('%s', metalName) } + + let json = { + ingredient: ingredient, + heat_capacity: itemType.heat_capacity, + forging_temperature: metalSpecifications.forging_temp, + welding_temperature: metalSpecifications.welding_temp + } + + event.addJson(path, json) } - - let path = `tfc:tfc/item_heats/metal/${metal}_${propName}` - - if (property.heat_capacity == 0.0) event.addJson(path, emptyJson) - else event.addJson(path, json) - }); - - if (metalSpecs.hasOre) { - let path = `tfc:tfc/item_heats/ore/${metalName}` - let json = { - ingredient: [ - { - "tag": `forge:poor_raw_materials/${metalName}` - }, - { - "tag": `forge:raw_materials/${metalName}` - }, - { - "tag": `forge:rich_raw_materials/${metalName}` - } - ], - heat_capacity: 1.143, - forging_temperature: metalSpecs.forging_temperature, - welding_temperature: metalSpecs.welding_temperature - } - - event.addJson(path, json) - } + }) } } +const registerTFCHeatingRecipes = (event) => { + for (const [tfcMetalName, metalSpecifications] of Object.entries(Metals)) { + metalSpecifications.props.forEach(propertyName => { + let path = `tfc:recipes/metal/${tfcMetalName}_${propertyName}` + let itemType = ItemHeats[propertyName] + let metalName = (metalSpecifications.customName != undefined) ? metalSpecifications.customName : tfcMetalName + + if (itemType.heat_capacity == null) { + event.addJson(path, emptyJson) + } + else { + let ingredient + + if (itemType.input.item != undefined) ingredient = { item: itemType.input.item.replace('%s', metalName) } + else ingredient = { tag: itemType.input.tag.replace('%s', metalName) } + + let json + + if (typeof(itemType.metal_amount) == "object") + { + console.log(itemType.metal_amount) + if (itemType.metal_amount[metalName] != undefined) + { + let customMetalName = itemType.metal_amount[metalName].metalName + let metalAmount = itemType.metal_amount[metalName].amount + + json = { + type: "tfc:heating", + ingredient: ingredient, + result_fluid: { + fluid: `gtceu:${customMetalName}`, + amount: metalAmount + }, + temperature: metalSpecifications.melt_temp, + use_durability: (propertyName.includes('head') || propertyName.includes('blade')) ? true : false + } + } + } + else { + json = { + type: "tfc:heating", + ingredient: ingredient, + result_fluid: { + fluid: `gtceu:${metalName}`, + amount: itemType.metal_amount + }, + temperature: metalSpecifications.melt_temp, + use_durability: (propertyName.includes('head') || propertyName.includes('blade')) ? true : false + } + } + + event.addJson(path, json) + } + }) + } +} + +const registerTFCData = (event) => { + registerTFCItemHeats(event) + registerTFCHeatingRecipes(event) +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index dae6d0dc9..ff71a17ad 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -1,6 +1,11 @@ // priority: 0 const registerTFCRecipes = (event) => { + event.remove({ id: /tfc:anvil.*/ }) + event.remove({ id: /tfc:welding.*/ }) + event.remove({ id: /tfc:casting.*/ }) + event.remove({ id: /tfc:heating.*/ }) + event.remove({ id: 'tfc:crafting/vanilla/lapis_block' }) event.remove({ id: 'tfc:quern/amethyst' })