diff --git a/CHANGELOG.md b/CHANGELOG.md index 09806b2c8..e52c903b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ - Added mortar and pestel recipes for grain to flour @Pyritie - Added in-world shift + right-click interactions for bricks. Greens can be used to turn bricks into mossy bricks, and a knife reverts it. Hammers make cracked bricks and mortar repairs them. (#1416) @Redeix - Steam can now be pumped into Blaze Burners via the Straw (#1379) @Nyonyix +- Rearranged some anvil finish sequences to fit TFG convention @Zippity - Replaced moon skeletons with Strays @Pyritie - Replaced Beneath cave endermen with a different, passive one (same loot table though) @Pyritie - Added sandpaper recipes for early game gems @Pyritie @@ -50,6 +51,8 @@ - Fixed new extruder molds missing a tag to work with the curving press (#1412) @Forsuin - Fixed contraptions no longer understanding TFC chests @Pyritie - Fixed ice never melting in the overworld (#1408) @Pyritie +- Fixed small gears not having heat data @Zippity +- Fixed forgeable small gears not being meltable @Zippity - Removed most empty tag recipes (#1420) @BlueBoat29 - Fixed Styrene Butadiene Belt recipe (#1421) @BlueBoat29 - Fixed deer dropping camelidae meat with a butchery knife @Pyritie diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 01dc9edbf..84e15fe32 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -96,7 +96,7 @@ const registerCreateAdditionsRecipes = (event) => { //#region Liquid blaze burners - event.recipes.tfc.anvil('createaddition:straw', '#forge:plates/tin_alloy', ['shrink_second_last', 'upset_not_last', 'punch_last']) + event.recipes.tfc.anvil('createaddition:straw', '#forge:plates/tin_alloy', ['punch_last', 'shrink_second_last', 'upset_not_last']) .tier(3) .id(`tfc:anvil/straw`) diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index 054b75b0d..04af077c7 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -39,6 +39,7 @@ const registerGTCEUHeats = (event) => { makeItemHeatByTagPrefix(TagPrefix.nugget, material, tfcProperty, 0.124) makeItemHeatByTagPrefix(TagPrefix.block, material, tfcProperty, 20) makeItemHeatByTagPrefix(TagPrefix.rodLong, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix(TagPrefix.gearSmall, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TagPrefix.ingot, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TFGTagPrefix.ingotDouble, material, tfcProperty, 2.875) diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index b12bcd55a..8dd3c8082 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -289,7 +289,7 @@ function registerTFCMaterialsRecipes(event) { .id(`tfc:heating/metal/${material.getName()}_fish_hook`) // Крюк удочки - event.recipes.tfc.anvil(`tfc:metal/fish_hook/${material.getName()}`, plateItem, ['draw_not_last', 'bend_any', 'hit_any']) + event.recipes.tfc.anvil(`tfc:metal/fish_hook/${material.getName()}`, plateItem, ['bend_any', 'hit_any', 'draw_not_last']) .tier(tfcProperty.getTier()) .bonus(true) .id(`tfc:anvil/${material.getName()}_fish_hook`) @@ -604,10 +604,27 @@ function registerTFCMaterialsRecipes(event) { } } + // Small Gears + let smallGearItem = ChemicalHelper.get(TagPrefix.gearSmall, material, 1) + if (!smallGearItem.isEmpty()) { + + if (tfcProperty.getMeltTemp() <= 1540) { + event.recipes.tfc.heating(`gtceu:small_${material.getName()}_gear`, tfcProperty.getMeltTemp()) + .resultFluid(Fluid.of(`gtceu:${material.getName()}`, 144)) + .id(`tfc:heating/small_${material.getName()}_gear`) + } + + if (material.hasFlag(MaterialFlags.GENERATE_SMALL_GEAR)) { + event.recipes.tfc.anvil(`gtceu:small_${material.getName()}_gear`, `#forge:ingots/${material.getName()}`, ['hit_last', 'shrink_second_last', 'draw_third_last']) + .tier(tfcProperty.getTier()) + .id(`tfc:anvil/small_${material.getName()}_gear`) + } + } + // Tools (From Ingot) if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) { - //#region Кирка + //#region pickaxe // Крафт инструмента event.remove({ id: `tfc:crafting/metal/pickaxe/${material.getName()}` }) @@ -654,7 +671,7 @@ function registerTFCMaterialsRecipes(event) { } //#endregion - // #region Mattock + // #region mattock event.recipes.tfc.heating(`rnr:metal/mattock/${material.getName()}`, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) .useDurability(true) @@ -710,7 +727,7 @@ function registerTFCMaterialsRecipes(event) { .id(`gtceu:anvil/${material.getName()}_wire_cutter_head`) //#endregion - //#region Топор + //#region axe // Крафт инструмента event.remove({ id: `tfc:crafting/metal/axe/${material.getName()}` }) @@ -756,7 +773,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Лопата + //#region shovel // Крафт инструмента event.remove({ id: `tfc:crafting/metal/shovel/${material.getName()}` }) @@ -804,7 +821,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Мотыга + //#region hoe // Крафт инструмента event.remove({ id: `tfc:crafting/metal/hoe/${material.getName()}` }) @@ -850,7 +867,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Молот + //#region crafting hammer // Крафт инструмента event.remove({ id: `tfc:crafting/metal/hammer/${material.getName()}` }) @@ -898,7 +915,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Пила + //#region saw // Крафт инструмента event.remove({ id: `tfc:crafting/metal/saw/${material.getName()}` }) @@ -946,7 +963,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Коса + //#region scythe // Крафт инструмента event.remove({ id: `tfc:crafting/metal/scythe/${material.getName()}` }) @@ -992,7 +1009,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Напильник + //#region file // Декрафт инструмента в жидкость let fileItem = ToolHelper.get(GTToolType.FILE, material) @@ -1021,7 +1038,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Нож + //#region knife // Крафт инструмента event.remove({ id: `tfc:crafting/metal/knife/${material.getName()}` }) @@ -1063,7 +1080,7 @@ function registerTFCMaterialsRecipes(event) { ).id(`tfg:tfc/filling/${material.getName()}_knife_blade_mold`) } - //#region Ножницы + //#region shears // Сварка оголовий event.recipes.tfc.welding(`tfc:metal/shears/${material.getName()}`, knifeHeadItem, knifeHeadItem, tfcProperty.getTier()) @@ -1086,7 +1103,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Проспектор + //#region prospector pick // Декрафт инструмента в жидкость event.recipes.tfc.heating(`tfc:metal/propick/${material.getName()}`, tfcProperty.getMeltTemp()) @@ -1115,7 +1132,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Стамеска + //#region chisel // Декрафт инструмента в жидкость event.recipes.tfc.heating(`tfc:metal/chisel/${material.getName()}`, tfcProperty.getMeltTemp()) @@ -1144,7 +1161,7 @@ function registerTFCMaterialsRecipes(event) { //#endregion - //#region Копье + //#region javelin // Декрафт инструмента в жидкость event.recipes.tfc.heating(`tfc:metal/javelin/${material.getName()}`, tfcProperty.getMeltTemp()) @@ -1240,7 +1257,7 @@ function registerTFCMaterialsRecipes(event) { .id(`tfc:heating/metal/${material.getName()}_anvil`) } - //#region Щипцы + //#region tongs let tongsStack = Item.of(`tfchotornot:tongs/${material.getName()}`) let tongPartStack = Item.of(`tfchotornot:tong_part/${material.getName()}`) @@ -1255,12 +1272,12 @@ function registerTFCMaterialsRecipes(event) { C: '#forge:tools/hammers' }, 0, 0).id(`tfchotornot:crafting/tongs/${material.getName()}`) - // Ручка щипцов + // tong parts event.recipes.tfc.heating(tongPartStack, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) .id(`tfchotornot:heating/tong_part/${material.getName()}`) - // Щипцы + // tong heating event.recipes.tfc.heating(tongsStack, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 288)) .useDurability(true) diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index da8753d8b..a951bee19 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -278,32 +278,6 @@ function registerTFCMetalsRecipes(event) { .tier(5) .id('tfc:anvil/blue_steel_ingot') - // Small Gears - event.recipes.tfc.anvil('gtceu:small_wrought_iron_gear', '#forge:ingots/wrought_iron', ['hit_last', 'shrink_second_last', 'draw_third_last']) - .tier(3) - .id('tfc:anvil/small_wrought_iron_gear') - event.recipes.tfc.anvil('gtceu:small_steel_gear', '#forge:ingots/steel', ['hit_last', 'shrink_second_last', 'draw_third_last']) - .tier(4) - .id('tfc:anvil/small_steel_gear') - event.recipes.tfc.anvil('gtceu:small_iron_gear', '#forge:ingots/iron', ['hit_last', 'shrink_second_last', 'draw_third_last']) - .tier(2) - .id('tfc:anvil/small_iron_gear') - event.recipes.tfc.anvil('gtceu:small_brass_gear', '#forge:ingots/brass', ['hit_last', 'shrink_second_last', 'draw_third_last']) - .tier(2) - .id('tfc:anvil/small_brass_gear') - event.recipes.tfc.anvil('gtceu:small_bronze_gear', '#forge:ingots/bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) - .tier(2) - .id('tfc:anvil/small_bronze_gear') - event.recipes.tfc.anvil('gtceu:small_bismuth_bronze_gear', '#forge:ingots/bismuth_bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) - .tier(2) - .id('tfc:anvil/small_bismuth_bronze_gear') - event.recipes.tfc.anvil('gtceu:small_black_bronze_gear', '#forge:ingots/black_bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) - .tier(2) - .id('tfc:anvil/small_black_bronze_gear') - event.recipes.tfc.anvil('gtceu:small_red_alloy_gear', '#forge:ingots/red_alloy', ['hit_last', 'shrink_second_last', 'draw_third_last']) - .tier(2) - .id('tfc:anvil/small_red_alloy_gear') - // Cast iron -> Raw Iron Bloom event.recipes.tfc.bloomery('tfc:raw_iron_bloom', 'minecraft:charcoal', Fluid.of('gtceu:iron', 144), 15000) .id('tfc:bloomery/raw_iron_bloom') diff --git a/kubejs/server_scripts/tfg/recipes.paper.js b/kubejs/server_scripts/tfg/recipes.paper.js index 6df194cd7..fd5f22c95 100644 --- a/kubejs/server_scripts/tfg/recipes.paper.js +++ b/kubejs/server_scripts/tfg/recipes.paper.js @@ -126,7 +126,7 @@ function registerTFGPapermakingRecipes(event) { generateMixerRecipe(event, 'gtceu:tiny_hardwood_dust', Fluid.of('tfc:lye', 16), 'gtceu:tiny_thermochemically_treated_hardwood_dust', null, [], 50, 2, 64, 'tfg:mixer/mix_tiny_hardwood_dust_with_lye') //Beat thermochemically treated hardwood dust into soaked unrefined paper - event.recipes.tfc.anvil('tfg:soaked_unrefined_paper', 'gtceu:thermochemically_treated_hardwood_dust', ['hit_last', 'hit_last', 'hit_last']) + event.recipes.tfc.anvil('tfg:soaked_unrefined_paper', 'gtceu:thermochemically_treated_hardwood_dust', ['hit_last', 'hit_second_last', 'hit_third_last']) .id('tfg:anvil/soaked_unrefined_paper') event.recipes.greate.pressing(Item.of('tfg:soaked_unrefined_paper'), 'gtceu:thermochemically_treated_hardwood_dust') .recipeTier(0)