diff --git a/kubejs/data/tfc/recipes/anvil/black_steel_ingot.json b/kubejs/data/tfc/recipes/anvil/black_steel_ingot.json deleted file mode 100644 index 29045e09d..000000000 --- a/kubejs/data/tfc/recipes/anvil/black_steel_ingot.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "item": "tfc:metal/ingot/high_carbon_black_steel" - }, - "result": { - "item": "gtceu:black_steel_ingot" - }, - "tier": 4, - "rules": [ - "hit_last", - "hit_second_last", - "hit_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/blowpipe.json b/kubejs/data/tfc/recipes/anvil/blowpipe.json deleted file mode 100644 index 68a05ee16..000000000 --- a/kubejs/data/tfc/recipes/anvil/blowpipe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "tag": "forge:rods/brass" - }, - "result": { - "item": "tfc:blowpipe" - }, - "tier": 2, - "rules": [ - "draw_last", - "draw_second_last", - "hit_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/blue_steel_bucket.json b/kubejs/data/tfc/recipes/anvil/blue_steel_bucket.json deleted file mode 100644 index 315de577d..000000000 --- a/kubejs/data/tfc/recipes/anvil/blue_steel_bucket.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "tag": "forge:plates/blue_steel" - }, - "result": { - "item": "tfc:metal/bucket/blue_steel" - }, - "tier": 6, - "rules": [ - "bend_last", - "bend_second_last", - "bend_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/blue_steel_ingot.json b/kubejs/data/tfc/recipes/anvil/blue_steel_ingot.json deleted file mode 100644 index 2c261a2f4..000000000 --- a/kubejs/data/tfc/recipes/anvil/blue_steel_ingot.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "item": "tfc:metal/ingot/high_carbon_blue_steel" - }, - "result": { - "item": "gtceu:blue_steel_ingot" - }, - "tier": 5, - "rules": [ - "hit_last", - "hit_second_last", - "hit_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/brass_mechanisms.json b/kubejs/data/tfc/recipes/anvil/brass_mechanisms.json deleted file mode 100644 index 898cfbd77..000000000 --- a/kubejs/data/tfc/recipes/anvil/brass_mechanisms.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "tag": "forge:ingots/brass" - }, - "result": { - "item": "tfc:brass_mechanisms", - "count": 2 - }, - "tier": 2, - "rules": [ - "punch_last", - "hit_second_last", - "punch_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/high_carbon_steel_ingot.json b/kubejs/data/tfc/recipes/anvil/high_carbon_steel_ingot.json deleted file mode 100644 index e14546bb8..000000000 --- a/kubejs/data/tfc/recipes/anvil/high_carbon_steel_ingot.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "item": "tfc:metal/ingot/pig_iron" - }, - "result": { - "item": "tfc:metal/ingot/high_carbon_steel" - }, - "tier": 3, - "rules": [ - "hit_last", - "hit_second_last", - "hit_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/iron_door.json b/kubejs/data/tfc/recipes/anvil/iron_door.json deleted file mode 100644 index f1f9d23c1..000000000 --- a/kubejs/data/tfc/recipes/anvil/iron_door.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "tag": "forge:plates/wrought_iron" - }, - "result": { - "item": "minecraft:iron_door" - }, - "tier": 3, - "rules": [ - "hit_last", - "draw_not_last", - "punch_not_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/jar_lid.json b/kubejs/data/tfc/recipes/anvil/jar_lid.json deleted file mode 100644 index 153c30cba..000000000 --- a/kubejs/data/tfc/recipes/anvil/jar_lid.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "tag": "forge:ingots/tin" - }, - "result": { - "item": "tfc:jar_lid", - "count": 16 - }, - "tier": 1, - "rules": [ - "hit_last", - "hit_second_last", - "punch_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/red_steel_bucket.json b/kubejs/data/tfc/recipes/anvil/red_steel_bucket.json deleted file mode 100644 index 2de3de3b1..000000000 --- a/kubejs/data/tfc/recipes/anvil/red_steel_bucket.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "tag": "forge:plates/red_steel" - }, - "result": { - "item": "tfc:metal/bucket/red_steel" - }, - "tier": 6, - "rules": [ - "bend_last", - "bend_second_last", - "bend_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/red_steel_ingot.json b/kubejs/data/tfc/recipes/anvil/red_steel_ingot.json deleted file mode 100644 index 81023690c..000000000 --- a/kubejs/data/tfc/recipes/anvil/red_steel_ingot.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "item": "tfc:metal/ingot/high_carbon_red_steel" - }, - "result": { - "item": "gtceu:red_steel_ingot" - }, - "tier": 5, - "rules": [ - "hit_last", - "hit_second_last", - "hit_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/refined_iron_bloom.json b/kubejs/data/tfc/recipes/anvil/refined_iron_bloom.json deleted file mode 100644 index eae502feb..000000000 --- a/kubejs/data/tfc/recipes/anvil/refined_iron_bloom.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "item": "tfc:raw_iron_bloom" - }, - "result": { - "item": "tfc:refined_iron_bloom" - }, - "tier": 2, - "rules": [ - "hit_last", - "hit_second_last", - "hit_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/steel_ingot.json b/kubejs/data/tfc/recipes/anvil/steel_ingot.json deleted file mode 100644 index 2493e0d01..000000000 --- a/kubejs/data/tfc/recipes/anvil/steel_ingot.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "item": "tfc:metal/ingot/high_carbon_steel" - }, - "result": { - "item": "gtceu:steel_ingot" - }, - "tier": 3, - "rules": [ - "hit_last", - "hit_second_last", - "hit_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/wrought_iron_from_bloom.json b/kubejs/data/tfc/recipes/anvil/wrought_iron_from_bloom.json deleted file mode 100644 index 776b075f2..000000000 --- a/kubejs/data/tfc/recipes/anvil/wrought_iron_from_bloom.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "item": "tfc:refined_iron_bloom" - }, - "result": { - "item": "gtceu:wrought_iron_ingot" - }, - "tier": 2, - "rules": [ - "hit_last", - "hit_second_last", - "hit_third_last" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/recipes/anvil/wrought_iron_grill.json b/kubejs/data/tfc/recipes/anvil/wrought_iron_grill.json deleted file mode 100644 index 2b825d463..000000000 --- a/kubejs/data/tfc/recipes/anvil/wrought_iron_grill.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "tfc:anvil", - "input": { - "tag": "forge:plates/double/wrought_iron" - }, - "result": { - "item": "tfc:wrought_iron_grill" - }, - "tier": 3, - "rules": [ - "draw_any", - "punch_last", - "punch_not_last" - ] -} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index befdb9b62..0e5d4485b 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -7,7 +7,7 @@ const registerTFCRecipes = (event) => { event.remove({ id: /tfc:heating\/ore.*/ }) event.remove({ id: /tfc:heating\/metal.*/ }) event.remove({ id: /tfc:casting\/.*/ }) - // event.remove({ id: /tfc:anvil.*/ }) // todo + event.remove({ id: /tfc:anvil\/.*/ }) // event.remove({ id: /tfc:welding.*/ }) // todo event.remove({ id: 'tfc:crafting/vanilla/lapis_block' }) @@ -46,8 +46,9 @@ const registerTFCRecipes = (event) => { registerAutoTFCHeatingRecipes(event) registerAutoTFCCastingRecipes(event) - //registerAutoTFCAnvilRecipes(event) + registerAutoTFCAnvilRecipes(event) + // Black Steel Ingot addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/high_carbon_black_steel', { item: "tfc:metal/ingot/high_carbon_black_steel" }, @@ -56,6 +57,7 @@ const registerTFCRecipes = (event) => { [ "hit_last", "hit_second_last", "hit_third_last" ] ) + // Blowpipe addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/blowpipe', { tag: "forge:rods/brass" }, @@ -64,6 +66,7 @@ const registerTFCRecipes = (event) => { [ "draw_last", "draw_second_last", "hit_third_last" ] ) + // Blue Steel Bucket addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/blue_steel_bucket', { tag: "forge:plates/blue_steel" }, @@ -72,6 +75,7 @@ const registerTFCRecipes = (event) => { [ "bend_last", "bend_second_last", "bend_third_last" ] ) + // Blue Steel Ingot addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/blue_steel_ingot', { item: "tfc:metal/ingot/high_carbon_blue_steel" }, @@ -80,6 +84,7 @@ const registerTFCRecipes = (event) => { [ "hit_last", "hit_second_last", "hit_third_last" ] ) + // Brass Mechanisms addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/brass_mechanisms', { tag: "forge:ingots/brass" }, @@ -88,6 +93,7 @@ const registerTFCRecipes = (event) => { [ "punch_last", "hit_second_last", "punch_third_last" ] ) + // High Carbon Steel Ingot addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/high_carbon_steel_ingot', { item: "tfc:metal/ingot/pig_iron" }, @@ -96,7 +102,8 @@ const registerTFCRecipes = (event) => { [ "hit_last", "hit_second_last", "hit_third_last" ] ) - addCastingRecipe(event, + // Iron Door + addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/iron_door', { tag: "forge:plates/wrought_iron" }, { item: "minecraft:iron_door" }, @@ -104,7 +111,8 @@ const registerTFCRecipes = (event) => { [ "hit_last", "draw_not_last", "punch_not_last" ] ) - addCastingRecipe(event, + // Jar Lid + addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/jar_lid', { tag: "forge:ingots/tin" }, { item: "tfc:jar_lid", count: 16 }, @@ -112,12 +120,58 @@ const registerTFCRecipes = (event) => { [ "hit_last", "hit_second_last", "punch_third_last" ] ) - addCastingRecipe(event, + // Red Steel Bucket + addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/red_steel_bucket', { tag: "forge:plates/red_steel" }, - { - "item": "tfc:metal/bucket/red_steel" - } + { item: "tfc:metal/bucket/red_steel" }, + 6, + [ "bend_last", "bend_second_last", "bend_third_last" ] + ) + + // High Carbon Red Steel + addAnvilRecipe(event, + 'tfc:recipes/anvil/tfg/high_carbon_red_steel', + { item: "tfc:metal/ingot/high_carbon_red_steel" }, + { item: "gtceu:red_steel_ingot" }, + 5, + [ "hit_last", "hit_second_last", "hit_third_last" ] + ) + + // Refined Iron Bloom + addAnvilRecipe(event, + 'tfc:recipes/anvil/tfg/refined_iron_bloom', + { item: "tfc:raw_iron_bloom" }, + { item: "tfc:refined_iron_bloom" }, + 2, + [ "hit_last", "hit_second_last", "hit_third_last" ] + ) + + // High Carbon Steel + addAnvilRecipe(event, + 'tfc:recipes/anvil/tfg/high_carbon_steel', + { "item": "tfc:metal/ingot/high_carbon_steel" }, + { "item": "gtceu:steel_ingot" }, + 3, + [ "hit_last", "hit_second_last", "hit_third_last" ] + ) + + // Wrought Iron From Bloom + addAnvilRecipe(event, + 'tfc:recipes/anvil/tfg/wrought_iron_from_bloom', + { "item": "tfc:refined_iron_bloom" }, + { "item": "gtceu:wrought_iron_ingot" }, + 2, + [ "hit_last", "hit_second_last", "hit_third_last" ] + ) + + // Wrought Iron Grill + addAnvilRecipe(event, + 'tfc:recipes/anvil/tfg/wrought_iron_grill', + { "tag": "forge:plates/double/wrought_iron" }, + { "item": "tfc:wrought_iron_grill" }, + 3, + [ "draw_any", "punch_last", "punch_not_last" ] ) // Gold Bell