diff --git a/CHANGELOG.md b/CHANGELOG.md index 98b8ebef..98da3c89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ ### Changes -- Added Stainless Steel jar lids +- Added Stainless Steel jar lids. - Updated the stomping barrel recipe again. -- Made the check for flowers for bees much more forgiving, most plants should work now. \ No newline at end of file +- Made the check for flowers for bees much more forgiving, most plants should work now. +- Reduced the oil requirement for pizzas to 100 mB. +- Added soybean oil. It burns slightly less efficiently than olive oil in a lamp, and may be substituted for olive oil in pizza. \ No newline at end of file diff --git a/resources/constants.py b/resources/constants.py index b76a9eb4..3291498c 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -12,13 +12,13 @@ class Wood(NamedTuple): SIMPLE_ITEMS = ('fruit_leaf', 'cinnamon_bark', 'beeswax', 'pineapple_fiber', 'pineapple_leather', 'pineapple_yarn', 'raw_honey', 'rennet', 'watering_can', 'treated_lumber', 'cheesecloth', 'spoon', 'pie_pan', 'seed_ball', 'rustic_finish', 'stone_finish', 'tile_finish', 'oven_insulation', 'ice_shavings', 'beekeeper_helmet', 'beekeeper_chestplate', 'beekeeper_leggings', 'beekeeper_boots', 'reinforced_glass', 'pottery_sherd', 'hematitic_wine_bottle', 'olivine_wine_bottle', 'volcanic_wine_bottle', 'empty_hematitic_wine_bottle', 'empty_olivine_wine_bottle', 'empty_volcanic_wine_bottle', 'cork', 'bottle_label', 'barrel_stave', 'stainless_steel_jar_lid', - 'empty_jar_with_stainless_steel_lid') + 'empty_jar_with_stainless_steel_lid',) SIMPLE_FOODS = ('frothy_coconut', 'white_chocolate_blend', 'dark_chocolate_blend', 'milk_chocolate_blend', 'tofu', 'soy_mixture', 'yak_curd', 'goat_curd', 'milk_curd', 'cheddar', 'chevre', 'rajya_metok', 'gouda', 'feta', 'shosha', 'butter', 'pie_dough', 'filled_pie', 'cooked_pie', 'pizza_dough', 'raw_pizza', 'cooked_pizza', 'shredded_cheese', 'pickled_egg', 'pumpkin_pie_dough', 'raw_pumpkin_pie', 'cooked_pumpkin_pie', 'cocoa_beans', 'roasted_cocoa_beans', 'cocoa_butter', 'cocoa_powder', 'toast', 'dark_chocolate', 'milk_chocolate', 'white_chocolate', 'garlic_bread', 'cured_maize', 'nixtamal', 'masa', 'masa_flour', 'corn_tortilla', 'taco_shell', 'burrito', 'taco', 'salsa', 'tomato_sauce', 'nightshade_berry', 'stinky_soup', 'toast_with_jam', 'toast_with_butter', 'bacon', 'cooked_bacon', 'tomato_sauce_mix', 'vanilla_ice_cream', 'strawberry_ice_cream', 'chocolate_ice_cream', 'banana_split', 'cookie_dough', 'sugar_cookie', 'chocolate_chip_cookie_dough', 'chocolate_chip_cookie', 'cookie_dough_ice_cream', 'maki_roll', 'futo_maki_roll', 'hardtack', 'hardtack_dough', 'cooked_lasagna', 'cooked_pasta', - 'cooked_rice_noodles', 'nachos', 'pasta_with_tomato_sauce', 'raw_egg_noodles', 'raw_lasagna', 'raw_rice_noodles', 'tortilla_chips', 'smashed_red_grapes', 'smashed_white_grapes') + 'cooked_rice_noodles', 'nachos', 'pasta_with_tomato_sauce', 'raw_egg_noodles', 'raw_lasagna', 'raw_rice_noodles', 'tortilla_chips', 'smashed_red_grapes', 'smashed_white_grapes', 'dehydrated_soybeans', 'soybean_paste') SIMPLE_SPICES = ('ground_cinnamon', 'cinnamon', 'basil_leaves', 'vanilla') SIMPLE_BLOCKS: Dict[str, str] = { 'sealed_bricks': 'minecraft:mineable/pickaxe', @@ -30,7 +30,7 @@ class Wood(NamedTuple): } COLORS = ('white', 'orange', 'magenta', 'light_blue', 'yellow', 'lime', 'pink', 'gray', 'light_gray', 'cyan', 'purple', 'blue', 'brown', 'green', 'red', 'black') BLOCK_ENTITIES = ('oven_bottom', 'oven_top', 'drying_mat', 'beehive', 'solar_drier', 'mixing_bowl', 'string', 'berry_bush', 'large_planter', 'bonsai_planter', 'trellis_planter', 'hanging_planter', 'quad_planter', 'climate_station', 'hydroponic_planter', 'vat', 'oven_hopper', 'ashtray', 'stovetop_grill', 'stovetop_pot', 'jarbnet', 'plate', 'big_barrel', 'jarring_station', 'barrel_press', 'stomping_barrel') -EXTRA_FLUIDS = ('yeast_starter', 'coconut_milk', 'yak_milk', 'goat_milk', 'curdled_yak_milk', 'curdled_goat_milk', 'pina_colada', 'cream', 'chocolate', 'sugar_water', 'fruity_fluid', 'mead') +EXTRA_FLUIDS = ('yeast_starter', 'coconut_milk', 'yak_milk', 'goat_milk', 'curdled_yak_milk', 'curdled_goat_milk', 'pina_colada', 'cream', 'chocolate', 'sugar_water', 'fruity_fluid', 'mead', 'soybean_oil') WINES = ('red', 'white', 'rose', 'sparkling', 'dessert') JARS: Sequence[Tuple[str, int, str]] = ( ('honey', 1, 'firmalife:raw_honey'), diff --git a/resources/data.py b/resources/data.py index 8693db23..d64daf43 100644 --- a/resources/data.py +++ b/resources/data.py @@ -148,6 +148,8 @@ def generate(rm: ResourceManager): decayable(rm, 'nixtamal', 'firmalife:food/nixtamal', Category.other, decay=0.3) decayable(rm, 'masa_flour', 'firmalife:food/masa_flour', Category.other, decay=0.8) decayable(rm, 'masa', 'firmalife:food/masa', Category.other, decay=2.0) + decayable(rm, 'dehydrated_soybeans', 'firmalife:food/dehydrated_soybeans', Category.other, 0.5) + decayable(rm, 'soybean_paste', 'firmalife:food/soybean_paste', Category.other, 0.6) food_item(rm, 'corn_tortilla', 'firmalife:food/corn_tortilla', Category.grain, 4, 1, 0, 0.8, grain=0.6) food_item(rm, 'taco_shell', 'firmalife:food/taco_shell', Category.grain, 4, 1, 0, 0.8, grain=0.6) food_item(rm, 'tortilla_chips', 'firmalife:food/tortilla_chips', Category.grain, 4, 1.2, 0, 0.8, grain=0.7) @@ -193,6 +195,8 @@ def generate(rm: ResourceManager): item_heat(rm, 'oxidized_copper_pipe', 'firmalife:oxidized_copper_pipe', 0.171, melt_temperature=864) item_heat(rm, 'stainless_steel_jar_lid', 'firmalife:stainless_steel_jar_lid', 1.429, melt_temperature=1540) + lamp_fuel(rm, 'soybean_oil', 'firmalife:soybean_oil', 7000) + for fruit, data in FRUITS.items(): climate_range(rm, 'plant/%s_tree' % fruit, hydration=(hydration_from_rainfall(data.min_rain), 100, 0), temperature=(data.min_temp - 7, data.max_temp + 7, 0)) for berry, data in STILL_BUSHES.items(): @@ -211,6 +215,13 @@ def generate(rm: ResourceManager): global_loot_modifier(rm, 'fruit_leaf', 'firmalife:add_item', {'item': item_stack_codec('firmalife:fruit_leaf'), 'chance': 0.5}, match_block_ingredient('firmalife:drops_fruit_leaf')) global_loot_modifier(rm, 'ice_shavings', 'firmalife:add_item', {'item': item_stack_codec('firmalife:ice_shavings')}, match_block_ingredient('firmalife:drops_ice_shavings')) +def lamp_fuel(rm: ResourceManager, name: str, fluid: str, burn_rate: int, valid_lamps: str = '#tfc:lamps'): + rm.data(('tfc', 'lamp_fuels', name), { + 'fluid': fluid, + 'burn_rate': burn_rate, + # This is a block ingredient, not an ingredient + 'valid_lamps': {'type': 'tfc:tag', 'tag': valid_lamps.replace('#', '')} if '#' in valid_lamps else valid_lamps + }) def greenhouse(rm: ResourceManager, name: str, block_ingredient: str, tier: int): rm.data(('firmalife', 'greenhouse', name), { diff --git a/resources/recipes.py b/resources/recipes.py index 79062719..c92bfe30 100644 --- a/resources/recipes.py +++ b/resources/recipes.py @@ -232,6 +232,7 @@ def chisel_stair_slab(name: str, ingredient: str): barrel_sealed_recipe(rm, 'fermented_red_grapes', 'Fermenting Red Grapes', 24000 * 5, not_rotten(lacks_trait('firmalife:food/smashed_red_grapes', 'firmalife:fermented')), output_item=item_stack_provider(copy_input=True, add_trait='firmalife:fermented')) barrel_sealed_recipe(rm, 'fermented_white_grapes', 'Fermenting White Grapes', 24000 * 5, not_rotten(lacks_trait('firmalife:food/smashed_white_grapes', 'firmalife:fermented')), output_item=item_stack_provider(copy_input=True, add_trait='firmalife:fermented')) barrel_sealed_recipe(rm, 'cork', 'Making Corks', 24000, 'firmalife:treated_lumber', '1000 tfc:limewater', output_item='8 firmalife:cork') + barrel_sealed_recipe(rm, 'soybean_oil', 'Soybean Oil', 24000, 'firmalife:food/soybean_paste', '100 minecraft:water', output_fluid='250 firmalife:soybean_oil') barrel_sealed_recipe(rm, 'shosha', 'Shosha Wheel', 16000, '3 firmalife:food/yak_curd', '750 tfc:salt_water', output_item='firmalife:shosha_wheel') barrel_sealed_recipe(rm, 'feta', 'Feta Wheel', 16000, '3 firmalife:food/goat_curd', '750 tfc:salt_water', output_item='firmalife:feta_wheel') @@ -240,6 +241,7 @@ def chisel_stair_slab(name: str, ingredient: str): quern_recipe(rm, 'masa', not_rotten('firmalife:food/nixtamal'), 'firmalife:food/masa_flour', count=4) quern_recipe(rm, 'crushed_red_grapes', not_rotten('firmalife:food/red_grapes'), item_stack_provider('firmalife:food/smashed_red_grapes', copy_food=True)) quern_recipe(rm, 'crushed_white_grapes', not_rotten('firmalife:food/white_grapes'), item_stack_provider('firmalife:food/smashed_white_grapes', copy_food=True)) + quern_recipe(rm, 'soybean_paste', not_rotten('firmalife:food/dehydrated_soybeans'), item_stack_provider('firmalife:food/soybean_paste', copy_food=True)) loom_recipe(rm, 'pineapple_leather', '16 firmalife:pineapple_yarn', 'firmalife:pineapple_leather', 16, 'firmalife:block/pineapple') @@ -270,6 +272,7 @@ def chisel_stair_slab(name: str, ingredient: str): drying_recipe(rm, 'dry_grass', 'tfc:thatch', item_stack_provider('tfc:groundcover/dead_grass')) drying_recipe(rm, 'tofu', 'firmalife:food/soy_mixture', item_stack_provider('firmalife:food/tofu', copy_food=True)) drying_recipe(rm, 'vanilla', 'firmalife:plant/vanilla', item_stack_provider('firmalife:spice/vanilla')) + drying_recipe(rm, 'dehydrated_soybeans', not_rotten('tfc:food/soybean'), item_stack_provider('firmalife:food/dehydrated_soybeans', copy_food=True)) for choc in ('milk', 'white', 'dark'): drying_recipe(rm, '%s_chocolate' % choc, 'firmalife:food/%s_chocolate_blend' % choc, item_stack_provider('firmalife:food/%s_chocolate' % choc)) for dirt in ('loam', 'sandy_loam', 'silty_loam', 'silt'): @@ -278,6 +281,7 @@ def chisel_stair_slab(name: str, ingredient: str): stomping_recipe(rm, 'red_grapes', not_rotten(lacks_trait('firmalife:food/red_grapes', 'firmalife:dried')), item_stack_provider('firmalife:food/smashed_red_grapes'), 'firmalife:block/red_unsmashed_grapes', 'firmalife:block/red_smashed_grapes') stomping_recipe(rm, 'white_grapes', not_rotten(lacks_trait('firmalife:food/white_grapes', 'firmalife:dried')), item_stack_provider('firmalife:food/smashed_white_grapes'), 'firmalife:block/white_unsmashed_grapes', 'firmalife:block/white_smashed_grapes') stomping_recipe(rm, 'charcoal', 'minecraft:charcoal', item_stack_provider('4 tfc:powder/charcoal'), 'tfc:block/charcoal_pile', 'tfc:block/powder/charcoal', 'tfc:block.charcoal.fall') + stomping_recipe(rm, 'soybean_paste', not_rotten('firmalife:food/dehydrated_soybeans'), item_stack_provider('firmalife:food/soybean_paste'), 'firmalife:block/dehydrated_soybeans', 'firmalife:block/soybean_paste') smoking_recipe(rm, 'meat', not_rotten(has_trait(lacks_trait('#tfc:foods/raw_meats', 'firmalife:smoked'), 'tfc:brined')), item_stack_provider(copy_input=True, add_trait='firmalife:smoked')) smoking_recipe(rm, 'cheese', not_rotten(lacks_trait('#firmalife:foods/cheeses', 'firmalife:smoked')), item_stack_provider(copy_input=True, add_trait='firmalife:smoked')) @@ -285,7 +289,7 @@ def chisel_stair_slab(name: str, ingredient: str): mixing_recipe(rm, 'butter', ingredients=[utils.ingredient('tfc:powder/salt')], fluid='1000 firmalife:cream', output_item='firmalife:food/butter') mixing_recipe(rm, 'pie_dough', ingredients=[not_rotten('firmalife:food/butter'), not_rotten('#tfc:foods/flour'), utils.ingredient('#tfc:sweetener')], fluid='1000 minecraft:water', output_item='firmalife:food/pie_dough') mixing_recipe(rm, 'pumpkin_pie_dough', ingredients=[utils.ingredient('#firmalife:foods/raw_eggs'), not_rotten('tfc:food/pumpkin_chunks'), not_rotten('tfc:food/pumpkin_chunks'), not_rotten('#tfc:foods/flour'), utils.ingredient('#tfc:sweetener')], fluid='1000 minecraft:water', output_item='firmalife:food/pumpkin_pie_dough') - mixing_recipe(rm, 'pizza_dough', ingredients=[not_rotten('#tfc:foods/dough'), utils.ingredient('tfc:powder/salt'), utils.ingredient('firmalife:spice/basil_leaves')], fluid='1000 tfc:olive_oil', output_item='4 firmalife:food/pizza_dough') + mixing_recipe(rm, 'pizza_dough', ingredients=[not_rotten('#tfc:foods/dough'), utils.ingredient('tfc:powder/salt'), utils.ingredient('firmalife:spice/basil_leaves')], fluid='100 #firmalife:oils', output_item='4 firmalife:food/pizza_dough') mixing_recipe(rm, 'dark_chocolate_blend', ingredients=[utils.ingredient('#tfc:sweetener'), not_rotten('firmalife:food/cocoa_powder'), not_rotten('firmalife:food/cocoa_powder')], fluid='1000 #tfc:milks', output_item='2 firmalife:food/dark_chocolate_blend') mixing_recipe(rm, 'white_chocolate_blend', ingredients=[utils.ingredient('#tfc:sweetener'), not_rotten('firmalife:food/cocoa_butter'), not_rotten('firmalife:food/cocoa_butter')], fluid='1000 #tfc:milks', output_item='2 firmalife:food/white_chocolate_blend') mixing_recipe(rm, 'milk_chocolate_blend', ingredients=[utils.ingredient('#tfc:sweetener'), not_rotten('firmalife:food/cocoa_butter'), not_rotten('firmalife:food/cocoa_powder')], fluid='1000 #tfc:milks', output_item='2 firmalife:food/milk_chocolate_blend') diff --git a/resources/tags.py b/resources/tags.py index 3fde4781..69174ce7 100644 --- a/resources/tags.py +++ b/resources/tags.py @@ -83,6 +83,7 @@ def generate(rm: ResourceManager): rm.fluid_tag('usable_in_hollow_shell', '#tfc:usable_in_wooden_bucket') rm.fluid_tag('usable_in_wine_glass', '#tfc:drinkables') rm.fluid_tag('usable_in_vat', '#tfc:usable_in_pot', 'firmalife:fruity_fluid') + rm.fluid_tag('oils', 'firmalife:soybean_oil', 'tfc:olive_oil') # Ore tags ore = 'chromite' diff --git a/src/main/java/com/eerussianguy/firmalife/common/items/FLFood.java b/src/main/java/com/eerussianguy/firmalife/common/items/FLFood.java index 8ee45cb5..7426a281 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/items/FLFood.java +++ b/src/main/java/com/eerussianguy/firmalife/common/items/FLFood.java @@ -94,6 +94,8 @@ public enum FLFood NACHOS, SMASHED_RED_GRAPES, SMASHED_WHITE_GRAPES, + SOYBEAN_PASTE, + DEHYDRATED_SOYBEANS, ; private final boolean meat, fast; diff --git a/src/main/java/com/eerussianguy/firmalife/common/util/ExtraFluid.java b/src/main/java/com/eerussianguy/firmalife/common/util/ExtraFluid.java index b0d988f1..4131d6d7 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/util/ExtraFluid.java +++ b/src/main/java/com/eerussianguy/firmalife/common/util/ExtraFluid.java @@ -17,7 +17,9 @@ public enum ExtraFluid implements StringRepresentable CHOCOLATE(0xFF875633), SUGAR_WATER(0xFF99EEFF), FRUITY_FLUID(0xFFFF6619), - MEAD(0xFFc79f28); + MEAD(0xFFc79f28), + SOYBEAN_OIL(0xFFdbc99a), + ; private final String id; private final int color; diff --git a/src/main/resources/assets/firmalife/blockstates/fluid/soybean_oil.json b/src/main/resources/assets/firmalife/blockstates/fluid/soybean_oil.json new file mode 100644 index 00000000..749ff0b5 --- /dev/null +++ b/src/main/resources/assets/firmalife/blockstates/fluid/soybean_oil.json @@ -0,0 +1,8 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "variants": { + "": { + "model": "firmalife:block/fluid/soybean_oil" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/firmalife/lang/en_us.json b/src/main/resources/assets/firmalife/lang/en_us.json index 3ebb09d1..0f330171 100644 --- a/src/main/resources/assets/firmalife/lang/en_us.json +++ b/src/main/resources/assets/firmalife/lang/en_us.json @@ -607,6 +607,8 @@ "item.firmalife.food.tortilla_chips": "Tortilla Chips", "item.firmalife.food.smashed_red_grapes": "Smashed Red Grapes", "item.firmalife.food.smashed_white_grapes": "Smashed White Grapes", + "item.firmalife.food.dehydrated_soybeans": "Dehydrated Soybeans", + "item.firmalife.food.soybean_paste": "Soybean Paste", "item.firmalife.food.wheat_slice": "Wheat Slice", "item.firmalife.food.wheat_flatbread": "Wheat Flatbread", "item.firmalife.food.wheat_dough": "Wheat Dough", @@ -697,6 +699,9 @@ "block.firmalife.fluid.mead": "Mead", "item.firmalife.bucket.mead": "Mead Bucket", "fluid.firmalife.mead": "Mead", + "block.firmalife.fluid.soybean_oil": "Soybean Oil", + "item.firmalife.bucket.soybean_oil": "Soybean Oil Bucket", + "fluid.firmalife.soybean_oil": "Soybean Oil", "block.firmalife.fluid.red_wine": "Red Wine", "item.firmalife.bucket.red_wine": "Red Wine Bucket", "fluid.firmalife.red_wine": "Red Wine", @@ -897,6 +902,7 @@ "tfc.recipe.barrel.firmalife.barrel.fermented_red_grapes": "Fermenting Red Grapes", "tfc.recipe.barrel.firmalife.barrel.fermented_white_grapes": "Fermenting White Grapes", "tfc.recipe.barrel.firmalife.barrel.cork": "Making Corks", + "tfc.recipe.barrel.firmalife.barrel.soybean_oil": "Soybean Oil", "tfc.recipe.barrel.firmalife.barrel.shosha": "Shosha Wheel", "tfc.recipe.barrel.firmalife.barrel.feta": "Feta Wheel", "tfc.recipe.barrel.firmalife.barrel.gouda": "Gouda Wheel", diff --git a/src/main/resources/assets/firmalife/models/block/fluid/soybean_oil.json b/src/main/resources/assets/firmalife/models/block/fluid/soybean_oil.json new file mode 100644 index 00000000..bea4e3ae --- /dev/null +++ b/src/main/resources/assets/firmalife/models/block/fluid/soybean_oil.json @@ -0,0 +1,6 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "textures": { + "particle": "minecraft:block/water_still" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/firmalife/models/item/bucket/soybean_oil.json b/src/main/resources/assets/firmalife/models/item/bucket/soybean_oil.json new file mode 100644 index 00000000..ba771654 --- /dev/null +++ b/src/main/resources/assets/firmalife/models/item/bucket/soybean_oil.json @@ -0,0 +1,6 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "loader": "forge:fluid_container", + "parent": "forge:item/bucket", + "fluid": "firmalife:soybean_oil" +} \ No newline at end of file diff --git a/src/main/resources/assets/firmalife/models/item/food/dehydrated_soybeans.json b/src/main/resources/assets/firmalife/models/item/food/dehydrated_soybeans.json new file mode 100644 index 00000000..3ce6a4ee --- /dev/null +++ b/src/main/resources/assets/firmalife/models/item/food/dehydrated_soybeans.json @@ -0,0 +1,7 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "item/generated", + "textures": { + "layer0": "firmalife:item/food/dehydrated_soybeans" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/firmalife/models/item/food/soybean_paste.json b/src/main/resources/assets/firmalife/models/item/food/soybean_paste.json new file mode 100644 index 00000000..e748f211 --- /dev/null +++ b/src/main/resources/assets/firmalife/models/item/food/soybean_paste.json @@ -0,0 +1,7 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "item/generated", + "textures": { + "layer0": "firmalife:item/food/soybean_paste" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/firmalife/textures/block/dehydrated_soybeans.png b/src/main/resources/assets/firmalife/textures/block/dehydrated_soybeans.png new file mode 100644 index 00000000..6119a3d4 Binary files /dev/null and b/src/main/resources/assets/firmalife/textures/block/dehydrated_soybeans.png differ diff --git a/src/main/resources/assets/firmalife/textures/block/soybean_paste.png b/src/main/resources/assets/firmalife/textures/block/soybean_paste.png new file mode 100644 index 00000000..5d439b76 Binary files /dev/null and b/src/main/resources/assets/firmalife/textures/block/soybean_paste.png differ diff --git a/src/main/resources/assets/firmalife/textures/item/food/dehydrated_soybeans.png b/src/main/resources/assets/firmalife/textures/item/food/dehydrated_soybeans.png new file mode 100644 index 00000000..29b4f481 Binary files /dev/null and b/src/main/resources/assets/firmalife/textures/item/food/dehydrated_soybeans.png differ diff --git a/src/main/resources/assets/firmalife/textures/item/food/soybean_paste.png b/src/main/resources/assets/firmalife/textures/item/food/soybean_paste.png new file mode 100644 index 00000000..ce1af66f Binary files /dev/null and b/src/main/resources/assets/firmalife/textures/item/food/soybean_paste.png differ diff --git a/src/main/resources/data/firmalife/recipes/barrel/soybean_oil.json b/src/main/resources/data/firmalife/recipes/barrel/soybean_oil.json new file mode 100644 index 00000000..42b9ef0f --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/barrel/soybean_oil.json @@ -0,0 +1,18 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:barrel_sealed", + "input_item": { + "ingredient": { + "item": "firmalife:food/soybean_paste" + } + }, + "input_fluid": { + "ingredient": "minecraft:water", + "amount": 100 + }, + "output_fluid": { + "fluid": "firmalife:soybean_oil", + "amount": 250 + }, + "duration": 24000 +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/drying/dehydrated_soybeans.json b/src/main/resources/data/firmalife/recipes/drying/dehydrated_soybeans.json new file mode 100644 index 00000000..b620ae78 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/drying/dehydrated_soybeans.json @@ -0,0 +1,18 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:drying", + "ingredient": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "tfc:food/soybean" + } + }, + "result": { + "stack": { + "item": "firmalife:food/dehydrated_soybeans" + }, + "modifiers": [ + "tfc:copy_food" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/mixing_bowl/pizza_dough.json b/src/main/resources/data/firmalife/recipes/mixing_bowl/pizza_dough.json index 8f61e5e2..65a980c2 100644 --- a/src/main/resources/data/firmalife/recipes/mixing_bowl/pizza_dough.json +++ b/src/main/resources/data/firmalife/recipes/mixing_bowl/pizza_dough.json @@ -16,8 +16,10 @@ } ], "fluid_ingredient": { - "ingredient": "tfc:olive_oil", - "amount": 1000 + "ingredient": { + "tag": "firmalife:oils" + }, + "amount": 100 }, "output_item": { "item": "firmalife:food/pizza_dough", diff --git a/src/main/resources/data/firmalife/recipes/quern/soybean_paste.json b/src/main/resources/data/firmalife/recipes/quern/soybean_paste.json new file mode 100644 index 00000000..7c116e5f --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/quern/soybean_paste.json @@ -0,0 +1,18 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:quern", + "ingredient": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/dehydrated_soybeans" + } + }, + "result": { + "stack": { + "item": "firmalife:food/soybean_paste" + }, + "modifiers": [ + "tfc:copy_food" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/stomping/soybean_paste.json b/src/main/resources/data/firmalife/recipes/stomping/soybean_paste.json new file mode 100644 index 00000000..8eee70e6 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/stomping/soybean_paste.json @@ -0,0 +1,16 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "firmalife:stomping", + "ingredient": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/dehydrated_soybeans" + } + }, + "result": { + "item": "firmalife:food/soybean_paste" + }, + "input_texture": "firmalife:block/dehydrated_soybeans", + "output_texture": "firmalife:block/soybean_paste", + "sound": "minecraft:entity.slime.squish" +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tags/fluids/mixable.json b/src/main/resources/data/firmalife/tags/fluids/mixable.json index 80d87e20..5c7ee54a 100644 --- a/src/main/resources/data/firmalife/tags/fluids/mixable.json +++ b/src/main/resources/data/firmalife/tags/fluids/mixable.json @@ -26,6 +26,8 @@ "firmalife:flowing_fruity_fluid", "firmalife:mead", "firmalife:flowing_mead", + "firmalife:soybean_oil", + "firmalife:flowing_soybean_oil", "firmalife:red_wine", "firmalife:flowing_red_wine", "firmalife:white_wine", diff --git a/src/main/resources/data/firmalife/tags/fluids/oils.json b/src/main/resources/data/firmalife/tags/fluids/oils.json new file mode 100644 index 00000000..4fdc7675 --- /dev/null +++ b/src/main/resources/data/firmalife/tags/fluids/oils.json @@ -0,0 +1,8 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": false, + "values": [ + "firmalife:soybean_oil", + "tfc:olive_oil" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tags/fluids/soybean_oil.json b/src/main/resources/data/firmalife/tags/fluids/soybean_oil.json new file mode 100644 index 00000000..cca699ae --- /dev/null +++ b/src/main/resources/data/firmalife/tags/fluids/soybean_oil.json @@ -0,0 +1,8 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": false, + "values": [ + "firmalife:soybean_oil", + "firmalife:flowing_soybean_oil" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tfc/food_items/dehydrated_soybeans.json b/src/main/resources/data/firmalife/tfc/food_items/dehydrated_soybeans.json new file mode 100644 index 00000000..4d248fd8 --- /dev/null +++ b/src/main/resources/data/firmalife/tfc/food_items/dehydrated_soybeans.json @@ -0,0 +1,10 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "ingredient": { + "item": "firmalife:food/dehydrated_soybeans" + }, + "category": "other", + "hunger": 4, + "saturation": 0, + "decay_modifier": 0.5 +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tfc/food_items/soybean_paste.json b/src/main/resources/data/firmalife/tfc/food_items/soybean_paste.json new file mode 100644 index 00000000..3e11852b --- /dev/null +++ b/src/main/resources/data/firmalife/tfc/food_items/soybean_paste.json @@ -0,0 +1,10 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "ingredient": { + "item": "firmalife:food/soybean_paste" + }, + "category": "other", + "hunger": 4, + "saturation": 0, + "decay_modifier": 0.6 +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tfc/lamp_fuels/soybean_oil.json b/src/main/resources/data/firmalife/tfc/lamp_fuels/soybean_oil.json new file mode 100644 index 00000000..012b489b --- /dev/null +++ b/src/main/resources/data/firmalife/tfc/lamp_fuels/soybean_oil.json @@ -0,0 +1,9 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "fluid": "firmalife:soybean_oil", + "burn_rate": 7000, + "valid_lamps": { + "type": "tfc:tag", + "tag": "tfc:lamps" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/fluids/water.json b/src/main/resources/data/minecraft/tags/fluids/water.json index 80d87e20..5c7ee54a 100644 --- a/src/main/resources/data/minecraft/tags/fluids/water.json +++ b/src/main/resources/data/minecraft/tags/fluids/water.json @@ -26,6 +26,8 @@ "firmalife:flowing_fruity_fluid", "firmalife:mead", "firmalife:flowing_mead", + "firmalife:soybean_oil", + "firmalife:flowing_soybean_oil", "firmalife:red_wine", "firmalife:flowing_red_wine", "firmalife:white_wine", diff --git a/src/main/resources/data/tfc/tags/blocks/all_fluids.json b/src/main/resources/data/tfc/tags/blocks/all_fluids.json index fedf6235..5e253ca3 100644 --- a/src/main/resources/data/tfc/tags/blocks/all_fluids.json +++ b/src/main/resources/data/tfc/tags/blocks/all_fluids.json @@ -14,6 +14,7 @@ "firmalife:fluid/sugar_water", "firmalife:fluid/fruity_fluid", "firmalife:fluid/mead", + "firmalife:fluid/soybean_oil", "firmalife:fluid/red_wine", "firmalife:fluid/white_wine", "firmalife:fluid/rose_wine", diff --git a/src/main/resources/data/tfc/tags/fluids/ingredients.json b/src/main/resources/data/tfc/tags/fluids/ingredients.json index bec48c4e..dab1f74e 100644 --- a/src/main/resources/data/tfc/tags/fluids/ingredients.json +++ b/src/main/resources/data/tfc/tags/fluids/ingredients.json @@ -13,6 +13,7 @@ "firmalife:chocolate", "firmalife:sugar_water", "firmalife:fruity_fluid", - "firmalife:mead" + "firmalife:mead", + "firmalife:soybean_oil" ] } \ No newline at end of file diff --git a/src/main/resources/data/tfc/tags/items/foods.json b/src/main/resources/data/tfc/tags/items/foods.json index 3fa323ee..2ebea1db 100644 --- a/src/main/resources/data/tfc/tags/items/foods.json +++ b/src/main/resources/data/tfc/tags/items/foods.json @@ -48,6 +48,8 @@ "firmalife:food/nixtamal", "firmalife:food/masa_flour", "firmalife:food/masa", + "firmalife:food/dehydrated_soybeans", + "firmalife:food/soybean_paste", "firmalife:food/corn_tortilla", "firmalife:food/taco_shell", "firmalife:food/tortilla_chips",