diff --git a/kubejs/client_scripts/minecraft/constants.js b/kubejs/client_scripts/minecraft/constants.js index a7c71ddec..6ceb60b8e 100644 --- a/kubejs/client_scripts/minecraft/constants.js +++ b/kubejs/client_scripts/minecraft/constants.js @@ -150,9 +150,9 @@ const minecraftItemsToHide = [ 'minecraft:dark_prismarine_slab', 'minecraft:smooth_stone',*/ - 'minecraft:blast_furnace', - 'minecraft:furnace', - 'minecraft:furnace_minecart', + //'minecraft:blast_furnace', + //'minecraft:furnace', + //'minecraft:furnace_minecart', 'minecraft:netherite_scrap', 'minecraft:netherite_ingot', diff --git a/kubejs/data/tfc/tags/items/usable_on_tool_rack.json b/kubejs/data/tfc/tags/items/usable_on_tool_rack.json index 5d71c84e8..42dc1b9f2 100644 --- a/kubejs/data/tfc/tags/items/usable_on_tool_rack.json +++ b/kubejs/data/tfc/tags/items/usable_on_tool_rack.json @@ -25,12 +25,10 @@ "gtceu:copper_mining_hammer", "gtceu:copper_saw", "gtceu:copper_hammer", - "gtceu:copper_mallet", "gtceu:copper_wrench", "gtceu:copper_file", "gtceu:copper_crowbar", "gtceu:copper_screwdriver", - "gtceu:copper_mortar", "gtceu:copper_wire_cutter", "gtceu:copper_scythe", "gtceu:copper_knife", @@ -200,12 +198,10 @@ "gtceu:black_bronze_mining_hammer", "gtceu:black_bronze_saw", "gtceu:black_bronze_hammer", - "gtceu:black_bronze_mallet", "gtceu:black_bronze_wrench", "gtceu:black_bronze_file", "gtceu:black_bronze_crowbar", "gtceu:black_bronze_screwdriver", - "gtceu:black_bronze_mortar", "gtceu:black_bronze_wire_cutter", "gtceu:black_bronze_scythe", "gtceu:black_bronze_knife", @@ -219,12 +215,10 @@ "gtceu:bismuth_bronze_mining_hammer", "gtceu:bismuth_bronze_saw", "gtceu:bismuth_bronze_hammer", - "gtceu:bismuth_bronze_mallet", "gtceu:bismuth_bronze_wrench", "gtceu:bismuth_bronze_file", "gtceu:bismuth_bronze_crowbar", "gtceu:bismuth_bronze_screwdriver", - "gtceu:bismuth_bronze_mortar", "gtceu:bismuth_bronze_wire_cutter", "gtceu:bismuth_bronze_scythe", "gtceu:bismuth_bronze_knife", @@ -330,12 +324,10 @@ "gtceu:black_steel_mining_hammer", "gtceu:black_steel_saw", "gtceu:black_steel_hammer", - "gtceu:black_steel_mallet", "gtceu:black_steel_wrench", "gtceu:black_steel_file", "gtceu:black_steel_crowbar", "gtceu:black_steel_screwdriver", - "gtceu:black_steel_mortar", "gtceu:black_steel_wire_cutter", "gtceu:black_steel_scythe", "gtceu:black_steel_knife", diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index c79cf4177..4ccc06f18 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1,6 +1,19 @@ // priority: 0 const registerGTRecipes = (event) => { + // Отключение рецептов раскрафта ванильной наковальни + event.remove({id: 'gtceu:arc_furnace/arc_anvil'}) + event.remove({id: 'gtceu:macerator/macerate_anvil'}) + event.remove({id: 'gtceu:alloy_smelter/anvil'}) + event.remove({id: 'gtceu:fluid_solidifier/solidify_anvil'}) + + event.remove({id: 'gtceu:arc_furnace/arc_damaged_anvil'}) + event.remove({id: 'gtceu:macerator/macerate_damaged_anvil'}) + event.remove({id: 'gtceu:arc_furnace/arc_chipped_anvil'}) + event.remove({id: 'gtceu:macerator/macerate_chipped_anvil'}) + + + // Отключение других рецептов event.remove({id: 'gtceu:shaped/chainmail_boots'}) event.remove({id: 'gtceu:shaped/chainmail_leggings'}) event.remove({id: 'gtceu:shaped/chainmail_chestplate'}) @@ -11,6 +24,122 @@ const registerGTRecipes = (event) => { event.remove({id: 'gtceu:shaped/wooden_barrel'}) event.remove({id: 'gtceu:assembler/wood_barrel'}) + // Low Pressure Steam Forge Hammer + event.shaped('gtceu:lp_steam_forge_hammer', [ + 'ABA', + 'ACA', + 'ADA' + ], { + A: 'gtceu:bronze_small_fluid_pipe', + B: '#forge:pistons', + C: 'gtceu:bronze_machine_casing', + D: 'tfc:metal/anvil/wrought_iron' + }).id('gtceu:shaped/steam_hammer_bronze') + + // LV Forge Hammer + event.shaped('gtceu:lv_forge_hammer', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'gtceu:tin_single_cable', + B: 'gtceu:lv_electric_piston', + C: '#forge:circuits/lv', + D: 'gtceu:lv_machine_hull', + E: 'tfc:metal/anvil/steel', + }).id('gtceu:shaped/lv_forge_hammer') + + // MV Forge Hammer + event.shaped('gtceu:mv_forge_hammer', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'gtceu:copper_single_cable', + B: 'gtceu:mv_electric_piston', + C: '#forge:circuits/mv', + D: 'gtceu:mv_machine_hull', + E: 'tfc:metal/anvil/steel', + }).id('gtceu:shaped/mv_forge_hammer') + + // HV Forge Hammer + event.shaped('gtceu:hv_forge_hammer', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'gtceu:gold_single_cable', + B: 'gtceu:hv_electric_piston', + C: '#forge:circuits/hv', + D: 'gtceu:hv_machine_hull', + E: 'tfc:metal/anvil/steel', + }).id('gtceu:shaped/hv_forge_hammer') + + // EV Forge Hammer + event.shaped('gtceu:ev_forge_hammer', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'gtceu:aluminium_single_cable', + B: 'gtceu:ev_electric_piston', + C: '#forge:circuits/ev', + D: 'gtceu:ev_machine_hull', + E: 'tfc:metal/anvil/black_steel', + }).id('gtceu:shaped/ev_forge_hammer') + + // IV Forge Hammer + event.shaped('gtceu:iv_forge_hammer', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'gtceu:platinum_single_cable', + B: 'gtceu:iv_electric_piston', + C: '#forge:circuits/iv', + D: 'gtceu:iv_machine_hull', + E: 'tfc:metal/anvil/black_steel', + }).id('gtceu:shaped/iv_forge_hammer') + + // LuV Forge Hammer + event.shaped('gtceu:luv_forge_hammer', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'gtceu:niobium_titanium_single_cable', + B: 'gtceu:luv_electric_piston', + C: '#forge:circuits/luv', + D: 'gtceu:luv_machine_hull', + E: 'tfc:metal/anvil/black_steel', + }).id('gtceu:shaped/luv_forge_hammer') + + // ZPM Forge Hammer + event.shaped('gtceu:zpm_forge_hammer', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'gtceu:vanadium_gallium_single_cable', + B: 'gtceu:zpm_electric_piston', + C: '#forge:circuits/zpm', + D: 'gtceu:zpm_machine_hull', + E: '#tfc:red_or_blue_anvil', + }).id('gtceu:shaped/zpm_forge_hammer') + + // UV Forge Hammer + event.shaped('gtceu:uv_forge_hammer', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'gtceu:yttrium_barium_cuprate_single_cable', + B: 'gtceu:uv_electric_piston', + C: '#forge:circuits/uv', + D: 'gtceu:uv_machine_hull', + E: '#tfc:red_or_blue_anvil', + }).id('gtceu:shaped/uv_forge_hammer') + // Fire Brick event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay').id('gtceu:smelting/fireclay_brick') diff --git a/kubejs/server_scripts/tfc/constants.js b/kubejs/server_scripts/tfc/constants.js index d168f4a75..02144f0b2 100644 --- a/kubejs/server_scripts/tfc/constants.js +++ b/kubejs/server_scripts/tfc/constants.js @@ -360,7 +360,7 @@ const ItemHeats = { "ingot": { heat_capacity: 2.857, metal_amount: 144, hasMold: true, input: (name) => { return { tag: `forge:ingots/${name}` } }, - output: (name) => { return { item: Item.getId(AlmostUnified.getPreferredItemForTag(`forge:ingots/${name}`)) + "" } } }, + output: (name) => { return { item: Item.of(`#forge:ingots/${name}`).getId() + "" } } }, "double_ingot": { heat_capacity: 5.714, metal_amount: 288, input: (name) => { return { tag: `forge:ingots/double/${name}` } }, output: (name) => { return { item: `tfc:metal/double_ingot/${name}` } } }, diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 53652ef6b..9d675c7e7 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -673,6 +673,151 @@ const registerTFCRecipes = (event) => { A: '#tfc:knives', B: 'tfc:pumpkin' }).id('tfc:crafting/pumpkin_chunks_knife') + + // Copper Anvil из Слитков + event.recipes.gtceu.alloy_smelter('alloy_smelter/ingots_to_copper_anvil') + .itemInputs('14x #forge:ingots/copper') + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/copper') + .duration(1680) + .EUt(16) + + // Copper Anvil в отвердителе + event.recipes.gtceu.fluid_solidifier('fluid_solidifier/solidify_copper_anvil') + .inputFluids(Fluid.of('gtceu:copper', 2016)) + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/copper') + .duration(1680) + .EUt(16) + + // BismuthBronze Anvil из Слитков + event.recipes.gtceu.alloy_smelter('alloy_smelter/ingots_to_bismuth_bronze_anvil') + .itemInputs('14x #forge:ingots/bismuth_bronze') + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/bismuth_bronze') + .duration(1680) + .EUt(16) + + // BismuthBronze Anvil в отвердителе + event.recipes.gtceu.fluid_solidifier('fluid_solidifier/solidify_bismuth_bronze_anvil') + .inputFluids(Fluid.of('gtceu:bismuth_bronze', 2016)) + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/bismuth_bronze') + .duration(1680) + .EUt(16) + + // Bronze Anvil из Слитков + event.recipes.gtceu.alloy_smelter('alloy_smelter/asdfasdfasdfasdf') + .itemInputs('14x #forge:ingots/bronze') + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/bronze') + .duration(1680) + .EUt(16) + + // Bronze Anvil в отвердителе + event.recipes.gtceu.fluid_solidifier('fluid_solidifier/solidify_bronze_anvil') + .inputFluids(Fluid.of('gtceu:bronze', 2016)) + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/bronze') + .duration(1680) + .EUt(16) + + // Black Bronze Anvil из Слитков + event.recipes.gtceu.alloy_smelter('alloy_smelter/ingots_to_black_bronze_anvil') + .itemInputs('14x #forge:ingots/black_bronze') + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/black_bronze') + .duration(1680) + .EUt(16) + + // Black Bronze Anvil в отвердителе + event.recipes.gtceu.fluid_solidifier('fluid_solidifier/solidify_black_bronze_anvil') + .inputFluids(Fluid.of('gtceu:black_bronze', 2016)) + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/black_bronze') + .duration(1680) + .EUt(16) + + + // Wrought Iron Anvil из Слитков + event.recipes.gtceu.alloy_smelter('alloy_smelter/ingots_to_wrought_iron_anvil') + .itemInputs('14x #forge:ingots/wrought_iron') + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/wrought_iron') + .duration(1680) + .EUt(16) + + // Wrought Iron Anvil в отвердителе + event.recipes.gtceu.fluid_solidifier('fluid_solidifier/solidify_wrought_iron_anvil') + .inputFluids(Fluid.of('gtceu:wrought_iron', 2016)) + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/wrought_iron') + .duration(1680) + .EUt(16) + + // Steel Anvil из Слитков + event.recipes.gtceu.alloy_smelter('alloy_smelter/ingots_to_steel_anvil') + .itemInputs('14x #forge:ingots/steel') + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/steel') + .duration(1680) + .EUt(16) + + // Steel Anvil в отвердителе + event.recipes.gtceu.fluid_solidifier('fluid_solidifier/solidify_steel_anvil') + .inputFluids(Fluid.of('gtceu:steel', 2016)) + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/steel') + .duration(1680) + .EUt(16) + + // Black Steel Anvil из Слитков + event.recipes.gtceu.alloy_smelter('alloy_smelter/ingots_to_black_steel_anvil') + .itemInputs('14x #forge:ingots/black_steel') + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/black_steel') + .duration(1680) + .EUt(16) + + // Black Steel Anvil в отвердителе + event.recipes.gtceu.fluid_solidifier('fluid_solidifier/solidify_black_steel_anvil') + .inputFluids(Fluid.of('gtceu:black_steel', 2016)) + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/black_steel') + .duration(1680) + .EUt(16) + + // Red Steel Anvil из Слитков + event.recipes.gtceu.alloy_smelter('alloy_smelter/ingots_to_red_steel_anvil') + .itemInputs('14x #forge:ingots/red_steel') + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/red_steel') + .duration(1680) + .EUt(16) + + // Red Steel Anvil в отвердителе + event.recipes.gtceu.fluid_solidifier('fluid_solidifier/solidify_red_steel_anvil') + .inputFluids(Fluid.of('gtceu:red_steel', 2016)) + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/red_steel') + .duration(1680) + .EUt(16) + + // Blue Steel Anvil из Слитков + event.recipes.gtceu.alloy_smelter('alloy_smelter/ingots_to_blue_steel_anvil') + .itemInputs('14x #forge:ingots/blue_steel') + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/blue_steel') + .duration(1680) + .EUt(16) + + // Blue Steel Anvil в отвердителе + event.recipes.gtceu.fluid_solidifier('fluid_solidifier/solidify_blue_steel_anvil') + .inputFluids(Fluid.of('gtceu:blue_steel', 2016)) + .notConsumable('gtceu:anvil_casting_mold') + .itemOutputs('tfc:metal/anvil/blue_steel') + .duration(1680) + .EUt(16) } const registerAutoTFCHeatingRecipes = (event) => { diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 5d7c8edb3..80cfd632b 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -25,6 +25,9 @@ const registerTFCItemsTags = (event) => { event.add('forge:ingots/double/blue_steel', 'tfc:metal/double_ingot/blue_steel') event.add('forge:ingots/double/red_steel', 'tfc:metal/double_ingot/red_steel') + event.add('tfc:red_or_blue_anvil', 'tfc:metal/anvil/blue_steel') + event.add('tfc:red_or_blue_anvil', 'tfc:metal/anvil/red_steel') + event.add('tfc:can_collapse', '#forge:tfc_stonetype_ore') event.add('tfc:can_start_collapse', '#forge:tfc_stonetype_ore') event.add('tfc:can_trigger_collapse', '#forge:tfc_stonetype_ore') diff --git a/mods/almostunified-forge-1.20.1-0.7.2.jar b/mods/almostunified-forge-1.20.1-0.7.2.jard similarity index 100% rename from mods/almostunified-forge-1.20.1-0.7.2.jar rename to mods/almostunified-forge-1.20.1-0.7.2.jard