illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nugget material fix, changelog (#1332)

Browse source
This commit is contained in:
Pyritie 2025-07-14 21:34:23 +01:00 • committed by GitHub
parent 8dd8d5b344
commit 9de6557326
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kubejs/assets/tfc/lang/en_us.json
View file

@ -2609,6 +2609,7 @@
"metal.tfg.redstone": "Redstone",
"metal.tfg.red_alloy": "Red Alloy",
"metal.tfg.tin_alloy": "Tin Alloy",
"metal.tfg.lead": "Lead",
"trim_material.tfc.almandine_tfc": "Almandine",
"trim_material.tfc.andradite_tfc": "Andradite",
"trim_material.tfc.blue_topaz_tfc": "Blue Topaz",

BIN
kubejs/assets/tfg/textures/block/metal/smooth/lead.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 381 B

1
kubejs/server_scripts/gregtech/data.js
View file

@ -112,6 +112,7 @@ const registerGTCEUMetals = (event) => {
event.metal('gtceu:redstone', 460, 0.01729, null, null, null, 1, 'tfg:redstone')
event.metal('gtceu:red_alloy', 740, 0.01529, '#forge:ingots/red_alloy', '#forge:double_ingots/red_alloy', '#forge:plates/red_alloy', 2, 'tfg:red_alloy')
event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', '#forge:double_ingots/tin_alloy', '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy')
event.metal('gtceu:lead', 330, 0.01729, '#forge:ingots/lead', '#forge:double_ingots/lead', '#forge:plates/lead', 2, 'tfg:lead')
}

3
kubejs/server_scripts/gregtech/utility.js
View file

@ -136,6 +136,9 @@ function generatePlatedBlockRecipe(event, material) {
let platedSlab = ChemicalHelper.get(TFGTagPrefix.slabPlated, material, 1);
let platedStair = ChemicalHelper.get(TFGTagPrefix.stairPlated, material, 1);
if (platedBlock == null)
return
let tfcMetalName = material.getName();
if (tfcMetalName == "iron")
tfcMetalName = "cast_iron";

2
kubejs/server_scripts/tacz/recipes.ammo.js
View file

@ -22,8 +22,6 @@ function registerTACZAmmoRecipes(event){
.EUt(GTValues.VA[GTValues.MV])
//Additives
event.recipes.tfc.anvil('6x #forge:nuggets/lead', '#forge:ingots/lead', ['punch_last', 'hit_second_last', 'punch_third_last'])
.tier(2).id('tfg:anvil/lead_nugget')
event.recipes.gtceu.chemical_reactor('tfg_tacz:nitrocellulose_from_wood')
.itemInputs('gtceu:thermochemically_treated_hardwood_dust')
.inputFluids(Fluid.of('gtceu:nitric_acid', 200), Fluid.of('gtceu:sulfuric_acid', 400), Fluid.of('minecraft:water', 600))

14
kubejs/server_scripts/tfc/recipes.materials.js
View file

@ -300,14 +300,9 @@ function registerTFCMaterialsRecipes(event) {
.id(`tfc:heating/metal/${material.getName()}_fishing_rod`)
//#endregion
}
// Plated Blocks - applies for everything with a double ingot (except tin/red alloy)
if (material != GTMaterials.TinAlloy && material != GTMaterials.RedAlloy) {
generatePlatedBlockRecipe(event, material);
}
generatePlatedBlockRecipe(event, material);
}
// Tools (From Double Ingots)
@ -594,6 +589,13 @@ function registerTFCMaterialsRecipes(event) {
.id(`tfc:anvil/${material.getName()}_small_spring`)
}
// Nugget
let nuggetItem = ChemicalHelper.get(TagPrefix.nugget, material, 6)
if (!nuggetItem.isEmpty()) {
event.recipes.tfc.anvil(nuggetItem, ingotItem, ['punch_last', 'hit_second_last', 'punch_third_last'])
.tier(tfcProperty.getTier())
.id(`tfg:anvil/${material.getName()}_nugget`)
}
}
// Tools (From Ingot)

1
kubejs/server_scripts/tfc/tags.js
View file

@ -482,6 +482,7 @@ const registerTFCFluidTags = (event) => {
event.add('tfc:usable_in_ingot_mold', 'gtceu:red_alloy')
event.add('tfc:usable_in_ingot_mold', 'gtceu:tin_alloy')
event.add('tfc:usable_in_ingot_mold', 'gtceu:lead')
event.add('tfc:usable_in_bell_mold', 'gtceu:bronze')
event.add('tfc:usable_in_bell_mold', 'gtceu:gold')

5
kubejs/startup_scripts/gtceu/materials.js
View file

@ -81,6 +81,10 @@ const registerGTCEuMaterialModification = (event) => {
/* TFC Проперти для материалов */
// TFC_PROPERTY = (forging temp, welding temp, melt temp, material, tier, percent of material)
// OR = (forging temp, welding temp, melt temp, tier)
//
// If registering a new material that you want to melt into a liquid in a vessel etc,
// make sure you add it to registerGTCEUMetals()!
GTMaterials.Copper.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(648, 864, 1080, 1));
GTMaterials.BismuthBronze.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(591, 788, 985, 2));
@ -177,6 +181,7 @@ const registerGTCEuMaterialModification = (event) => {
// /* Имеют двойные слитки */
GTMaterials.RedAlloy.addFlags(GENERATE_DOUBLE_INGOTS, GENERATE_SMALL_GEAR);
GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS);
GTMaterials.Lead.addFlags(GENERATE_DOUBLE_INGOTS);
//
// /* Другое */