From e00816ae67e9d209d0b9ce6329fbe2364e5f9996 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 30 Nov 2023 16:52:49 +0700 Subject: [PATCH] cleanup --- kubejs/server_scripts/tfc/recipes.js | 119 ------------------------ kubejs/startup_scripts/tfc/constants.js | 79 +++++++++++++--- 2 files changed, 66 insertions(+), 132 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 4174ea423..07e6dd981 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -52,123 +52,6 @@ const registerTFCRecipes = (event) => { registerAutoTFCCastingRecipes(event) registerAutoTFCAnvilRecipes(event) - // Bucket - addWeldingRecipe(event, - 'tfg:recipes/anvil/vanilla_bucket', - { item: 'tfc:metal/bucket/red_steel' }, - { item: 'tfc:metal/bucket/blue_steel' }, - { item: 'minecraft:bucket' }, - 6 - ) - - // Small Copper -> Copper - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_copper', - { item: "tfc:ore/small_native_copper" }, - { fluid: "gtceu:copper", amount: 12 }, - 1080, - false - ) - - // Small Gold -> Gold - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_gold', - { item: "tfc:ore/small_native_gold" }, - { fluid: "gtceu:gold", amount: 12 }, - 1060, - false - ) - - // Small Hematite -> Iron - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_hematite', - { item: "tfc:ore/small_hematite" }, - { fluid: "gtceu:iron", amount: 12 }, - 1535, - false - ) - - // Small Silver -> Silver - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_silver', - { item: "tfc:ore/small_native_silver" }, - { fluid: "gtceu:silver", amount: 12 }, - 961, - false - ) - - // Small Cassiterite -> Tin - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_cassiterite', - { item: "tfc:ore/small_cassiterite" }, - { fluid: "gtceu:tin", amount: 12 }, - 230, - false - ) - - // Small Bismuth -> Bismuth - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_bismuth', - { item: "tfc:ore/small_bismuthinite" }, - { fluid: "gtceu:bismuth", amount: 12 }, - 270, - false - ) - - // Small Nickel -> Nickel - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_garnierite', - { item: "tfc:ore/small_garnierite" }, - { fluid: "gtceu:nickel", amount: 12 }, - 1453, - false - ) - - // Small Malachite -> Copper - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_malachite', - { item: "tfc:ore/small_malachite" }, - { fluid: "gtceu:copper", amount: 12 }, - 1453, - false - ) - - // Small Magnetite -> Iron - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_magnetite', - { item: "tfc:ore/small_magnetite" }, - { fluid: "gtceu:iron", amount: 12 }, - 1535, - false - ) - - // Small Limonite -> Iron - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_limonite', - { item: "tfc:ore/small_limonite" }, - { fluid: "gtceu:iron", amount: 12 }, - 1535, - false - ) - - // Small Sphalerite -> Iron - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_sphalerite', - { item: "tfc:ore/small_sphalerite" }, - { fluid: "gtceu:zinc", amount: 12 }, - 420, - false - ) - - // Small Tetrahedrite -> Iron - addHeatingItemToFluidRecipe(event, - 'tfc:recipes/heating/tfg/small_tetrahedrite', - { item: "tfc:ore/small_tetrahedrite" }, - { fluid: "gtceu:copper", amount: 12 }, - 1080, - false - ) - // Gold Bell addCastingRecipe(event, 'tfc:recipes/casting/tfg/gold_bell', @@ -304,8 +187,6 @@ const registerTFCRecipes = (event) => { [ "draw_any", "punch_last", "punch_not_last" ] ) - - // Fire Charge event.remove({ id: 'tfc:crafting/vanilla/fire_charge' }) event.shapeless('3x minecraft:fire_charge', [ diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 80fc7c3b2..b6c0b9bf6 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -229,9 +229,17 @@ global.TFC_TOOL_GEN = [ /** * Указывает, что у этого металла есть ведро. */ -global.TFC_BUCKET_GEN = [ - "bucket", -]; +global.TFC_BUCKET_GEN = ["bucket"]; + +/** + * Указывает, что у этого металла есть чистый кусок (тфк штука). + */ +global.TFC_SMALL_NATIVE_ORE_GEN = ["small_native_ore"]; + +/** + * Указывает, что у этого металла есть кусок (тфк штука). + */ +global.TFC_SMALL_ORE_GEN = ["small_ore"]; global.ITEM_TAG_TO_HEAT = { nugget: { @@ -457,6 +465,32 @@ global.ITEM_TAG_TO_HEAT = { }, }, + small_native_ore: { + heat_capacity: 0.869, + metal_amount: { + default: 12 + }, + input: (name) => { + return { item: `tfc:ore/small_native_${name}` }; + }, + output: (name) => { + return { item: `tfc:ore/small_native_${name}` }; + }, + }, + + small_ore: { + heat_capacity: 0.869, + metal_amount: { + default: 12 + }, + input: (name) => { + return { item: `tfc:ore/small_${name}` }; + }, + output: (name) => { + return { item: `tfc:ore/small_${name}` }; + }, + }, + block_slab: { heat_capacity: null }, // can't melt block_stairs: { heat_capacity: null }, // can't melt @@ -1138,6 +1172,14 @@ global.ITEM_TAG_TO_HEAT = { }; global.METAL_TO_SPECS = { + bismuthinite: { + forging_temp: 162, + welding_temp: 216, + melt_temp: 270, + fluidName: "gtceu:bismuth", + tier: 1, + props: global.TFC_SMALL_ORE_GEN, + }, bismuth: { forging_temp: 162, welding_temp: 216, @@ -1173,7 +1215,8 @@ global.METAL_TO_SPECS = { global.NUGGET_GEN, global.DUST_GEN, global.ORE_GEN, - global.PART_GEN + global.PART_GEN, + global.TFC_SMALL_NATIVE_ORE_GEN ), }, nickel: { @@ -1211,7 +1254,8 @@ global.METAL_TO_SPECS = { global.NUGGET_GEN, global.DUST_GEN, global.ORE_GEN, - global.PART_GEN + global.PART_GEN, + global.TFC_SMALL_NATIVE_ORE_GEN ), }, tin: { @@ -1262,7 +1306,8 @@ global.METAL_TO_SPECS = { global.ARMOR_GEN, global.GT_TOOL_GEN, global.TFC_TOOL_GEN, - global.UTILITY_GEN + global.UTILITY_GEN, + global.TFC_SMALL_NATIVE_ORE_GEN ), }, bismuth_bronze: { @@ -1506,7 +1551,7 @@ global.METAL_TO_SPECS = { melt_temp: 230, fluidName: "gtceu:tin", tier: 1, - props: [].concat(global.DUST_GEN, global.ORE_GEN), + props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN), }, garnierite: { forging_temp: 138, @@ -1514,7 +1559,7 @@ global.METAL_TO_SPECS = { melt_temp: 1453, fluidName: "gtceu:nickel", tier: 1, - props: [].concat(global.DUST_GEN, global.ORE_GEN), + props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN), }, hematite: { forging_temp: 921, @@ -1522,7 +1567,7 @@ global.METAL_TO_SPECS = { melt_temp: 1535, fluidName: "gtceu:iron", tier: 3, - props: [].concat(global.DUST_GEN, global.ORE_GEN), + props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN), }, yellow_limonite: { forging_temp: 921, @@ -1532,13 +1577,21 @@ global.METAL_TO_SPECS = { tier: 3, props: [].concat(global.DUST_GEN, global.ORE_GEN), }, + limonite: { + forging_temp: 921, + welding_temp: 1228, + melt_temp: 1535, + fluidName: "gtceu:iron", + tier: 3, + props: [].concat(global.TFC_SMALL_ORE_GEN), + }, magnetite: { forging_temp: 138, welding_temp: 184, melt_temp: 1535, fluidName: "gtceu:iron", tier: 3, - props: [].concat(global.DUST_GEN, global.ORE_GEN), + props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN), }, malachite: { forging_temp: 138, @@ -1546,7 +1599,7 @@ global.METAL_TO_SPECS = { melt_temp: 1080, fluidName: "gtceu:copper", tier: 1, - props: [].concat(global.DUST_GEN, global.ORE_GEN), + props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN), }, pyrite: { forging_temp: 921, @@ -1562,7 +1615,7 @@ global.METAL_TO_SPECS = { melt_temp: 420, fluidName: "gtceu:zinc", tier: 1, - props: [].concat(global.DUST_GEN, global.ORE_GEN), + props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN), }, tetrahedrite: { forging_temp: 138, @@ -1570,7 +1623,7 @@ global.METAL_TO_SPECS = { melt_temp: 1080, fluidName: "gtceu:copper", tier: 1, - props: [].concat(global.DUST_GEN, global.ORE_GEN), + props: [].concat(global.DUST_GEN, global.ORE_GEN, global.TFC_SMALL_ORE_GEN), }, chalcopyrite: { forging_temp: 648,