diff --git a/gradle.properties b/gradle.properties index 1e2f1805..761e4438 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,6 @@ mixin_version=0.8.5 jei_version=9.7.1.232 patchouli_version=1.18.2-70 tfc_version=0.0.0-indev -tfc_identifier=4081689 +tfc_identifier=4378409 jade_version=3970956 top_version=3965688 \ No newline at end of file diff --git a/resources/assets.py b/resources/assets.py index 1f3ded60..61e42426 100644 --- a/resources/assets.py +++ b/resources/assets.py @@ -391,7 +391,7 @@ def greenhouse_door(rm: ResourceManager, name: str, bot: str, upper: str) -> 'Bl rm.block_model(door_model + '_top_hinge', {'top': upper}, parent='block/door_top_rh') rm.item_model(door) door_loot(block, 'firmalife:%s' % door) - greenhouse_tags(block, name).with_tag('minecraft:doors') + greenhouse_tags(block, name).with_tag('minecraft:doors').with_item_tag('minecraft:doors') return block def greenhouse_tags(block: BlockContext, greenhouse_name: str) -> 'BlockContext': diff --git a/resources/constants.py b/resources/constants.py index 69456bc4..3d2f63f5 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -22,7 +22,7 @@ class Wood(NamedTuple): 'treated_wood': 'minecraft:mineable/axe' } BLOCK_ENTITIES = ('oven_bottom', 'oven_top', 'drying_mat', 'beehive', 'solar_drier', 'mixing_bowl', 'iron_composter', 'string', 'berry_bush', 'large_planter', 'bonsai_planter', 'trellis_planter', 'hanging_planter', 'quad_planter', 'climate_station') -EXTRA_FLUIDS = ('yeast_starter', 'coconut_milk', 'yak_milk', 'goat_milk', 'curdled_yak_milk', 'curdled_goat_milk', 'pina_colada', 'cream') +EXTRA_FLUIDS = ('yeast_starter', 'coconut_milk', 'yak_milk', 'goat_milk', 'curdled_yak_milk', 'curdled_goat_milk', 'pina_colada', 'cream', 'chocolate') JARS: Sequence[Tuple[str, int, str, str]] = ( ('honey', 1, 'minecraft:block/honey_block_side', 'firmalife:raw_honey'), ('compost', 8, 'firmalife:block/potting_soil_wet', 'tfc:compost'), @@ -224,6 +224,10 @@ def preset_vein(ore: str, vein_type: str, rocks: List[str], spoiler_ore: Optiona 'firmalife.enum.plantertype.quad': 'Quad Planter', 'firmalife.enum.plantertype.large': 'Large Planter', + 'firmalife.enum.foodage.fresh': 'Fresh', + 'firmalife.enum.foodage.aged': 'Aged', + 'firmalife.enum.foodage.vintage': 'Vintage', + 'firmalife.jade.food_age': 'Age: %s', 'firmalife.jade.aging': 'Currently Aging', 'firmalife.jade.not_aging': 'Not Aging', diff --git a/resources/data.py b/resources/data.py index 2c9e0daa..169b8909 100644 --- a/resources/data.py +++ b/resources/data.py @@ -51,7 +51,7 @@ def generate(rm: ResourceManager): rm.item_tag('smoking_fuel', '#minecraft:logs') rm.item_tag('oven_fuel', '#minecraft:logs', 'tfc:stick_bundle') rm.item_tag('chocolate_blends', 'firmalife:food/milk_chocolate_blend', 'firmalife:food/dark_chocolate_blend', 'firmalife:food/white_chocolate_blend') - rm.item_tag('food/chocolate', 'firmalife:food/milk_chocolate', 'firmalife:food/dark_chocolate', 'firmalife:food/white_chocolate') + rm.item_tag('foods/chocolate', 'firmalife:food/milk_chocolate', 'firmalife:food/dark_chocolate', 'firmalife:food/white_chocolate') rm.item_tag('tfc:foods/can_be_salted', 'firmalife:food/butter') rm.item_tag('tfc:usable_on_tool_rack', 'firmalife:spoon', 'firmalife:peel') rm.item_tag('pumpkin_knapping', 'tfc:pumpkin') @@ -62,6 +62,7 @@ def generate(rm: ResourceManager): rm.item_tag('contains_pie_pan', 'firmalife:food/cooked_pumpkin_pie') rm.item_tag('can_be_hung', '#tfc:foods/meats', 'tfc:food/garlic') rm.item_tag('tfc:compost_greens_low', 'firmalife:fruit_leaf') + rm.item_tag('foods/cooked_meats_and_substitutes', '#tfc:foods/cooked_meats', 'firmalife:food/tofu') rm.block_tag('oven_insulation', 'minecraft:bricks', '#tfc:forge_insulation', '#firmalife:oven_blocks', 'minecraft:brick_stairs', 'minecraft:brick_slab') rm.block_tag('minecraft:mineable/pickaxe', '#firmalife:oven_blocks') @@ -86,6 +87,7 @@ def generate(rm: ResourceManager): rm.fluid_tag('tfc:alcohols', 'firmalife:pina_colada') rm.fluid_tag('tfc:milks', 'firmalife:yak_milk', 'firmalife:goat_milk', 'firmalife:coconut_milk') + rm.fluid_tag('tfc:drinkables', 'firmalife:chocolate') rm.fluid_tag('tfc:ingredients', *['firmalife:%s' % fluid for fluid in EXTRA_FLUIDS]) rm.fluid_tag('usable_in_mixing_bowl', '#tfc:usable_in_pot') rm.fluid_tag('usable_in_hollow_shell', '#tfc:usable_in_wooden_bucket') @@ -94,8 +96,8 @@ def generate(rm: ResourceManager): ore = 'chromite' rm.block_tag('forge:ores', '#forge:ores/%s' % ore) rm.block_tag('forge:ores/%s' % ore, '#firmalife:ores/%s/poor' % ore, '#firmalife:ores/%s/normal' % ore, '#firmalife:ores/%s/rich' % ore) - rm.item_tag('ore_pieces', 'firmalife:ore/poor_%s' % ore, 'firmalife:ore/normal_%s' % ore, 'firmalife:ore/rich_%s' % ore) - rm.item_tag('small_ore_pieces', 'firmalife:ore/small_%s' % ore) + rm.item_tag('tfc:ore_pieces', 'firmalife:ore/poor_%s' % ore, 'firmalife:ore/normal_%s' % ore, 'firmalife:ore/rich_%s' % ore) + rm.item_tag('tfc:small_ore_pieces', 'firmalife:ore/small_%s' % ore) for rock in TFC_ROCKS.keys(): rm.block_tag('ores/%s/poor' % ore, 'firmalife:ore/poor_%s/%s' % (ore, rock)) rm.block_tag('ores/%s/normal' % ore, 'firmalife:ore/normal_%s/%s' % (ore, rock)) @@ -152,6 +154,9 @@ def generate(rm: ResourceManager): trellis_plantable(rm, 'wintergreen_berry', 'tfc:plant/wintergreen_berry_bush', 'tfc:food/wintergreen_berry', 'nitrogen') # missing is cranberries. hydroponic planter? + # Drinkable + drinkable(rm, 'chocolate', 'firmalife:chocolate', thirst=10, food={'hunger': 0, 'saturation': 1.0, 'dairy': 1.0}) + # Food: HUNGER, SATURATION, WATER, DECAY decayable(rm, 'frothy_coconut', 'firmalife:food/frothy_coconut', Category.vegetable) food_item(rm, 'tofu', 'firmalife:food/tofu', Category.vegetable, 4, 2, 2, 0.75, protein=1.5) @@ -167,7 +172,7 @@ def generate(rm: ResourceManager): food_item(rm, 'shredded_cheese', 'firmalife:food/shredded_cheese', Category.dairy, 4, 2, 0, 0.3, dairy=0.75) food_item(rm, 'pickled_egg', 'firmalife:food/pickled_egg', Category.other, 4, 2, 10, 0.3, protein=1.5, dairy=0.25) decayable(rm, 'chocolate_blends', '#firmalife:chocolate_blends', Category.dairy) - food_item(rm, 'chocolate', '#firmalife:food/chocolate', Category.other, 4, 1, 0, 0.3, dairy=0.5, grain=0.5) + food_item(rm, 'chocolate', '#firmalife:foods/chocolate', Category.other, 4, 1, 0, 0.3, dairy=0.5, grain=0.5) decayable(rm, 'doughs', '#firmalife:foods/extra_dough', Category.other, decay=2) decayable(rm, 'butter', 'firmalife:food/butter', Category.other) decayable(rm, 'pie_dough', 'firmalife:food/pie_dough', Category.other) @@ -315,13 +320,16 @@ def food_item(rm: ResourceManager, name_parts: utils.ResourceIdentifier, ingredi if category == Category.dairy: rm.item_tag('tfc:foods/dairy', ingredient) -def drinkable(rm: ResourceManager, name_parts: utils.ResourceIdentifier, fluid: utils.Json, thirst: Optional[int] = None, intoxication: Optional[int] = None): +def drinkable(rm: ResourceManager, name_parts: utils.ResourceIdentifier, fluid: utils.Json, thirst: Optional[int] = None, intoxication: Optional[int] = None, effects: Optional[utils.Json] = None, food: Optional[utils.Json] = None): rm.data(('tfc', 'drinkables', name_parts), { 'ingredient': fluid_ingredient(fluid), 'thirst': thirst, - 'intoxication': intoxication + 'intoxication': intoxication, + 'effects': effects, + 'food': food }) + def item_size(rm: ResourceManager, name_parts: utils.ResourceIdentifier, ingredient: utils.Json, size: Size, weight: Weight): rm.data(('tfc', 'item_sizes', name_parts), { 'ingredient': utils.ingredient(ingredient), diff --git a/resources/recipes.py b/resources/recipes.py index d2597020..c37ae545 100644 --- a/resources/recipes.py +++ b/resources/recipes.py @@ -118,6 +118,7 @@ def generate(rm: ResourceManager): simple_pot_recipe(rm, 'soy_mixture', [not_rotten('tfc:food/soybean'), not_rotten('tfc:food/soybean'), utils.ingredient('tfc:powder/salt'), utils.ingredient('tfc:powder/salt')], '1000 minecraft:water', output_items=['firmalife:food/soy_mixture', 'firmalife:food/soy_mixture']) simple_pot_recipe(rm, 'cured_maize', [not_rotten('tfc:food/maize_grain')], '1000 tfc:limewater', output_items=['firmalife:food/cured_maize'], duration=3000) simple_pot_recipe(rm, 'tomato_sauce', [not_rotten('tfc:food/tomato'), utils.ingredient('tfc:powder/salt'), not_rotten('tfc:food/garlic')], '1000 minecraft:water', output_items=['firmalife:food/tomato_sauce', 'firmalife:food/tomato_sauce', 'firmalife:food/tomato_sauce', 'firmalife:food/tomato_sauce', 'firmalife:food/tomato_sauce']) + simple_pot_recipe(rm, 'chocolate', [utils.ingredient('#firmalife:sweetener'), not_rotten('#firmalife:foods/chocolate')], '1000 #tfc:milks', output_fluid='1000 firmalife:chocolate') barrel_instant_recipe(rm, 'clean_any_bowl', '#firmalife:foods/washable', '100 minecraft:water', output_item=item_stack_provider(other_modifier='firmalife:empty_pan')) @@ -178,8 +179,8 @@ def generate(rm: ResourceManager): meal_shapeless(rm, 'crafting/filled_pie', (not_rotten('firmalife:food/pie_dough'), '#firmalife:foods/preserves', '#firmalife:pie_pans'), 'firmalife:food/filled_pie', 'firmalife:pie').with_advancement('firmalife:food/pie_dough') meal_shapeless(rm, 'crafting/raw_pizza', (not_rotten('firmalife:food/pizza_dough'), not_rotten('#firmalife:foods/pizza_ingredients'), not_rotten('#firmalife:foods/pizza_ingredients'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/tomato_sauce')), 'firmalife:food/raw_pizza', 'firmalife:pizza').with_advancement('firmalife:food/pizza_dough') - meal_shapeless(rm, 'crafting/burrito', (not_rotten('#tfc:foods/cooked_meats'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/corn_tortilla'), not_rotten('#tfc:foods/vegetables'), not_rotten('firmalife:food/salsa')), 'firmalife:food/burrito', 'firmalife:burrito').with_advancement('firmalife:food/corn_tortilla') - meal_shapeless(rm, 'crafting/taco', (not_rotten('#tfc:foods/cooked_meats'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/taco_shell'), not_rotten('#tfc:foods/vegetables'), not_rotten('firmalife:food/salsa')), 'firmalife:food/taco', 'firmalife:burrito').with_advancement('firmalife:food/taco_shell') + meal_shapeless(rm, 'crafting/burrito', (not_rotten('#firmalife:foods/cooked_meats_and_substitutes'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/corn_tortilla'), not_rotten('#tfc:foods/vegetables'), not_rotten('firmalife:food/salsa')), 'firmalife:food/burrito', 'firmalife:burrito').with_advancement('firmalife:food/corn_tortilla') + meal_shapeless(rm, 'crafting/taco', (not_rotten('#firmalife:foods/cooked_meats_and_substitutes'), not_rotten('firmalife:food/shredded_cheese'), not_rotten('firmalife:food/taco_shell'), not_rotten('#tfc:foods/vegetables'), not_rotten('firmalife:food/salsa')), 'firmalife:food/taco', 'firmalife:burrito').with_advancement('firmalife:food/taco_shell') # Greenhouse for block in GREENHOUSE_BLOCKS: @@ -208,6 +209,18 @@ def generate(rm: ResourceManager): heat_recipe(rm, grain + '_dough', not_rotten('tfc:food/%s_dough' % grain), 200, result_item=item_stack_provider('firmalife:food/%s_flatbread' % grain, copy_food=True)) rm.domain = 'firmalife' # DOMAIN RESET + for bread in ('slice', 'flatbread'): + sandwich_pattern = ['ZX ', 'YYY', ' X '] + sandwich_ingredients = {'X': not_rotten('firmalife:food/%s_%s' % (grain, bread)), 'Y': not_rotten('#tfc:foods/usable_in_sandwich'), 'Z': '#tfc:knives'} + delegate_recipe(rm, 'crafting/%s_%s_sandwich' % (grain, bread), 'tfc:damage_inputs_shaped_crafting', { + 'type': 'tfc:advanced_shaped_crafting', + 'pattern': sandwich_pattern, + 'key': utils.item_stack_dict(sandwich_ingredients, ''.join(sandwich_pattern)[0]), + 'result': item_stack_provider('2 tfc:food/%s_bread_sandwich' % grain, other_modifier='tfc:sandwich'), + 'input_row': 0, + 'input_column': 0, + }).with_advancement('tfc:food/%s_bread' % grain) + heat_recipe(rm, 'corn_tortilla', not_rotten('firmalife:food/masa'), 200, result_item=item_stack_provider('firmalife:food/corn_tortilla', copy_food=True)) ore = 'chromite' @@ -219,8 +232,8 @@ def generate(rm: ResourceManager): 'firmalife:ore/rich_%s/%s' % (ore, rock) ], cobble) for grade in ORE_GRADES.keys(): - rm.block_tag('can_start_collapse', 'firmalife:ore/%s_%s/%s' % (grade, ore, rock)) - rm.block_tag('can_collapse', 'firmalife:ore/%s_%s/%s' % (grade, ore, rock)) + rm.block_tag('tfc:can_start_collapse', 'firmalife:ore/%s_%s/%s' % (grade, ore, rock)) + rm.block_tag('tfc:can_collapse', 'firmalife:ore/%s_%s/%s' % (grade, ore, rock)) alloy_recipe(rm, 'stainless_steel', 'stainless_steel', ('firmalife:chromium', 0.2, 0.3), ('tfc:nickel', 0.1, 0.2), ('tfc:steel', 0.6, 0.8)) anvil_recipe(rm, 'pie_pan', '#forge:sheets/cast_iron', '4 firmalife:pie_pan', 1, Rules.hit_last, Rules.hit_second_last, Rules.draw_third_last) diff --git a/src/main/java/com/eerussianguy/firmalife/common/FLForgeEvents.java b/src/main/java/com/eerussianguy/firmalife/common/FLForgeEvents.java index c0530847..aa5d9b9e 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/FLForgeEvents.java +++ b/src/main/java/com/eerussianguy/firmalife/common/FLForgeEvents.java @@ -5,21 +5,19 @@ import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.CarvedPumpkinBlock; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluid; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AddReloadListenerEvent; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.OnDatapackSyncEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.network.PacketDistributor; import com.eerussianguy.firmalife.common.blockentities.FLBlockEntities; @@ -29,7 +27,6 @@ import com.eerussianguy.firmalife.common.util.ExtraFluid; import com.eerussianguy.firmalife.common.util.GreenhouseType; import com.eerussianguy.firmalife.common.util.Plantable; -import net.dries007.tfc.common.capabilities.Capabilities; import net.dries007.tfc.common.entities.TFCEntities; import net.dries007.tfc.util.Helpers; import net.dries007.tfc.util.events.AnimalProductEvent; @@ -98,26 +95,15 @@ else if (block instanceof CarvedPumpkinBlock) public static void onAnimalProduce(AnimalProductEvent event) { - Entity entity = event.getEntity(); - ItemStack product = event.getProduct(); - if (entity.getType() == TFCEntities.YAK.get()) + final EntityType type = event.getEntity().getType(); + if (type == TFCEntities.YAK.get()) { - replaceFluid(product, FLFluids.EXTRA_FLUIDS.get(ExtraFluid.YAK_MILK).getSource()); + event.setProduct(new FluidStack(FLFluids.EXTRA_FLUIDS.get(ExtraFluid.YAK_MILK).getSource(), 1000)); } - else if (entity.getType() == TFCEntities.GOAT.get()) + else if (type == TFCEntities.GOAT.get()) { - replaceFluid(product, FLFluids.EXTRA_FLUIDS.get(ExtraFluid.GOAT_MILK).getSource()); + event.setProduct(new FluidStack(FLFluids.EXTRA_FLUIDS.get(ExtraFluid.GOAT_MILK).getSource(), 1000)); } } - private static void replaceFluid(ItemStack bucket, Fluid toFill) - { - bucket.getCapability(Capabilities.FLUID_ITEM).ifPresent(cap -> { - final int drained = cap.drain(Integer.MAX_VALUE, IFluidHandler.FluidAction.EXECUTE).getAmount(); - if (drained > 0) - { - cap.fill(new FluidStack(toFill, drained), IFluidHandler.FluidAction.EXECUTE); - } - }); - } } 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 d3c4400b..543eb30f 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/util/ExtraFluid.java +++ b/src/main/java/com/eerussianguy/firmalife/common/util/ExtraFluid.java @@ -13,7 +13,8 @@ public enum ExtraFluid implements StringRepresentable CURDLED_YAK_MILK(0xFFf9f4d6), CURDLED_GOAT_MILK(0xFFeeeed9), CREAM(0xFFFCF6C7), - PINA_COLADA(0xFFE4C06A); + PINA_COLADA(0xFFE4C06A), + CHOCOLATE(0xFF875633); private final String id; private final int color; diff --git a/src/main/resources/assets/firmalife/blockstates/fluid/chocolate.json b/src/main/resources/assets/firmalife/blockstates/fluid/chocolate.json new file mode 100644 index 00000000..fbad8e03 --- /dev/null +++ b/src/main/resources/assets/firmalife/blockstates/fluid/chocolate.json @@ -0,0 +1,8 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "variants": { + "": { + "model": "firmalife:block/fluid/chocolate" + } + } +} \ 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 47705c24..4258284d 100644 --- a/src/main/resources/assets/firmalife/lang/en_us.json +++ b/src/main/resources/assets/firmalife/lang/en_us.json @@ -430,6 +430,9 @@ "block.firmalife.fluid.cream": "Cream", "item.firmalife.bucket.cream": "Cream Bucket", "fluid.firmalife.cream": "Cream", + "block.firmalife.fluid.chocolate": "Chocolate", + "item.firmalife.bucket.chocolate": "Chocolate Bucket", + "fluid.firmalife.chocolate": "Chocolate", "effect.firmalife.swarm": "Swarm", "entity.firmalife.seed_ball": "Seed Ball", "firmalife.tooltip.food_trait.dried": "Dried", @@ -496,6 +499,9 @@ "firmalife.enum.plantertype.bonsai": "Bonsai Planter", "firmalife.enum.plantertype.quad": "Quad Planter", "firmalife.enum.plantertype.large": "Large Planter", + "firmalife.enum.foodage.fresh": "Fresh", + "firmalife.enum.foodage.aged": "Aged", + "firmalife.enum.foodage.vintage": "Vintage", "firmalife.jade.food_age": "Age: %s", "firmalife.jade.aging": "Currently Aging", "firmalife.jade.not_aging": "Not Aging", diff --git a/src/main/resources/assets/firmalife/models/block/fluid/chocolate.json b/src/main/resources/assets/firmalife/models/block/fluid/chocolate.json new file mode 100644 index 00000000..bea4e3ae --- /dev/null +++ b/src/main/resources/assets/firmalife/models/block/fluid/chocolate.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/chocolate.json b/src/main/resources/assets/firmalife/models/item/bucket/chocolate.json new file mode 100644 index 00000000..29ef5b99 --- /dev/null +++ b/src/main/resources/assets/firmalife/models/item/bucket/chocolate.json @@ -0,0 +1,6 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "loader": "forge:bucket", + "parent": "forge:item/bucket", + "fluid": "firmalife:chocolate" +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/barley_flatbread_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/barley_flatbread_sandwich.json new file mode 100644 index 00000000..a35b57fe --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/barley_flatbread_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/barley_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/barley_flatbread_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/barley_flatbread_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/barley_slice_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/barley_slice_sandwich.json new file mode 100644 index 00000000..6fc3cd7e --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/barley_slice_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/barley_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/barley_slice_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/barley_slice_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/maize_flatbread_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/maize_flatbread_sandwich.json new file mode 100644 index 00000000..fd1791ff --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/maize_flatbread_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/maize_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/maize_flatbread_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/maize_flatbread_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/maize_slice_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/maize_slice_sandwich.json new file mode 100644 index 00000000..c648d6a2 --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/maize_slice_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/maize_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/maize_slice_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/maize_slice_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/oat_flatbread_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/oat_flatbread_sandwich.json new file mode 100644 index 00000000..32fe9cd2 --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/oat_flatbread_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/oat_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/oat_flatbread_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/oat_flatbread_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/oat_slice_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/oat_slice_sandwich.json new file mode 100644 index 00000000..5926b901 --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/oat_slice_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/oat_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/oat_slice_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/oat_slice_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/rice_flatbread_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/rice_flatbread_sandwich.json new file mode 100644 index 00000000..a8338b1b --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/rice_flatbread_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/rice_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/rice_flatbread_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/rice_flatbread_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/rice_slice_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/rice_slice_sandwich.json new file mode 100644 index 00000000..de7d248f --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/rice_slice_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/rice_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/rice_slice_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/rice_slice_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/rye_flatbread_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/rye_flatbread_sandwich.json new file mode 100644 index 00000000..2adbac48 --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/rye_flatbread_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/rye_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/rye_flatbread_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/rye_flatbread_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/rye_slice_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/rye_slice_sandwich.json new file mode 100644 index 00000000..1961d00f --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/rye_slice_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/rye_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/rye_slice_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/rye_slice_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/wheat_flatbread_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/wheat_flatbread_sandwich.json new file mode 100644 index 00000000..b7e39754 --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/wheat_flatbread_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/wheat_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/wheat_flatbread_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/wheat_flatbread_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/advancements/crafting/wheat_slice_sandwich.json b/src/main/resources/data/firmalife/advancements/crafting/wheat_slice_sandwich.json new file mode 100644 index 00000000..1c170c6f --- /dev/null +++ b/src/main/resources/data/firmalife/advancements/crafting/wheat_slice_sandwich.json @@ -0,0 +1,35 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "tfc:food/wheat_bread" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "firmalife:crafting/wheat_slice_sandwich" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "firmalife:crafting/wheat_slice_sandwich" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/barley_flatbread_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/barley_flatbread_sandwich.json new file mode 100644 index 00000000..93038295 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/barley_flatbread_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/barley_flatbread" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/barley_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/barley_slice_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/barley_slice_sandwich.json new file mode 100644 index 00000000..9a449485 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/barley_slice_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/barley_slice" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/barley_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/burrito.json b/src/main/resources/data/firmalife/recipes/crafting/burrito.json index 3d87955d..7b68591a 100644 --- a/src/main/resources/data/firmalife/recipes/crafting/burrito.json +++ b/src/main/resources/data/firmalife/recipes/crafting/burrito.json @@ -5,7 +5,7 @@ { "type": "tfc:not_rotten", "ingredient": { - "tag": "tfc:foods/cooked_meats" + "tag": "firmalife:foods/cooked_meats_and_substitutes" } }, { @@ -44,7 +44,7 @@ "primary_ingredient": { "type": "tfc:not_rotten", "ingredient": { - "tag": "tfc:foods/cooked_meats" + "tag": "firmalife:foods/cooked_meats_and_substitutes" } } } \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/maize_flatbread_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/maize_flatbread_sandwich.json new file mode 100644 index 00000000..f48e2979 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/maize_flatbread_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/maize_flatbread" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/maize_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/maize_slice_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/maize_slice_sandwich.json new file mode 100644 index 00000000..daba1dad --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/maize_slice_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/maize_slice" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/maize_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/oat_flatbread_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/oat_flatbread_sandwich.json new file mode 100644 index 00000000..0827a398 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/oat_flatbread_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/oat_flatbread" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/oat_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/oat_slice_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/oat_slice_sandwich.json new file mode 100644 index 00000000..c80d213e --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/oat_slice_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/oat_slice" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/oat_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/rice_flatbread_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/rice_flatbread_sandwich.json new file mode 100644 index 00000000..319bd7e1 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/rice_flatbread_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/rice_flatbread" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/rice_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/rice_slice_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/rice_slice_sandwich.json new file mode 100644 index 00000000..1b51a1a3 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/rice_slice_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/rice_slice" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/rice_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/rye_flatbread_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/rye_flatbread_sandwich.json new file mode 100644 index 00000000..78dd2bed --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/rye_flatbread_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/rye_flatbread" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/rye_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/rye_slice_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/rye_slice_sandwich.json new file mode 100644 index 00000000..60d63c0f --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/rye_slice_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/rye_slice" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/rye_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/taco.json b/src/main/resources/data/firmalife/recipes/crafting/taco.json index a494b952..af94b458 100644 --- a/src/main/resources/data/firmalife/recipes/crafting/taco.json +++ b/src/main/resources/data/firmalife/recipes/crafting/taco.json @@ -5,7 +5,7 @@ { "type": "tfc:not_rotten", "ingredient": { - "tag": "tfc:foods/cooked_meats" + "tag": "firmalife:foods/cooked_meats_and_substitutes" } }, { @@ -44,7 +44,7 @@ "primary_ingredient": { "type": "tfc:not_rotten", "ingredient": { - "tag": "tfc:foods/cooked_meats" + "tag": "firmalife:foods/cooked_meats_and_substitutes" } } } \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/wheat_flatbread_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/wheat_flatbread_sandwich.json new file mode 100644 index 00000000..ea402802 --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/wheat_flatbread_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/wheat_flatbread" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/wheat_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/crafting/wheat_slice_sandwich.json b/src/main/resources/data/firmalife/recipes/crafting/wheat_slice_sandwich.json new file mode 100644 index 00000000..28ce836d --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/crafting/wheat_slice_sandwich.json @@ -0,0 +1,40 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:damage_inputs_shaped_crafting", + "recipe": { + "type": "tfc:advanced_shaped_crafting", + "pattern": [ + "ZX ", + "YYY", + " X " + ], + "key": { + "X": { + "type": "tfc:not_rotten", + "ingredient": { + "item": "firmalife:food/wheat_slice" + } + }, + "Y": { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "tfc:foods/usable_in_sandwich" + } + }, + "Z": { + "tag": "tfc:knives" + } + }, + "result": { + "stack": { + "item": "tfc:food/wheat_bread_sandwich", + "count": 2 + }, + "modifiers": [ + "tfc:sandwich" + ] + }, + "input_row": 0, + "input_column": 0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/recipes/pot/chocolate.json b/src/main/resources/data/firmalife/recipes/pot/chocolate.json new file mode 100644 index 00000000..20603cbf --- /dev/null +++ b/src/main/resources/data/firmalife/recipes/pot/chocolate.json @@ -0,0 +1,27 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "tfc:pot", + "ingredients": [ + { + "tag": "firmalife:sweetener" + }, + { + "type": "tfc:not_rotten", + "ingredient": { + "tag": "firmalife:foods/chocolate" + } + } + ], + "fluid_ingredient": { + "ingredient": { + "tag": "tfc:milks" + }, + "amount": 1000 + }, + "duration": 2000, + "temperature": 300, + "fluid_output": { + "fluid": "firmalife:chocolate", + "amount": 1000 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tags/fluids/chocolate.json b/src/main/resources/data/firmalife/tags/fluids/chocolate.json new file mode 100644 index 00000000..f63df1e3 --- /dev/null +++ b/src/main/resources/data/firmalife/tags/fluids/chocolate.json @@ -0,0 +1,8 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": false, + "values": [ + "firmalife:chocolate", + "firmalife:flowing_chocolate" + ] +} \ 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 04f1678b..0cfa676f 100644 --- a/src/main/resources/data/firmalife/tags/fluids/mixable.json +++ b/src/main/resources/data/firmalife/tags/fluids/mixable.json @@ -17,6 +17,8 @@ "firmalife:pina_colada", "firmalife:flowing_pina_colada", "firmalife:cream", - "firmalife:flowing_cream" + "firmalife:flowing_cream", + "firmalife:chocolate", + "firmalife:flowing_chocolate" ] } \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tags/items/food/chocolate.json b/src/main/resources/data/firmalife/tags/items/foods/chocolate.json similarity index 100% rename from src/main/resources/data/firmalife/tags/items/food/chocolate.json rename to src/main/resources/data/firmalife/tags/items/foods/chocolate.json diff --git a/src/main/resources/data/firmalife/tags/items/foods/cooked_meats_and_substitutes.json b/src/main/resources/data/firmalife/tags/items/foods/cooked_meats_and_substitutes.json new file mode 100644 index 00000000..b19ef7b8 --- /dev/null +++ b/src/main/resources/data/firmalife/tags/items/foods/cooked_meats_and_substitutes.json @@ -0,0 +1,8 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": false, + "values": [ + "#tfc:foods/cooked_meats", + "firmalife:food/tofu" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tfc/drinkables/chocolate.json b/src/main/resources/data/firmalife/tfc/drinkables/chocolate.json new file mode 100644 index 00000000..1313c421 --- /dev/null +++ b/src/main/resources/data/firmalife/tfc/drinkables/chocolate.json @@ -0,0 +1,10 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "ingredient": "firmalife:chocolate", + "thirst": 10, + "food": { + "hunger": 0, + "saturation": 1.0, + "dairy": 1.0 + } +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tfc/food_items/chocolate.json b/src/main/resources/data/firmalife/tfc/food_items/chocolate.json index 303af570..aaff8419 100644 --- a/src/main/resources/data/firmalife/tfc/food_items/chocolate.json +++ b/src/main/resources/data/firmalife/tfc/food_items/chocolate.json @@ -1,7 +1,7 @@ { "__comment__": "This file was automatically created by mcresources", "ingredient": { - "tag": "firmalife:food/chocolate" + "tag": "firmalife:foods/chocolate" }, "category": "other", "hunger": 4, diff --git a/src/main/resources/data/minecraft/tags/fluids/water.json b/src/main/resources/data/minecraft/tags/fluids/water.json index 04f1678b..0cfa676f 100644 --- a/src/main/resources/data/minecraft/tags/fluids/water.json +++ b/src/main/resources/data/minecraft/tags/fluids/water.json @@ -17,6 +17,8 @@ "firmalife:pina_colada", "firmalife:flowing_pina_colada", "firmalife:cream", - "firmalife:flowing_cream" + "firmalife:flowing_cream", + "firmalife:chocolate", + "firmalife:flowing_chocolate" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/doors.json b/src/main/resources/data/minecraft/tags/items/doors.json new file mode 100644 index 00000000..6e02aea0 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/doors.json @@ -0,0 +1,15 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": false, + "values": [ + "firmalife:rusted_iron_greenhouse_door", + "firmalife:iron_greenhouse_door", + "firmalife:oxidized_copper_greenhouse_door", + "firmalife:weathered_copper_greenhouse_door", + "firmalife:exposed_copper_greenhouse_door", + "firmalife:copper_greenhouse_door", + "firmalife:weathered_treated_wood_greenhouse_door", + "firmalife:treated_wood_greenhouse_door", + "firmalife:stainless_steel_greenhouse_door" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/firmalife/tags/blocks/can_collapse.json b/src/main/resources/data/tfc/tags/blocks/can_collapse.json similarity index 100% rename from src/main/resources/data/firmalife/tags/blocks/can_collapse.json rename to src/main/resources/data/tfc/tags/blocks/can_collapse.json diff --git a/src/main/resources/data/firmalife/tags/blocks/can_start_collapse.json b/src/main/resources/data/tfc/tags/blocks/can_start_collapse.json similarity index 100% rename from src/main/resources/data/firmalife/tags/blocks/can_start_collapse.json rename to src/main/resources/data/tfc/tags/blocks/can_start_collapse.json diff --git a/src/main/resources/data/tfc/tags/fluids/drinkables.json b/src/main/resources/data/tfc/tags/fluids/drinkables.json new file mode 100644 index 00000000..a427cf69 --- /dev/null +++ b/src/main/resources/data/tfc/tags/fluids/drinkables.json @@ -0,0 +1,7 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": false, + "values": [ + "firmalife:chocolate" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/tfc/tags/fluids/ingredients.json b/src/main/resources/data/tfc/tags/fluids/ingredients.json index 8f0f31e1..e8e475df 100644 --- a/src/main/resources/data/tfc/tags/fluids/ingredients.json +++ b/src/main/resources/data/tfc/tags/fluids/ingredients.json @@ -9,6 +9,7 @@ "firmalife:curdled_yak_milk", "firmalife:curdled_goat_milk", "firmalife:pina_colada", - "firmalife:cream" + "firmalife:cream", + "firmalife:chocolate" ] } \ 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 97a387dd..9f83928f 100644 --- a/src/main/resources/data/tfc/tags/items/foods.json +++ b/src/main/resources/data/tfc/tags/items/foods.json @@ -16,7 +16,7 @@ "firmalife:food/shredded_cheese", "firmalife:food/pickled_egg", "#firmalife:chocolate_blends", - "#firmalife:food/chocolate", + "#firmalife:foods/chocolate", "#firmalife:foods/extra_dough", "firmalife:food/butter", "firmalife:food/pie_dough", diff --git a/src/main/resources/data/firmalife/tags/items/ore_pieces.json b/src/main/resources/data/tfc/tags/items/ore_pieces.json similarity index 100% rename from src/main/resources/data/firmalife/tags/items/ore_pieces.json rename to src/main/resources/data/tfc/tags/items/ore_pieces.json diff --git a/src/main/resources/data/firmalife/tags/items/small_ore_pieces.json b/src/main/resources/data/tfc/tags/items/small_ore_pieces.json similarity index 100% rename from src/main/resources/data/firmalife/tags/items/small_ore_pieces.json rename to src/main/resources/data/tfc/tags/items/small_ore_pieces.json