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

use tfg namespace insteaf of gtceu where applicable

Browse source
This commit is contained in:
Dmitry 2024-04-23 08:11:02 +07:00
parent cb933705ce
commit 49751dfd02
11 changed files with 90 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/ftbquests/quests/chapters/primitive_age.snbt
View file

@ -2898,7 +2898,7 @@
tag: {
fluid: {
Amount: 1000
FluidName: "gtceu:latex"
FluidName: "tfg:latex"
}
}
}

5
config/jade/sort-order.json
View file

@ -147,6 +147,11 @@
"tfc:windmill": null,
"minecraft:campfire": null,
"tfc:mold_table": null,
"tfc_support_indicator:support_indicator": null,
"framedblocks:framed_item_frame": null,
"expatternprovider:tile_data": null,
"expatternprovider:jade_wireless": null,
"expatternprovider:jade_chamber": null,
"corpse:corpse": null,
"tfc_support_indicator:support_indicator": null,
"framedblocks:framed_item_frame": null,

2
kubejs/server_scripts/computer_craft/data.js
View file

@ -5,7 +5,7 @@ const registerComputerCraftData = (event) => {
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
TURTLE_TOOL_TYPES.forEach(type => {
let toolStack = $ToolHelper.get(type, material)
let toolStack = ToolHelper.get(type, material)
if (!toolStack.isEmpty()) {

2
kubejs/server_scripts/firmalife/recipes.js
View file

@ -651,7 +651,7 @@ const registerFirmaLifeRecipes = (event) => {
}
},
"input_fluid": {
"ingredient": 'gtceu:latex',
"ingredient": 'tfg:latex',
"amount": 1000
},
"output_item": {

2
kubejs/server_scripts/gregtech/loot.js
View file

@ -6,7 +6,7 @@ const registerGTCEULoots = (event) => {
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
if (material.hasProperty(PropertyKey.ORE)) {
let stoneTypeMaterial = GTMaterials.get(stoneType)
let stoneTypeMaterial = TFGHelpers.getMaterial(stoneType)
let stoneTypeDust = null
if (stoneTypeMaterial != null) stoneTypeDust = ChemicalHelper.get(TagPrefix.dust, stoneTypeMaterial, 1)

10
kubejs/server_scripts/gregtech/recipes.js
View file

@ -1,7 +1,6 @@
// priority: 0
const registerGTCEURecipes = (event) => {
//#region Выход: Удобрение
// В обычном миксере
@ -178,7 +177,7 @@ const registerGTCEURecipes = (event) => {
//#region Выход: Капля резины
// Из латекса
event.recipes.tfc.pot('tfc:powder/sulfur', Fluid.of('gtceu:latex', 1000), 5000, 300)
event.recipes.tfc.pot('tfc:powder/sulfur', Fluid.of('tfg:latex', 1000), 5000, 300)
.itemOutput('gtceu:sticky_resin')
.id('tfg:pot/sticky_resin')
@ -1342,12 +1341,11 @@ const registerGTCEURecipes = (event) => {
//#region Рецепты, которые итерируются по всем материалам
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
//#region Рецепты инструментов
if (material.hasFlag(TFGMaterialFlags.HAS_TFC_TOOL)) {
global.GTCEU_ANVIL_TOOL_TYPES.forEach(toolType => {
let toolStack = $ToolHelper.get(toolType, material)
let toolStack = ToolHelper.get(toolType, material)
event.recipes.tfc.advanced_shaped_crafting(TFC.itemStackProvider.of(toolStack).copyForgingBonus(), [
'A',
@ -1443,7 +1441,7 @@ const registerGTCEURecipes = (event) => {
let ingotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1)
if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && material != GTMaterials.Wood && material != GTMaterials.TreatedWood && !material.hasProperty(PropertyKey.POLYMER))
if (material.hasFlag(MaterialFlags.GENERATE_PLATE) && material != GTMaterials.Wood && material != GTMaterials.TreatedWood && !material.hasProperty(PropertyKey.POLYMER))
{
let plateStack = ChemicalHelper.get(TagPrefix.plate, material, 1)
let blockStack = ChemicalHelper.get(TagPrefix.block, material, 1)
@ -1479,7 +1477,7 @@ const registerGTCEURecipes = (event) => {
}
// Прокатка стержней
if (material.hasFlag($MaterialFlags.GENERATE_ROD) && material != GTMaterials.Wood)
if (material.hasFlag(MaterialFlags.GENERATE_ROD) && material != GTMaterials.Wood)
{
let rodStack = ChemicalHelper.get(TagPrefix.rod, material, 2)

3
kubejs/server_scripts/main_server_script.js
View file

@ -1,8 +1,5 @@
// priority: 1
const $MaterialFlags = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags')
const $ToolHelper = Java.loadClass('com.gregtechceu.gtceu.api.item.tool.ToolHelper')
/**
* Событие регистрации предмет-тэгов.
*/

20
kubejs/server_scripts/tfc/data.js
View file

@ -22,15 +22,15 @@ const registerTFCMetals = (event) => {
event.metal('gtceu:blue_steel', 1540, 0.00857, '#forge:ingots/blue_steel', '#forge:double_ingots/blue_steel', '#forge:plates/blue_steel', 6, 'tfc:blue_steel')
event.metal('gtceu:red_steel', 1540, 0.00857, '#forge:ingots/red_steel', '#forge:double_ingots/red_steel', '#forge:plates/red_steel', 6, 'tfc:red_steel')
event.metal('gtceu:pig_iron', 1535, 0.00857, '#forge:ingots/pig_iron', null, null, 3, 'tfc:pig_iron')
event.metal('gtceu:high_carbon_steel', 1540, 0.00857, '#forge:ingots/high_carbon_steel', null, null, 3, 'tfc:high_carbon_steel')
event.metal('gtceu:high_carbon_black_steel', 1535, 0.00857, '#forge:ingots/high_carbon_black_steel', null, null, 4, 'tfc:high_carbon_black_steel')
event.metal('gtceu:high_carbon_red_steel', 1535, 0.00857, '#forge:ingots/high_carbon_red_steel', null, null, 5, 'tfc:high_carbon_red_steel')
event.metal('gtceu:high_carbon_blue_steel', 1535, 0.00857, '#forge:ingots/high_carbon_blue_steel', null, null, 5, 'tfc:high_carbon_blue_steel')
event.metal('gtceu:weak_steel', 1540, 0.00857, '#forge:ingots/weak_steel', null, null, 4, 'tfc:weak_steel')
event.metal('gtceu:weak_red_steel', 1540, 0.00857, '#forge:ingots/weak_red_steel', null, null, 5, 'tfc:weak_red_steel')
event.metal('gtceu:weak_blue_steel', 1540, 0.00857, '#forge:ingots/weak_blue_steel', null, null, 5, 'tfc:weak_blue_steel')
event.metal('gtceu:unknown', 400, 0.006, '#forge:ingots/unknown', null, null, 0, 'tfc:unknown')
event.metal('tfg:pig_iron', 1535, 0.00857, '#forge:ingots/pig_iron', null, null, 3, 'tfc:pig_iron')
event.metal('tfg:high_carbon_steel', 1540, 0.00857, '#forge:ingots/high_carbon_steel', null, null, 3, 'tfc:high_carbon_steel')
event.metal('tfg:high_carbon_black_steel', 1535, 0.00857, '#forge:ingots/high_carbon_black_steel', null, null, 4, 'tfc:high_carbon_black_steel')
event.metal('tfg:high_carbon_red_steel', 1535, 0.00857, '#forge:ingots/high_carbon_red_steel', null, null, 5, 'tfc:high_carbon_red_steel')
event.metal('tfg:high_carbon_blue_steel', 1535, 0.00857, '#forge:ingots/high_carbon_blue_steel', null, null, 5, 'tfc:high_carbon_blue_steel')
event.metal('tfg:weak_steel', 1540, 0.00857, '#forge:ingots/weak_steel', null, null, 4, 'tfc:weak_steel')
event.metal('tfg:weak_red_steel', 1540, 0.00857, '#forge:ingots/weak_red_steel', null, null, 5, 'tfc:weak_red_steel')
event.metal('tfg:weak_blue_steel', 1540, 0.00857, '#forge:ingots/weak_blue_steel', null, null, 5, 'tfc:weak_blue_steel')
event.metal('tfg:unknown', 400, 0.006, '#forge:ingots/unknown', null, null, 0, 'tfc:unknown')
event.metal('gtceu:iron', 1535, 0.00857, '#forge:ingots/iron', '#forge:double_ingots/iron', '#forge:plates/iron', 3, 'tfc:cast_iron')
event.metal('gtceu:tin', 230, 0.02143, '#forge:ingots/tin', '#forge:double_ingots/tin', '#forge:plates/tin', 1, 'tfc:tin')
@ -56,7 +56,7 @@ const registerTFCHeats = (event) => {
}
function makeItemHeatByToolType(toolType, material, tfcProperty, heatCapacity) {
let tool = $ToolHelper.get(toolType, material)
let tool = ToolHelper.get(toolType, material)
if (!tool.isEmpty()) event.itemHeat(tool, heatCapacity, tfcProperty.getForgingTemp(), tfcProperty.getWeldingTemp())
}

103
kubejs/server_scripts/tfc/recipes.js
View file

@ -1,7 +1,7 @@
// priority: 0
const registerTFCRecipes = (event) => {
//return; TODO тут баг
//#region Металлы
// Удаление рецептов руд TFC
@ -22,7 +22,6 @@ const registerTFCRecipes = (event) => {
event.remove({ id: /tfc:heating\/metal\/*_block_slab/ })
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)
if (tfcProperty != null) {
@ -273,7 +272,7 @@ const registerTFCRecipes = (event) => {
event.remove({ id: `tfc:crafting/metal/sword/${material.getName()}` })
// Декрафт инструмента в жидкость
let swordItem = $ToolHelper.get(GTToolType.SWORD, material)
let swordItem = ToolHelper.get(GTToolType.SWORD, material)
if (!swordItem.isEmpty()) {
event.recipes.tfc.heating(swordItem, tfcProperty.getMeltTemp())
@ -331,7 +330,7 @@ const registerTFCRecipes = (event) => {
//#region Мясницкий нож
// Декрафт инструмента в жидкость
let butcheryKnifeItem = $ToolHelper.get(GTToolType.BUTCHERY_KNIFE, material)
let butcheryKnifeItem = ToolHelper.get(GTToolType.BUTCHERY_KNIFE, material)
if (!butcheryKnifeItem.isEmpty()) {
event.recipes.tfc.heating(butcheryKnifeItem, tfcProperty.getMeltTemp())
@ -362,7 +361,7 @@ const registerTFCRecipes = (event) => {
//#region Молот шахтера
// Декрафт инструмента в жидкость
let miningHammerItem = $ToolHelper.get(GTToolType.MINING_HAMMER, material)
let miningHammerItem = ToolHelper.get(GTToolType.MINING_HAMMER, material)
if (!miningHammerItem.isEmpty()) {
event.recipes.tfc.heating(miningHammerItem, tfcProperty.getMeltTemp())
@ -394,7 +393,7 @@ const registerTFCRecipes = (event) => {
//#region Большая лопата
// Декрафт инструмента в жидкость
let spadeItem = $ToolHelper.get(GTToolType.SPADE, material)
let spadeItem = ToolHelper.get(GTToolType.SPADE, material)
if (!spadeItem.isEmpty()) {
event.recipes.tfc.heating(spadeItem, tfcProperty.getMeltTemp())
@ -513,7 +512,7 @@ const registerTFCRecipes = (event) => {
event.remove({ id: `tfc:crafting/metal/pickaxe/${material.getName()}` })
// Декрафт инструмента в жидкость
let pickaxeItem = $ToolHelper.get(GTToolType.PICKAXE, material)
let pickaxeItem = ToolHelper.get(GTToolType.PICKAXE, material)
if (!pickaxeItem.isEmpty()) {
event.recipes.tfc.heating(`gtceu:${material.getName()}_pickaxe`, tfcProperty.getMeltTemp())
@ -553,7 +552,7 @@ const registerTFCRecipes = (event) => {
event.remove({ id: `tfc:crafting/metal/axe/${material.getName()}` })
// Декрафт инструмента в жидкость
let axeItem = $ToolHelper.get(GTToolType.AXE, material)
let axeItem = ToolHelper.get(GTToolType.AXE, material)
if (!axeItem.isEmpty()) {
event.recipes.tfc.heating(axeItem, tfcProperty.getMeltTemp())
@ -591,7 +590,7 @@ const registerTFCRecipes = (event) => {
event.remove({ id: `tfc:crafting/metal/shovel/${material.getName()}` })
// Декрафт инструмента в жидкость
let shovelItem = $ToolHelper.get(GTToolType.SHOVEL, material)
let shovelItem = ToolHelper.get(GTToolType.SHOVEL, material)
if (!shovelItem.isEmpty()) {
event.recipes.tfc.heating(shovelItem, tfcProperty.getMeltTemp())
@ -631,7 +630,7 @@ const registerTFCRecipes = (event) => {
event.remove({ id: `tfc:crafting/metal/hoe/${material.getName()}` })
// Декрафт инструмента в жидкость
let hoeItem = $ToolHelper.get(GTToolType.HOE, material)
let hoeItem = ToolHelper.get(GTToolType.HOE, material)
if (!hoeItem.isEmpty()) {
event.recipes.tfc.heating(hoeItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
@ -669,7 +668,7 @@ const registerTFCRecipes = (event) => {
event.remove({ id: `tfc:crafting/metal/hammer/${material.getName()}` })
// Декрафт инструмента в жидкость
let hammerItem = $ToolHelper.get(GTToolType.HARD_HAMMER, material)
let hammerItem = ToolHelper.get(GTToolType.HARD_HAMMER, material)
if (!hammerItem.isEmpty()) {
event.recipes.tfc.heating(hammerItem, tfcProperty.getMeltTemp())
@ -709,7 +708,7 @@ const registerTFCRecipes = (event) => {
event.remove({ id: `tfc:crafting/metal/saw/${material.getName()}` })
// Декрафт инструмента в жидкость
let sawItem = $ToolHelper.get(GTToolType.SAW, material)
let sawItem = ToolHelper.get(GTToolType.SAW, material)
if (!sawItem.isEmpty()) {
event.recipes.tfc.heating(sawItem, tfcProperty.getMeltTemp())
@ -749,7 +748,7 @@ const registerTFCRecipes = (event) => {
event.remove({ id: `tfc:crafting/metal/scythe/${material.getName()}` })
// Декрафт инструмента в жидкость
let scytheItem = $ToolHelper.get(GTToolType.SCYTHE, material)
let scytheItem = ToolHelper.get(GTToolType.SCYTHE, material)
if (!scytheItem.isEmpty()) {
event.recipes.tfc.heating(scytheItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
@ -784,7 +783,7 @@ const registerTFCRecipes = (event) => {
//#region Напильник
// Декрафт инструмента в жидкость
let fileItem = $ToolHelper.get(GTToolType.FILE, material)
let fileItem = ToolHelper.get(GTToolType.FILE, material)
if (!fileItem.isEmpty()) {
event.recipes.tfc.heating(fileItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
@ -816,7 +815,7 @@ const registerTFCRecipes = (event) => {
event.remove({ id: `tfc:crafting/metal/knife/${material.getName()}` })
// Декрафт инструмента в жидкость
let knifeItem = $ToolHelper.get(GTToolType.KNIFE, material)
let knifeItem = ToolHelper.get(GTToolType.KNIFE, material)
if (!knifeItem.isEmpty()) {
event.recipes.tfc.heating(knifeItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
@ -1152,6 +1151,7 @@ const registerTFCRecipes = (event) => {
}
})
//#region Рецепты для новых сплавов
event.recipes.tfc.alloy('tfg:red_alloy', [
@ -1394,13 +1394,13 @@ const registerTFCRecipes = (event) => {
.id('tfc:bloomery/raw_iron_bloom')
// Cast Iron -> Pig Iron
event.recipes.tfc.blast_furnace(Fluid.of('gtceu:pig_iron', 1), '#tfc:flux', Fluid.of('gtceu:iron', 1))
event.recipes.tfc.blast_furnace(Fluid.of('tfg:pig_iron', 1), '#tfc:flux', Fluid.of('gtceu:iron', 1))
.id('tfc:blast_furnace/pig_iron')
//#endregion
//#endregion
//#region Земля
// Loam + Silt -> Silty Loam (Миксер)
@ -1536,8 +1536,9 @@ const registerTFCRecipes = (event) => {
global.TFC_STONE_TYPES.forEach(stone => {
let stoneMaterial = GTMaterials.get(stone);
let stoneMaterial = TFGHelpers.getMaterial(stone);
let stoneDust = ChemicalHelper.get(TagPrefix.dust, stoneMaterial, 1)
let smallStoneDust = ChemicalHelper.get(TagPrefix.dustSmall, stoneMaterial, 1)
// Кирпич (предмет)
event.recipes.gtceu.assembler(`tfg:tfc/${stone}_loose_to_brick`)
@ -1860,49 +1861,49 @@ const registerTFCRecipes = (event) => {
// Сырой
event.recipes.gtceu.macerator(`raw_${stone}_to_dust`)
.itemInputs(`tfc:rock/raw/${stone}`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Булыжник
event.recipes.gtceu.macerator(`cobble_${stone}_to_dust`)
.itemInputs(`tfc:rock/cobble/${stone}`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Гладкий
event.recipes.gtceu.macerator(`smooth_${stone}_to_dust`)
.itemInputs(`tfc:rock/smooth/${stone}`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Кирпичи
event.recipes.gtceu.macerator(`bricks_${stone}_to_dust`)
.itemInputs(`tfc:rock/bricks/${stone}`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Потрескавшиеся кирпичи
event.recipes.gtceu.macerator(`cracked_bricks_${stone}_to_dust`)
.itemInputs(`tfc:rock/cracked_bricks/${stone}`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Замшелый булыжник
event.recipes.gtceu.macerator(`mossy_cobble_${stone}_to_dust`)
.itemInputs(`tfc:rock/mossy_cobble/${stone}`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Замшелый кирпич
event.recipes.gtceu.macerator(`mossy_bricks_${stone}_to_dust`)
.itemInputs(`tfc:rock/mossy_bricks/${stone}`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
@ -1913,49 +1914,49 @@ const registerTFCRecipes = (event) => {
// Сырой
event.recipes.gtceu.macerator(`raw_stairs_${stone}_to_dust`)
.itemInputs(`tfc:rock/raw/${stone}_stairs`)
.itemOutputs(`6x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(6))
.duration(4)
.EUt(75)
// Булыжник
event.recipes.gtceu.macerator(`cobble_stairs_${stone}_to_dust`)
.itemInputs(`tfc:rock/cobble/${stone}_stairs`)
.itemOutputs(`6x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(6))
.duration(4)
.EUt(75)
// Гладкий
event.recipes.gtceu.macerator(`smooth_stairs_${stone}_to_dust`)
.itemInputs(`tfc:rock/smooth/${stone}_stairs`)
.itemOutputs(`6x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(6))
.duration(4)
.EUt(75)
// Кирпичи
event.recipes.gtceu.macerator(`bricks_stairs_${stone}_to_dust`)
.itemInputs(`tfc:rock/bricks/${stone}_stairs`)
.itemOutputs(`6x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(6))
.duration(4)
.EUt(75)
// Потрескавшиеся кирпичи
event.recipes.gtceu.macerator(`cracked_bricks_stairs_${stone}_to_dust`)
.itemInputs(`tfc:rock/cracked_bricks/${stone}_stairs`)
.itemOutputs(`6x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(6))
.duration(4)
.EUt(75)
// Замшелый булыжник
event.recipes.gtceu.macerator(`mossy_cobble_stairs_${stone}_to_dust`)
.itemInputs(`tfc:rock/mossy_cobble/${stone}_stairs`)
.itemOutputs(`6x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(6))
.duration(4)
.EUt(75)
// Замшелый кирпич
event.recipes.gtceu.macerator(`mossy_bricks_stairs_${stone}_to_dust`)
.itemInputs(`tfc:rock/mossy_bricks/${stone}_stairs`)
.itemOutputs(`6x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(6))
.duration(4)
.EUt(75)
@ -1966,49 +1967,49 @@ const registerTFCRecipes = (event) => {
// Сырой
event.recipes.gtceu.macerator(`raw_slab_${stone}_to_dust`)
.itemInputs(`tfc:rock/raw/${stone}_slab`)
.itemOutputs(`2x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(2))
.duration(4)
.EUt(75)
// Булыжник
event.recipes.gtceu.macerator(`cobble_slab_${stone}_to_dust`)
.itemInputs(`tfc:rock/cobble/${stone}_slab`)
.itemOutputs(`2x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(2))
.duration(4)
.EUt(75)
// Гладкий
event.recipes.gtceu.macerator(`smooth_slab_${stone}_to_dust`)
.itemInputs(`tfc:rock/smooth/${stone}_slab`)
.itemOutputs(`2x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(2))
.duration(4)
.EUt(75)
// Кирпичи
event.recipes.gtceu.macerator(`bricks_slab_${stone}_to_dust`)
.itemInputs(`tfc:rock/bricks/${stone}_slab`)
.itemOutputs(`2x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(2))
.duration(4)
.EUt(75)
// Потрескавшиеся кирпичи
event.recipes.gtceu.macerator(`cracked_bricks_slab_${stone}_to_dust`)
.itemInputs(`tfc:rock/cracked_bricks/${stone}_slab`)
.itemOutputs(`2x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(2))
.duration(4)
.EUt(75)
// Замшелый булыжник
event.recipes.gtceu.macerator(`mossy_cobble_slab_${stone}_to_dust`)
.itemInputs(`tfc:rock/mossy_cobble/${stone}_slab`)
.itemOutputs(`2x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(2))
.duration(4)
.EUt(75)
// Замшелый кирпич
event.recipes.gtceu.macerator(`mossy_bricks_slab_${stone}_to_dust`)
.itemInputs(`tfc:rock/mossy_bricks/${stone}_slab`)
.itemOutputs(`2x gtceu:small_${stone}_dust`)
.itemOutputs(smallStoneDust.withCount(2))
.duration(4)
.EUt(75)
@ -2019,49 +2020,49 @@ const registerTFCRecipes = (event) => {
// Сырой
event.recipes.gtceu.macerator(`raw_wall_${stone}_to_dust`)
.itemInputs(`tfc:rock/raw/${stone}_wall`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Булыжник
event.recipes.gtceu.macerator(`cobble_wall_${stone}_to_dust`)
.itemInputs(`tfc:rock/cobble/${stone}_wall`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Гладкий
event.recipes.gtceu.macerator(`smooth_wall_${stone}_to_dust`)
.itemInputs(`tfc:rock/smooth/${stone}_wall`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Кирпичи
event.recipes.gtceu.macerator(`bricks_wall_${stone}_to_dust`)
.itemInputs(`tfc:rock/bricks/${stone}_wall`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Потрескавшиеся кирпичи
event.recipes.gtceu.macerator(`cracked_bricks_wall_${stone}_to_dust`)
.itemInputs(`tfc:rock/cracked_bricks/${stone}_wall`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Замшелый булыжник
event.recipes.gtceu.macerator(`mossy_cobble_wall_${stone}_to_dust`)
.itemInputs(`tfc:rock/mossy_cobble/${stone}_wall`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Замшелый кирпич
event.recipes.gtceu.macerator(`mossy_bricks_wall_${stone}_to_dust`)
.itemInputs(`tfc:rock/mossy_bricks/${stone}_wall`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
@ -2070,14 +2071,14 @@ const registerTFCRecipes = (event) => {
// Резной кирпич
event.recipes.gtceu.macerator(`chiseled_${stone}_to_dust`)
.itemInputs(`tfc:rock/chiseled/${stone}`)
.itemOutputs(`gtceu:${stone}_dust`)
.itemOutputs(stoneDust)
.duration(4)
.EUt(75)
// Укрепленный
event.recipes.gtceu.macerator(`hardened_${stone}_to_dust`)
.itemInputs(`tfc:rock/hardened/${stone}`)
.itemOutputs(`2x gtceu:${stone}_dust`)
.itemOutputs(stoneDust.withCount(2))
.duration(8)
.EUt(150)
@ -2290,7 +2291,7 @@ const registerTFCRecipes = (event) => {
.EUt(2)
//#endregion
//#region Дерево
// Декрафт деревянной херни в деревянную пыль
@ -2355,7 +2356,7 @@ const registerTFCRecipes = (event) => {
})
//#endregion
//#region Рецепты порошков
// Удаление рецептов
@ -2883,7 +2884,7 @@ const registerTFCRecipes = (event) => {
.id(`tfg:milling/tfc/olive_paste`)
//#endregion
//#region Рецепты бочки в миксере
// А где?
//#endregion

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

@ -6,7 +6,7 @@ const registerTFCItemTags = (event) => {
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
if (material.hasProperty(PropertyKey.TOOL)) {
for (let [key, value] of Object.entries(global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS)) {
var tool = $ToolHelper.get(value, material)
var tool = ToolHelper.get(value, material)
if (!tool.isEmpty()) event.add(key, tool.getId())
event.add('tfc:usable_on_tool_rack', `#${key}`)
@ -286,15 +286,15 @@ const registerTFCFluidTags = (event) => {
event.add('tfc:usable_in_ingot_mold', 'gtceu:black_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:blue_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:red_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:pig_iron')
event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_black_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_red_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:high_carbon_blue_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:weak_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:weak_red_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:weak_blue_steel')
event.add('tfc:usable_in_ingot_mold', 'gtceu:unknown')
event.add('tfc:usable_in_ingot_mold', 'tfg:pig_iron')
event.add('tfc:usable_in_ingot_mold', 'tfg:high_carbon_steel')
event.add('tfc:usable_in_ingot_mold', 'tfg:high_carbon_black_steel')
event.add('tfc:usable_in_ingot_mold', 'tfg:high_carbon_red_steel')
event.add('tfc:usable_in_ingot_mold', 'tfg:high_carbon_blue_steel')
event.add('tfc:usable_in_ingot_mold', 'tfg:weak_steel')
event.add('tfc:usable_in_ingot_mold', 'tfg:weak_red_steel')
event.add('tfc:usable_in_ingot_mold', 'tfg:weak_blue_steel')
event.add('tfc:usable_in_ingot_mold', 'tfg:unknown')
event.add('tfc:usable_in_ingot_mold', 'gtceu:red_alloy')
event.add('tfc:usable_in_ingot_mold', 'gtceu:tin_alloy')
@ -311,9 +311,9 @@ const registerTFCFluidTags = (event) => {
event.add('tfc:usable_in_tool_head_mold', 'gtceu:bronze')
//
event.add('tfc:usable_in_pot', 'gtceu:latex')
event.add('tfc:usable_in_barrel', 'gtceu:latex')
event.add('tfc:usable_in_wooden_bucket', 'gtceu:latex')
event.add('tfc:usable_in_pot', 'tfg:latex')
event.add('tfc:usable_in_barrel', 'tfg:latex')
event.add('tfc:usable_in_wooden_bucket', 'tfg:latex')
//
event.add('tfc:usable_in_barrel', 'gtceu:creosote')

4
kubejs/server_scripts/treetap/recipes.js
View file

@ -22,11 +22,11 @@ const registerTreeTapRecipes = (event) => {
},
processing_time: 9600,
metal_result: {
item: "gtceu:latex_bucket"
item: "tfg:latex_bucket"
},
wooden_result: {
item: "tfc:wooden_bucket",
nbt: "{fluid: {FluidName: \"gtceu:latex\", Amount: 1000}}"
nbt: "{fluid: {FluidName: \"tfg:latex\", Amount: 1000}}"
},
life_cycle: [0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0],
collect_bucket: true,