diff --git a/CHANGELOG.md b/CHANGELOG.md index 58961ca28..62c2b2f24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,17 @@ ## Unreleased ### Changes -- Doubled the durability of all space suits @Pyritie -- Added "too cold to handle" and "too light to handle" for cold things and lighter-than-air things. Uses the same mechanic as tongs. Lighter-than-air things can also be negated with diving suit boots or carrying something Very Heavy in your inventory, and all effects (including "too hot to handle") are negated by super tanks/chests, cells, and space suits, but *not* drums or buckets. @Pyritie +- Added "too cold to handle" and "too light to handle" for cold things and lighter-than-air things. Uses the same mechanic as tongs. Lighter-than-air things can also be negated with something Very Heavy in your inventory, and all effects (including "too hot to handle") are negated by super tanks/chests and cells, but *not* drums or buckets. Check the `tfg:hot_protection_equipment`, `tfg:cold_protection_equipment`, and `tfg:floating_protection_equipment` tags for equipment that makes you immune to these effects. @Pyritie +- GregTech hot ingots are also now properly included in the "too hot to handle" system so the same protection applies @Pyritie - Added debuff effects for all medical conditions, so you're immediately notified when carrying something hazardous instead of wondering why you have Hunger II. @Pyritie - The hazard effect that previously instantly killed you (which did not spawn a corpse) now gives you Wither III instead. @Pyritie +- Added machine recipes for crafting tongs @Pyritie +- Doubled the durability of all space suits @Pyritie ### Bug fixes - Fixed aged sake, vodka, and whiskey losing their buff effects, but for real this time @Pyritie - Fixed fries and cheese curds not being able to be put on burgers. @Redeix - Fixed sliced brinza missing the proper cheese tags. @Redeix +- Fixed pyroxenite and keratophyre bricks crafting 1 instead of 4 (#2373) @Pyritie ### Translation updates ## [0.11.10] - 9-12-2025 diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 5fc44fd5e..1a8d62187 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -1324,22 +1324,44 @@ function registerTFCMaterialsRecipes(event) { let tongPartStack = Item.of(`tfchotornot:tong_part/${material.getName()}`) if (!tongsStack.isEmpty() && !tongPartStack.isEmpty() && material !== GTMaterials.Iron) { + // tong parts + event.custom({ + type: 'vintageimprovements:curving', + ingredients: [ChemicalHelper.get(TagPrefix.rodLong, material, 1)], + itemAsHead: 'gtceu:rod_extruder_mold', + results: [tongPartStack], + processingTime: material.getMass() * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER + }).id(`tfg:vi/curving/${material.getName()}_tong`) + + event.recipes.gtceu.extruder(`tfg:${material.getName()}_tong`) + .itemInputs(`#forge:rods/long/${material.getName()}`) + .notConsumable('gtceu:rod_extruder_mold') + .itemOutputs(tongPartStack) + .duration(material.getMass()) + .EUt(GTValues.VA[GTValues.LV]) + + // tongs event.recipes.tfc.advanced_shaped_crafting( TFC.isp.of(tongsStack).copyForgingBonus(), [ 'AA', 'BC' ], { A: tongPartStack, - B: '#forge:bolts', + B: Ingredient.of('#forge:bolts').subtract('gtceu:wood_bolt'), C: '#forge:tools/hammers' }, 0, 0).id(`tfchotornot:crafting/tongs/${material.getName()}`) - // tong parts + event.recipes.gtceu.forge_hammer(`tfg:${material.getName()}_tong`) + .itemInputs(tongPartStack.withCount(2)) + .itemOutputs(tongsStack) + .duration(material.getMass()) + .EUt(GTValues.VA[GTValues.ULV]) + + // tong heating 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/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index cd9294168..32c8d2ab0 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -259,6 +259,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BismuthBronze.addFlags(GENERATE_SMALL_GEAR); GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD); + GTMaterials.Zinc.addFlags(GENERATE_LONG_ROD); GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_FOIL);