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

Merge branch 'dev' into active/food

Browse source 
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
This commit is contained in:
Redeix 2025-06-16 23:54:43 -05:00 • committed by GitHub
commit fb90ef6666
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 411 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kubejs/server_scripts/create/recipes.js
View file

@ -42,6 +42,7 @@ const registerCreateRecipes = (event) => {
})
event.remove({ type: 'minecraft:stonecutting', input: 'create:andesite_alloy' })
event.remove({ type: 'minecraft:stonecutting', input: 'create:rose_quartz' })
// Train Station
event.shapeless('2x create:track_station', [

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

@ -95,16 +95,8 @@ const registerFirmaLifeRecipes = (event) => {
.duration(50)
.EUt(2)
// Pineapple Fiber
event.recipes.gtceu.assembler(`tfg:firmalife/pineapple_fiber`)
.itemInputs('firmalife:food/pineapple')
.circuit(1)
.itemOutputs('firmalife:pineapple_fiber')
.duration(50)
.EUt(7)
// Pineapple Yarn
event.recipes.gtceu.assembler(`tfg:firmalife/pineapple_yarn`)
event.recipes.gtceu.wiremill(`tfg:firmalife/pineapple_yarn`)
.itemInputs('firmalife:pineapple_fiber')
.circuit(1)
.itemOutputs('8x firmalife:pineapple_yarn')

1
kubejs/server_scripts/greate/recipes.removes.js
View file

@ -27,6 +27,7 @@ function removeGreateRecipes(event) {
event.remove({ id: 'greate:shaped/titanium_mechanical_saw' })
event.remove({ id: 'greate:splashing/dough' })
event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_chromatic_compound' })
event.remove({ mod: 'greate', type: 'create:deploying' });
event.remove({ mod: 'greate', type: 'create:sequenced_assembly' });

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

@ -139,7 +139,7 @@ function registerGTCEUMetalRecipes(event) {
let matAmount = TagPrefix.block.getMaterialAmount(material) / GTValues.M;
if (!plateStack.isEmpty()) {
if (!plateStack.isEmpty() && !ingotStack.hasTag('c:hidden_from_recipe_viewers')) {
event.custom({
type: "createaddition:rolling",
@ -149,7 +149,6 @@ function registerGTCEUMetalRecipes(event) {
}).id(`tfg:rolling/${material.getName()}_plate`)
if (!blockStack.isEmpty() && GTMaterials.Stone != material) {
// 9х Слиток -> Блок
event.recipes.createCompacting(blockStack, ingotStack.withCount(matAmount))
.heated()
@ -158,7 +157,6 @@ function registerGTCEUMetalRecipes(event) {
}
else {
if (!blockStack.isEmpty()) {
// Блок из гемов -> 9 Пластин
event.recipes.createCutting(plateStack.withCount(matAmount).withChance(0.65), blockStack)
.id(`tfg:cutting/${material.getName()}_plate`)
@ -192,7 +190,7 @@ function registerGTCEUMetalRecipes(event) {
const foilItem = ChemicalHelper.get(TagPrefix.foil, material, 4)
const plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1)
if (plateItem != null && foilItem != null) {
if (plateItem != null && foilItem != null && !plateItem.hasTag('c:hidden_from_recipe_viewers')) {
event.custom({
type: "createaddition:rolling",
input: plateItem,

13
kubejs/server_scripts/minecraft/recipes.js
View file

@ -997,6 +997,18 @@ const registerMinecraftRecipes = (event) => {
event.shapeless('4x minecraft:brown_mushroom', ['minecraft:brown_mushroom_block', '#forge:tools/knives'])
.id('tfg:shapeless/cut_brown_mushroom_block')
event.recipes.gtceu.compressor('tfg:red_mushroom')
.itemInputs('4x minecraft:red_mushroom')
.itemOutputs('minecraft:red_mushroom_block')
.duration(20)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.compressor('tfg:brown_mushroom')
.itemInputs('4x minecraft:brown_mushroom')
.itemOutputs('minecraft:brown_mushroom_block')
.duration(20)
.EUt(GTValues.VA[GTValues.ULV])
event.recipes.gtceu.chemical_bath('tfg:red_mushroom_to_shroomlight')
.itemInputs('minecraft:red_mushroom_block')
.inputFluids(Fluid.of('gtceu:glowstone', 144))
@ -1028,4 +1040,5 @@ const registerMinecraftRecipes = (event) => {
}).id('tfg:shaped/stonecutter');
event.stonecutting('minecraft:smooth_quartz', 'minecraft:quartz_block')
event.stonecutting('create:cut_deepslate', 'minecraft:polished_deepslate')
}

1
kubejs/server_scripts/minecraft/tags.js
View file

@ -56,6 +56,7 @@ const registerMinecraftItemTags = (event) => {
event.remove('forge:gems', 'minecraft:charcoal')
event.remove('forge:gems', 'minecraft:coal')
event.remove('forge:gems', 'minecraft:flint')
event.add('tfc:compost_greens_high', 'minecraft:red_mushroom_block')
event.add('tfc:compost_greens_high', 'minecraft:brown_mushroom_block')

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

@ -69,6 +69,7 @@ const registerTFCHeats = (event) => {
makeItemHeatByTagPrefix(TagPrefix.rodLong, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TagPrefix.ingot, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.ingotDouble, material, tfcProperty, 2.875)
makeItemHeatByTagPrefix(TagPrefix.rawOre, material, tfcProperty, 1.429)
makeItemHeatByTagPrefix(TFGTagPrefix.richRawOre, material, tfcProperty, 1.429)

9
kubejs/server_scripts/tfc/recipes.materials.js
View file

@ -1114,6 +1114,15 @@ function registerTFCMaterialsRecipes(event) {
let tongPartStack = Item.of(`tfchotornot:tong_part/${material.getName()}`)
if (!tongsStack.isEmpty() && !tongPartStack.isEmpty()) {
event.shaped(tongsStack, [
'AA',
'BC'
], {
A: tongPartStack,
B: '#forge:bolts',
C: '#forge:tools/hammers'
}).id(`tfchotornot:crafting/tongs/${material.getName()}`)
// Ручка щипцов
event.recipes.tfc.heating(tongPartStack, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))

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

@ -47,13 +47,13 @@ function registerTFCLunchBoxRecipes(event) {
event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice')
.itemInputs('tfclunchbox:universal_capsule')
.inputFluids(Fluid.of('gtceu:ice', 45 * 144))
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:1000}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid')
.itemInputs('tfclunchbox:universal_capsule', '5x minecraft:packed_ice')
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:1000}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled')))
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
}

2
kubejs/server_scripts/tfg/recipes.rocks.js
View file

@ -287,4 +287,4 @@ function registerTFGRockRecipes(event) {
.EUt(GTValues.VA[GTValues.LV])
})
//#endregion
}
}

11
kubejs/server_scripts/vintage_improvements/recipes.js
View file

@ -293,6 +293,10 @@ function registerVintageImprovementsRecipes(event) {
forEachMaterial(material => {
const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1);
if (ingotItem == null || ingotItem.hasTag('c:hidden_from_recipe_viewers'))
return;
// #region Coiling
if (material.hasFlag(MaterialFlags.GENERATE_ROD) && material.hasFlag(MaterialFlags.GENERATE_SPRING_SMALL)) {
@ -627,6 +631,13 @@ function registerVintageImprovementsRecipes(event) {
processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/coiling/phantom_thread`)
event.custom({
type: 'vintageimprovements:coiling',
ingredients: [{ item: 'firmalife:pineapple_fiber' }],
results: [{ item: 'firmalife:pineapple_yarn', count: 8 }],
processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/coiling/pineapple_yarn`)
event.custom({
type: 'vintageimprovements:coiling',
ingredients: [ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Polycaprolactam, 1)],