diff --git a/kubejs/server_scripts/datapack/greg_ingots.js b/kubejs/server_scripts/datapack/greg_ingots.js index f0400113..caf7131d 100644 --- a/kubejs/server_scripts/datapack/greg_ingots.js +++ b/kubejs/server_scripts/datapack/greg_ingots.js @@ -202,117 +202,117 @@ let addGregTechIngotsToTFC = (/** @type {Internal.DataPackEventJS} */ event) => { ore: "gtceu:raw_lead", liquid: "gtceu:lead", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_silver", liquid: "tfc:metal/silver", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_tin", liquid: "tfc:metal/tin", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_hematite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_goethite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_cassiterite", liquid: "tfc:metal/tin", - amount: 144 + amount: 36 }, { ore: "gtceu:raw_cassiterite_sand", liquid: "tfc:metal/tin", - amount: 144 + amount: 36 }, { ore: "gtceu:raw_galena", liquid: "gtceu:lead", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_garnierite", liquid: "tfc:metal/nickel", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_magnetite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_pyrite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_sphalerite", liquid: "tfc:metal/zinc", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_tetrahedrite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_chalcopyrite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_yellow_limonite", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_bornite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_chalcocite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_pentlandite", liquid: "tfc:metal/nickel", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_malachite", liquid: "tfc:metal/copper", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_basaltic_mineral_sand", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_granitic_mineral_sand", liquid: "tfc:metal/cast_iron", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_thorium", liquid: "gtceu:thorium", - amount: 72 + amount: 36 }, { ore: "gtceu:raw_chromite", liquid: "gtceu:chromium", - amount: 72 + amount: 36 } diff --git a/kubejs/server_scripts/mods/gtceu/gtceuAdd.js b/kubejs/server_scripts/mods/gtceu/gtceuAdd.js index bcfcd1c9..1d423c84 100644 --- a/kubejs/server_scripts/mods/gtceu/gtceuAdd.js +++ b/kubejs/server_scripts/mods/gtceu/gtceuAdd.js @@ -299,6 +299,7 @@ let gtceuAdd = (/** @type {Internal.RecipesEventJS} */ event) => { .EUt(LV) }) + event.recipes.kubejs.shaped('gtceu:wood_drum', [ 'mRs', 'PWP', 'PWP' ], { m: '#forge:tools/mallets', R: 'gtceu:sticky_resin', s: '#forge:tools/saws', P: '#minecraft:planks', W: 'gtceu:long_wrought_iron_rod'}).damageIngredient(['#forge:tools']) event.recipes.kubejs.shaped('gtceu:lv_electric_motor', ['cwr', 'wmw', 'rwc'], { c: 'gtceu:tin_single_cable', w: 'gtceu:copper_single_wire', r: 'gtceu:wrought_iron_rod', m: 'gtceu:magnetic_wrought_iron_rod' }) diff --git a/kubejs/server_scripts/recipes/add.js b/kubejs/server_scripts/recipes/add.js index 096b680f..ce2b1984 100644 --- a/kubejs/server_scripts/recipes/add.js +++ b/kubejs/server_scripts/recipes/add.js @@ -781,6 +781,9 @@ let recipeAdd = (/** @type {Internal.RecipesEventJS} */ event) => { smoking(`tfc:food\/${grain}_bread`,`firmalife:food\/${grain}_dough`) }) + + event.recipes.tfc.anvil('gtceu:wrought_iron_plate', 'tfc:metal/double_ingot/wrought_iron', ['hit_last', 'hit_second_last', 'hit_third_last']) + shaped("gtceu:bronze_rotor" , ["PHP", "SRF","PDP"], { H: "#forge:tools/hammers", D: "#forge:tools/screwdrivers", @@ -812,4 +815,5 @@ let recipeAdd = (/** @type {Internal.RecipesEventJS} */ event) => { sound: "minecraft:block.fire.extinguish" }) }) + } diff --git a/kubejs/server_scripts/recipes/removal.js b/kubejs/server_scripts/recipes/removal.js index 88ae2e84..82df6bf2 100644 --- a/kubejs/server_scripts/recipes/removal.js +++ b/kubejs/server_scripts/recipes/removal.js @@ -324,4 +324,34 @@ let recipeRemoval = (/** @type {Internal.RecipesEventJS} */ event) => { event.remove({ id: `/^iceandfire:.*copper.*/`}) event.remove({ id: `/^iceandfire:.*_pile/`}) + event.remove({ id: 'tfc:anvil/wrought_iron_sheet'}) + + let only_hotworked = (mineral) => { + event.remove({ id: "gtceu:shaped/plate_" + mineral }) + event.remove({ id: "gtceu:shaped/plate_double_" + mineral }) + } + + + only_hotworked("bismuth") + only_hotworked("copper") + only_hotworked("gold") + only_hotworked("nickel") + only_hotworked("silver") + only_hotworked("tin") + only_hotworked("zinc") + only_hotworked("brass") + only_hotworked("bronze") + only_hotworked("invar") + only_hotworked("sterling_silver") + only_hotworked("rose_gold") + only_hotworked("black_bronze") + only_hotworked("bismuth_bronze") + only_hotworked("steel") + only_hotworked("rose_gold") + only_hotworked("wrought_iron") + only_hotworked("black_steel") + only_hotworked("red_steel") + only_hotworked("blue_steel") + only_hotworked("wrought_iron") + }