Merge branch 'active/food' into revert-3-feature/food
Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
This commit is contained in:
Redeix
GitHub
commit
50ad90af2a
48 changed files with 753 additions and 659 deletions
|
|
@ -84,6 +84,13 @@ global.FIRMALIFE_ORE_MATERIALS = [
|
|||
'chromite'
|
||||
];
|
||||
|
||||
global.FIRMALIFE_JAMS = [
|
||||
"fig",
|
||||
"pineapple",
|
||||
"red_grapes",
|
||||
"white_grapes"
|
||||
]
|
||||
|
||||
global.FIRMALIFE_GREENHOUSE_FRUIT_RECIPE_COMPONENTS = [
|
||||
{ input: 'firmalife:plant/cocoa_sapling', fluid_amount: 8000, output: '3x firmalife:food/cocoa_beans', name: 'cocoa_beans' },
|
||||
{ input: 'firmalife:plant/fig_sapling', fluid_amount: 8000, output: '3x firmalife:food/fig', name: 'fig' },
|
||||
|
|
@ -94,26 +101,20 @@ global.FIRMALIFE_GREENHOUSE_BERRY_RECIPE_COMPONENTS = [
|
|||
{ input: 'firmalife:plant/nightshade_bush', fluid_amount: 6000, output: '3x firmalife:food/nightshade_berry', name: 'nightshade' },
|
||||
];
|
||||
|
||||
global.FIRMALIFE_QUERN_FLOUR_RECIPE_COMPONENTS = [
|
||||
{ input: 'firmalife:food/nixtamal', output: '2x firmalife:food/masa_flour', name: 'masa_flour' },
|
||||
];
|
||||
|
||||
global.FIRMALIFE_MIXER_FLATBREAD_DOUGH_RECIPE_COMPONENTS = [
|
||||
{ input: 'tfc:food/barley_flour', output: '4x firmalife:food/barley_dough', name: 'firmalife_barley_dough' },
|
||||
{ input: 'tfc:food/maize_flour', output: '4x firmalife:food/maize_dough', name: 'firmalife_maize_dough' },
|
||||
{ input: 'tfc:food/oat_flour', output: '4x firmalife:food/oat_dough', name: 'firmalife_oat_dough' },
|
||||
{ input: 'tfc:food/rye_flour', output: '4x firmalife:food/rye_dough', name: 'firmalife_rye_dough' },
|
||||
{ input: 'tfc:food/rice_flour', output: '4x firmalife:food/rice_dough', name: 'firmalife_rice_dough' },
|
||||
{ input: 'tfc:food/wheat_flour', output: '4x firmalife:food/wheat_dough', name: 'firmalife_wheat_dough' },
|
||||
{ input: 'firmalife:food/masa_flour', output: '2x firmalife:food/masa', name: 'firmalife_masa' },
|
||||
];
|
||||
|
||||
global.FIRMALIFE_FURNACE_FLATBREAD_RECIPE_COMPONENTS = [
|
||||
{ input: 'tfc:food/barley_dough', output: 'firmalife:food/barley_flatbread', name: 'barley_flatbread' },
|
||||
{ input: 'tfc:food/maize_dough', output: 'firmalife:food/maize_flatbread', name: 'maize_flatbread' },
|
||||
{ input: 'tfc:food/oat_dough', output: 'firmalife:food/oat_flatbread', name: 'oat_flatbread' },
|
||||
{ input: 'tfc:food/rye_dough', output: 'firmalife:food/rye_flatbread', name: 'rye_flatbread' },
|
||||
{ input: 'tfc:food/rice_dough', output: 'firmalife:food/rice_flatbread', name: 'rice_flatbread' },
|
||||
{ input: 'tfc:food/wheat_dough', output: 'firmalife:food/wheat_flatbread', name: 'wheat_flatbread' },
|
||||
{ input: 'firmalife:food/masa', output: 'firmalife:food/corn_tortilla', name: 'corn_tortilla' },
|
||||
];
|
||||
global.FIRMALIFE_COOKING_RECIPE_COMPONENTS = [
|
||||
{ input: 'firmalife:food/white_chocolate_blend', output: 'firmalife:food/white_chocolate', name: 'white_chocolate' },
|
||||
{ input: 'firmalife:food/dark_chocolate_blend', output: 'firmalife:food/dark_chocolate', name: 'dark_chocolate' },
|
||||
{ input: 'firmalife:food/milk_chocolate_blend', output: 'firmalife:food/milk_chocolate', name: 'milk_chocolate' },
|
||||
{ input: 'firmalife:food/raw_pizza', output: 'firmalife:food/cooked_pizza', name: 'cooked_pizza' },
|
||||
{ input: 'firmalife:food/corn_tortilla', output: 'firmalife:food/taco_shell', name: 'taco_shell' },
|
||||
{ input: 'firmalife:food/cookie_dough', output: 'firmalife:food/sugar_cookie', name: 'sugar_cookie' },
|
||||
{ input: 'firmalife:food/chocolate_chip_cookie_dough', output: 'firmalife:food/chocolate_chip_cookie', name: 'chocolate_chip_cookie' },
|
||||
{ input: 'firmalife:food/hardtack_dough', output: 'firmalife:food/hardtack', name: 'hardtack' },
|
||||
{ input: 'firmalife:food/filled_pie', output: 'firmalife:food/cooked_pie', name: 'cooked_pie' },
|
||||
{ input: 'firmalife:food/cocoa_beans', output: 'firmalife:food/roasted_cocoa_beans', name: 'roasted_cocoa_beans' },
|
||||
{ input: 'firmalife:food/raw_pumpkin_pie', output: 'minecraft:pumpkin_pie', name: 'pumpkin_pie' },
|
||||
{ input: 'tfc:food/soybean', output: 'firmalife:food/dehydrated_soybeans', name: 'dehydrated_soybeans' },
|
||||
{ input: 'firmalife:food/raw_lasagna', output: 'firmalife:food/cooked_lasagna', name: 'cooked_lasagna' },
|
||||
{ input: 'firmalife:food/bacon', output: 'firmalife:food/cooked_bacon', name: 'cooked_bacon' },
|
||||
{ input: '#firmalife:foods/slices', output: 'firmalife:food/toast', name: 'toast' }
|
||||
];
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
// priority: 0
|
||||
|
||||
//#region Greenhouse
|
||||
|
||||
const registerGTCEuMachines = (event) => {
|
||||
|
||||
GTMachineUtils.registerCrate(GTMaterials.BismuthBronze, 54, "Bismuth Bronze Crate");
|
||||
|
|
@ -12,66 +10,6 @@ const registerGTCEuMachines = (event) => {
|
|||
const $SteamMulti = Java.loadClass('com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine');
|
||||
const $Tags = Java.loadClass("dev.latvian.mods.kubejs.util.Tags")
|
||||
|
||||
event.create('greenhouse', 'multiblock')
|
||||
.rotationState(RotationState.NON_Y_AXIS)
|
||||
.recipeType('greenhouse')
|
||||
.recipeModifiers([GTRecipeModifiers.OC_PERFECT])
|
||||
.appearanceBlock(GTBlocks.CASING_STEEL_SOLID)
|
||||
.pattern(definition => FactoryBlockPattern.start()
|
||||
.aisle("CCCCCCC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ")
|
||||
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ")
|
||||
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ")
|
||||
.aisle("CDDDDDC", "F#####F", "F#####F", "F#####F", "F#####F", "F#####F", "F#####F", "F#####F", "FFFFFFF")
|
||||
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ")
|
||||
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ")
|
||||
.aisle("CCCYCCC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ")
|
||||
.where('X', Predicates.blocks('ae2:quartz_glass'))
|
||||
.where('F', Predicates.frames('steel'))
|
||||
.where('D', Predicates.blocks('tfc:grass/silt')
|
||||
.or(Predicates.blocks('tfc:dirt/loam'))
|
||||
.or(Predicates.blocks('tfc:dirt/sandy_loam'))
|
||||
.or(Predicates.blocks('tfc:dirt/silty_loam'))
|
||||
.or(Predicates.blocks('tfc:grass/silt'))
|
||||
.or(Predicates.blocks('tfc:grass/loam'))
|
||||
.or(Predicates.blocks('tfc:grass/sandy_loam'))
|
||||
.or(Predicates.blocks('tfc:grass/silty_loam')))
|
||||
.where('C', Predicates.blocks('gtceu:steel_machine_casing').or(Predicates.autoAbilities(definition.getRecipeTypes())))
|
||||
.where('#', Predicates.air()
|
||||
.or(Predicates.blockTag($Tags.block("minecraft:logs")))
|
||||
.or(Predicates.blockTag($Tags.block("minecraft:leaves"))))
|
||||
.where(' ', Predicates.any())
|
||||
.where('Y', Predicates.controller(Predicates.blocks(definition.get())))
|
||||
.build()
|
||||
)
|
||||
.shapeInfo(controller => MultiblockShapeInfo.builder()
|
||||
.aisle("CCCCCCC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ")
|
||||
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ")
|
||||
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X##L##X", "X#LLL#X", "X##L##X", "X#####X", " XXFXX ")
|
||||
.aisle("CDDDDDC", "F##W##F", "F##W##F", "F##W##F", "F#LWL#F", "F#LWL#F", "F#LLL#F", "F#####F", "FFFFFFF")
|
||||
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X##L##X", "X#LLL#X", "X##L##X", "X#####X", " XXFXX ")
|
||||
.aisle("CDDDDDC", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", "X#####X", " XXFXX ")
|
||||
.aisle("CitYfeC", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", "XXXFXXX", " F ")
|
||||
.where('Y', controller, Direction.SOUTH)
|
||||
.where('C', GTBlocks.STEEL_HULL.get())
|
||||
.where('D', Block.getBlock('tfc:grass/silt'))
|
||||
.where('F', Block.getBlock('gtceu:steel_frame'))
|
||||
.where('X', Block.getBlock('ae2:quartz_glass'))
|
||||
.where('W', Block.getBlock('tfc:wood/log/oak'))
|
||||
.where('L', Block.getBlock('tfc:wood/leaves/oak'))
|
||||
.where(' ', Block.getBlock('minecraft:air'))
|
||||
.where('i', GTMachines.ITEM_IMPORT_BUS[GTValues.ULV], Direction.SOUTH)
|
||||
.where('t', GTMachines.ITEM_EXPORT_BUS[GTValues.ULV], Direction.SOUTH)
|
||||
.where('f', GTMachines.FLUID_IMPORT_HATCH[GTValues.ULV], Direction.SOUTH)
|
||||
.where('e', GTMachines.ENERGY_INPUT_HATCH[GTValues.LV], Direction.SOUTH)
|
||||
.build()
|
||||
)
|
||||
.workableCasingRenderer(
|
||||
'gtceu:block/casings/solid/machine_casing_solid_steel',
|
||||
'gtceu:block/multiblock/implosion_compressor', false
|
||||
)
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Nether Dome
|
||||
|
||||
event.create('nether_dome', 'multiblock')
|
||||
|
|
|
|||
|
|
@ -1,13 +1,6 @@
|
|||
// priority: 0
|
||||
|
||||
const registerGTCEuRecipeTypes = (event) => {
|
||||
event.create('greenhouse')
|
||||
.category('greenhouse')
|
||||
.setEUIO('in')
|
||||
.setMaxIOSize(3, 4, 1, 0)
|
||||
.setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT)
|
||||
.setSound(GTSoundEntries.BATH)
|
||||
|
||||
event.create('nether_dome')
|
||||
.category('nether_dome')
|
||||
.setEUIO('in')
|
||||
|
|
|
|||
|
|
@ -852,7 +852,7 @@ global.TFC_BATCH_TO_BOTTLE_ASSEMBLING_RECIPE_COMPONENTS = [
|
|||
{ input: 'tfc:volcanic_glass_batch', output: 'tfc:volcanic_glass_bottle', name: 'volcanic_glass_bottle' },
|
||||
];
|
||||
|
||||
global.TFC_FURNACE_MEAT_RECIPE_COMPONENTS = [
|
||||
global.TFC_MEAT_RECIPE_COMPONENTS = [
|
||||
{ input: 'tfc:food/horse_meat', output: 'tfc:food/cooked_horse_meat', name: 'cooked_horse_meat' },
|
||||
{ input: 'tfc:food/bear', output: 'tfc:food/cooked_bear', name: 'cooked_bear' },
|
||||
{ input: 'tfc:food/mutton', output: 'tfc:food/cooked_mutton', name: 'cooked_mutton' },
|
||||
|
|
@ -924,41 +924,39 @@ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [
|
|||
{ input: 'firmalife:ore/small_chromite', output: 'gtceu:small_chromite_dust', name: 'chromite' }
|
||||
];
|
||||
|
||||
global.TFC_QUERN_GRAIN_RECIPE_COMPONENTS = [
|
||||
{ input: 'tfc:food/barley', output: 'tfc:food/barley_grain', name: 'barley_grain' },
|
||||
{ input: 'tfc:food/maize', output: 'tfc:food/maize_grain', name: 'maize_grain' },
|
||||
{ input: 'tfc:food/oat', output: 'tfc:food/oat_grain', name: 'oat_grain' },
|
||||
{ input: 'tfc:food/rye', output: 'tfc:food/rye_grain', name: 'rye_grain' },
|
||||
{ input: 'tfc:food/rice', output: 'tfc:food/rice_grain', name: 'rice_grain' },
|
||||
{ input: 'tfc:food/wheat', output: 'tfc:food/wheat_grain', name: 'wheat_grain' },
|
||||
];
|
||||
global.TFC_GRAINS = [
|
||||
"barley",
|
||||
"maize",
|
||||
"oat",
|
||||
"rye",
|
||||
"rice",
|
||||
"wheat",
|
||||
]
|
||||
|
||||
global.TFC_QUERN_FLOUR_RECIPE_COMPONENTS = [
|
||||
{ input: 'tfc:food/barley_grain', output: '2x tfc:food/barley_flour', name: 'barley_flour' },
|
||||
{ input: 'tfc:food/maize_grain', output: '2x tfc:food/maize_flour', name: 'maize_flour' },
|
||||
{ input: 'tfc:food/oat_grain', output: '2x tfc:food/oat_flour', name: 'oat_flour' },
|
||||
{ input: 'tfc:food/rye_grain', output: '2x tfc:food/rye_flour', name: 'rye_flour' },
|
||||
{ input: 'tfc:food/rice_grain', output: '2x tfc:food/rice_flour', name: 'rice_flour' },
|
||||
{ input: 'tfc:food/wheat_grain', output: '2x tfc:food/wheat_flour', name: 'wheat_flour' },
|
||||
];
|
||||
|
||||
global.TFC_MIXER_FLATBREAD_DOUGH_RECIPE_COMPONENTS = [
|
||||
{ input: 'tfc:food/barley_flour', output: '2x tfc:food/barley_dough', name: 'tfc_barley_dough' },
|
||||
{ input: 'tfc:food/maize_flour', output: '2x tfc:food/maize_dough', name: 'tfc_maize_dough' },
|
||||
{ input: 'tfc:food/oat_flour', output: '2x tfc:food/oat_dough', name: 'tfc_oat_dough' },
|
||||
{ input: 'tfc:food/rye_flour', output: '2x tfc:food/rye_dough', name: 'tfc_rye_dough' },
|
||||
{ input: 'tfc:food/rice_flour', output: '2x tfc:food/rice_dough', name: 'tfc_rice_dough' },
|
||||
{ input: 'tfc:food/wheat_flour', output: '2x tfc:food/wheat_dough', name: 'tfc_wheat_dough' },
|
||||
];
|
||||
|
||||
global.TFC_FURNACE_BREAD_RECIPE_COMPONENTS = [
|
||||
{ input: 'firmalife:food/barley_dough', output: 'tfc:food/barley_bread', name: 'barley_bread' },
|
||||
{ input: 'firmalife:food/maize_dough', output: 'tfc:food/maize_bread', name: 'maize_bread' },
|
||||
{ input: 'firmalife:food/oat_dough', output: 'tfc:food/oat_bread', name: 'oat_bread' },
|
||||
{ input: 'firmalife:food/rye_dough', output: 'tfc:food/rye_bread', name: 'rye_bread' },
|
||||
{ input: 'firmalife:food/rice_dough', output: 'tfc:food/rice_bread', name: 'rice_bread' },
|
||||
{ input: 'firmalife:food/wheat_dough', output: 'tfc:food/wheat_bread', name: 'wheat_bread' },
|
||||
];
|
||||
global.TFC_JAMS = [
|
||||
"blackberry",
|
||||
"blueberry",
|
||||
"bunchberry",
|
||||
"cloudberry",
|
||||
"cranberry",
|
||||
"elderberry",
|
||||
"gooseberry",
|
||||
"raspberry",
|
||||
"snowberry",
|
||||
"strawberry",
|
||||
"wintergreen_berry",
|
||||
"banana",
|
||||
"cherry",
|
||||
"green_apple",
|
||||
"lemon",
|
||||
"olive",
|
||||
"orange",
|
||||
"peach",
|
||||
"plum",
|
||||
"red_apple",
|
||||
"pumpkin_chunks",
|
||||
"melon_slice",
|
||||
]
|
||||
|
||||
global.TFC_GREENHOUSE_FRUIT_RECIPE_COMPONENTS = [
|
||||
{ input: 'tfc:plant/cherry_sapling', fluid_amount: 8000, output: '32x tfc:food/cherry', name: 'cherry' },
|
||||
|
|
@ -1016,7 +1014,14 @@ global.TFC_MILKS = [
|
|||
{id: 'minecraft:milk'},
|
||||
{id: 'firmalife:yak_milk'},
|
||||
{id: 'firmalife:goat_milk'},
|
||||
{id: 'firmalife:coconut_milk'},
|
||||
// Uncomment this if firmalife ever makes this obtainable
|
||||
//{id: 'firmalife:coconut_milk'},
|
||||
];
|
||||
|
||||
global.TFC_CURDS_AND_CHEESES = [
|
||||
{ id: 'milk', input_fluid: 'tfc:curdled_milk', curd: 'firmalife:food/milk_curd', cheese1: 'gouda', cheese2: 'cheddar' },
|
||||
{ id: 'yak', input_fluid: 'firmalife:curdled_yak_milk', curd: 'firmalife:food/yak_curd', cheese1: 'shosha', cheese2: 'rajya_metok' },
|
||||
{ id: 'goat', input_fluid: 'firmalife:curdled_goat_milk', curd: 'firmalife:food/goat_curd', cheese1: 'feta', cheese2: 'chevre' },
|
||||
];
|
||||
|
||||
global.TFC_ALCOHOL = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue