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

Incorrect tiering for extractor for Bis and Black Bronze (#2684)

Browse source 
* Incorrect tiering for extractor for Bis and Black Bronze

Bismuth Bronze and Black Bronze wrong tiering in extractor
Added some documentation

* Update recipes.materials.js

* Updated

* Updated

* Unified tiering

* Revert "Unified tiering"

This reverts commit ea9e00d2bca8f70c2f95bb1362766edcc9e29498.

---------

Co-authored-by: Redeix <redeix.m@gmail.com>
This commit is contained in:
Inceitious 2026-01-12 03:46:10 +08:00 • committed by GitHub
parent 17be437196
commit 563bf2306a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 56 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

97
kubejs/server_scripts/gregtech/recipes.materials.js
View file

@ -6,6 +6,12 @@
*/
function registerGTCEUMetalRecipes(event) {
function getExtractorEUt(material) {
return (material.hasProperty(PropertyKey.BLAST) && material !== GTMaterials.BismuthBronze && material !== GTMaterials.BlackBronze
? GTValues.VA[GTValues.MV]
: GTValues.VA[GTValues.LV]);
}
/**
* @param {GTToolType} toolType
* @param {String} tagPrefixName
@ -114,13 +120,13 @@ function registerGTCEUMetalRecipes(event) {
.duration(material.getMass() * 6 * materialAmount)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.extractor(`gtceu:extract_${material.getName()}_${tagPrefixName}`)
.itemInputs(toolHeadItem)
.outputFluids(Fluid.of(material.getFluid(), materialAmount * 144))
.duration(material.getMass() * 6 * materialAmount)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
event.recipes.gtceu.extractor(`gtceu:extract_${material.getName()}_${tagPrefixName}`)
.itemInputs(toolHeadItem)
.outputFluids(Fluid.of(material.getFluid(), materialAmount * 144))
.duration(material.getMass() * 6 * materialAmount)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(getExtractorEUt(material))
}
} else if (material.hasProperty(PropertyKey.GEM)) {
@ -271,6 +277,7 @@ function registerGTCEUMetalRecipes(event) {
event.remove({ id: `gtceu:compressor/compress_${material.getName()}_to_block` })
}
//Foils
/**
* @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material
*/
@ -289,6 +296,7 @@ function registerGTCEUMetalRecipes(event) {
}
}
//Rods
/**
* @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material
*/
@ -311,6 +319,7 @@ function registerGTCEUMetalRecipes(event) {
}
}
//Double Ingots
/**
* @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material
*/
@ -321,12 +330,13 @@ function registerGTCEUMetalRecipes(event) {
const doubleIngotStack = ChemicalHelper.get(TFGTagPrefix.ingotDouble, material, 1);
if (material.hasProperty(PropertyKey.FLUID)) {
event.recipes.gtceu.extractor(`tfg:extract_${material.getName()}_double_ingot`)
.itemInputs(doubleIngotStack)
.outputFluids(Fluid.of(material.getFluid(), 288))
.duration(material.getMass())
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
.EUt(getExtractorEUt(material))
}
if (material.hasProperty(PropertyKey.DUST)) {
@ -812,6 +822,7 @@ function registerGTCEUMetalRecipes(event) {
.id(`tfg:quern/${material.getName()}_gem_to_dust`)
}
//Anvils
/**
* @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material
*/
@ -824,21 +835,21 @@ function registerGTCEUMetalRecipes(event) {
.itemOutputs(ChemicalHelper.get(TagPrefix.dust, material, 14))
.duration(material.getMass() * 32)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_anvil`)
.itemInputs(anvilStack)
.itemOutputs(ChemicalHelper.get(TagPrefix.ingot, material, 14))
.duration(material.getMass() * 32)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.extractor(`tfg:extract_${material.getName()}_anvil`)
.itemInputs(anvilStack)
.outputFluids(Fluid.of(material.getFluid(), 14 * 144))
.duration(material.getMass() * 32)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
.EUt(getExtractorEUt(material))
event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_anvil`)
.itemInputs(ChemicalHelper.get(TagPrefix.ingot, material, 14))
@ -853,9 +864,10 @@ function registerGTCEUMetalRecipes(event) {
.notConsumable('gtceu:anvil_casting_mold')
.itemOutputs(anvilStack)
.duration(material.getMass() * 32)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
}
//Unfinished Lamps
/**
* @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material
*/
@ -873,21 +885,21 @@ function registerGTCEUMetalRecipes(event) {
.itemOutputs([materialDustStack, glassDustStack])
.duration(material.getMass() * 8)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_lamp`)
.itemInputs(finishedLampStack)
.itemOutputs([materialIngotStack, glassDustStack])
.duration(material.getMass() * 8)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.assembler(`tfg:${material.getName()}_lamp`)
.itemInputs("tfc:lamp_glass", unfinishedLampStack)
.itemOutputs(finishedLampStack)
.duration(material.getMass() * 7)
.circuit(12)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.assembler(`tfg:${material.getName()}_lamp_from_liquid`)
.itemInputs(unfinishedLampStack)
@ -895,28 +907,28 @@ function registerGTCEUMetalRecipes(event) {
.itemOutputs(finishedLampStack)
.duration(material.getMass() * 7)
.circuit(13)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.macerator(`tfg:macerate_${material.getName()}_unfinished_lamp`)
.itemInputs(unfinishedLampStack)
.itemOutputs(materialDustStack)
.duration(material.getMass() * 8)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_unfinished_lamp`)
.itemInputs(unfinishedLampStack)
.itemOutputs(materialIngotStack)
.duration(material.getMass() * 8)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.extractor(`tfg:extract_${material.getName()}_unfinished_lamp`)
.itemInputs(unfinishedLampStack)
.outputFluids(Fluid.of(material.getFluid(), 144))
.duration(material.getMass() * 8)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
event.recipes.gtceu.extractor(`tfg:extract_${material.getName()}_unfinished_lamp`)
.itemInputs(unfinishedLampStack)
.outputFluids(Fluid.of(material.getFluid(), 144))
.duration(material.getMass() * 8)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(getExtractorEUt(material))
event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_unfinished_lamp`)
.itemInputs(materialIngotStack)
@ -931,7 +943,7 @@ function registerGTCEUMetalRecipes(event) {
.notConsumable('tfg:lamp_casting_mold')
.itemOutputs(unfinishedLampStack)
.duration(material.getMass() * 8)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
}
/**
@ -949,21 +961,22 @@ function registerGTCEUMetalRecipes(event) {
.itemOutputs(materialDustStack)
.duration(material.getMass() * 7)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_trapdoor`)
.itemInputs(trapdoorStack)
.itemOutputs(materialIngotStack)
.duration(material.getMass() * 7)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.extractor(`tfg:extract_${material.getName()}_trapdoor`)
.itemInputs(trapdoorStack)
.outputFluids(Fluid.of(material.getFluid(), 144))
.duration(material.getMass() * 7)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
.EUt(getExtractorEUt(material))
event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_trapdoor`)
.itemInputs(materialIngotStack)
@ -978,7 +991,7 @@ function registerGTCEUMetalRecipes(event) {
.notConsumable('tfg:trapdoor_casting_mold')
.itemOutputs(trapdoorStack)
.duration(material.getMass() * 7)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
}
/**
@ -999,21 +1012,21 @@ function registerGTCEUMetalRecipes(event) {
.itemOutputs(materialDustTinyStack)
.duration(material.getMass() * 3)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_chain`)
.itemInputs(chain2Stack)
.itemOutputs(materialNuggetStack)
.duration(material.getMass() * 3)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.extractor(`tfg:extract_${material.getName()}_chain`)
.itemInputs(chainStack)
.outputFluids(Fluid.of(material.getFluid(), 9))
.duration(material.getMass() * 3)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
.EUt(getExtractorEUt(material))
event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_chain`)
.itemInputs(materialIngotStack)
@ -1028,9 +1041,10 @@ function registerGTCEUMetalRecipes(event) {
.notConsumable('tfg:chain_casting_mold')
.itemOutputs(chainStack)
.duration(material.getMass() * 3)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
}
//Bell
/**
* @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material
*/
@ -1046,21 +1060,21 @@ function registerGTCEUMetalRecipes(event) {
.itemOutputs(materialDustStack)
.duration(material.getMass() * 5)
.category(GTRecipeCategories.MACERATOR_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_bell`)
.itemInputs(bellStack)
.itemOutputs(materialIngotStack)
.duration(material.getMass() * 5)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.extractor(`tfg:extract_${material.getName()}_bell`)
.itemInputs(bellStack)
.outputFluids(Fluid.of(material.getFluid(), 144))
.duration(material.getMass() * 5)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.alloy_smelter(`tfg:cast_${material.getName()}_bell`)
.itemInputs(materialIngotStack)
@ -1075,9 +1089,10 @@ function registerGTCEUMetalRecipes(event) {
.notConsumable('tfg:bell_casting_mold')
.itemOutputs(bellStack)
.duration(material.getMass() * 5)
.EUt(GTValues.VA[GTValues.ULV])
.EUt(GTValues.VA[GTValues.LV])
}
//Buzzsaws
/**
* @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material
*/
@ -1116,16 +1131,16 @@ function registerGTCEUMetalRecipes(event) {
.duration(material.getMass() * 6 * 2)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.LV])
event.remove({ id: `gtceu:extractor/extract_${material.getName()}_buzz_saw_blade` })
event.recipes.gtceu.extractor(`tfg:extract_${material.getName()}_buzz_saw_blade`)
.itemInputs(buzzsawBladeItem)
.outputFluids(Fluid.of(material.getFluid(), 2 * 144))
.duration(material.getMass() * 6 * 2)
.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
.EUt(material.hasProperty(PropertyKey.BLAST) ? GTValues.VA[GTValues.MV] : GTValues.VA[GTValues.ULV])
event.remove({ id: `gtceu:shaped/buzzsaw_blade_${material.getName()}` })
.EUt(getExtractorEUt(material))
event.remove({ id: `gtceu:shaped/buzzsaw_blade_${material.getName()}` })
}
/**