diff --git a/kubejs/server_scripts/tfc/constants.js b/kubejs/server_scripts/tfc/constants.js index 0f1aafa91..5e274b5a1 100644 --- a/kubejs/server_scripts/tfc/constants.js +++ b/kubejs/server_scripts/tfc/constants.js @@ -4,8 +4,11 @@ const defaultProperty = [ "ingot" ] +const nuggetProperty = [ + "nugget" +] + const dustProperty = [ - "nugget", "dust", "dust_small", "dust_tiny", @@ -87,7 +90,7 @@ const utilityProperty = [ ] const ItemHeats = { - "nugget": { heat_capacity : 0.124, metal_amount: { + "nugget": { heat_capacity: 0.124, metal_amount: { "bismuth": { metalName: "bismuth", amount: 16 }, "cassiterite": { metalName: "tin", amount: 16 }, "copper": { metalName: "copper", amount: 16 }, @@ -95,7 +98,7 @@ const ItemHeats = { "gold": { metalName: "gold", amount: 16 }, "hematite": { metalName: "iron", amount: 13 }, "iron": { metalName: "iron", amount: 16 }, - "limonite": { metalName: "iron", amount: 14 }, + "yellow_limonite": { metalName: "iron", amount: 14 }, "magnetite": { metalName: "iron", amount: 14 }, "malachite": { metalName: "copper", amount: 13 }, "nickel": { metalName: "nickel", amount: 16 }, @@ -104,9 +107,9 @@ const ItemHeats = { "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' } }, + }, input: (name) => { return { tag: `forge:nuggets/${name}` } }, output: (name) => { return { item: `gtceu:${name}_nugget` } } }, - "dust": { heat_capacity : 1.429, metal_amount: { + "dust": { heat_capacity: 1.429, metal_amount: { "bismuth": { metalName: "bismuth", amount: 144 }, "cassiterite": { metalName: "tin", amount: 144 }, "copper": { metalName: "copper", amount: 144 }, @@ -114,7 +117,7 @@ const ItemHeats = { "gold": { metalName: "gold", amount: 144 }, "hematite": { metalName: "iron", amount: 117 }, "iron": { metalName: "iron", amount: 144 }, - "limonite": { metalName: "iron", amount: 126 }, + "yellow_limonite": { metalName: "iron", amount: 126 }, "magnetite": { metalName: "iron", amount: 126 }, "malachite": { metalName: "copper", amount: 117 }, "nickel": { metalName: "nickel", amount: 144 }, @@ -123,10 +126,10 @@ const ItemHeats = { "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' } }, + }, input: (name) => { return { tag: `forge:dusts/${name}` } }, output: (name) => { return { item: `gtceu:${name}_dust` } } }, - "dust_small": { heat_capacity : 0.714, metal_amount: { + "dust_small": { heat_capacity: 0.714, metal_amount: { "bismuth": { metalName: "bismuth", amount: 36 }, "cassiterite": { metalName: "tin", amount: 36 }, "copper": { metalName: "copper", amount: 36 }, @@ -134,7 +137,7 @@ const ItemHeats = { "gold": { metalName: "gold", amount: 36 }, "hematite": { metalName: "iron", amount: 29 }, "iron": { metalName: "iron", amount: 36 }, - "limonite": { metalName: "iron", amount: 31 }, + "yellow_limonite": { metalName: "iron", amount: 31 }, "magnetite": { metalName: "iron", amount: 31 }, "malachite": { metalName: "copper", amount: 29 }, "nickel": { metalName: "nickel", amount: 36 }, @@ -143,10 +146,10 @@ const ItemHeats = { "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' } }, + }, input: (name) => { return { tag: `forge:dusts/small/${name}` } }, output: (name) => { return { item: `gtceu:${name}_dust_small` } } }, - "dust_tiny": { heat_capacity : 0.357, metal_amount: { + "dust_tiny": { heat_capacity: 0.357, metal_amount: { "bismuth": { metalName: "bismuth", amount: 16 }, "cassiterite": { metalName: "tin", amount: 16 }, "copper": { metalName: "copper", amount: 16 }, @@ -154,7 +157,7 @@ const ItemHeats = { "gold": { metalName: "gold", amount: 16 }, "hematite": { metalName: "iron", amount: 13 }, "iron": { metalName: "iron", amount: 16 }, - "limonite": { metalName: "iron", amount: 14 }, + "yellow_limonite": { metalName: "iron", amount: 14 }, "magnetite": { metalName: "iron", amount: 14 }, "malachite": { metalName: "copper", amount: 13 }, "nickel": { metalName: "nickel", amount: 16 }, @@ -163,10 +166,10 @@ const ItemHeats = { "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' } }, + }, input: (name) => { return { tag: `forge:dusts/tiny/${name}` } }, output: (name) => { return { item: `gtceu:${name}_dust_tiny` } } }, - "poor_raw": { heat_capacity : 1.429, metal_amount: { + "poor_raw": { heat_capacity: 1.429, metal_amount: { "bismuth": { metalName: "bismuth", amount: 24 }, "cassiterite": { metalName: "tin", amount: 24 }, "copper": { metalName: "copper", amount: 24 }, @@ -174,7 +177,7 @@ const ItemHeats = { "gold": { metalName: "gold", amount: 24 }, "hematite": { metalName: "iron", amount: 18 }, "iron": { metalName: "iron", amount: 24 }, - "limonite": { metalName: "iron", amount: 21 }, + "yellow_limonite": { metalName: "iron", amount: 21 }, "magnetite": { metalName: "iron", amount: 21 }, "malachite": { metalName: "copper", amount: 18 }, "nickel": { metalName: "nickel", amount: 24 }, @@ -183,10 +186,10 @@ const ItemHeats = { "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' } }, + }, input: (name) => { return { tag: `forge:poor_raw_materials/${name}` } }, output: (name) => { return { item: `gtceu:poor_raw_${name}` } } }, - "normal_raw": { heat_capacity : 1.429, metal_amount: { + "normal_raw": { heat_capacity: 1.429, metal_amount: { "bismuth": { metalName: "bismuth", amount: 36 }, "cassiterite": { metalName: "tin", amount: 36 }, "copper": { metalName: "copper", amount: 36 }, @@ -194,7 +197,7 @@ const ItemHeats = { "gold": { metalName: "gold", amount: 36 }, "hematite": { metalName: "iron", amount: 29 }, "iron": { metalName: "iron", amount: 36 }, - "limonite": { metalName: "iron", amount: 31 }, + "yellow_limonite": { metalName: "iron", amount: 31 }, "magnetite": { metalName: "iron", amount: 31 }, "malachite": { metalName: "copper", amount: 29 }, "nickel": { metalName: "nickel", amount: 36 }, @@ -203,10 +206,10 @@ const ItemHeats = { "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' } }, + }, input: (name) => { return { tag: `forge:raw_materials/${name}` } }, output: (name) => { return { item: `gtceu:raw_${name}` } } }, - "rich_raw": { heat_capacity : 1.429, metal_amount: { + "rich_raw": { heat_capacity: 1.429, metal_amount: { "bismuth": { metalName: "bismuth", amount: 48 }, "cassiterite": { metalName: "tin", amount: 48 }, "copper": { metalName: "copper", amount: 48 }, @@ -214,7 +217,7 @@ const ItemHeats = { "gold": { metalName: "gold", amount: 48 }, "hematite": { metalName: "iron", amount: 39 }, "iron": { metalName: "iron", amount: 48 }, - "limonite": { metalName: "iron", amount: 42 }, + "yellow_limonite": { metalName: "iron", amount: 42 }, "magnetite": { metalName: "iron", amount: 42 }, "malachite": { metalName: "copper", amount: 39 }, "nickel": { metalName: "nickel", amount: 48 }, @@ -223,111 +226,210 @@ const ItemHeats = { "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' } }, + }, input: (name) => { return { tag: `forge:rich_raw_materials/${name}` } }, output: (name) => { return { item: `gtceu:rich_raw_${name}` } } }, - "block_slab": { heat_capacity : null }, - "block_stairs": { heat_capacity : null }, + "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' } }, + "block": { heat_capacity: 2.857, metal_amount: 1296, + input: (name) => { return { tag: `forge:storage_blocks/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_block` } } }, + "anvil": { heat_capacity: 40.0, metal_amount: 2016, + input: (name) => { return { item: `tfc:metal/anvil/${name}` } }, + output: (name) => { return { item: `tfc:metal/anvil/${name}` } } }, + "chain": { heat_capacity: 0.171, metal_amount: 9, + input: (name) => { return { item: `tfc:metal/chain/${name}` } }, + output: (name) => { return { item: `tfc:metal/chain/${name}` } } }, + "bars": { heat_capacity: 0.714, metal_amount: 36, + input: (name) => { return { item: `tfc:metal/bars/${name}` } }, + output: (name) => { return { item: `tfc:metal/bars/${name}` } } }, + "trapdoor": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { item: `tfc:metal/trapdoor/${name}` } }, + output: (name) => { return { item: `tfc:metal/trapdoor/${name}` } } }, + "lamp": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `tfc:metal/lamp/${name}` } }, + output: (name) => { return { item: `tfc:metal/lamp/${name}` } } }, + "unfinished_lamp": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `tfc:metal/unfinished_lamp/${name}` } }, + output: (name) => { return { item: `tfc:metal/unfinished_lamp/${name}` } } }, - "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' } }, + "helmet": { heat_capacity: 17.143, metal_amount: 864, + input: (name) => { return { item: `tfc:metal/helmet/${name}` } }, + output: (name) => { return { item: `tfc:metal/helmet/${name}` } } }, + "chestplate": { heat_capacity: 22.857, metal_amount: 1152, + input: (name) => { return { item: `tfc:metal/chestplate/${name}` }}, + output: (name) => { return { item: `tfc:metal/chestplate/${name}` } } }, + "greaves": { heat_capacity: 17.143, metal_amount: 864, + input: (name) => { return { item: `tfc:metal/greaves/${name}` } }, + output: (name) => { return { item: `tfc:metal/greaves/${name}` } } }, + "boots": { heat_capacity: 11.429, metal_amount: 576, + input: (name) => { return { item: `tfc:metal/boots/${name}` } }, + output: (name) => { return { item: `tfc:metal/boots/${name}` } } }, + "unfinished_boots": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { item: `tfc:metal/unfinished_boots/${name}` } }, + output: (name) => { return { item: `tfc:metal/unfinished_boots/${name}` } } }, + "unfinished_chestplate": { heat_capacity: 11.429, metal_amount: 576, + input: (name) => { return { item: `tfc:metal/unfinished_chestplate/${name}` } }, + output: (name) => { return { item: `tfc:metal/unfinished_chestplate/${name}` } } }, + "unfinished_greaves": { heat_capacity: 11.429, metal_amount: 576, + input: (name) => { return { item: `tfc:metal/unfinished_greaves/${name}` } }, + output: (name) => { return { item: `tfc:metal/unfinished_greaves/${name}` } } }, + "unfinished_helmet": { heat_capacity: 11.429, metal_amount: 576, + input: (name) => { return { item: `tfc:metal/unfinished_helmet/${name}` } }, + output: (name) => { return { item: `tfc:metal/unfinished_helmet/${name}` } } }, - "horse_armor": { heat_capacity : 34.286, metal_amount: 1728, input : { item: 'tfc:metal/horse_armor/%s' }, output : { item: 'tfc:metal/horse_armor/%s' } }, + "horse_armor": { heat_capacity: 34.286, metal_amount: 1728, + input: (name) => { return { item: `tfc:metal/horse_armor/${name}` } }, + output: (name) => { return { item: `tfc:metal/horse_armor/${name}` } } }, - "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' } }, + "sword_blade": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { tag: `forge:sword_heads/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_sword_head` } } }, + "sword": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { item: `gtceu:${name}_sword` } }, + output: (name) => { return { item: `gtceu:${name}_sword` } } }, + "pickaxe_head": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { tag: `forge:pickaxe_heads/${name}` } }, + output: (name) => { return { tag: `forge:pickaxe_heads/${name}` } } }, + "pickaxe": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `gtceu:${name}_pickaxe` } }, + output: (name) => { return { item: `gtceu:${name}_pickaxe` } } }, + "axe_head": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { tag: `forge:axe_heads/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_axe_head` } } }, + "axe": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `gtceu:${name}_axe` } }, + output: (name) => { return { item: `gtceu:${name}_axe` } } }, + "shovel_head": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { tag: `forge:shovel_heads/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_shovel_head` } } }, + "shovel": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `gtceu:${name}_shovel` } }, + output: (name) => { return { item: `gtceu:${name}_shovel` } } }, + "hammer_head": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { tag: `forge:hammer_heads/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_hammer_head` } } }, + "hammer": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `gtceu:${name}_hammer` } }, + output: (name) => { return { item: `gtceu:${name}_hammer` } } }, + "hoe_head": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { tag: `forge:hoe_heads/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_hoe_head` } } }, + "hoe": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `gtceu:${name}_hoe` } }, + output: (name) => { return { item: `gtceu:${name}_hoe` } } }, + "knife_blade": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { tag: `forge:knife_heads/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_knife_head` } } }, + "knife": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `gtceu:${name}_knife` } }, + output: (name) => { return { item: `gtceu:${name}_knife` } } }, + "saw_blade": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { tag: `forge:saw_heads/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_saw_head` } } }, + "saw": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `gtceu:${name}_saw` } }, + output: (name) => { return { item: `gtceu:${name}_saw` } } }, + "scythe_blade": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { tag: `forge:scythe_heads/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_scythe_head` } } }, + "scythe": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `gtceu:${name}_scythe` } }, + output: (name) => { return { item: `gtceu:${name}_scythe` } } }, + "chisel_head": { heat_capacity: 2.857, + input: (name) => { return { item: `tfc:metal/chisel_head/${name}` } }, + output: (name) => { return { item: `tfc:metal/chisel_head/${name}` } }, }, + "chisel": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `tfc:metal/chisel/${name}` } }, + output: (name) => { return { item: `tfc:metal/chisel/${name}` } } }, + "javelin_head": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `tfc:metal/javelin_head/${name}` } }, + output: (name) => { return { item: `tfc:metal/javelin_head/${name}` } } }, + "javelin": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `tfc:metal/javelin/${name}` } }, + output: (name) => { return { item: `tfc:metal/javelin/${name}` } } }, + "propick_head": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `tfc:metal/propick_head/${name}` } }, + output: (name) => { return { item: `tfc:metal/propick_head/${name}` } } }, + "propick": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { item: `tfc:metal/propick/${name}` } }, + output: (name) => { return { item: `tfc:metal/propick/${name}` } } }, + "mace_head": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { item: `tfc:metal/mace_head/${name}` } }, + output: (name) => { return { item: `tfc:metal/mace_head/${name}` } } }, + "mace": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { item: `tfc:metal/mace/${name}` } }, + output: (name) => { return { item: `tfc:metal/mace/${name}` } } }, + "fish_hook": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { item: `tfc:metal/fish_hook/${name}` } }, + output: (name) => { return { item: `tfc:metal/fish_hook/${name}` } } }, + "fishing_rod": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { item: `tfc:metal/fishing_rod/${name}` } }, + output: (name) => { return { item: `tfc:metal/fishing_rod/${name}` } } }, + "tuyere": { heat_capacity: 11.429, metal_amount: 576, + input: (name) => { return { item: `tfc:metal/tuyere/${name}` } }, + output: (name) => { return { item: `tfc:metal/tuyere/${name}` } } }, + "shears": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { item: `tfc:metal/shears/${name}` } }, + output: (name) => { return { item: `tfc:metal/shears/${name}` } } }, + "shield": { heat_capacity: 11.429, metal_amount: 576, + input: (name) => { return { item: `tfc:metal/shield/${name}` } }, + output: (name) => { return { item: `tfc:metal/shield/${name}` } } }, - "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' } }, + "ingot": { heat_capacity: 2.857, metal_amount: 144, + input: (name) => { return { tag: `forge:ingots/${name}` } }, + output: (name) => { return { item: Item.getId(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.get(name), 1)) } } }, + "double_ingot": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { tag: `forge:double_ingots/${name}` } }, + output: (name) => { return { item: `tfc:metal/double_ingot/${name}` } } }, + "sheet": { heat_capacity: 5.714, metal_amount: 288, + input: (name) => { return { tag: `forge:plates/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_plate` } } }, + "double_sheet": { heat_capacity: 11.429, metal_amount: 576, + input: (name) => { return { tag: `forge:plates/double/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_double_plate` } } }, + "rod": { heat_capacity: 1.429, metal_amount: 72, + input: (name) => { return { tag: `forge:rods/${name}` } }, + output: (name) => { return { item: `gtceu:${name}_rod` } } }, } 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 asdas = { - "1": { cock: 1, dead: (dead) => {}} + "bismuth": { forging_temp: 162, welding_temp: 216, melt_temp: 270, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) }, + "brass": { forging_temp: 558, welding_temp: 744, melt_temp: 930, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) }, + "gold": { forging_temp: 636, welding_temp: 848, melt_temp: 1060, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) }, + "nickel": { forging_temp: 872, welding_temp: 1162, melt_temp: 1453, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) }, + "rose_gold": { forging_temp: 576, welding_temp: 768, melt_temp: 960, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) }, + "silver": { forging_temp: 577, welding_temp: 769, melt_temp: 961, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) }, + "tin": { forging_temp: 138, welding_temp: 184, melt_temp: 230, props: [].concat(defaultProperty, partProperty, oreProperty, dustProperty, nuggetProperty) }, + "zinc": { forging_temp: 252, welding_temp: 336, melt_temp: 420, props: [].concat(defaultProperty, partProperty, dustProperty, nuggetProperty) }, + "sterling_silver": { forging_temp: 570, welding_temp: 760, melt_temp: 950, props: [].concat(defaultProperty, partProperty, dustProperty, nuggetProperty) }, + "copper": { forging_temp: 648, welding_temp: 864, melt_temp: 1080, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, oreProperty, dustProperty, nuggetProperty) }, + "bismuth_bronze": { forging_temp: 591, welding_temp: 788, melt_temp: 985, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) }, + "bronze": { forging_temp: 570, welding_temp: 760, melt_temp: 950, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) }, + "black_bronze": { forging_temp: 642, welding_temp: 856, melt_temp: 1070, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) }, + "wrought_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, oreProperty, dustProperty, nuggetProperty) }, + "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, nuggetProperty) }, + "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, nuggetProperty) }, + "red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) }, + "blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, props: [].concat(defaultProperty, partProperty, armorProperty, toolProperty, utilityProperty, dustProperty, nuggetProperty) }, + "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, customName: "yellow_limonite", 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 removeAllTagsItems = [ diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index 4201d8cef..eed5cff3b 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -17,10 +17,7 @@ const registerTFCItemHeats = (event) => { 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 ingredient = itemType.input(metalName) let json = { ingredient: ingredient, @@ -46,10 +43,7 @@ const registerTFCHeatingRecipes = (event) => { 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 ingredient = itemType.input(metalName) let json