фиксы

This commit is contained in:
Dmitry 2023-12-30 15:27:59 +07:00
parent 850460ecef
commit 5978c3504f
5 changed files with 69 additions and 53 deletions

View file

@ -3,7 +3,6 @@
const registerCreateRecipes = (event) => {
// Удаление рецептов мода create
/*
event.remove({ not: [
{ id: 'create:crafting/kinetics/gearboxfrom_conversion' },
{ id: 'create:crafting/kinetics/gearbox' },
@ -27,7 +26,6 @@ const registerCreateRecipes = (event) => {
{ id: 'create:crafting/kinetics/smart_fluid_pipe' },
{ id: 'create:crafting/kinetics/portable_fluid_interface' },
{ id: 'create:crafting/kinetics/mechanical_piston' },
{ id: 'create:crafting/kinetics/sticky_mechanical_piston' },
{ id: 'create:crafting/kinetics/gantry_carriage' },
{ id: 'create:crafting/kinetics/windmill_bearing' },
{ id: 'create:crafting/kinetics/mechanical_bearing' },
@ -91,7 +89,7 @@ const registerCreateRecipes = (event) => {
{ id: 'create:crafting/kinetics/green_seat' },
{ id: 'create:crafting/kinetics/red_seat' },
{ id: 'create:crafting/kinetics/black_seat' },
], mod: 'create' })*/
], mod: 'create' })
// Пушка для постройки схематик
event.shaped('create:schematicannon', [
@ -582,7 +580,7 @@ const registerCreateRecipes = (event) => {
event.shaped('2x create:andesite_funnel', [
'AAA',
'ABA',
'ACA'
'ABA'
], {
A: '#forge:plates/wrought_iron',
B: '#forge:foils/rubber'
@ -592,7 +590,7 @@ const registerCreateRecipes = (event) => {
event.shaped('2x create:brass_funnel', [
'AAA',
'ABA',
'ACA'
'ABA'
], {
A: '#forge:plates/brass',
B: '#forge:foils/rubber'
@ -884,6 +882,25 @@ const registerCreateRecipes = (event) => {
D: '#forge:plates/copper'
}).id('tfg:create/mechanical_crafting/potato_cannon')
// Липкий механический поршень
event.shaped('create:sticky_mechanical_piston', [
'A',
'B'
], {
A: 'tfc:glue',
B: 'create:mechanical_piston'
}).id('tfg:create/shaped/sticky_mechanical_piston_from_glue')
event.shaped('create:sticky_mechanical_piston', [
'A',
'B',
'C'
], {
A: '#forge:tools/hammers',
B: 'gtceu:sticky_resin',
C: 'create:mechanical_piston',
}).id('tfg:create/shaped/sticky_mechanical_piston_from_sticky_resin')
/*
//

View file

@ -1076,4 +1076,10 @@ const registerGTCEURecipes = (event) => {
.duration(25)
//#endregion
event.recipes.gtceu.centrifuge('glue_from_tfc_glue')
.itemInputs('tfc:glue')
.outputFluids(Fluid.of('gtceu:glue', 50))
.duration(400)
.EUt(5)
}

View file

@ -2475,6 +2475,12 @@ const registerMinecraftRecipes = (event) => {
//#endregion
//#region Выход: Веревка
event.remove({ id: 'minecraft:lead' })
//#endregion
//#region Исправление дерьма с медью (Однажды разраб GTCEu вспомнит, лучше бы забыл)
event.smelting('tfc:metal/ingot/copper', 'minecraft:raw_copper')

View file

@ -8,18 +8,6 @@ const registerTFCDataForTFC = (event) => {
registerTFCFertilizers(event)
}
/**
* event.metal(
fluid: string,
meltTemperature: number,
heatCapacity: number,
ingot: @Nullable Ingredient,
doubleIngot: @Nullable Ingredient,
sheet: @Nullable Ingredient,
tier: number,
name?: string
)
*/
const registerTFCMetals = (event) => {
event.metal('gtceu:tin', 230, 0.02143, '#forge:ingots/tin', '#forge:double_ingots/tin', '#forge:plates/tin', 1, 'tfc:tin')
event.metal('gtceu:bismuth', 270, 0.02143, '#forge:ingots/bismuth', '#forge:double_ingots/bismuth', '#forge:plates/bismuth', 1, 'tfc:bismuth')
@ -46,15 +34,6 @@ const registerTFCMetals = (event) => {
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.itemHeat(
ingredient: Ingredient,
heatCapacity: number,
forgingTemperature: @Nullable number,
weldingTemperature: @Nullable number,
name?: string
)
*/
const registerTFCHeats = (event) => {
Object.entries(global.METAL_TO_SPECS).forEach(keyValuePair => {
let metal = keyValuePair[0]
@ -64,10 +43,13 @@ const registerTFCHeats = (event) => {
event.itemHeat(`gtceu:${metal}_tiny_dust`, 0.357, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_small_dust`, 0.714, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_dust`, 1.429, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_rod`, 0.567, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_bolt`, 0.245, metalSpecs.forging_temp, metalSpecs.welding_temp)
event.itemHeat(`gtceu:${metal}_screw`, 0.567, metalSpecs.forging_temp, metalSpecs.welding_temp)
}
if (metalSpecs.props.includes('nugget')) {
event.itemHeat(`gtceu:${metal}_nugget`, 0.124, metalSpecs.forging_temp, metalSpecs.welding_temp)
}
@ -108,15 +90,6 @@ const registerTFCHeats = (event) => {
event.itemHeat('tfc:metal/bucket/red_steel', 1.429, 924, 1232)
}
/**
* event.fuel(
ingredient: Ingredient,
temperature: number,
duration: number,
purity: @Nullable number,
name?: string
)
*/
const registerTFCFuels = (event) => {
event.fuel('minecraft:coal', 1415, 2200, 1.0)
event.fuel('gtceu:coke_gem', 1415, 4400, 1.0)
@ -126,27 +99,10 @@ const registerTFCFuels = (event) => {
event.fuel('gtceu:poor_raw_coal', 1415, 1600, 0.95)
}
/**
* event.lampFuel(
fluidIngredient: FluidIngredient,
blockIngredient: BlockIngredient,
burnRate: number,
name?: string
)
*/
const registerTFCLampFuels = (event) => {
event.lampFuel('gtceu:creosote', '#tfc:lamps', 1)
}
/**
* event.fertilizer(
ingredient: Ingredient,
nitrogen: @Nullable number,
phosphorous: @Nullable number,
potassium: @Nullable number,
name?: string
)
*/
const registerTFCFertilizers = (event) => {
event.fertilizer('gtceu:fertilizer', 0.15, 0.15, 0.15)

View file

@ -203,6 +203,37 @@ const registerTFCRecipes = (event) => {
}
if (metalSpecs.props.includes('tool')) {
// Кольцо -> Металл
// event.recipes.tfc.heating(`gtceu:${metal}_ring`, metalSpecs.melt_temp)
// .resultFluid(Fluid.of(metalSpecs.fluid, 72))
// .id(`tfc:heating/metal/${metal}_ring`)
// Стержень -> Кольцо
// Возможно, когда нибудь, когда они пригодятся
// Болт -> Металл
event.recipes.tfc.heating(`gtceu:${metal}_bolt`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.fluid, 36))
.id(`tfc:heating/metal/${metal}_bolt`)
event.recipes.tfc.anvil(`2x gtceu:${metal}_bolt`, `#forge:rods/${metal}`, ['punch_last', 'draw_second_last', 'draw_third_last'])
.tier(metalSpecs.tier)
.id(`tfc:anvil/${metal}_bolt`)
// Стержень -> Болт
// Винт -> Металл
event.recipes.tfc.heating(`gtceu:${metal}_screw`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.fluid, 72))
.id(`tfc:heating/metal/${metal}_screw`)
// Стержень -> Винт
event.recipes.tfc.anvil(`gtceu:${metal}_screw`, `#forge:rods/${metal}`, ['punch_last', 'punch_second_last', 'shrink_third_last'])
.tier(metalSpecs.tier)
.id(`tfc:anvil/${metal}_screw`)
//#region Фурма
// Декрафт инструмента в жидкость