Пару новых удобных утили методов + подчистил за собой

This commit is contained in:
SpeeeDCraft 2023-11-15 22:54:04 +07:00
parent a0cf0b1acc
commit 7947a14d10
4 changed files with 98 additions and 28 deletions

View file

@ -1,6 +1,7 @@
// priority: 0
const registerCreateRecipes = (event) => {
// Удаление рецептов мода create
event.remove({ mod: 'create' });
@ -34,6 +35,7 @@ const registerCreateRecipes = (event) => {
B: 'gtceu:wood_gear',
});
// todo: использовать ютилити методы для создания рецептов ниже (порядок, heatItem -> heatRecipe -> любые другие тфкшные)
// galvanized_iron
//customWelding(event, ["forge:ingots/iron", "forge:plates/zinc"], "kubejs:galvanized_iron", 3);
//customWelding(event, ["forge:ingots/wrought_iron", "forge:plates/zinc"], "kubejs:galvanized_iron", 3);

View file

@ -80,295 +80,344 @@ const registerTFCRecipes = (event) => {
])
// 2x Coke Powder
addQuernRecipe(event,
addQuernRecipe(event,
'tfc:recipes/quern/tfg/coke_powder',
{ tag: "forge:gems/coke" },
{ item: "tfc:powder/coke", count: 2 }
)
// 4x Amethyst Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/amethyst_powder',
{ tag: "forge:raw_materials/amethyst" },
{ item: "tfc:powder/amethyst", count: 4 }
)
// 4x Diamond Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/diamond_powder',
{ tag: "forge:raw_materials/diamond" },
{ item: "tfc:powder/diamond", count: 4 }
)
// 4x Emerald Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/emerald_powder',
{ tag: "forge:raw_materials/emerald" },
{ item: "tfc:powder/emerald", count: 4 }
)
// 4x LapisLazuli Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/lapis_powder',
{ tag: "forge:raw_materials/lapis" },
{ item: "tfc:powder/lapis_lazuli", count: 4 }
)
// 4x Opal Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/opal_powder',
{ tag: "forge:raw_materials/opal" },
{ item: "tfc:powder/opal", count: 4 }
)
// 4x Pyrite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/pyrite_powder',
{ tag: "forge:raw_materials/pyrite" },
{ item: "tfc:powder/pyrite", count: 4 }
)
// 4x Ruby Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/ruby_powder',
{ tag: "forge:raw_materials/ruby" },
{ item: "tfc:powder/ruby", count: 4 }
)
// 4x Sapphire Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/sapphire_powder',
{ tag: "forge:raw_materials/sapphire" },
{ item: "tfc:powder/sapphire", count: 4 }
)
// 4x Topaz Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/topaz_powder',
{ tag: "forge:raw_materials/topaz" },
{ item: "tfc:powder/topaz", count: 4 }
)
// 2x Gold Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_gold_powder',
{ tag: "forge:poor_raw_materials/gold" },
{ item: "tfc:powder/native_gold", count: 2 }
)
// 4x Gold Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_coke_powder',
{ tag: "forge:raw_materials/gold" },
{ item: "tfc:powder/native_gold", count: 4 }
)
// 6x Gold Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_coke_powder',
{ tag: "forge:rich_raw_materials/gold" },
{ item: "tfc:powder/native_gold", count: 6 }
)
// 2x Silver Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_silver_powder',
{ tag: "forge:poor_raw_materials/silver" },
{ item: "tfc:powder/native_silver", count: 2 }
)
// 4x Silver Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_silver_powder',
{ tag: "forge:raw_materials/silver" },
{ item: "tfc:powder/native_silver", count: 4 }
)
// 6x Silver Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_silver_powder',
{ tag: "forge:rich_raw_materials/silver" },
{ item: "tfc:powder/native_silver", count: 6 }
)
// 2x Cassiterite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_cassiterite_powder',
{ tag: "forge:poor_raw_materials/cassiterite" },
{ item: "tfc:powder/cassiterite", count: 2 }
)
// 4x Cassiterite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_cassiterite_powder',
{ tag: "forge:raw_materials/cassiterite" },
{ item: "tfc:powder/cassiterite", count: 4 }
)
// 6x Cassiterite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_cassiterite_powder',
{ tag: "forge:rich_raw_materials/cassiterite" },
{ item: "tfc:powder/cassiterite", count: 6 }
)
// 2x Bismuth Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_bismuth_powder',
{ tag: "forge:poor_raw_materials/bismuth" },
{ item: "tfc:powder/bismuthinite", count: 2 }
)
// 4x Bismuth Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_bismuth_powder',
{ tag: "forge:raw_materials/bismuth" },
{ item: "tfc:powder/bismuthinite", count: 4 }
)
// 6x Bismuth Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_bismuth_powder',
{ tag: "forge:rich_raw_materials/bismuth" },
{ item: "tfc:powder/bismuthinite", count: 6 }
)
// 2x Garnierite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_garnierite_powder',
{ tag: "forge:poor_raw_materials/garnierite" },
{ item: "tfc:powder/garnierite", count: 1 }
)
// 4x Garnierite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_garnierite_powder',
{ tag: "forge:raw_materials/garnierite" },
{ item: "tfc:powder/garnierite", count: 3 }
)
// 6x Garnierite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_garnierite_powder',
{ tag: "forge:rich_raw_materials/garnierite" },
{ item: "tfc:powder/garnierite", count: 5 }
)
// 2x Nickel Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_nickel_powder',
{ tag: "forge:poor_raw_materials/nickel" },
{ item: "tfc:powder/garnierite", count: 2 }
)
// 4x Nickel Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_nickel_powder',
{ tag: "forge:raw_materials/nickel" },
{ item: "tfc:powder/garnierite", count: 4 }
)
// 6x Nickel Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_nickel_powder',
{ tag: "forge:rich_raw_materials/nickel" },
{ item: "tfc:powder/garnierite", count: 6 }
)
// 2x Sphalerite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_sphalerite_powder',
{ tag: "forge:poor_raw_materials/sphalerite" },
{ item: "tfc:powder/sphalerite", count: 2 }
)
// 4x Sphalerite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_sphalerite_powder',
{ tag: "forge:raw_materials/sphalerite" },
{ item: "tfc:powder/sphalerite", count: 4 }
)
// 6x Sphalerite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_sphalerite_powder',
{ tag: "forge:rich_raw_materials/sphalerite" },
{ item: "tfc:powder/sphalerite", count: 6 }
)
// 2x Sulfur Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_sulfur_powder',
{ tag: "forge:poor_raw_materials/sulfur" },
{ item: "tfc:powder/sulfur", count: 2 }
)
// 4x Sulfur Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_sulfur_powder',
{ tag: "forge:raw_materials/sulfur" },
{ item: "tfc:powder/sulfur", count: 4 }
)
// 6x Sulfur Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_sulfur_powder',
{ tag: "forge:rich_raw_materials/sulfur" },
{ item: "tfc:powder/sulfur", count: 6 }
)
// 2x Saltpeter Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_saltpeter_powder',
{ tag: "forge:poor_raw_materials/saltpeter" },
{ item: "tfc:powder/saltpeter", count: 2 }
)
// 4x Saltpeter Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_saltpeter_powder',
{ tag: "forge:raw_materials/saltpeter" },
{ item: "tfc:powder/saltpeter", count: 4 }
)
// 6x Saltpeter Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_saltpeter_powder',
{ tag: "forge:rich_raw_materials/saltpeter" },
{ item: "tfc:powder/saltpeter", count: 6 }
)
// 2x Salt Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_salt_powder',
{ tag: "forge:poor_raw_materials/salt" },
{ item: "tfc:powder/salt", count: 2 }
)
// 4x Salt Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_salt_powder',
{ tag: "forge:raw_materials/salt" },
{ item: "tfc:powder/salt", count: 4 }
)
// 6x Salt Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_salt_powder',
{ tag: "forge:rich_raw_materials/salt" },
{ item: "tfc:powder/salt", count: 6 }
)
// 2x Graphite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_graphite_powder',
{ tag: "forge:poor_raw_materials/graphite" },
{ item: "tfc:powder/graphite", count: 2 }
)
// 4x Graphite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_graphite_powder',
{ tag: "forge:raw_materials/graphite" },
{ item: "tfc:powder/graphite", count: 4 }
)
// 6x Graphite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_graphite_powder',
{ tag: "forge:rich_raw_materials/graphite" },
{ item: "tfc:powder/graphite", count: 6 }
)
// 2x Sylvite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_sylvite_powder',
{ tag: "forge:poor_raw_materials/sylvite" },
{ item: "tfc:powder/sylvite", count: 2 }
)
// 4x Sylvite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_sylvite_powder',
{ tag: "forge:raw_materials/sylvite" },
{ item: "tfc:powder/sylvite", count: 4 }
)
// 6x Sylvite Powder
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_sylvite_powder',
{ tag: "forge:rich_raw_materials/sylvite" },
{ item: "tfc:powder/sylvite", count: 6 }
)
// 2x Flux
addQuernRecipe(event,
'tfc:recipes/quern/tfg/2x_borax_powder',
{ tag: "forge:poor_raw_materials/borax" },
{ item: "tfc:powder/flux", count: 2 }
)
// 4x Flux
addQuernRecipe(event,
'tfc:recipes/quern/tfg/4x_borax_powder',
{ tag: "forge:raw_materials/borax" },
{ item: "tfc:powder/flux", count: 4 }
)
// 6x Flux
addQuernRecipe(event,
'tfc:recipes/quern/tfg/6x_borax_powder',
{ tag: "forge:rich_raw_materials/borax" },
{ item: "tfc:powder/flux", count: 6 }
)

View file

@ -132,7 +132,7 @@ const addTFCBlastFurnaceRecipe = (event, recipeId, fluid, result, catalyst) => {
}
/**
* Регистрирует рецепт отливки чего-либо из молда в предмет.
* Создает рецепт отливки чего-либо из молда в предмет.
* @param { ServerEvents.recipes } event Событие в котором вызывается.
* @param { String } recipeId Название рецепта.
* @param { Object } inputMold Форма на вход.
@ -150,42 +150,56 @@ const addCastingRecipe = (event, recipeId, inputMold, fluidInMold, resultOutput,
}).id(recipeId)
}
/*
const addWeldingRecipe = (event, id, input1, input2, output, tier) => {
/**
* Создает рецепт наковальни.
* @param { ServerEvents.recipes } event Событие в котором вызывается.
* @param { String } recipeId Название рецепта.
* @param { Object } input Объект входа, может принимать объект с тэгом или предметом.
* @param { Object } result Объект выхода, может принимать объект только предметом.
* @param { Number } tier Уровень рецепта, базируется на уровне металла тфк.
* @param { Array } rules Правила ковки.
*/
const addAnvilRecipe = (event, recipeId, input, result, tier, rules) => {
event.custom({
type: "tfc:anvil",
input: input,
result: result,
tier: tier,
rules: rules
}).id(recipeId)
}
/**
* Создает рецепт сварки.
* @param { ServerEvents.recipes } event Событие в котором вызывается.
* @param { String } recipeId Название рецепта.
* @param { Object } input1 Объект входа, может принимать объект с тэгом или предметом.
* @param { Object } input2 Объект входа, может принимать объект с тэгом или предметом.
* @param { Object } output Объект выхода, может принимать объект только предметом.
* @param { Number } tier Уровень рецепта, базируется на уровне металла тфк.
*/
const addWeldingRecipe = (event, recipeId, input1, input2, output, tier) => {
event.custom({
id: id,
type: "tfc:welding",
first_input: input1,
second_input: input2,
result: output,
tier: tier,
})
}).id(recipeId)
}
const customAnvil = (event, input1, [result, count], tier, [firstRule, secondRule, thirdRule]) => {
event.custom({
type: "tfc:anvil",
input: {
tag: input1
},
result: {
item: result,
count: count
},
tier: tier,
rules: [
firstRule,
secondRule,
thirdRule
]
})
}*/
const addQuernRecipe = (event, input, output) => {
/**
* Создает рецепт дробилки.
* @param { ServerEvents.recipes } event
* @param { String } recipeId
* @param { Object } input
* @param { Object } output
*/
const addQuernRecipe = (event, recipeId, input, output) => {
event.custom({
type: "tfc:quern",
ingredient: input,
result: output
})
}).id(recipeId)
}

View file

@ -1,3 +1,8 @@
// priority: 0
const registerCreateItems = (event) => {
event.create('galvanized_iron').displayName('Galvanized Iron').maxStackSize(16).texture("kubejs:item/galvanized_iron")
event.create('galvanized_iron')
.displayName('Galvanized Iron')
.maxStackSize(16)
.texture("kubejs:item/galvanized_iron")
}