diff --git a/kubejs/assets/tfg/textures/item/axe_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/axe_head_extruder_mold.png index bf4980a20..458d3bc58 100644 Binary files a/kubejs/assets/tfg/textures/item/axe_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/axe_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/bell_casting_mold.png b/kubejs/assets/tfg/textures/item/bell_casting_mold.png index ff6c6776b..2d5178604 100644 Binary files a/kubejs/assets/tfg/textures/item/bell_casting_mold.png and b/kubejs/assets/tfg/textures/item/bell_casting_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png index 93a4849e4..62c58ba25 100644 Binary files a/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/butchery_knife_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/chain_casting_mold.png b/kubejs/assets/tfg/textures/item/chain_casting_mold.png index 43330bf6a..03d570d83 100644 Binary files a/kubejs/assets/tfg/textures/item/chain_casting_mold.png and b/kubejs/assets/tfg/textures/item/chain_casting_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/chisel_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/chisel_head_extruder_mold.png index ec8202022..4d3949c62 100644 Binary files a/kubejs/assets/tfg/textures/item/chisel_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/chisel_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/file_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/file_head_extruder_mold.png index 62ca30abd..cd4c1c96a 100644 Binary files a/kubejs/assets/tfg/textures/item/file_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/file_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/fish_hook_extruder_mold.png b/kubejs/assets/tfg/textures/item/fish_hook_extruder_mold.png new file mode 100644 index 000000000..d46a66aaf Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fish_hook_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/hammer_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/hammer_head_extruder_mold.png index 83220a2f3..a6cf6901a 100644 Binary files a/kubejs/assets/tfg/textures/item/hammer_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/hammer_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/hoe_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/hoe_head_extruder_mold.png index 152bb6f93..719c04364 100644 Binary files a/kubejs/assets/tfg/textures/item/hoe_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/hoe_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/javelin_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/javelin_head_extruder_mold.png index 1ecbe20a4..c3bf9b18b 100644 Binary files a/kubejs/assets/tfg/textures/item/javelin_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/javelin_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/knife_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/knife_head_extruder_mold.png index efdc6d366..88e76ad47 100644 Binary files a/kubejs/assets/tfg/textures/item/knife_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/knife_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/lamp_casting_mold.png b/kubejs/assets/tfg/textures/item/lamp_casting_mold.png index d94f7b4a2..86ddabba9 100644 Binary files a/kubejs/assets/tfg/textures/item/lamp_casting_mold.png and b/kubejs/assets/tfg/textures/item/lamp_casting_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/mace_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/mace_head_extruder_mold.png index 327fbafe4..7a81c86d3 100644 Binary files a/kubejs/assets/tfg/textures/item/mace_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/mace_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/mattock_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/mattock_head_extruder_mold.png index e1bc780cc..cd52b62eb 100644 Binary files a/kubejs/assets/tfg/textures/item/mattock_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/mattock_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/mining_hammer_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/mining_hammer_head_extruder_mold.png index 8398d97eb..20f2c279f 100644 Binary files a/kubejs/assets/tfg/textures/item/mining_hammer_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/mining_hammer_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/pickaxe_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/pickaxe_head_extruder_mold.png index 344e96c5d..c4830a3a0 100644 Binary files a/kubejs/assets/tfg/textures/item/pickaxe_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/pickaxe_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/propick_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/propick_head_extruder_mold.png index 747881431..4d99c051f 100644 Binary files a/kubejs/assets/tfg/textures/item/propick_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/propick_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/saw_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/saw_head_extruder_mold.png index b333f9b3a..5a26bf80a 100644 Binary files a/kubejs/assets/tfg/textures/item/saw_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/saw_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/screwdriver_tip_extruder_mold.png b/kubejs/assets/tfg/textures/item/screwdriver_tip_extruder_mold.png new file mode 100644 index 000000000..e079f921d Binary files /dev/null and b/kubejs/assets/tfg/textures/item/screwdriver_tip_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/scythe_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/scythe_head_extruder_mold.png index e7c4387ae..731208158 100644 Binary files a/kubejs/assets/tfg/textures/item/scythe_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/scythe_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/shovel_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/shovel_head_extruder_mold.png index 5940e79fb..f69652eda 100644 Binary files a/kubejs/assets/tfg/textures/item/shovel_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/shovel_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/spade_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/spade_head_extruder_mold.png index b621e6a37..9ede5476b 100644 Binary files a/kubejs/assets/tfg/textures/item/spade_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/spade_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/sword_head_extruder_mold.png b/kubejs/assets/tfg/textures/item/sword_head_extruder_mold.png index 24690d7ce..36bbf22fa 100644 Binary files a/kubejs/assets/tfg/textures/item/sword_head_extruder_mold.png and b/kubejs/assets/tfg/textures/item/sword_head_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/trapdoor_casting_mold.png b/kubejs/assets/tfg/textures/item/trapdoor_casting_mold.png index 5ca1e99ef..19eae83ba 100644 Binary files a/kubejs/assets/tfg/textures/item/trapdoor_casting_mold.png and b/kubejs/assets/tfg/textures/item/trapdoor_casting_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/whisk_extruder_mold.png b/kubejs/assets/tfg/textures/item/whisk_extruder_mold.png new file mode 100644 index 000000000..1fcf37ee3 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/whisk_extruder_mold.png differ diff --git a/kubejs/assets/tfg/textures/item/wrench_tip_extruder_mold.png b/kubejs/assets/tfg/textures/item/wrench_tip_extruder_mold.png new file mode 100644 index 000000000..78cc0dcaf Binary files /dev/null and b/kubejs/assets/tfg/textures/item/wrench_tip_extruder_mold.png differ diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 6cf892759..f126833af 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -575,13 +575,20 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/steel' }).id('gtceu:shaped/steel_whisk') - event.recipes.gtceu.assembler('greate:steel_whisk') + event.recipes.gtceu.assembler('gtceu:steel_whisk') .itemInputs('#forge:rings/steel', '4x #forge:rods/long/steel') - .itemOutputs('greate:steel_whisk') + .itemOutputs('gtceu:steel_whisk') .circuit(2) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.extruder('gtceu:steel_whisk') + .itemInputs('4x #forge:ingots/steel') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:steel_whisk') + .duration(GTMaterials.Steel.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + event.shaped('gtceu:aluminium_whisk', [ 'ABC', 'D D', @@ -593,13 +600,20 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/aluminium' }).id('gtceu:shaped/aluminium_whisk') - event.recipes.gtceu.assembler('greate:aluminium_whisk') + event.recipes.gtceu.assembler('gtceu:aluminium_whisk') .itemInputs('#forge:rings/aluminium', '4x #forge:rods/long/aluminium') - .itemOutputs('greate:aluminium_whisk') + .itemOutputs('gtceu:aluminium_whisk') .circuit(2) .duration(50) .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.extruder('gtceu:aluminium_whisk') + .itemInputs('4x #forge:ingots/aluminium') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:aluminium_whisk') + .duration(GTMaterials.Aluminium.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + event.shaped('gtceu:stainless_steel_whisk', [ 'ABC', 'D D', @@ -611,13 +625,20 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/stainless_steel' }).id('gtceu:shaped/stainless_steel_whisk') - event.recipes.gtceu.assembler('greate:stainless_steel_whisk') + event.recipes.gtceu.assembler('gtceu:stainless_steel_whisk') .itemInputs('#forge:rings/stainless_steel', '4x #forge:rods/long/stainless_steel') - .itemOutputs('greate:stainless_steel_whisk') + .itemOutputs('gtceu:stainless_steel_whisk') .circuit(2) .duration(50) .EUt(GTValues.VA[GTValues.MV]) + event.recipes.gtceu.extruder('gtceu:stainless_steel_whisk') + .itemInputs('4x #forge:ingots/stainless_steel') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:stainless_steel_whisk') + .duration(GTMaterials.StainlessSteel.getMass() * 3) + .EUt(GTValues.VA[GTValues.MV]) + event.shaped('gtceu:titanium_whisk', [ 'ABC', 'D D', @@ -629,13 +650,20 @@ function registerGreateRecipes(event) { D: '#forge:rods/long/titanium' }).id('gtceu:shaped/titanium_whisk') - event.recipes.gtceu.assembler('greate:titanium_whisk') + event.recipes.gtceu.assembler('gtceu:titanium_whisk') .itemInputs('#forge:rings/titanium', '4x #forge:rods/long/titanium') - .itemOutputs('greate:titanium_whisk') + .itemOutputs('gtceu:titanium_whisk') .circuit(2) .duration(50) .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.extruder('gtceu:titanium_whisk') + .itemInputs('4x #forge:ingots/titanium') + .notConsumable('tfg:whisk_extruder_mold') + .itemOutputs('gtceu:titanium_whisk') + .duration(GTMaterials.Titanium.getMass() * 3) + .EUt(GTValues.VA[GTValues.HV]) + // #endregion // #region Presses diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 435fbe730..f9eb9efb4 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -951,15 +951,18 @@ function registerGTCEUMetalRecipes(event) { makeToolRecipe(GTToolType.MINING_HAMMER, TFGTagPrefix.toolHeadMiningHammer, 'tfg:mining_hammer_head_extruder_mold', 10, material) makeToolRecipe(GTToolType.SCYTHE, TFGTagPrefix.toolHeadScythe, 'tfg:scythe_head_extruder_mold', 11, material) makeToolRecipe(GTToolType.HARD_HAMMER, TFGTagPrefix.toolHeadHammer, 'tfg:hammer_head_extruder_mold', 12, material) - makeToolRecipe(GTToolType.BUTCHERY_KNIFE, TFGTagPrefix.toolHeadButcheryKnife, 'tfg:butchery_knife_head_extruder_mold', 13, material) + makeToolRecipe(GTToolType.SCREWDRIVER, TagPrefix.toolHeadScrewdriver, 'tfg:screwdriver_tip_extruder_mold', 14, material) + processToolMortar(GTToolType.MORTAR, material) - processToolHead(TFGTagPrefix.toolHeadPropick, 'tfg:propick_head_extruder_mold', 14, material) - processToolHead(TFGTagPrefix.toolHeadJavelin, 'tfg:javelin_head_extruder_mold', 15, material) - processToolHead(TFGTagPrefix.toolHeadChisel, 'tfg:chisel_head_extruder_mold', 16, material) - processToolHead(TFGTagPrefix.toolHeadMace, 'tfg:mace_head_extruder_mold', 17, material) - processToolHead(TFGTagPrefix.toolHeadMattock, 'tfg:mattock_head_extruder_mold', 18, material) + processToolHead(TagPrefix.toolHeadWrench, 'tfg:wrench_tip_extruder_mold', 15, material) + processToolHead(TFGTagPrefix.toolHeadPropick, 'tfg:propick_head_extruder_mold', 16, material) + processToolHead(TFGTagPrefix.toolHeadJavelin, 'tfg:javelin_head_extruder_mold', 17, material) + processToolHead(TFGTagPrefix.toolHeadChisel, 'tfg:chisel_head_extruder_mold', 18, material) + processToolHead(TFGTagPrefix.toolHeadMace, 'tfg:mace_head_extruder_mold', 19, material) + processToolHead(TFGTagPrefix.toolHeadMattock, 'tfg:mattock_head_extruder_mold', 20, material) + processToolHead(TFGTagPrefix.toolHeadHook, 'tfg:fish_hook_extruder_mold', 21, material) } if (ingotProperty != null) { @@ -1001,4 +1004,4 @@ function registerGTCEUMetalRecipes(event) { 'minecraft:gravel', '#tfc:rock/gravel') } }) -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index f5ae4fb2d..ccafa76c8 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -618,7 +618,33 @@ function registerTFCMaterialsRecipes(event) { .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) .id(`rnr:heating/metal/${material.getName()}_mattock_head`) //#endregion + + // #region screwdriver + event.recipes.tfc.heating(`gtceu:${material.getName()}_screwdriver`, tfcProperty.getMeltTemp()) + .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) + .useDurability(true) + .id(`gtceu:heating/metal/${material.getName()}_screwdriver`) + event.recipes.tfc.heating(`gtceu:${material.getName()}_screwdriver_tip`, tfcProperty.getMeltTemp()) + .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) + .id(`gtceu:heating/metal/${material.getName()}_screwdriver_tip`) + + event.recipes.tfc.anvil(`gtceu:${material.getName()}_screwdriver_tip`, ingotItem, ['draw_last', 'hit_second_last', 'hit_third_last']) + .tier(tfcProperty.getTier()) + .id(`gtceu:anvil/${material.getName()}_screwdriver_tip`) + //#endregion + + //#region wrench + event.recipes.tfc.heating(`gtceu:${material.getName()}_wrench`, tfcProperty.getMeltTemp()) + .resultFluid(Fluid.of(outputMaterial.getFluid(), 576)) + .useDurability(true) + .id(`gtceu:heating/metal/${material.getName()}_wrench`) + + event.recipes.tfc.heating(`gtceu:${material.getName()}_wrench_tip`, tfcProperty.getMeltTemp()) + .resultFluid(Fluid.of(outputMaterial.getFluid(), 576)) + .id(`gtceu:heating/metal/${material.getName()}_wrench_tip`) + //#endregion + //#region Топор // Крафт инструмента @@ -1327,4 +1353,4 @@ function registerTFCMaterialsRecipes(event) { .id(`tfg:heating/nugget/${material.getName()}`) } }) -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/recipes.molds.js b/kubejs/server_scripts/tfg/recipes.molds.js index 9de3fd411..773943aa6 100644 --- a/kubejs/server_scripts/tfg/recipes.molds.js +++ b/kubejs/server_scripts/tfg/recipes.molds.js @@ -222,6 +222,45 @@ function registerTFGMoldRecipes(event) { h: '#forge:tools/hammers' }) + event.shaped('tfg:fish_hook_extruder_mold', [ + 'f ', + ' S ', + ' h' + ], { + S: 'gtceu:empty_mold', + f: '#forge:tools/files', + h: '#forge:tools/hammers' + }) + + event.shaped('tfg:whisk_extruder_mold', [ + 'f h', + ' S ', + ' ' + ], { + S: 'gtceu:empty_mold', + f: '#forge:tools/files', + h: '#forge:tools/hammers' + }) + + event.shaped('tfg:screwdriver_tip_extruder_mold', [ + 'f ', + ' S ', + ' h ' + ], { + S: 'gtceu:empty_mold', + f: '#forge:tools/files', + h: '#forge:tools/hammers' + }) + + event.shaped('tfg:wrench_tip_extruder_mold', [ + 'f ', + 'hS ', + ' ' + ], { + S: 'gtceu:empty_mold', + f: '#forge:tools/files', + h: '#forge:tools/hammers' + }) let steelIngots = ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4); let steelDusts = ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 4); @@ -291,4 +330,4 @@ function registerTFGMoldRecipes(event) { // .id(`tfg:shapeless/vessel_cleaning/${vessel.replace(":", "/")}`); // }); -} \ No newline at end of file +} diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index ad4f3ad3b..0f4a1fc1d 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -176,7 +176,11 @@ global.TFG_EXTRUDER_MOLDS = [ 'tfg:javelin_head_extruder_mold', 'tfg:chisel_head_extruder_mold', 'tfg:mace_head_extruder_mold', - 'tfg:mattock_head_extruder_mold' + 'tfg:mattock_head_extruder_mold', + 'tfg:fish_hook_extruder_mold', + 'tfg:whisk_extruder_mold', + 'tfg:screwdriver_tip_extruder_mold', + 'tfg:wrench_tip_extruder_mold' ]; global.TFG_CASTING_MOLDS = [