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

Merge pull request #740 from deneth-weerasinghe/main

Browse source 
Fix assembler wool recipe conflicts
This commit is contained in:
Dmitry 2025-01-25 23:59:15 +07:00 • committed by GitHub
commit 4090358be0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2917,7 +2917,7 @@ const registerMinecraftRecipes = (event) => {
//#region Выход: Шерсть
event.recipes.gtceu.assembler('wool_from_string')
.itemInputs('4x #forge:string')
.itemInputs('8x #forge:string')
.circuit(4)
.itemOutputs('minecraft:white_wool')
.duration(100)

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

@ -3442,24 +3442,34 @@ const registerTFCRecipes = (event) => {
// Burlap Cloth
event.recipes.gtceu.assembler('tfg:tfc/burlap_cloth')
.itemInputs('12x tfc:jute_fiber')
.circuit(0)
.itemOutputs('tfc:burlap_cloth')
.duration(100)
.EUt(4)
// Silk Cloth
event.recipes.gtceu.assembler('tfg:tfc/silk_cloth')
event.recipes.gtceu.assembler('tfg:tfc/silk_cloth')
.itemInputs('24x minecraft:string')
.circuit(0)
.itemOutputs('tfc:silk_cloth')
.duration(100)
.EUt(4)
// Silk Cloth
event.recipes.gtceu.assembler('tfg:tfc/wool_cloth')
// Wool Cloth
event.recipes.gtceu.assembler('tfg:tfc/wool_cloth')
.itemInputs('16x tfc:wool_yarn')
.circuit(0)
.itemOutputs('tfc:wool_cloth')
.duration(100)
.EUt(4)
.circuit(16)
// Cloths to Wool
event.recipes.gtceu.assembler('tfg:tfc/cloth_to_wool')
.itemInputs('4x #tfc:sewing_light_cloth')
.itemOutputs('8x minecraft:white_wool')
.circuit(16)
.duration(100)
.EUt(4)
// Jute Fiber
generateMixerRecipe(event, 'tfc:jute', Fluid.of('minecraft:water', 200), 'tfc:jute_fiber', null, [], 100, 4, 16, 'tfg:tfc/jute_fiber')