Нормально я тут устроил

This commit is contained in:
Dmitry 2023-12-31 17:06:39 +07:00
parent 75c8c4af9d
commit a162d4aa51
7 changed files with 83 additions and 40 deletions

View file

@ -5,5 +5,5 @@
#. #.
#. #.
#Prevents all worldgen added by Create from taking effect #Prevents all worldgen added by Create from taking effect
disableWorldGen = false disableWorldGen = true

View file

@ -1086,9 +1086,39 @@ const registerGTCEURecipes = (event) => {
.duration(400) .duration(400)
.EUt(5) .EUt(5)
// Прокатка слитков в стержни //#region Рецепты, которые итерируются по всем материалам
GTRegistries.MATERIALS.forEach(material => { GTRegistries.MATERIALS.forEach(material => {
if (material.hasFlag($MaterialFlags.GENERATE_ROD) && material != 'treated_wood') if (material.hasProperty(PropertyKey.ORE))
{
event.recipes.createCrushing([`gtceu:${material}_crushed_ore`, Item.of(`gtceu:${material}_crushed_ore`).withChance(0.3)], `#forge:raw_materials/${material}`)
.processingTime(200)
.id(`tfg:crushing/${material}_crushed_ore`)
event.recipes.createSplashing(Item.of(`gtceu:${material}_dust`).withChance(0.9), `gtceu:${material}_impure_dust`)
.id(`tfg:splashing/${material}_dust`)
}
if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && material != 'wood')
{
if (material.hasProperty(PropertyKey.INGOT))
{
event.recipes.createPressing(Item.of(`gtceu:${material}_plate`).withChance(0.97), `#forge:ingots/${material}`)
.id(`tfg:pressing/${material}_plate`)
event.recipes.createCompacting(Item.of(`#forge:storage_blocks/${material}`), `9x #forge:ingots/${material}`)
.heated()
.id(`tfg:compacting/${material}_block`)
}
else
{
event.recipes.createCutting(Item.of(`9x gtceu:${material}_plate`).withChance(0.65), `#forge:storage_blocks/${material}`)
.id(`tfg:cutting/${material}_plate`)
}
}
// Прокатка стержней
if (material.hasFlag($MaterialFlags.GENERATE_ROD) && material != 'wood')
{ {
if (material.hasProperty(PropertyKey.INGOT)) if (material.hasProperty(PropertyKey.INGOT))
{ {
@ -1101,7 +1131,7 @@ const registerGTCEURecipes = (event) => {
'item': `gtceu:${material}_rod`, 'item': `gtceu:${material}_rod`,
'count': 2 'count': 2
} }
}) }).id(`tfg:rolling/${material}_rod`)
} }
else else
{ {
@ -1114,9 +1144,10 @@ const registerGTCEURecipes = (event) => {
'item': `gtceu:${material}_rod`, 'item': `gtceu:${material}_rod`,
'count': 2 'count': 2
} }
}) }).id(`tfg:rolling/${material}_rod`)
} }
} }
}); });
//#endregion
} }

View file

@ -34,4 +34,6 @@ const registerGTCEUItemTags = (event) => {
//#endregion //#endregion
event.add('forge:storage_blocks/treated_wood', 'gtceu:treated_wood_planks')
} }

View file

@ -24,27 +24,30 @@ const generateCutterRecipe = (event, input, circuit, output, duration, EUt, id)
// потому что блядский разработчик GTCEu не может исправить баги своего мода // потому что блядский разработчик GTCEu не может исправить баги своего мода
// Я так устал.. // Я так устал..
const recipe1 = event.recipes.gtceu.cutter(id + "_water") const recipe1 = event.recipes.gtceu.cutter(`tfg:${id}_water`)
.itemInputs(input) .itemInputs(input)
.inputFluids(Fluid.of('minecraft:water', 4)) .inputFluids(Fluid.of('minecraft:water', 4))
.itemOutputs(output) .itemOutputs(output)
.duration(duration) .duration(duration)
.EUt(EUt) .EUt(EUt)
const recipe2 = event.recipes.gtceu.cutter(id + "_dist_water") const recipe2 = event.recipes.gtceu.cutter(`tfg:${id}_dist_water`)
.itemInputs(input) .itemInputs(input)
.inputFluids(Fluid.of('gtceu:distilled_water', 3)) .inputFluids(Fluid.of('gtceu:distilled_water', 3))
.itemOutputs(output) .itemOutputs(output)
.duration(duration) .duration(duration)
.EUt(EUt) .EUt(EUt)
const recipe3 = event.recipes.gtceu.cutter(id + "_lubricant") const recipe3 = event.recipes.gtceu.cutter(`tfg:${id}_lubricant`)
.itemInputs(input) .itemInputs(input)
.inputFluids(Fluid.of('gtceu:lubricant', 1)) .inputFluids(Fluid.of('gtceu:lubricant', 1))
.itemOutputs(output) .itemOutputs(output)
.duration(duration) .duration(duration)
.EUt(EUt) .EUt(EUt)
event.recipes.createCutting(output, input)
.id(`tfg:cutting/${id}`)
if (circuit != null) { if (circuit != null) {
recipe1.circuit(circuit) recipe1.circuit(circuit)

View file

@ -4,4 +4,6 @@ const registerMinecraftItemTags = (event) => {
global.MINECRAFT_DISABLED_ITEMS.forEach(item => { global.MINECRAFT_DISABLED_ITEMS.forEach(item => {
event.removeAllTagsFrom(item) event.removeAllTagsFrom(item)
}) })
event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian')
} }

View file

@ -2046,6 +2046,12 @@ const registerTFCRecipes = (event) => {
// Добавление рецептов // Добавление рецептов
global.TFC_QUERN_POWDER_RECIPE_COMPONENTS.forEach(element => { global.TFC_QUERN_POWDER_RECIPE_COMPONENTS.forEach(element => {
event.recipes.gtceu.macerator(`tfg:${element.name}`)
.itemInputs(element.input)
.itemOutputs(element.output)
.duration(60)
.EUt(2)
event.recipes.tfc.quern(element.output, element.input) event.recipes.tfc.quern(element.output, element.input)
.id(`tfg:quern/${element.name}`) .id(`tfg:quern/${element.name}`)
@ -2065,7 +2071,7 @@ const registerTFCRecipes = (event) => {
.EUt(16) .EUt(16)
event.recipes.createMilling(element.output, element.input) event.recipes.createMilling(element.output, element.input)
.id(`tfg:quern/${element.name}`) .id(`tfg:milling/${element.name}`)
}) })
//#endregion //#endregion

View file

@ -1564,36 +1564,35 @@ global.TFC_FURNACE_MEAT_RECIPE_COMPONENTS = [
]; ];
global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [
{ input: '#forge:gems/coke', output: '4x tfc:powder/coke', name: 'coke_powder' }, { input: '#forge:dusts/coke', output: '4x tfc:powder/coke', name: 'coke_powder' },
{ input: '#forge:raw_materials/amethyst', output: '4x tfc:powder/amethyst', name: 'amethyst_powder' }, { input: '#forge:dusts/amethyst', output: '4x tfc:powder/amethyst', name: 'amethyst_powder' },
{ input: '#forge:raw_materials/diamond', output: '4x tfc:powder/diamond', name: 'diamond_powder' }, { input: '#forge:dusts/diamond', output: '4x tfc:powder/diamond', name: 'diamond_powder' },
{ input: '#forge:raw_materials/emerald', output: '4x tfc:powder/emerald', name: 'emerald_powder' }, { input: '#forge:dusts/emerald', output: '4x tfc:powder/emerald', name: 'emerald_powder' },
{ input: '#forge:raw_materials/lapis', output: '4x tfc:powder/lapis_lazuli', name: 'lapis_powder' }, { input: '#forge:dusts/lapis', output: '4x tfc:powder/lapis_lazuli', name: 'lapis_powder' },
{ input: '#forge:raw_materials/opal', output: '4x tfc:powder/opal', name: 'opal_powder' }, { input: '#forge:dusts/opal', output: '4x tfc:powder/opal', name: 'opal_powder' },
{ input: '#forge:raw_materials/pyrite', output: '4x tfc:powder/pyrite', name: 'pyrite_powder' }, { input: '#forge:dusts/pyrite', output: '4x tfc:powder/pyrite', name: 'pyrite_powder' },
{ input: '#forge:raw_materials/ruby', output: '4x tfc:powder/ruby', name: 'ruby_powder' }, { input: '#forge:dusts/ruby', output: '4x tfc:powder/ruby', name: 'ruby_powder' },
{ input: '#forge:raw_materials/sapphire', output: '4x tfc:powder/sapphire', name: 'sapphire_powder' }, { input: '#forge:dusts/sapphire', output: '4x tfc:powder/sapphire', name: 'sapphire_powder' },
{ input: '#forge:raw_materials/topaz', output: '4x tfc:powder/topaz', name: 'topaz_powder' }, { input: '#forge:dusts/topaz', output: '4x tfc:powder/topaz', name: 'topaz_powder' },
{ input: '#forge:raw_materials/gold', output: '4x tfc:powder/native_gold', name: 'gold_powder' }, { input: '#forge:dusts/gold', output: '4x tfc:powder/native_gold', name: 'gold_powder' },
{ input: '#forge:raw_materials/silver', output: '4x tfc:powder/native_silver', name: 'silver_powder' }, { input: '#forge:dusts/silver', output: '4x tfc:powder/native_silver', name: 'silver_powder' },
{ input: '#forge:raw_materials/copper', output: '4x tfc:powder/native_copper', name: 'copper_powder' }, { input: '#forge:dusts/copper', output: '4x tfc:powder/native_copper', name: 'copper_powder' },
{ input: '#forge:raw_materials/cassiterite', output: '4x tfc:powder/cassiterite', name: 'cassiterite_powder' }, { input: '#forge:dusts/cassiterite', output: '4x tfc:powder/cassiterite', name: 'cassiterite_powder' },
{ input: '#forge:raw_materials/bismuth', output: '4x tfc:powder/bismuthinite', name: 'bismuth_powder' }, { input: '#forge:dusts/bismuth', output: '4x tfc:powder/bismuthinite', name: 'bismuth_powder' },
{ input: '#forge:raw_materials/garnierite', output: '4x tfc:powder/garnierite', name: 'garnierite_powder' }, { input: '#forge:dusts/garnierite', output: '4x tfc:powder/garnierite', name: 'garnierite_powder' },
{ input: '#forge:raw_materials/nickel', output: '4x tfc:powder/garnierite', name: 'nickel_powder' }, { input: '#forge:dusts/nickel', output: '4x tfc:powder/garnierite', name: 'nickel_powder' },
{ input: '#forge:raw_materials/sphalerite', output: '4x tfc:powder/sphalerite', name: 'sphalerite_powder' }, { input: '#forge:dusts/sphalerite', output: '4x tfc:powder/sphalerite', name: 'sphalerite_powder' },
{ input: '#forge:raw_materials/magnetite', output: '4x tfc:powder/magnetite', name: 'magnetite_powder' }, { input: '#forge:dusts/magnetite', output: '4x tfc:powder/magnetite', name: 'magnetite_powder' },
{ input: '#forge:raw_materials/tetrahedrite', output: '4x tfc:powder/tetrahedrite', name: 'tetrahedrite_powder' }, { input: '#forge:dusts/tetrahedrite', output: '4x tfc:powder/tetrahedrite', name: 'tetrahedrite_powder' },
{ input: '#forge:raw_materials/malachite', output: '4x tfc:powder/malachite', name: 'malachite_powder' }, { input: '#forge:dusts/malachite', output: '4x tfc:powder/malachite', name: 'malachite_powder' },
{ input: '#forge:raw_materials/yellow_limonite', output: '4x tfc:powder/limonite', name: 'limonite_powder' }, { input: '#forge:dusts/yellow_limonite', output: '4x tfc:powder/limonite', name: 'limonite_powder' },
{ input: '#forge:raw_materials/hematite', output: '4x tfc:powder/hematite', name: 'hematite_powder' }, { input: '#forge:dusts/hematite', output: '4x tfc:powder/hematite', name: 'hematite_powder' },
{ input: '#forge:raw_materials/cinnabar', output: '4x minecraft:redstone', name: 'cinnabar_powder' }, { input: '#forge:dusts/cinnabar', output: '4x minecraft:redstone', name: 'cinnabar_powder' },
{ input: '#forge:raw_materials/sulfur', output: '4x tfc:powder/sulfur', name: 'sulfur_powder' }, { input: '#forge:dusts/sulfur', output: '4x tfc:powder/sulfur', name: 'sulfur_powder' },
{ input: '#forge:raw_materials/saltpeter', output: '4x tfc:powder/saltpeter', name: 'saltpeter_powder' }, { input: '#forge:dusts/saltpeter', output: '4x tfc:powder/saltpeter', name: 'saltpeter_powder' },
{ input: '#forge:raw_materials/salt', output: '4x tfc:powder/salt', name: 'salt_powder' }, { input: '#forge:dusts/salt', output: '4x tfc:powder/salt', name: 'salt_powder' },
{ input: '#forge:raw_materials/graphite', output: '4x tfc:powder/graphite', name: 'graphite_powder' }, { input: '#forge:dusts/graphite', output: '4x tfc:powder/graphite', name: 'graphite_powder' },
{ input: '#forge:raw_materials/borax', output: '4x tfc:powder/', name: '_powder' }, { input: '#forge:dusts/borax', output: '4x tfc:powder/flux', name: 'flux_powder' }
{ input: '#forge:raw_materials/', output: '4x tfc:powder/flux', name: 'flux_powder' },
]; ];
global.TFC_QUERN_FLOUR_RECIPE_COMPONENTS = [ global.TFC_QUERN_FLOUR_RECIPE_COMPONENTS = [