diff --git a/CHANGELOG.md b/CHANGELOG.md index f1343f08..47525077 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ ### Fixes -- Temporarily rolled back the sherd changes as they are crashing the mod on load. You can still obtain sherds via crafting. \ No newline at end of file +- Fix ingot and sheet textures missing for Firmalife metals. +- Add vat recipes for TFC fruits. +- Fix hollow shells deleting blocks they shouldn't when placing. +- Attempt to fix a crash related to greenhouse blocks. +- Fix toast with jam recipe not being usable. +- Update some textures, thanks to Lexal for these \ No newline at end of file diff --git a/resources/recipes.py b/resources/recipes.py index b5bc420e..cd80619c 100644 --- a/resources/recipes.py +++ b/resources/recipes.py @@ -84,7 +84,7 @@ def craft_decorations(recipe_name: str, base_block: str): damage_shapeless(rm, 'crafting/salsa', ('tfc:food/tomato', 'tfc:powder/salt', 'firmalife:plant/cilantro', '#tfc:knives'), '5 firmalife:food/salsa').with_advancement('tfc:food/tomato') damage_shapeless(rm, 'crafting/pineapple_fiber', (not_rotten(has_trait('firmalife:food/pineapple', trait='firmalife:dried')), '#tfc:knives'), 'firmalife:pineapple_fiber').with_advancement('firmalife:food/pineapple') damage_shapeless(rm, 'crafting/pineapple_yarn', ('tfc:spindle', 'firmalife:pineapple_fiber'), '8 firmalife:pineapple_yarn').with_advancement('firmalife:pineapple_fiber') - rm.crafting_shapeless('crafting/toast_with_jam', ('firmalife:food/toast', '#firmalife:foods/preserves'), 'firmalife:food/toast_with_jam').with_advancement('firmalife:food/toast') + rm.crafting_shapeless('crafting/toast_with_jam', ('firmalife:food/toast', '#tfc:foods/preserves'), 'firmalife:food/toast_with_jam').with_advancement('firmalife:food/toast') rm.crafting_shapeless('crafting/toast_with_butter', ('firmalife:food/toast', 'firmalife:food/butter'), 'firmalife:food/toast_with_butter').with_advancement('firmalife:food/toast') damage_shapeless(rm, 'crafting/bacon', (not_rotten(has_trait('tfc:food/pork', trait='firmalife:smoked')), '#tfc:knives', 'tfc:powder/salt'), '4 firmalife:food/bacon').with_advancement('tfc:food/cooked_pork') rm.crafting_shapeless('crafting/tomato_sauce_mix', (not_rotten('tfc:food/tomato'), utils.ingredient('tfc:powder/salt'), not_rotten('tfc:food/garlic')), '5 firmalife:food/tomato_sauce_mix').with_advancement('tfc:food/tomato') @@ -177,6 +177,9 @@ def chisel_stair_slab(name: str, ingredient: str): 'texture': 'firmalife:block/jar/%s' % fruit }) rm.crafting_shapeless('crafting/unseal_%s_jar' % fruit, (not_rotten('firmalife:jar/%s' % fruit), ), 'firmalife:jar/%s_unsealed' % fruit).with_advancement('firmalife:jar/%s' % fruit) + for fruit in TFC_FRUITS: + ing = not_rotten(has_trait('tfc:food/%s' % fruit, 'firmalife:dried', True)) + vat_recipe(rm, '%s_jar' % fruit, ing, '500 firmalife:sugar_water', output_fluid='500 firmalife:fruity_fluid', jar='tfc:jar/%s' % fruit) beet = not_rotten('tfc:food/beet') simple_pot_recipe(rm, 'beet_sugar', [beet, beet, beet, beet, beet], '1000 tfc:salt_water', output_items=['minecraft:sugar', 'minecraft:sugar', 'minecraft:sugar']) diff --git a/src/main/java/com/eerussianguy/firmalife/common/blocks/IWeatherable.java b/src/main/java/com/eerussianguy/firmalife/common/blocks/IWeatherable.java index 28321a85..49900a4a 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blocks/IWeatherable.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blocks/IWeatherable.java @@ -13,7 +13,7 @@ public interface IWeatherable { - default void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) + default void onRandomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) { Supplier next = getNext(); if (next != null && random.nextInt(weatherChance()) == 0) diff --git a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseDoorBlock.java b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseDoorBlock.java index 54043425..8c7cd61c 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseDoorBlock.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseDoorBlock.java @@ -39,7 +39,7 @@ public boolean isRandomlyTicking(BlockState state) @Override @SuppressWarnings("deprecation") - public void randomTick(BlockState lower, ServerLevel level, BlockPos pos, RandomSource rand) + public void onRandomTick(BlockState lower, ServerLevel level, BlockPos pos, RandomSource rand) { Supplier next = getNext(); if (next != null && rand.nextInt(weatherChance()) == 0) diff --git a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseSlabBlock.java b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseSlabBlock.java index 8cf51107..a1f77978 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseSlabBlock.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseSlabBlock.java @@ -34,9 +34,9 @@ public boolean isRandomlyTicking(BlockState pState) @Override @SuppressWarnings("deprecation") - public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand) + public void onRandomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand) { - IWeatherable.super.randomTick(state, level, pos, rand); + IWeatherable.super.onRandomTick(state, level, pos, rand); } @Override diff --git a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseStairBlock.java b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseStairBlock.java index f9390d19..cc134e54 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseStairBlock.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseStairBlock.java @@ -36,9 +36,9 @@ public boolean isRandomlyTicking(BlockState pState) } @Override - public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand) + public void onRandomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand) { - IWeatherable.super.randomTick(state, level, pos, rand); + IWeatherable.super.onRandomTick(state, level, pos, rand); } @Override diff --git a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseWallBlock.java b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseWallBlock.java index ef8003b2..b1d17201 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseWallBlock.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/GreenhouseWallBlock.java @@ -48,10 +48,9 @@ public boolean isRandomlyTicking(BlockState state) } @Override - @SuppressWarnings("deprecation") - public void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand) + public void onRandomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand) { - IWeatherable.super.randomTick(state, level, pos, rand); + IWeatherable.super.onRandomTick(state, level, pos, rand); } @Override diff --git a/src/main/java/com/eerussianguy/firmalife/common/items/HollowShellItem.java b/src/main/java/com/eerussianguy/firmalife/common/items/HollowShellItem.java index fe4a9ef5..29d48481 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/items/HollowShellItem.java +++ b/src/main/java/com/eerussianguy/firmalife/common/items/HollowShellItem.java @@ -42,7 +42,7 @@ protected InteractionResultHolder afterFillFailed(IFluidHandler handl { final BlockPos pos = hit.getBlockPos().above(); BlockState state = FLBlocks.HOLLOW_SHELL.get().defaultBlockState(); - if (state.canSurvive(level, pos)) + if (state.canSurvive(level, pos) && level.getBlockState(pos).canBeReplaced()) { Fluid fluid = level.getFluidState(pos).getType(); state = FluidHelpers.fillWithFluid(state, fluid); diff --git a/src/main/resources/assets/firmalife/textures/block/metal/smooth/chromium.png b/src/main/resources/assets/firmalife/textures/block/metal/smooth/chromium.png new file mode 100644 index 00000000..0f051600 Binary files /dev/null and b/src/main/resources/assets/firmalife/textures/block/metal/smooth/chromium.png differ diff --git a/src/main/resources/assets/firmalife/textures/block/metal/smooth/stainless_steel.png b/src/main/resources/assets/firmalife/textures/block/metal/smooth/stainless_steel.png new file mode 100644 index 00000000..bbb869d7 Binary files /dev/null and b/src/main/resources/assets/firmalife/textures/block/metal/smooth/stainless_steel.png differ diff --git a/src/main/resources/data/firmalife/recipes/crafting/toast_with_jam.json b/src/main/resources/data/firmalife/recipes/crafting/toast_with_jam.json index 94c1d246..40d486e5 100644 --- a/src/main/resources/data/firmalife/recipes/crafting/toast_with_jam.json +++ b/src/main/resources/data/firmalife/recipes/crafting/toast_with_jam.json @@ -6,7 +6,7 @@ "item": "firmalife:food/toast" }, { - "tag": "firmalife:foods/preserves" + "tag": "tfc:foods/preserves" } ], "result": { diff --git a/src/main/resources/data/firmalife/recipes/vat/banana_jar.json b/src/main/resources/data/firmalife/recipes/vat/banana_jar.json new file mode 100644 index 00000000..7b8316e6 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/banana_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/banana" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/banana" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/blackberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/blackberry_jar.json new file mode 100644 index 00000000..90e5b071 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/blackberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/blackberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/blackberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/blueberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/blueberry_jar.json new file mode 100644 index 00000000..f4a1f91e --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/blueberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/blueberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/blueberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/bunchberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/bunchberry_jar.json new file mode 100644 index 00000000..f05d7a4c --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/bunchberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/bunchberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/bunchberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/cherry_jar.json b/src/main/resources/data/firmalife/recipes/vat/cherry_jar.json new file mode 100644 index 00000000..c6d9cdaa --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/cherry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/cherry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/cherry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/cloudberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/cloudberry_jar.json new file mode 100644 index 00000000..1a5933a0 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/cloudberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/cloudberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/cloudberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/cranberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/cranberry_jar.json new file mode 100644 index 00000000..1309801a --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/cranberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/cranberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/cranberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/elderberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/elderberry_jar.json new file mode 100644 index 00000000..60bd225f --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/elderberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/elderberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/elderberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/gooseberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/gooseberry_jar.json new file mode 100644 index 00000000..e73c764f --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/gooseberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/gooseberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/gooseberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/green_apple_jar.json b/src/main/resources/data/firmalife/recipes/vat/green_apple_jar.json new file mode 100644 index 00000000..c0ba2d82 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/green_apple_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/green_apple" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/green_apple" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/lemon_jar.json b/src/main/resources/data/firmalife/recipes/vat/lemon_jar.json new file mode 100644 index 00000000..ddab7481 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/lemon_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/lemon" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/lemon" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/melon_slice_jar.json b/src/main/resources/data/firmalife/recipes/vat/melon_slice_jar.json new file mode 100644 index 00000000..91cd5458 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/melon_slice_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/melon_slice" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/melon_slice" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/olive_jar.json b/src/main/resources/data/firmalife/recipes/vat/olive_jar.json new file mode 100644 index 00000000..3061d0d4 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/olive_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/olive" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/olive" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/orange_jar.json b/src/main/resources/data/firmalife/recipes/vat/orange_jar.json new file mode 100644 index 00000000..3fbd23de --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/orange_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/orange" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/orange" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/peach_jar.json b/src/main/resources/data/firmalife/recipes/vat/peach_jar.json new file mode 100644 index 00000000..0654ac68 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/peach_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/peach" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/peach" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/plum_jar.json b/src/main/resources/data/firmalife/recipes/vat/plum_jar.json new file mode 100644 index 00000000..0978ad6b --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/plum_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/plum" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/plum" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/pumpkin_chunks_jar.json b/src/main/resources/data/firmalife/recipes/vat/pumpkin_chunks_jar.json new file mode 100644 index 00000000..a80f4a8a --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/pumpkin_chunks_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/pumpkin_chunks" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/pumpkin_chunks" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/raspberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/raspberry_jar.json new file mode 100644 index 00000000..8ce53304 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/raspberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/raspberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/raspberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/red_apple_jar.json b/src/main/resources/data/firmalife/recipes/vat/red_apple_jar.json new file mode 100644 index 00000000..4af53294 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/red_apple_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/red_apple" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/red_apple" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/snowberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/snowberry_jar.json new file mode 100644 index 00000000..8efea13e --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/snowberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/snowberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/snowberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/strawberry_jar.json b/src/main/resources/data/firmalife/recipes/vat/strawberry_jar.json new file mode 100644 index 00000000..f645a52f --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/strawberry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/strawberry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/strawberry" + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/vat/wintergreen_berry_jar.json b/src/main/resources/data/firmalife/recipes/vat/wintergreen_berry_jar.json new file mode 100644 index 00000000..48ca90f4 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/vat/wintergreen_berry_jar.json @@ -0,0 +1,24 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:vat", + "input_item": { + "ingredient": { + "type": "tfc:lacks_trait", + "trait": "firmalife:dried", + "ingredient": { + "item": "tfc:food/wintergreen_berry" + } + } + }, + "input_fluid": { + "ingredient": "firmalife:sugar_water", + "amount": 500 + }, + "output_fluid": { + "fluid": "firmalife:fruity_fluid", + "amount": 500 + }, + "jar": { + "item": "tfc:jar/wintergreen_berry" + } +} \ No newline at end of file