diff --git a/kubejs/assets/tfc/lang/en_us.json b/kubejs/assets/tfc/lang/en_us.json index 5c3762495..7f533d0dc 100644 --- a/kubejs/assets/tfc/lang/en_us.json +++ b/kubejs/assets/tfc/lang/en_us.json @@ -1,4 +1,5 @@ { + "metal.tfc.cast_iron": "Iron", "block.gtceu.tfc_andesite_almandine_ore.prospected": "Almandine", "block.gtceu.tfc_andesite_aluminium_ore.prospected": "Aluminium", "block.gtceu.tfc_andesite_alunite_ore.prospected": "Alunite", diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index a0738c1a6..4ece41e57 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -23,4 +23,9 @@ ServerEvents.recipes(event => { LootJS.modifiers((event) => { modifyLootGT(event) -}); \ No newline at end of file +}); + +BlockEvents.rightClicked(event => { + console.log(event.getBlock()) + console.log(event.getItem()) +}) \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/constants.js b/kubejs/server_scripts/tfc/constants.js index 4d95bde99..0d64d13aa 100644 --- a/kubejs/server_scripts/tfc/constants.js +++ b/kubejs/server_scripts/tfc/constants.js @@ -8,42 +8,45 @@ const oreGen = [ "poor_raw", "raw", "rich_raw" ] const partGen = [ "sheet", "double_sheet", "rod", "block", "block_stairs", "block_slab" ] const armorGen = [ "boots", "greaves", "chestplate", "helmet", "shield", "unfinished_boots", "unfinished_chestplate", "unfinished_greaves", "unfinished_helmet" ] const utilityGen = [ "anvil", "bars", "chain", "lamp", "trapdoor", "unfinished_lamp" ] -const toolGen = [ +const gtToolGen = [ "axe_head", "axe", - "chisel_head", - "chisel", - "fish_hook", - "fishing_rod", "hammer_head", "hammer", "hoe", "hoe_head", - "horse_armor", - "javelin_head", - "javelin", "knife_blade", "knife", - "mace_head", - "mace", - "pickaxe_head", - "pickaxe", - "propick_head", - "propick", "saw_blade", "saw", + "pickaxe_head", + "pickaxe", "scythe_blade", "scythe", - "shears", "shovel_head", "shovel", "sword_blade", "sword", +] +const tfcToolGen = [ + "chisel_head", + "chisel", + "fish_hook", + "fishing_rod", + "horse_armor", + "javelin_head", + "javelin", + "mace_head", + "mace", + "propick_head", + "propick", + "shears", "tuyere" ] const ItemHeats = { "nugget": { heat_capacity: 0.124, metal_amount: { + "default": 16, "bismuth": 16, "cassiterite": 16, "copper": 16, @@ -63,6 +66,7 @@ const ItemHeats = { }, input: (name) => { return { tag: `forge:nuggets/${name}` } }, output: (name) => { return { item: `gtceu:${name}_nugget` } } }, "dust": { heat_capacity: 1.429, metal_amount: { + "default": 144, "bismuth": 144, "cassiterite": 144, "copper": 144, @@ -83,6 +87,7 @@ const ItemHeats = { "dust_small": { heat_capacity: 0.714, metal_amount: { + "default": 36, "bismuth": 36, "cassiterite": 36, "copper": 36, @@ -103,6 +108,7 @@ const ItemHeats = { "dust_tiny": { heat_capacity: 0.357, metal_amount: { + "default": 16, "bismuth": 16, "cassiterite": 16, "copper": 16, @@ -123,6 +129,7 @@ const ItemHeats = { "poor_raw": { heat_capacity: 1.429, metal_amount: { + "default": 24, "bismuth": 24, "cassiterite": 24, "copper": 24, @@ -143,6 +150,7 @@ const ItemHeats = { "raw": { heat_capacity: 1.429, metal_amount: { + "default": 36, "bismuth": 36, "cassiterite": 36, "copper": 36, @@ -163,6 +171,7 @@ const ItemHeats = { "rich_raw": { heat_capacity: 1.429, metal_amount: { + "default": 48, "bismuth": 48, "cassiterite": 48, "copper": 48, @@ -206,16 +215,16 @@ const ItemHeats = { 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, + "helmet": { heat_capacity: 17.143, metal_amount: 864, hasDur: true, input: (name) => { return { item: `tfc:metal/helmet/${name}` } }, output: (name) => { return { item: `tfc:metal/helmet/${name}` } } }, - "chestplate": { heat_capacity: 22.857, metal_amount: 1152, + "chestplate": { heat_capacity: 22.857, metal_amount: 1152, hasDur: true, input: (name) => { return { item: `tfc:metal/chestplate/${name}` }}, output: (name) => { return { item: `tfc:metal/chestplate/${name}` } } }, - "greaves": { heat_capacity: 17.143, metal_amount: 864, + "greaves": { heat_capacity: 17.143, metal_amount: 864, hasDur: true, input: (name) => { return { item: `tfc:metal/greaves/${name}` } }, output: (name) => { return { item: `tfc:metal/greaves/${name}` } } }, - "boots": { heat_capacity: 11.429, metal_amount: 576, + "boots": { heat_capacity: 11.429, metal_amount: 576, hasDur: true, 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, @@ -231,101 +240,101 @@ const ItemHeats = { 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, + "horse_armor": { heat_capacity: 34.286, metal_amount: 1728, hasDur: true, 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: (name) => { return { tag: `forge:sword_heads/${name}` } }, output: (name) => { return { item: `gtceu:${name}_sword_head` } } }, - "sword": { heat_capacity: 5.714, metal_amount: 288, + "sword": { heat_capacity: 5.714, metal_amount: 288, hasDur: true, 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, + "pickaxe": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "axe": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "shovel": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "hammer": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "hoe": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "knife": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "saw": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "scythe": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, input: (name) => { return { item: `gtceu:${name}_scythe` } }, output: (name) => { return { item: `gtceu:${name}_scythe` } } }, "chisel_head": { heat_capacity: 2.857, metal_amount: 144, 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, + "chisel": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "javelin": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "propick": { heat_capacity: 2.857, metal_amount: 144, hasDur: true, 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, + "mace": { heat_capacity: 5.714, metal_amount: 288, hasDur: true, 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, + "fishing_rod": { heat_capacity: 5.714, metal_amount: 288, hasDur: true, 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, + "tuyere": { heat_capacity: 11.429, metal_amount: 576, hasDur: true, input: (name) => { return { item: `tfc:metal/tuyere/${name}` } }, output: (name) => { return { item: `tfc:metal/tuyere/${name}` } } }, - "shears": { heat_capacity: 5.714, metal_amount: 288, + "shears": { heat_capacity: 5.714, metal_amount: 288, hasDur: true, input: (name) => { return { item: `tfc:metal/shears/${name}` } }, output: (name) => { return { item: `tfc:metal/shears/${name}` } } }, - "shield": { heat_capacity: 11.429, metal_amount: 576, + "shield": { heat_capacity: 11.429, metal_amount: 576, hasDur: true, input: (name) => { return { item: `tfc:metal/shield/${name}` } }, output: (name) => { return { item: `tfc:metal/shield/${name}` } } }, @@ -348,32 +357,32 @@ const ItemHeats = { const Metals = { "bismuth": { forging_temp: 162, welding_temp: 216, melt_temp: 270, fluidName: "gtceu:bismuth", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) }, - "brass": { forging_temp: 558, welding_temp: 744, melt_temp: 930, fluidName: "gtceu:brass", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) }, + "brass": { forging_temp: 558, welding_temp: 744, melt_temp: 930, fluidName: "gtceu:brass", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen) }, "gold": { forging_temp: 636, welding_temp: 848, melt_temp: 1060, fluidName: "gtceu:gold", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) }, "nickel": { forging_temp: 872, welding_temp: 1162, melt_temp: 1453, fluidName: "gtceu:nickel", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) }, - "rose_gold": { forging_temp: 576, welding_temp: 768, melt_temp: 960, fluidName: "gtceu:rose_gold", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) }, + "rose_gold": { forging_temp: 576, welding_temp: 768, melt_temp: 960, fluidName: "gtceu:rose_gold", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen) }, "silver": { forging_temp: 577, welding_temp: 769, melt_temp: 961, fluidName: "gtceu:silver", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) }, "tin": { forging_temp: 138, welding_temp: 184, melt_temp: 230, fluidName: "gtceu:tin", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) }, - "zinc": { forging_temp: 252, welding_temp: 336, melt_temp: 420, fluidName: "gtceu:zinc", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) }, - "sterling_silver": { forging_temp: 570, welding_temp: 760, melt_temp: 950, fluidName: "gtceu:sterling_silver", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen) }, - "copper": { forging_temp: 648, welding_temp: 864, melt_temp: 1080, fluidName: "gtceu:copper", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, utilityGen) }, - "bismuth_bronze": { forging_temp: 591, welding_temp: 788, melt_temp: 985, fluidName: "gtceu:bismuth_bronze", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, utilityGen) }, - "bronze": { forging_temp: 570, welding_temp: 760, melt_temp: 950, fluidName: "gtceu:bronze", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, utilityGen) }, - "black_bronze": { forging_temp: 642, welding_temp: 856, melt_temp: 1070, fluidName: "gtceu:black_bronze", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, utilityGen) }, - "wrought_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:wrought_iron", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, utilityGen) }, - "iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", props: [].concat(ingotGen, dustGen, oreGen, partGen) }, + "zinc": { forging_temp: 252, welding_temp: 336, melt_temp: 420, fluidName: "gtceu:zinc", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen) }, + "sterling_silver": { forging_temp: 570, welding_temp: 760, melt_temp: 950, fluidName: "gtceu:sterling_silver", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen) }, + "copper": { forging_temp: 648, welding_temp: 864, melt_temp: 1080, fluidName: "gtceu:copper", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, + "bismuth_bronze": { forging_temp: 591, welding_temp: 788, melt_temp: 985, fluidName: "gtceu:bismuth_bronze", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, + "bronze": { forging_temp: 570, welding_temp: 760, melt_temp: 950, fluidName: "gtceu:bronze", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, + "black_bronze": { forging_temp: 642, welding_temp: 856, melt_temp: 1070, fluidName: "gtceu:black_bronze", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, + "wrought_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:wrought_iron", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, + "iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", props: [].concat(ingotGen, dustGen, oreGen, gtToolGen, partGen) }, "cast_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", props: doubleIngotGen }, "pig_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "tfc:metal/pig_iron", props: ingotGen}, - "steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:steel", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, utilityGen) }, + "steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:steel", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, "high_carbon_black_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_black_steel", props: ingotGen }, "high_carbon_red_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_red_steel", props: ingotGen }, "high_carbon_blue_steel": { forging_temp: 924, melt_temp: 1540, welding_temp: 1232, fluidName: "tfc:metal/high_carbon_blue_steel", props: ingotGen }, "weak_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_steel", props: ingotGen }, "weak_red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_red_steel", props: ingotGen }, "weak_blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "tfc:metal/weak_blue_steel", props: ingotGen }, - "black_steel": { forging_temp: 891, welding_temp: 1188, melt_temp: 1485, fluidName: "gtceu:black_steel", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, utilityGen) }, - "red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:red_steel", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, utilityGen) }, - "blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:blue_steel", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, oreGen, partGen, armorGen, utilityGen) }, + "black_steel": { forging_temp: 891, welding_temp: 1188, melt_temp: 1485, fluidName: "gtceu:black_steel", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, + "red_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:red_steel", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, + "blue_steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:blue_steel", props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, "unknown": { forging_temp: 240, welding_temp: 320, melt_temp: 400, fluidName: "tfc:metal/unknown", props: ingotGen }, "cassiterite": { forging_temp: 138, welding_temp: 184, melt_temp: 230, fluidName: "gtceu:zinc", props: [].concat(dustGen, oreGen) }, "garnierite": { forging_temp: 138, welding_temp: 184, melt_temp: 1453, fluidName: "gtceu:nickel", props: [].concat(dustGen, oreGen) }, diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 12b243365..938c39341 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -8,7 +8,7 @@ const registerTFCRecipes = (event) => { event.remove({ id: /tfc:heating\/ore.*/ }) registerTFCHeatingRecipes(event) - //registerTFCCastingRecipes(event) + registerTFCCastingRecipes(event) event.remove({ id: 'tfc:crafting/vanilla/lapis_block' }) @@ -356,11 +356,13 @@ const registerTFCHeatingRecipes = (event) => { if (itemTypeSpecifications.heat_capacity != null) { let ingredientInput = itemTypeSpecifications.input(tfcMetalName) + let json + if (typeof(itemTypeSpecifications.metal_amount) == "object") { if (itemTypeSpecifications.metal_amount[tfcMetalName] != undefined) { - let json = { + json = { id: jsonRecipePath, type: "tfc:heating", ingredient: ingredientInput, @@ -369,15 +371,26 @@ const registerTFCHeatingRecipes = (event) => { amount: itemTypeSpecifications.metal_amount[tfcMetalName] }, temperature: metalSpecifications.melt_temp, - use_durability: false + use_durability: (itemTypeSpecifications.hasDur != undefined) ? itemTypeSpecifications.hasDur : false + } + } + else + { + json = { + id: jsonRecipePath, + type: "tfc:heating", + ingredient: ingredientInput, + result_fluid: { + fluid: metalSpecifications.fluidName, + amount: itemTypeSpecifications.metal_amount["default"] + }, + temperature: metalSpecifications.melt_temp, + use_durability: (itemTypeSpecifications.hasDur != undefined) ? itemTypeSpecifications.hasDur : false } - - //console.log(json) - event.custom(json) } } else { - let json = { + json = { id: jsonRecipePath, type: "tfc:heating", ingredient: ingredientInput, @@ -386,12 +399,13 @@ const registerTFCHeatingRecipes = (event) => { amount: itemTypeSpecifications.metal_amount }, temperature: metalSpecifications.melt_temp, - use_durability: false + use_durability: (itemTypeSpecifications.hasDur != undefined) ? itemTypeSpecifications.hasDur : false } - //console.log(json) - event.custom(json) + } + + event.custom(json) } })