diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json index d4cbd0030..34e75d070 100644 --- a/config/almostunified/unify.json +++ b/config/almostunified/unify.json @@ -76,5 +76,5 @@ "tfc:landslide" ], "ignoredRecipes": [], - "itemsHidingJeiRei": false + "itemsHidingJeiRei": true } \ No newline at end of file diff --git a/kubejs/client_scripts/mainClientScript.js b/kubejs/client_scripts/mainClientScript.js index b858d738e..bc7b78e10 100644 --- a/kubejs/client_scripts/mainClientScript.js +++ b/kubejs/client_scripts/mainClientScript.js @@ -1,6 +1,5 @@ // priority: 199 -/* REIEvents.hide('item', event => { hideGTStuff(event) hideTFCStuff(event) @@ -13,4 +12,4 @@ REIEvents.hide('item', event => { REIEvents.groupEntries(event => { groupGTStuff(event) -})*/ +}) diff --git a/kubejs/client_scripts/tfc/constants.js b/kubejs/client_scripts/tfc/constants.js index d121c3e75..7c30459b7 100644 --- a/kubejs/client_scripts/tfc/constants.js +++ b/kubejs/client_scripts/tfc/constants.js @@ -53,7 +53,7 @@ const tfcItemsToHide = [ // Metals with tools // Copper - 'tfc:metal/ingot/copper', + // 'tfc:metal/ingot/copper', 'tfc:metal/sheet/copper', 'tfc:metal/double_sheet/copper', 'tfc:metal/rod/copper', @@ -335,7 +335,70 @@ const tfcItemsToHide = [ 'tfc:ore/sylvite', 'tfc:ore/bituminous_coal', 'tfc:ore/lignite', - 'tfc:ore/halite' + 'tfc:ore/halite', + + // Blocks + 'tfc:metal/block/bismuth', + 'tfc:metal/block/bismuth_bronze', + 'tfc:metal/block/black_bronze', + 'tfc:metal/block/bronze', + 'tfc:metal/block/brass', + 'tfc:metal/block/copper', + 'tfc:metal/block/gold', + 'tfc:metal/block/nickel', + 'tfc:metal/block/rose_gold', + 'tfc:metal/block/silver', + 'tfc:metal/block/tin', + 'tfc:metal/block/zinc', + 'tfc:metal/block/sterling_silver', + 'tfc:metal/block/wrought_iron', + 'tfc:metal/block/cast_iron', + 'tfc:metal/block/steel', + 'tfc:metal/block/black_steel', + 'tfc:metal/block/blue_steel', + 'tfc:metal/block/red_steel', + + // Stairs + 'tfc:metal/block/bismuth_stairs', + 'tfc:metal/block/bismuth_bronze_stairs', + 'tfc:metal/block/black_bronze_stairs', + 'tfc:metal/block/bronze_stairs', + 'tfc:metal/block/brass_stairs', + 'tfc:metal/block/copper_stairs', + 'tfc:metal/block/gold_stairs', + 'tfc:metal/block/nickel_stairs', + 'tfc:metal/block/rose_gold_stairs', + 'tfc:metal/block/silver_stairs', + 'tfc:metal/block/tin_stairs', + 'tfc:metal/block/zinc_stairs', + 'tfc:metal/block/sterling_silver_stairs', + 'tfc:metal/block/wrought_iron_stairs', + 'tfc:metal/block/cast_iron_stairs', + 'tfc:metal/block/steel_stairs', + 'tfc:metal/block/black_steel_stairs', + 'tfc:metal/block/blue_steel_stairs', + 'tfc:metal/block/red_steel_stairs', + + // Slabs + 'tfc:metal/block/bismuth_slab', + 'tfc:metal/block/bismuth_bronze_slab', + 'tfc:metal/block/black_bronze_slab', + 'tfc:metal/block/bronze_slab', + 'tfc:metal/block/brass_slab', + 'tfc:metal/block/copper_slab', + 'tfc:metal/block/gold_slab', + 'tfc:metal/block/nickel_slab', + 'tfc:metal/block/rose_gold_slab', + 'tfc:metal/block/silver_slab', + 'tfc:metal/block/tin_slab', + 'tfc:metal/block/zinc_slab', + 'tfc:metal/block/sterling_silver_slab', + 'tfc:metal/block/wrought_iron_slab', + 'tfc:metal/block/cast_iron_slab', + 'tfc:metal/block/steel_slab', + 'tfc:metal/block/black_steel_slab', + 'tfc:metal/block/blue_steel_slab', + 'tfc:metal/block/red_steel_slab', ] const tfcSimpleMaterials = [ diff --git a/kubejs/server_scripts/tfc/constants.js b/kubejs/server_scripts/tfc/constants.js index 105e3a5ec..8f3bc77fd 100644 --- a/kubejs/server_scripts/tfc/constants.js +++ b/kubejs/server_scripts/tfc/constants.js @@ -342,7 +342,7 @@ const ItemHeats = { input: (name) => { return { tag: `forge:ingots/${name}` } }, output: (name) => { return { item: Item.getId(AlmostUnified.getPreferredItemForTag(`forge:ingots/${name}`)) + "" } } }, "double_ingot": { heat_capacity: 5.714, metal_amount: 288, - input: (name) => { return { item: `tfc:metal/double_ingot/${name}` } }, + input: (name) => { return { tag: `forge:ingots/double/${name}` } }, output: (name) => { return { item: `tfc:metal/double_ingot/${name}` } } }, "sheet": { heat_capacity: 5.714, metal_amount: 288, rules: [ "hit_last", "hit_second_last", "hit_third_last" ], anvilFrom: "double_ingot", input: (name) => { return { tag: `forge:plates/${name}` } }, @@ -370,8 +370,8 @@ const Metals = { "bronze": { forging_temp: 570, welding_temp: 760, melt_temp: 950, fluidName: "gtceu:bronze", tier: 1, canBeUnmolded: true, 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", tier: 1, canBeUnmolded: true, 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", tier: 1, props: [].concat(ingotGen, doubleIngotGen, nuggetGen, dustGen, partGen, armorGen, gtToolGen, tfcToolGen, utilityGen) }, - "iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: [].concat(ingotGen, dustGen, oreGen, gtToolGen, partGen) }, - "cast_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: doubleIngotGen }, + "iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: [].concat(/*ingotGen,*/ doubleIngotGen, dustGen, oreGen, /*gtToolGen,*/ /*partGen*/) }, + // "cast_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "gtceu:iron", tier: 1, props: doubleIngotGen }, "pig_iron": { forging_temp: 921, welding_temp: 1228, melt_temp: 1535, fluidName: "tfc:metal/pig_iron", tier: 1, props: ingotGen}, "steel": { forging_temp: 924, welding_temp: 1232, melt_temp: 1540, fluidName: "gtceu:steel", tier: 1, 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", tier: 1, props: ingotGen }, diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 773855f35..5c6558746 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -10,6 +10,10 @@ const registerTFCRecipes = (event) => { event.remove({ id: /tfc:anvil\/.*/ }) // event.remove({ id: /tfc:welding.*/ }) // todo + // Удаляет все рецепты металлических блоков + // с полублоками и ступеньками + event.remove({ id: /tfc:crafting\/metal\/block\/.*/ }) + event.remove({ id: 'tfc:crafting/vanilla/lapis_block' }) event.remove({ id: 'tfc:quern/amethyst' }) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index cebc2510c..f9aebdd2c 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -4,4 +4,24 @@ const registerTFCTags = (event) => { removeAllTagsItems.forEach(item => { event.removeAllTagsFrom(item) }) + + event.add('forge:ingots/double/bismuth', 'tfc:metal/double_ingot/bismuth') + event.add('forge:ingots/double/bismuth_bronze', 'tfc:metal/double_ingot/bismuth_bronze') + event.add('forge:ingots/double/black_bronze', 'tfc:metal/double_ingot/black_bronze') + event.add('forge:ingots/double/bronze', 'tfc:metal/double_ingot/bronze') + event.add('forge:ingots/double/brass', 'tfc:metal/double_ingot/brass') + event.add('forge:ingots/double/copper', 'tfc:metal/double_ingot/copper') + event.add('forge:ingots/double/gold', 'tfc:metal/double_ingot/gold') + event.add('forge:ingots/double/nickel', 'tfc:metal/double_ingot/nickel') + event.add('forge:ingots/double/rose_gold', 'tfc:metal/double_ingot/rose_gold') + event.add('forge:ingots/double/silver', 'tfc:metal/double_ingot/silver') + event.add('forge:ingots/double/tin', 'tfc:metal/double_ingot/tin') + event.add('forge:ingots/double/irzincon', 'tfc:metal/double_ingot/zinc') + event.add('forge:ingots/double/sterling_silver', 'tfc:metal/double_ingot/sterling_silver') + event.add('forge:ingots/double/iron', 'tfc:metal/double_ingot/cast_iron') + event.add('forge:ingots/double/wrought_iron', 'tfc:metal/double_ingot/wrought_iron') + event.add('forge:ingots/double/steel', 'tfc:metal/double_ingot/steel') + event.add('forge:ingots/double/black_steel', 'tfc:metal/double_ingot/black_steel') + 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') } \ No newline at end of file