From f5e94695c5c4ed8b79a16c6b799696f71addada0 Mon Sep 17 00:00:00 2001 From: EERussianguy Date: Sat, 27 May 2023 22:21:04 -0400 Subject: [PATCH] Some changes: - Make food stack more often when removed from firmalife devices - Added new textures for some prepared foods - Fix plates not giving effects / not returning the bowl / not acting as expected - Make food traits configurable - Allow composting nightshade --- resources/advancements.py | 2 +- resources/data.py | 1 + resources/recipes.py | 2 +- .../firmalife/common/FLHelpers.java | 6 + .../blockentities/FoodShelfBlockEntity.java | 1 + .../common/blocks/ConsumingBlock.java | 4 +- .../common/blocks/DryingMatBlock.java | 1 + .../blocks/greenhouse/LargePlanterBlock.java | 5 +- .../player/FLPlayerDataCapability.java | 2 +- .../firmalife/common/items/FLFoodTraits.java | 123 +++++++++++++++--- .../firmalife/config/FLServerConfig.java | 13 ++ .../textures/item/food/cooked_apple_pie.png | Bin 0 -> 399 bytes .../textures/item/food/cooked_pie.png | Bin 6572 -> 418 bytes .../textures/item/food/cooked_pizza.png | Bin 7421 -> 442 bytes .../textures/item/food/cooked_pumpkin_pie.png | Bin 6746 -> 408 bytes .../textures/item/food/dark_chocolate.png | Bin 768 -> 310 bytes .../item/food/dark_chocolate_blend.png | Bin 6182 -> 303 bytes .../textures/item/food/filled_pie.png | Bin 6601 -> 386 bytes .../textures/item/food/milk_chocolate.png | Bin 1918 -> 371 bytes .../item/food/milk_chocolate_blend.png | Bin 6250 -> 361 bytes .../textures/item/food/raw_apple_pie.png | Bin 0 -> 386 bytes .../textures/item/food/raw_pizza.png | Bin 7206 -> 433 bytes .../textures/item/food/raw_pumpkin_pie.png | Bin 6788 -> 335 bytes .../textures/item/food/shredded_cheese.png | Bin 1940 -> 426 bytes .../textures/item/food/white_chocolate.png | Bin 1845 -> 337 bytes .../item/food/white_chocolate_blend.png | Bin 6147 -> 348 bytes .../firmalife/textures/item/pie_pan.png | Bin 5980 -> 202 bytes .../advancements/story/all_cheese.json | 2 +- .../recipes/crafting/pumpkin_chunks_bulk.json | 40 ++++-- .../data/tfc/tags/items/compost_greens.json | 7 + 30 files changed, 178 insertions(+), 31 deletions(-) create mode 100644 src/main/resources/assets/firmalife/textures/item/food/cooked_apple_pie.png create mode 100644 src/main/resources/assets/firmalife/textures/item/food/raw_apple_pie.png create mode 100644 src/main/resources/data/tfc/tags/items/compost_greens.json diff --git a/resources/advancements.py b/resources/advancements.py index cf3473a4..2a43fe9f 100644 --- a/resources/advancements.py +++ b/resources/advancements.py @@ -11,7 +11,7 @@ def generate(rm: ResourceManager): story.advancement('root', icon('firmalife:empty_jar'), 'Firmalife Story', 'Things to do with Firmalife.', None, root_trigger(), chat=False) story.advancement('rennet', icon('firmalife:rennet'), 'A Useful Stomach', 'Kill an animal for some rennet.', 'root', inventory_changed('firmalife:rennet')) story.advancement('cheese_wheel', icon('firmalife:chevre_wheel'), 'A Wheel of Cheese', 'Craft your first cheese wheel.', 'rennet', inventory_changed('#firmalife:cheese_wheels')) - story.advancement('all_cheese', icon('firmalife:food/gouda'), 'Lactose Larry', 'Cut off a slice of every kind of cheese.', 'cheese_wheel', multiple(*[inventory_changed('firmalife:food/%s' % c, name=c) for c in ('gouda', 'chevre', 'cheddar', 'feta', 'rajya_metok', 'shosha')]), requirements=[[c] for c in ('gouda', 'chevre', 'cheddar', 'feta', 'rayja_metok', 'shosha')], frame='challenge') + story.advancement('all_cheese', icon('firmalife:food/gouda'), 'Lactose Larry', 'Cut off a slice of every kind of cheese.', 'cheese_wheel', multiple(*[inventory_changed('firmalife:food/%s' % c, name=c) for c in ('gouda', 'chevre', 'cheddar', 'feta', 'rajya_metok', 'shosha')]), requirements=[[c] for c in ('gouda', 'chevre', 'cheddar', 'feta', 'rajya_metok', 'shosha')], frame='challenge') story.advancement('climate_station', icon('firmalife:climate_station'), 'Climate Control', 'Craft a climate station.', 'root', inventory_changed('firmalife:climate_station')) story.advancement('cellar', icon('firmalife:sealed_bricks'), 'A Waxy Solution', 'Craft a cellar block.', 'climate_station', inventory_changed('#firmalife:cellar_insulation')) story.advancement('big_cellar', icon('firmalife:sealed_door'), 'The Dungeon', 'Activate a cellar of more than 200 blocks.', 'cellar', generic('firmalife:big_cellar', None), frame='goal') diff --git a/resources/data.py b/resources/data.py index d2680a08..d60a71db 100644 --- a/resources/data.py +++ b/resources/data.py @@ -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('tfc:compost_greens', 'firmalife:food/nightshade_berry') rm.item_tag('foods/cooked_meats_and_substitutes', '#tfc:foods/cooked_meats', 'firmalife:food/tofu') rm.item_tag('forge:leather', 'firmalife:pineapple_leather') rm.item_tag('usable_in_stovetop_soup', '#tfc:foods/usable_in_soup') diff --git a/resources/recipes.py b/resources/recipes.py index 6ed0a650..5f02f5d0 100644 --- a/resources/recipes.py +++ b/resources/recipes.py @@ -84,7 +84,7 @@ def craft_decorations(recipe_name: str, base_block: str): #rm.crafting_shaped('crafting/squirting_moisture_transducer', ['XYX', 'XZX', 'XYX'], {'X': '#forge:sheets/stainless_steel', 'Y': 'tfc:brass_mechanisms', 'Z': '#forge:rods/nickel'}, 'firmalife:squirting_moisture_transducer').with_advancement('#forge:rods/stainless_steel') #rm.crafting_shaped('crafting/embedded_pipe', ['XY', 'XY', 'ZZ'], {'X': '#forge:rods/stainless_steel', 'Y': '#forge:rods/copper', 'Z': 'firmalife:beeswax'}, '6 firmalife:embedded_pipe').with_advancement('#forge:rods/stainless_steel') rm.crafting_shaped('crafting/treated_wood', ['XX', 'XX'], {'X': 'firmalife:treated_lumber'}, 'firmalife:treated_wood').with_advancement('firmalife:treated_lumber') - damage_shapeless(rm, 'crafting/pumpkin_chunks_bulk', ('#tfc:hammers', *('tfc:pumpkin' for _ in range(0, 8))), '8 firmalife:food/pumpkin_chunks').with_advancement('tfc:pumpkin') + damage_shapeless(rm, 'crafting/pumpkin_chunks_bulk', ('#tfc:hammers', *(not_rotten('tfc:pumpkin') for _ in range(0, 8))), '8 firmalife:food/pumpkin_chunks').with_advancement('tfc:pumpkin') rm.crafting_shapeless('crafting/garlic_bread', ('firmalife:food/toast', 'firmalife:food/butter', 'tfc:food/garlic'), 'firmalife:food/garlic_bread').with_advancement('tfc:food/garlic') 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') rm.domain = 'tfc' diff --git a/src/main/java/com/eerussianguy/firmalife/common/FLHelpers.java b/src/main/java/com/eerussianguy/firmalife/common/FLHelpers.java index 45b96577..dfd68296 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/FLHelpers.java +++ b/src/main/java/com/eerussianguy/firmalife/common/FLHelpers.java @@ -36,6 +36,7 @@ import com.mojang.serialization.JsonOps; import net.dries007.tfc.common.blockentities.TickCounterBlockEntity; import net.dries007.tfc.common.capabilities.Capabilities; +import net.dries007.tfc.common.capabilities.food.FoodCapability; import net.dries007.tfc.util.Helpers; import net.dries007.tfc.util.JsonHelpers; @@ -195,6 +196,11 @@ public static String getEnumTranslationKey(Enum anEnum, String enumName) return String.join(".", MOD_ID, "enum", enumName, anEnum.name()).toLowerCase(Locale.ROOT); } + public static void roundCreationDate(ItemStack stack) + { + stack.getCapability(FoodCapability.CAPABILITY).ifPresent(cap -> cap.setCreationDate(FoodCapability.getRoundedCreationDate(cap.getCreationDate()))); + } + public static ResourceLocation[] arrayOfResourceLocationsFromJson(JsonObject json, String field) { final JsonArray array = JsonHelpers.getAsJsonArray(json, field); diff --git a/src/main/java/com/eerussianguy/firmalife/common/blockentities/FoodShelfBlockEntity.java b/src/main/java/com/eerussianguy/firmalife/common/blockentities/FoodShelfBlockEntity.java index 7f0ad963..12bfd66f 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blockentities/FoodShelfBlockEntity.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blockentities/FoodShelfBlockEntity.java @@ -126,6 +126,7 @@ else if (held.isEmpty()) ItemStack stack = inventory.extractItem(0, player.isShiftKeyDown() ? Integer.MAX_VALUE : 1, false); if (stack.isEmpty()) return InteractionResult.PASS; FoodCapability.removeTrait(stack, getFoodTrait()); + FLHelpers.roundCreationDate(stack); ItemHandlerHelper.giveItemToPlayer(player, stack); res = InteractionResult.sidedSuccess(level.isClientSide); } diff --git a/src/main/java/com/eerussianguy/firmalife/common/blocks/ConsumingBlock.java b/src/main/java/com/eerussianguy/firmalife/common/blocks/ConsumingBlock.java index 1e22d809..b6585948 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blocks/ConsumingBlock.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blocks/ConsumingBlock.java @@ -12,6 +12,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraftforge.items.ItemHandlerHelper; import net.dries007.tfc.common.blocks.ExtendedProperties; import net.dries007.tfc.common.blocks.devices.BottomSupportedDeviceBlock; @@ -46,8 +47,9 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player final IFood cap = Helpers.getCapability(stack, FoodCapability.CAPABILITY); if (!stack.isEmpty() && cap != null && player.isShiftKeyDown() && player.getFoodData() instanceof TFCFoodData data && data.needsFood()) { - data.eat(cap); + final ItemStack newItem = stack.getItem().finishUsingItem(stack, level, player); stack.shrink(1); + ItemHandlerHelper.giveItemToPlayer(player, newItem); Helpers.playSound(level, pos, SoundEvents.GENERIC_EAT); return InteractionResult.sidedSuccess(level.isClientSide); } diff --git a/src/main/java/com/eerussianguy/firmalife/common/blocks/DryingMatBlock.java b/src/main/java/com/eerussianguy/firmalife/common/blocks/DryingMatBlock.java index 3490a951..6b303822 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blocks/DryingMatBlock.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blocks/DryingMatBlock.java @@ -37,6 +37,7 @@ public static InteractionResult use(Level level, BlockPos pos, Player player, In else if (!inv.getStackInSlot(0).isEmpty() && held.isEmpty() && player.isShiftKeyDown()) { mat.markForSync(); + FLHelpers.roundCreationDate(inv.getStackInSlot(0)); return FLHelpers.takeOne(level, 0, inv, player); } return InteractionResult.PASS; diff --git a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/LargePlanterBlock.java b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/LargePlanterBlock.java index 30ea0a68..6099fd7e 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/LargePlanterBlock.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blocks/greenhouse/LargePlanterBlock.java @@ -195,9 +195,12 @@ public InteractionResult takeSlot(Level level, LargePlanterBlockEntity planter, if (!seed.isEmpty()) { seed.setCount(seedAmount); + FLHelpers.roundCreationDate(seed); ItemHandlerHelper.giveItemToPlayer(player, seed); } - ItemHandlerHelper.giveItemToPlayer(player, plant.getCrop()); + ItemStack crop = plant.getCrop(); + FLHelpers.roundCreationDate(crop); + ItemHandlerHelper.giveItemToPlayer(player, crop); planter.setGrowth(slot, resetGrowthTo()); return InteractionResult.sidedSuccess(level.isClientSide); } diff --git a/src/main/java/com/eerussianguy/firmalife/common/capabilities/player/FLPlayerDataCapability.java b/src/main/java/com/eerussianguy/firmalife/common/capabilities/player/FLPlayerDataCapability.java index f848dce4..4715ca50 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/capabilities/player/FLPlayerDataCapability.java +++ b/src/main/java/com/eerussianguy/firmalife/common/capabilities/player/FLPlayerDataCapability.java @@ -9,5 +9,5 @@ public class FLPlayerDataCapability { public static final Capability CAPABILITY = CapabilityManager.get(new CapabilityToken<>() {}); - public static final ResourceLocation KEY = FLHelpers.identifier("player_glow"); + public static final ResourceLocation KEY = FLHelpers.identifier("player_data"); } diff --git a/src/main/java/com/eerussianguy/firmalife/common/items/FLFoodTraits.java b/src/main/java/com/eerussianguy/firmalife/common/items/FLFoodTraits.java index cb88e067..6ec2bcc2 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/items/FLFoodTraits.java +++ b/src/main/java/com/eerussianguy/firmalife/common/items/FLFoodTraits.java @@ -1,29 +1,118 @@ package com.eerussianguy.firmalife.common.items; +import java.util.List; +import java.util.Locale; +import java.util.function.Supplier; import com.eerussianguy.firmalife.common.FLHelpers; +import com.eerussianguy.firmalife.config.FLConfig; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.Nullable; + import net.dries007.tfc.common.capabilities.food.FoodTrait; +import net.dries007.tfc.util.Helpers; public class FLFoodTraits { + public enum Default + { + DRIED(0.5f), + FRESH(1.1f), + AGED(0.9f), + VINTAGE(0.6f), + OVEN_BAKED(0.9f), + SMOKED(0.7f), + RANCID_SMOKED(2.0f), + RAW(1f), + SHELVED(0.4f), + SHELVED_2(0.35f), + SHELVED_3(0.25f), + HUNG(0.35f), + HUNG_2(0.3f), + HUNG_3(0.25f) + ; + + private final float mod; + private final String name; + + Default(float mod) + { + this.mod = mod; + this.name = name().toLowerCase(Locale.ROOT); + } + + public String getName() + { + return name; + } + + public String getCapitalizedName() + { + return name.substring(0, 1).toUpperCase(Locale.ROOT) + name.substring(1); + } + + public float getMod() + { + return mod; + } + } + public static void init() { } - public static final FoodTrait DRIED = register("dried", 0.5f); - public static final FoodTrait FRESH = register("fresh", 1.1f); - public static final FoodTrait AGED = register("aged", 0.9f); - public static final FoodTrait VINTAGE = register("vintage", 0.6f); - public static final FoodTrait OVEN_BAKED = register("oven_baked", 0.9f); - public static final FoodTrait SMOKED = register("smoked", 0.7f); - public static final FoodTrait RANCID_SMOKED = register("rancid_smoked", 2.0f); - public static final FoodTrait RAW = register("raw", 1f); - public static final FoodTrait SHELVED = register("shelved", 0.4f); - public static final FoodTrait SHELVED_2 = register("shelved_2", 0.35f); - public static final FoodTrait SHELVED_3 = register("shelved_3", 0.25f); - public static final FoodTrait HUNG = register("hung", 0.35f); - public static final FoodTrait HUNG_2 = register("hung_2", 0.3f); - public static final FoodTrait HUNG_3 = register("hung_3", 0.25f); - - private static FoodTrait register(String name, float mod) + public static final FoodTrait DRIED = register(Default.DRIED); + public static final FoodTrait FRESH = register(Default.FRESH); + public static final FoodTrait AGED = register(Default.AGED); + public static final FoodTrait VINTAGE = register(Default.VINTAGE); + public static final FoodTrait OVEN_BAKED = register(Default.OVEN_BAKED); + public static final FoodTrait SMOKED = register(Default.SMOKED); + public static final FoodTrait RANCID_SMOKED = register(Default.RANCID_SMOKED); + public static final FoodTrait RAW = register(Default.RAW); + public static final FoodTrait SHELVED = register(Default.SHELVED); + public static final FoodTrait SHELVED_2 = register(Default.SHELVED_2); + public static final FoodTrait SHELVED_3 = register(Default.SHELVED_3); + public static final FoodTrait HUNG = register(Default.HUNG); + public static final FoodTrait HUNG_2 = register(Default.HUNG_2); + public static final FoodTrait HUNG_3 = register(Default.HUNG_3); + + private static FoodTrait register(FLFoodTraits.Default trait) { - return FoodTrait.register(FLHelpers.identifier(name), new FoodTrait(mod, "firmalife.tooltip.food_trait." + name)); + return FoodTrait.register(FLHelpers.identifier(trait.name), new WrappedFT(() -> FLConfig.SERVER.foodTraits.get(trait).get().floatValue(), "firmalife.tooltip.food_trait." + trait.name)); + } + + private static class WrappedFT extends FoodTrait + { + private final Supplier decayModifier; + @Nullable private final String translationKey; + + public WrappedFT(Supplier decayModifier, @Nullable String translationKey) + { + super(1f, translationKey); + this.decayModifier = decayModifier; + this.translationKey = translationKey; + } + + @Override + public float getDecayModifier() + { + return decayModifier.get(); + } + + @Override + public void addTooltipInfo(ItemStack stack, List text) + { + if (this.translationKey != null) + { + MutableComponent component = Helpers.translatable(this.translationKey); + if (this.decayModifier.get() > 1.0F) + { + component.withStyle(ChatFormatting.RED); + } + + text.add(component); + } + } + } } diff --git a/src/main/java/com/eerussianguy/firmalife/config/FLServerConfig.java b/src/main/java/com/eerussianguy/firmalife/config/FLServerConfig.java index 0cd21b4e..f97d0a1f 100644 --- a/src/main/java/com/eerussianguy/firmalife/config/FLServerConfig.java +++ b/src/main/java/com/eerussianguy/firmalife/config/FLServerConfig.java @@ -1,7 +1,11 @@ package com.eerussianguy.firmalife.config; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; import java.util.function.Function; +import com.eerussianguy.firmalife.common.items.FLFoodTraits; import net.minecraftforge.common.ForgeConfigSpec.*; import static com.eerussianguy.firmalife.FirmaLife.MOD_ID; @@ -26,6 +30,7 @@ public class FLServerConfig public final DoubleValue greenhouseGrowthDays; public final DoubleValue greenhouseWaterDays; public final DoubleValue greenhouseNutrientDays; + public final Map foodTraits; FLServerConfig(Builder innerBuilder) @@ -53,6 +58,14 @@ public class FLServerConfig greenhouseWaterDays = builder.apply("greenhouseWaterDays").comment("The average amount of days for a crop in a greenhouse to consume all its water.").defineInRange("greenhouseWaterDays", 12d, 0, Double.MAX_VALUE); greenhouseNutrientDays = builder.apply("greenhouseNutrientDays").comment("The average amount of days for a crop to consume all of a nutrient. You should probably not configure this value unless you know what it does in the code. For regular crops this value is 12.").defineInRange("greenhouseNutrientDays", 8d, 0, Double.MAX_VALUE); + innerBuilder.pop().push("foodTraits"); + + foodTraits = new HashMap<>(); + Arrays.stream(FLFoodTraits.Default.values()).forEach(trait -> + foodTraits.put(trait, builder.apply("trait" + trait.getCapitalizedName() + "Modifier").comment("The modifier for the '" + trait.getCapitalizedName() + "' food trait. Values less than 1 extend food lifetime, values greater than one decrease it. A value of zero stops decay.") + .defineInRange("trait" + trait.getCapitalizedName() + "Modifier", trait.getMod(), 0, Double.MAX_VALUE)) + ); + innerBuilder.pop(); } } diff --git a/src/main/resources/assets/firmalife/textures/item/food/cooked_apple_pie.png b/src/main/resources/assets/firmalife/textures/item/food/cooked_apple_pie.png new file mode 100644 index 0000000000000000000000000000000000000000..863fc5f88c12a0f9454d496e8c289ab9f9669251 GIT binary patch literal 399 zcmV;A0dW3_P)Px$Nl8ROR5*?8k+DibaTvvaN;p_UgqT^7+9IeR(UMDqAee&&`VNhv4{-H0+M7}^ zB0}M=-lajf2|8GTrZ;sok&tdfdArx^12lBT^Z(BIpYwh256dbt?y#w=`1|pPY2HM{ z9X9o*eak@ZXxvWdfPviMBAqpvSeM1QM3}BrrYF^?<_iFHr83ogfm|YNO1HKww)@>E z@{ne!P9Pm&K4~Bd6$0r906BoWhPp^%U5L;3H#OI0sg5`3!4+~M3KgQo6nn=p?OmV5 zP{HnZGi~+p20hsQZl10ic!M4QdQwfBdwzUjG@BcjxJVH#rcmS|(^h|ZzxXm?M4`fE zd(6Y+(_+}cXg23+>kxkW`Z8e@c?f_j$)b-PB@Jv*>!F6 ts=SfS=6IKC+V3WVg^4M<4tnw5z!!FfdTqO=1epK;002ovPDHLkV1hnpwdw!> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/firmalife/textures/item/food/cooked_pie.png b/src/main/resources/assets/firmalife/textures/item/food/cooked_pie.png index 71129312a958ef6718faaf421489425b70db744f..6f134ac710365cb1683540a7c3ad7af4e1332dd0 100644 GIT binary patch delta 393 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 diff --git a/src/main/resources/assets/firmalife/textures/item/food/cooked_pizza.png b/src/main/resources/assets/firmalife/textures/item/food/cooked_pizza.png index bee7a35bc3ef148c8c8b4b349058077b285fbd04..952de074aef6585257b1835a4d5ca43b4482515a 100644 GIT binary patch delta 417 zcmV;S0bc(7Il2RoBYyw^b5ch_0Itp)=>Px$bV)=(R5*>*l08TRK@f$%95#kqganBM z6;3pTg4G!XK@7Hng^l)NY6%2vY;6K5#6|>b1r@=yob4V_xMCNLIHED=j_eq>t7?2c53OvDmsK#?KCApXqE9jRL$oclP zXW}z;P15sG!bUG0){Xm(9^7hJt<$ZYu!vFAR8w`|D?HWy@qAsy;6gcPOrrZ8;2& zcY2~?p~THq3o9E(b#Z>X2V-V{KzkSEi&Fr$vgJCViyB{V;@{&HV#lJ+Uj@db00000 LNkvXXu0mjfYMZ%P literal 7421 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 diff --git a/src/main/resources/assets/firmalife/textures/item/food/cooked_pumpkin_pie.png b/src/main/resources/assets/firmalife/textures/item/food/cooked_pumpkin_pie.png index 2b3caa6ec254cc3eb1f610b31d91d20655a40492..8e25fe6bd5450b9a6872755a2b5f10424cb7d43d 100644 GIT binary patch delta 382 zcmV-^0fGM7G?)XBBYyw^b5ch_0Itp)=>Px$Qb|NXR5*>*k-tkqQ545NSEZ#eQAtA( zgm8(RTAIQ|NC>AQh!Dyk8k$=h`!hs~#*DHsD59aF8Y0?UAHC=EiAaHjKN`%N7Y!Qg zJKgg==llI0&V_#uF^HV=4z&mIt80s5VK@7;L05Qkwk^4`p?}GDGMVW!620PddZkks zO)6GZNpgE!;Im7ku8B~@Jwms~g~RCtpi!$SJU%gv!wTLka`NUK6=m2bxSr) zVS-^-49t?w=6+Mw@*Af|Z0+Hhm@=G*&k~I#2>5+yy1`{3M=pQG`%Qs|x0X;0x+eSr cUGd+*C%4RnfJojG5&!@I07*qoM6N<$f?egXX#fBK literal 6746 zcmeHLc~}$I77v>ut~|9M+8QDXC_^UuBql{RAqs+oO%!D^Gl57pl0X7a>Ix`Tsn!MR z!s=7Mimy@y1Qk@YYUR0M!B$*AgjU4`3sgbgO+dufXP;k}znt&Oa_>Focb0q3@7`oh z;2fXfR(4h-5^1>5*DDBojxxL~2Z8sAZ9OQ7WcDm6I9wZq>c}d!QX-WRWNo5~AQO72 zghbMR{~&Ds76)g`Zr#|g%}wSmSbw{5`?cdPOZVGZM`ms2M%Ih6cZ6EzTAuMfq3+JE zNP9lit^HDY&ROyLON}<_GYcv+Z&nl~JwbnN{@9tdtMYR*!~DZ96S?jGXQqHB9iS$HmzTmqaA<1@1Ezo;thq(K$iBTJu!W zHDrwK{KgSx8OPUhlDTu9@j4YLohymGB~59MBNU@Yy6?PTTYcR&`QiRmt3Nxf5!Hr% zF!;Ec{nkS+d6W589~W-9bl(1-)5ywW&&&#grVMgfY08?)+(V7nd*W2(j?qpUVjebS z4I}LFh^W+SF)CB>aLc0L%4xPuKiEVhw9&)PMwMDSWaX@7cXbIK6z0(+=SC-%V-^+q zDfZVh&s2XDL|S!vvrn1nl0(fmt3sCL?1#s*!@CZIOqdm|sOE39I5;EFy<=W}%^V9$ zYuU8z_9mu?TOM`FAr##oIN`a751GsQBeGoCi--uky^$7o1$bWK;Uny}66mu|hPg+RLRv&mA!b zc1fU;%X=qnPHOoc3#dlq$xRp-a2R4P0;w6?6cshe)^nxnGwuUZz>QpIaI-8xu3vh?t% z7dDC|_RUkYHpIjBSe*9W70{$WLYLS*YqFUo8A;^DlFs)8i}3Ze`@T zr62RZ6zDeY{$2T<`|bFoG5NV@#Z{-Y;Z?*1qGrGK99C&6b3xvJOld*3K^Y&^%niJ*_mh4* zxn{oe>^vt@3uvWl<;YegDbXqjBvkGd!=f;ZQa?&h5C>u4jo3#~wAOZ|GUE$o`mh z!}XZlyK%n^>1^B7R>14APb?5BTx&(&y9IUdA9>14;tEfP{Vb*PAJ#?s6+SH9`e1$B z((D(lj?I*U4sPd+`X7*uVd!MNtWW3?y%40jWxh z8CXD&K7B+bJj_Fvo#&&ftZqg^F6YiqyRpdoBU6uJeO=opSJnpyVK)t}Av95*(6_2vB=#1!vl+Q^=q#(<5pr-Y4LJ7MS^ zkCZ!|$9ryd$f{4&6l@!lZcO|9JjhMB8w*>cB7x`WS?EB~;vxYfP(nDgMLH%$ext=A)(kz^8``DN4iTen8p zLP70i-;}T1p?O}in^iIKi{0uHK1XgsB8|3{f`cI3-;akW<*q2M6ces`xeC+)N`}b=rG<{hF`K0Pm6_w@+Q|0p4G&EZ8gje?7sG$i4=P@;i&?w{87~!2jD72FX z8db^SH3MzNYY4-X(Qg?pp#rCjmIvzi2>k>5bqr~YmdaH|4TJPRNgV5!Q^l)gMj0HV z5;8 MJ$|+H3M!spQoLy%vvQAm<>5+9 zit~(LB{+)%vltk}MwvLobd#5Qo7+ zASN4UKw>%z0~Lef1j?e*fE^>0VIO$zfkFX=?h3z}36!B)iBc^G?Il&`JE_)p3kB6JVmC+@x|enxLu_(Z&VC z#_&KmAhoEWI{>nA9z?_QR1>IHsSZ{uWde%9Te1Pt*i>YGU%T-9l$cS`C`{mnj_d0= z4>X!;9P+7e6aEd7C`PGM{C_yFMEg#~=goV%$NK9jJASS{1;h@R$rr?{4?){$CUxjv@q`i9jrb z0O2t>Vo1#5vLPCa26M#{CX3GKt=~U2JO+cuWc?lCaST)@W=bHjgbQehpka_0;lL0K z2#Aef5<1N7<&HlkJdSbqn1Hc(O!nUq9^h6s9hFD`M~g8)jR*=M96Am$xCp{!(%2XV zs_3<@_#?&1ff#Tw4d$^pJSOw+2#?^>F$s$X!effT8-n2win0iZgRz)m8p@Hd;a_$3 z9|;eE=&WFv3yv-xy?^)kRKxA&CDZT?=fA%{Zy*=(4fg|{&~ONd;#De{lu*CUQ7<|B zf5;8c?>irUPko?RuePUBl?YDI7;S(~@mBM15bQSK3(tA^-dXhC*k+i^*&wil!12=eqUXG zTDq)W{oO?|h1p2kOBPmLbv=z&VDw7B7=d5Q z7s=IiwpA9HwsxOy9%uNp>f##52b;3&moSIk`q$y|@{^O#$uek8v*|R;bYI4irEQy* zgXeZ@+tOi?X@$4!bgkFVo~Z=S3R#3+kC=hSvvw9fcOEi3GIEDe_HOmIx|5al_1zWQ zwvFH3)AX&)An>G?C~uxPrMPiqNXdtjhJ9w@$2fan*@O@3NJS4$nv+P0jPx#@JU2LR5*>*k}*%iFc3zcs{|2O9y+jq zkWeMMM2sEy{rm%@E(~3&E|s8agYDv&n4z*sNPv#;O_p`<-N`=q_YtQS&dXTEX>4Tx04R}tkv&MmKpe$iQ^iuM4t5Yx z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B8UL`Fns^#*d7t}p^eTCi0X~st?f%Ws^E4huXp zY-CdN#9?Bw*uioKvy!0_PZLKJRik_%>$1Xmi?dp(vDQ8L3qyHrCCzo3!-!)E2_zvx zMh#_DU?EDYMt_Ql6z#`6{6mgENiLaOWiWCqpb8a|;|KqP-`$#psYy2}6a%_nZ2Myr z=-CCDb=&?vw(aH#;C}|Lw6?$60A@c)ueY_x5zxO4TwJ#`c@MbU0S2FR$&eh$Pg5uq zfcG={rW`PE3k28P-dg)OeE>4l)$$E+a0rYQDSO@H-G713-u^w)>hA|9<#LJZVa^Fhzs(TmS$732;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rf3J4A( zGP32!kpKVy8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0N6=HK~y-) zrIJeyf`2d+MK2BEBN#(MoVo>OF2d!wHW$Iv9T?-JAwj~Yz@T*?ZKxnA`bN#`JLlar zwa!U`e~PRbP6_>8Fb5k6QbLgu3V*W|0K_$9!dNf{SyLj*nOTCAPz;+iFphlOAL?!@ zSOUk}SySo>Ou@G2swY#B;dK{5*{kYKo%3h$PGWH6d!vm25C$&Vo+HbdlG)>7&mj}g zb9}^+kGAIuI_(aYN=Px#=}AOER5*?8kg-p~Kp4e;2S*}z(S(J? zu#l)jqljU^HDYaRC=1CD`^#DD-o{p2eEjxVZR|OWwVE@4I&g|M+{TlH3KC z(lj&)r#`0uM%Ne8x9!HaF48>@k53Aq)i_l_-?kaw92&O(c7KIJYh5!MV==~hUe%){ zqt-xceH2)(6Mwc`Cq%9QVE!6^W=axgIj7wY&ZT6z5Pg`cW`M{QbUXeJ4-F>aRIN5b zoaHRi{kQMliTD+73$LrHDHsj};LM)zmTmwz?-^cJt~M}yo~fGnbx<%I$o=h=l>1-d br|>&wUROj8(GDvO00000NkvXXu0mjfZfkwG literal 6182 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 MXD_F-j-iSF0w&ldq5uE@ diff --git a/src/main/resources/assets/firmalife/textures/item/food/filled_pie.png b/src/main/resources/assets/firmalife/textures/item/food/filled_pie.png index ddd9682b76dd48cd11f067d968cc5305dd0b3093..848e1dd9e52293e5e955103debf61dc49a0aed5c 100644 GIT binary patch delta 360 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 delta 1904 zcmV-$2aovk0{#w=BYy;JdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+RayKlJq7F z{jXEx2$n!B$6>9?4RZWEmUgc*(=(H=Dy9usfb^s%u$$UHe|P!|m&jqsst+zYci^(o zMoH*|V_j+1eArphJQ~@SwhRreSuuz(Hry*apTqMRQYHQ+*??Ipp5P&@H*tX-0=3Q(~ zR$gE9j$1n&?tkb$dpiy2Y2YCZT-$Q;Ii9JT|8l$RQ8%j63k@|#p71={VWkBV7nCLSUt*-Q3^*Ekl5LB<;0!1 z%}(J0j8>X>v?4{!lm&1RrGRh-)hOJ>n`o*DNP~h@F@KOs@3gV-v>T_r!U2{mW2!Ke zF_wH;=$%QQmEOl*Vy3-kco8fz<37S@MvZA;g!>Mv&H!J^eL`+x4JgzZ<^TuNk(Y|B ze9bL0i8h$0XxHXuU)TDf$ilV)3>#2zI5x@-$sppH5y$|75+6Z~l?(=0RVqM=HO7G( zYyy}jtbg%5=Zeab!Mr_9zVvH%lW`gGAC}DnrBuh5gX3Z}99CFO5 zAbpB0T3qoZlvq-gYAW_|b=B8UV@-`4QmNUd)PG#_EwtEDN3M0#ZP)I)@1e(@PS!T7 zPvsk|@n%gXQ)8Y#S%cL3)zZutC>flAF|iEB{a^qIErYWou(dLn8=M_c#^ERcse_x! zM`9czeNG9k1;&8C$z>#Pl%Oeci+) zA%96O$+S*o^g|l2)L*r9{BIOxwu&Di2a9KIQ(Q~W$cs7W_+CrjT@Vf_0|9H`js%@> z@CiVEMc$iM>~FlJH{74z9}@=Niq5SlV6Wr_Ek>)679cCOwAoDvlleiI=<6_OJdLHg zAUZt(#ymxy#wlIvf*8urVbQN(3>0y#qJPqG5WE=wE=u|@&C$APyPOHr>Fx8)@U7S_+DdV@?}N?hN6uW)oTrZ6T=MlWSP`}4@qe0l zfiymue6aY)A6*H2_T>V^Ztn1sRoSPJJyE8WkdeC!7vV>(>YN;7XZJxW(Mu>-2v>qW zg0hj&=TP2+iY`*(|B^zB7!Qv7@$TN^?j0c1%S<&p#sO8cj8r@(W^*fI;1xl11AiF8sKiV? zkzUBab9~*y$Je_k&+(&RnhatG*t z(j`N3BtK1|PypV~=$mpt-z^Yab$e^>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{ z007=eL_t(I%cYVr4u66$6o!8a4J0%W!^GwtIy!p|kLKVtx_ANaU`z~)1Tm688o)u? zl!&D0o0^yR{qIX#XCKG-r^u3F!R7A(Q?ONl;1YsM&|uXA=#LxLTL+k+tP5m$YiA(1 z#IR`uriqKo^#;>|*n;MESr=miTd-<~?kNj0-0m!>dXJ~n=V^Ocz74h~YPAsnB1Ta) z1XlLO-f9TIB&f=pdd7%R q0NpJ3VPIO=fRh0##0LBtu(V$I(4M|JMiU4C0000Px$BS}O-R5*?8lEF&DKoEw%4Y^bWODz^b zr9uKyFCKD`+=Xbp6;8uIo~*R+kMf&&%@SqyRt^$0~6vmw(H|694vj$klyYIF5s! z?wl_E&0mShTCFC;I`vI()0v@7raGNqoOxmbKbmKFV=x1tF_=;B#S8*}xdXdmNVBMM zythLX$N15l;bgH^xv;I#9ZhM!g=heVWs9c2pc9O#_kJGZWB#eEJDRF^W{F8x$gfT~ zJuLF{>Z_dc!ASRAvmXi_!1Fu+VV3f;*$)LE_l-00-g;1fWB14q0PUBSOgR0!wPPxn hrM$E(OZjOI@C9$JhgZX6{&D~S002ovPDHLkV1f*vpsN4? literal 6250 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 diff --git a/src/main/resources/assets/firmalife/textures/item/food/raw_apple_pie.png b/src/main/resources/assets/firmalife/textures/item/food/raw_apple_pie.png new file mode 100644 index 0000000000000000000000000000000000000000..848e1dd9e52293e5e955103debf61dc49a0aed5c GIT binary patch literal 386 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 K1GfuO7ycWO{6yXW diff --git a/src/main/resources/assets/firmalife/textures/item/food/raw_pumpkin_pie.png b/src/main/resources/assets/firmalife/textures/item/food/raw_pumpkin_pie.png index eb633820c4668ef255cefe05f947c5e0eda5c3f5..95868adc5070479c0cb47e14d82b01139678ada9 100644 GIT binary patch delta 309 zcmV-50m}Y_HO~T&BYyw^b5ch_0Itp)=>Px$2}wjjR5*=eU>Nd%5u2c=2-|;b;z`M2 zjG>)Na2o*AxN-jkxY&nxui@Ejm$1_lNOK7JmA4MI$C zgJ6a*qG(3bh>Oi2#KaIE+{&>1%`ZkKWG}!J5n>Ani88$Y@qdSbfq{Vm#Q-5GaRx#F z#Y^Z0@JOOcV$&?3B90QUEDQ_`aOZq@_nJY@SQ*Y{U|?Vn5E4Z(E$nf>}E`~E-{xPB$05b%42p|AV^WXpgjaF+%>&Sq!00000NkvXX Hu0mjfTq}o` literal 6788 zcmeHLX;>528V-x1sJNo22q7Q{GGww(Vh|-DL}d|>MX@-UnS@|AvOvHM5x7XLLfvt# zih>I+bwg1usHIkM!L2F+DhgI8E?lu<@ty=!y!G1ab8Uag^8_;Iyx;rn-#N^p;6T4V zmcuMbBvK!tzfTDG+t2Xn(H;D@fA$(Bk<1#C!y>gIXd+pqR*I!Ef~-wa5oAIy6_ZH% zn@thZS5_fCe!uP}?rGXG?(C&!>u!{~&o6Yk^-vu#a>Z7!TRgUn!?@_|os(ZT*P!jC zr`bE=$Hw_PL`HiQof^9M=G^=La(Z;_nSP(kGcxD8xxi`D{uq|+%kAqL7moa?_LYTT z+R{Z&k(??tMwwydM|Tv#P4IFnLD}q7E3+i!*^I4E?hT$;b71|LOLN!$)&swX%BUxf zAIofH_4O*NN$!jWSaL(TItf};HL4rf43q1Rrjnk zh|`bn%!qC&Soi8#-P#p*`)KO?pu6@e4o!{+lmDSC4 z)j{`}K2>&eq8-uv@&5`RS1mi(ZA%EHyZb_0)=$iQ>a+riPx*SsQ5qtOzT(G4J0s1~ zs%)8v>Avp8k#4ot{=a3VudF#xH8liLm`Jpq zCM`?#xdEqa7iIf(8#^>(`RRBQ^EywC&zV3clI{J6!)H;T8PAJPBj1zKR+0N(+?1EH z;$&&Y%SC}x1UJ4;tZu8_60vcP)qv>74rw+I?yTD4Gh}XW+JtXh#n!rCSg~QOT&7E4 z>d8ynvqhE5L(Z#mQ7)#-@IIgZ^`MA3Jx30P3hJ_+78Jf57Pl)dZbwo4vJB1U^ucQn zT~Tje67ox7n_Y6_&Cm;Gd2Ia19Y34+27kwx{G1zm=M8J#GQlOTI6F7%iFcn#7(d`5 zKk(J5-kJLx$#yQLqhdF#jv872^W+9+F`IU@jIp_8;JOI|Y2*gpK6@?NYF1=XwOBJh zefY*7*Yvy{L6$gcso8CdZwG%y{k>0jfZ0+fLDXZ+B&3hPUVf89c(N4Ct zrGD*86=G65sG@swHKi^irV>hJCg>>&RWwec|YFPJ7n2HHtT+z0R7rM6$$VN@eT4qH;n!b9qec{RTeQ>-BfC zVW}~@4ss@LySA(;M{#zZFE*iHxoArh`_cWW^t!9hlOu1JB)FBVy=OntXJ=MLjIE?^ zb%lNUleBrmU&aYiYXm)Ck7>8)Hulc7B=^c!p#8-k?0cz7iy8XfGmB=G0{1p+ElzcD zN=Rwp<`Xlq+Sg^j1W#YNJGwEcL~$$3?uUu^**mUOhs|U3aqQGW(!#uyHhf0oU}>?9 zd+10(-$!){uP2j-_?`DQ*O5pj=~96pSSS#@nKVGpy16-?{wIS6r3Z!P`MOyp^y_~v zc*X&;+uc!9-BZ&m!(*?O*5%E=xYa=zA3rF%msPua_=xCrI-Sbeywtv*pNos{5Z5Os zwqB(C&}(UHe6{C4T7NZ5n~+{0zHYuLZe>nZ`6-!VYVTr7rpXI916{NxnR0yf0?FLl zp)OZvESDs;{vLIFVl|!;_;cKq&<5x$zC+w{%-G%3$x_qj?@6}N;KOWtss=m7`JZ_gRsJ$%stLZ|``fL5} zMtYkHGqa}%hFV8vRu<-nD8BWyzOOgk3;K4FbHvcaw!QMb)9YT8zOHSRRg_)Xx^_^O z$!+SP-)W}i2@Axx50xyHA4@WQv2nrZ-A#MgDK~;DAITxLd5hd^$aQ%@wV6j^$^w@e zbSJ;3mj_sOtNnfP30I4j8dJ|%zgA7FN9K~~%$@g#*Vgv4fkK`iEkCw!y{7H(c2v zSf*0QMu>KnCnYibE&dT9ckGS-sJSL0${h|h#h3h?AfiPdUVJSsIY zG0`KD;h|JZs5CB@ONHrFIvoNCNRy<{qIyW7aWqhLaQF}!ObrTJs#K5-oTx~t(|S@U zV4vJcZYXzOJy`5iV0bptYqU632p*Wg9{`}zVHkm6Iz;DEyUK&zfPlBs3QcDeK|HB? zR7ItEz*M>XJqeB0H{qSW4@zjlzzIwZAv8*z8Y6rY2!+H)gp7~_Lo|Sy_8wj<6~9Z+ zd;S=9{$L1D_m=-X^qY7YZ864`=cB}Q2BktDPl~}_923{*IvVlgo`Mu;(p!(bs0lZ`VV5uJsBia~J#WzlI& zq=U+k2j2K#p(lmz0UODUE5R~UD^{xIpuMCDT$!kOw-qLp6QNqv5H=c{O=B_`fR2XH z=p5QRP&lF1fHF6*(qIod-ME8eya|941?47{qY{FuQb>#&hQ#oIJ0P^Ep*sMxaUFQW z6Q~JPt5k<6l`>C?!8Wpi(%4jFerLPzCMz+cpb<>qhK}p(Id4=#H9qpG9|Qk^DKu7@ zsQBM_-a+58j8|(DmFihR>L5`ZfoVU^^C9qCrVudgG+K3%@K2oj4;;UvVEuutQk~RA ze<%^(@zgPrWKv_O$YkRf;GtMY_%&z(fg4i*;@Gi;#i9xc0p@LIv%OiDexQ(X21m?7 zXb2>tF*pztVIUAH;vx`+;cOO+z#=ihc%NOP6l)VvH8EZSY5?RJG?y{YDP2d3NKkUgBkWHS*IjAt4b1@3XVkO-sGAQXYwOeUyM2AlYN+2cSAIE)7K zSO^cM{~hje2{uy%(@==Pf|(GLg8|P(Y#PLY2?hscb6KL!bLg{V4}s{cFqq4uf!?FN zagR?m+-}}X8ouHD4+!9Ooke`Z{eUMl90H*_l}aWh)bG!zH#7Uc;JV0no)3Q}-WAp% zEl{eGzzG_w4N6peRQ(5l9SoDD7@^Q8KW2JYNJm(@Tmpg39c$on3GS-Yx0lt<2@Nvz zSN?QP{=ZTMnfyh`C&l+mxW0tzlOpg*;4jtnC0w5rflmT|sjkl!F3WeXy9fpNpDPi( z%v#e|P!3*%br((Y^C2~pDoEk}M}}gK-V6N+T($w=9~6V1O?w^q!4d|}T+9rVptH?Ql?*B>*f zt#cn2F|zftsJT7IYb$;K1gbno=uv3Ct$pytsb^G7=M_1gtH~>JMlAWEVTaSiZG+a- zy?n6b>Sf1L@;|R+G;wPy5fg{B(2ZVImG;s53t~twelCu`=_R30N9y?(W|PY2t#cBR zR-dEK+&A#~8o0Mf@I>9JQE7YQZI2bnr;~EG#gEBbuBjP)Nz(SByrv=XQhIZ{-wV^G X(UIxaCr-e?dy>#M(5KLQX6nBIKq9(3 diff --git a/src/main/resources/assets/firmalife/textures/item/food/shredded_cheese.png b/src/main/resources/assets/firmalife/textures/item/food/shredded_cheese.png index 3839b69e8e2599a13c5625fd254eb52f959ca118..79f8f2632f904710007b799e3fce9efe00758753 100644 GIT binary patch delta 401 zcmV;C0dD@352^!@BYyw^b5ch_0Itp)=>Px$WJyFpR5*>zQ!!}5Koorur;?DZltPwU z>{98{Aw!1lE)t4E*H&moGdM}<*ww+MuAM|gaB?YfWA%CuJFNIJ_6R1SP&xeO%-9kzeET=1EegpvMdBN5JN9ISuvb>XG-NL*d z3Ubd2_HUs@HwsE^R<;Tvd2w@%`|2we<1Uud6}~>d1!+5fuw5cfAoC-PY7G%{B46Io vHOi_$uyf-DC|iY7eNIDunP>fhbMXr$eZJS|`&l#q015yANkvXXu0mjf(ZIEC delta 1926 zcmV;12YL9a1C$StBYy-?dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgOc4 z{AU$ef+Y}w<%rig*+G_{0%PCD^h|ns^4aEI145Pxl`z=#fBqisFI-F-To6q$$9Uih zIb=38(s5p8-RTJHzB|X&c#*q%fFbgz{n^dDR+l1Ox!*B19$d(qV)66-cT#SQNS)@6iWODR z$;9AzP@qOegZio~RX_~fSy3}r_Dhz)Mds=!=acW?Xn(N!?3+)>hKgMA5c7?NmfyVG zRZ7VFM$lw}FQ;#94)pUi ziS=MmR+tkeXh%6s6ro3M`N{KK{elvXb9IxpZ2%#HZvhxAp+H9@FBIueW+g%#6ZkP8 zXCJtbtA9iy+<=mU_Yve^6~H&1QChkze2Ve*1QFsR7HR@P2C_mBq>qN=kV7V3f`~*> zNs`5)k8_2^sBylAO}z#cjjEb7t0kX8k`$Aslyb7n**mNlv557#IwlSO(qPJ(&BDHy6^Ec;k2G+@$XRV9rhI-kAH5w+~or zbAL0ai?Ou|-3sdAvHS*Q3;V{2)^QVUj0TcspEtn*K^fX zn{WC(R6_S(#O9tsKD%PssPGB!!+bt~?|)AG&m#jn=-D$IQR_J}KhS875k1tEOA){+}XYiN`7xvgd==TNRO(Q4wO;YH&~;bmY@IeWvHy1GNw^T&Hl zBhpsnszSLegE0!(*tX#^ik!Bc;#gv*5~3F44eQc?!fo8nQEicGit%)m@c~krJAbtU z+3O_IX=X@Lp5GH!cb;uNoP%4F2wN|=Jm>#pQ7as-UN_SmF2De#TP{J(U}z8gaB^>EX>4U6ba`-PAZc)PV}Aeuc-lRR!3}^g3*d* z7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u9b5%L@B_rr$w|>gO8j3^Xc6PVaX;SO zd)&PP{LLy;&7KKB)hr{Oh>N-WswlidKo~=aLXeoLCo_v#c#f}o`1pDk<5}M4{u~2J z!DN6>B%WisVG(Z-&um&c=YM_T5GzXx@j3ChK^G)`?i4sjutrr2DgEW>y9Sx0hc>K_(_)x$&msy{ly~ien#Jv2ZnEf z{x!F^_C8J@fGl;jd;=UD0%Il0UiWx+Uw3c+o@w{@19Jazr=T--OaK4?24YJ`L;(K) z!T@CJ)0> zOwgrD)r|#-Q}ixefDx(3;51x(iQ-fwuFs> zqCoV{kY@wlc3f|d)eJBv72E!tRNS*?w7c2rVokTYc&oQ_q5qSQE#)X&BZxI(ssI20 M07*qoM6N<$f|E~_0RR91 diff --git a/src/main/resources/assets/firmalife/textures/item/food/white_chocolate.png b/src/main/resources/assets/firmalife/textures/item/food/white_chocolate.png index fd1390ae0350831a3f5b6d0f554a2908f4f5e896..bd61953eb4dae348bf93eb40f23c7bc12bc6b29b 100644 GIT binary patch delta 311 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 U-O&ZcHUIzs07*qoM6N<$f>B?Zxc~qF literal 6147 zcmeHLXIK;I7LIx;%VIASQ9=*}b<#*eCV(iR1t}45DGEB7OdyiRB#?+JD(Iq81VI)> zS5OqhwW2Q76%@hs3W|yXVnac(fVwUqmOBZEc-QM*?{oK`@B}jFd(V5$ciJ~I8@OJs zBlV2+a5&sZj+>JY_J54}qpOYmHGT08!r}grAMF>Q@PU+g87dVBMF?K8T!!Egl~91g zshSS>3o~9=>c6hDYSVSYXS5#9>~7PRzqXo0irD||>yu*omcDWCC6~BAae8quj z7=QF`TtcnTgwa&<&5rE$)aotArd*5M-CY|OJY}@u^tgt9HrJd#S&=;FKwnYp#W^ub zg_HY(bG`UINZqDC%1qEA+aO*23pFJN4KmD6f1A3a8!O8NuAlc>rDS?9S2mC^MoO`!nnoY8p~;aNceU~F;Y@n{z@zFYGKK_Yxi*z%ue9+ zjV!aL7@4^?S+5{;8D@JAM;RH``y8iLPPA+^ZpDu(z#Vy(oJYx6muIwp#@aEhiSe|2 z@Ab$5{K~SCdSLpQ^%KX=2#Iy#)E0$6wac&lc;{ZyFCk?wZt9q>)SG@CU!i5{xZcb; z*#+8~u|7J{>}=+^*y$=Sl`Z7tzP0ciV}4X)dkXBO_0U(8dUqo!=gj7r{<~-D6_<2` z=O5Xd#K^4|*fic~`{i&IK+g@bzQ7P3?41-OddL;;dzIf5TzqKZ?mfn%a}q17ObaR= zzj+$_3MB+vTb|9xF6z|7=M;zU9T9jwxHz$3!F45fV&z<`;O*|g6w5Fho=_2{oZ0PT zgPh)^Xe~tx=66s2Z6C44vpBRRB>%fU0rv;qZoRAcg_F}wwMAwTZYu*{N9~V!bvN7< zcsDZhQo+uX*DD*Jko{imDQ+3JCv5rNSwQk<0(sLfJN;_%yb4-QtG400(8i_3p67NVK<>_rIlN_<-$>fU} z-j_!m>!Gk(3(q%LIkZo3SAqDtIZ-iv7Es4{$IYhpp+}Y#Q)U;g)U`>7y32`ltd@F_ z!-+44_x#ZY?M(B}e3MkYbL^g{Zkl~jZ z^33c<-rh!o#|{R4Z^!lS<31_Mo3>{AEGk%VeaqevmV)U|hc?EPT|T+%-sP5;ul!n=D>8bm;1KJao80GS3tw$Y*57e&<*uskv3C{$1@DG! zF$Jg=nH)15ZrC~@o6Y60+3#l-HmSC+Otp7AJ=dgaiSHi5LLJ+DCO_Y6(#9oB_lXHh zbB;|6iX<2R&JL?j$t_~)9n{isn6!Tsv9^R&q!)WzXMI*y+OCB3o?mk>63)i8#*~$I z7p>6IeM$AbkZhT~EF*Pe^%;@GS-;Hj6h3-vRr(nZ`_zz{Q}XXyPFG(m)vbFzr@Q^Z zg6Gpmd{1~b`|`*H)ecqk<$ADle0%`MXMNp)B^` zN0RO{1Qu+IpQeqPRp8R=*nq5iF)8%;V&uY#=LXs@n$T^JXz^pK3FF)x*Cx(naDP~* zd%)Ogy3aAw7hR*lx6_LGsCacMJauAziityy>FcKrvpo_^ITeN%dwI>K=5v=Cgk2H! z^<6(PdB*B@Mn&~OZ{4S4_D(BrsIPRLdy659XsN$ve;d^?RMlIs(P<8zIb7V$x(8Y4 z+;_mm@{T_mZd5-Uk&<&TL$W%Kz4Vw{WBAn0r^`B@+_Jv#HU`%@A8ka40UNOcWrYws zL;^fLSg=$~g!ob(LR5)m*dc?%**U0W5FCyu@H`|`D6uDWmi|h>3;Fg0f4V2xQ^rQZ zgl^F&;v4Pd2SZ1rB8i-(vL|SGS=e{Am_)#9Ac}B%LVzb1 z&z7PHo<^h*$$+y;7)2$_(Zk!Jd;!bH$z^~7yRs*QDHJjmiKJ92iArmt6b&U&KoBI6 zsU#{Dzz~3ZxkLe}0EygOP0`Qcgveo3C{qZf61njl1XCmM;da4 zbJPcWpVW~1VP`qX2a!u7Q5bQKLL>_Fp+;q*Ncm8kk#a;W()can3rLt#8p}g=pO!)|}5DGpd=%f9pSN`M(W^R!G zBlP=tX?)SdmE|ObBh^MZPWA+~zbw8K7V=q|uZRsDwB~_KfJw7q05li|0VYVM0aOZ& zg1}6w4TDJ;LdB8D6_5l*)KnNbQHb%tAjn53JU(D8fM9@T1Azc&4MG5dz&sl|OyS#5 zks%b`s1WM}NHo+dH5DJDLdY~eML;0~bRNtDXx0!7;E@H^08L;+rqgKFHUe5dl{ycs zd0dV?fl4H6$TbqK2vP{7s2FQ6p@c70%0Ddm3B`!70#b*K!l2No3>t$1(r7kJ(E0=D zI|P+uWv*tWkcm{PW`z&4Trf@uD>tDS3PngVNvLK)ofsCj9W1nvx;rptjU3wzi;W_X zLW=rHr6PNR+BdwKQqxp;yMcCLc}QW6q6Uoc)g3p`bB<6bNpopO`W*OAOuk`KrR2Zk z`2ZbcnTINrQZ(Ef_2w-@V8!QoJ_R0R^1-H^T!Aj<{KcmJ4QJP1ux^;H6kR^VzAqBd zf7L&dL_$rd@OaG_U_o$y_~lR(!q=n#i(~&190o~35p3QLG~0W*@Dqj1hiM2%V?uy{ z3<&@l!lwg}z?udyVLDkr<3VJQ*Iz4x>~g6qH;`0Fzp-}(`LO>=2 z!XTB$_}Jb5d3zMijHmmNK^C3NqJZzWXGc;WAn%iDryjAMo~)tiwo{K_7DwG@zL7GS zNQj^xm%;nC_z$=t`U5TaSL#Dy{n~7)Y&kZh!W7<0$!E=f0@%;sA%qc$T>3fJheG

gfpQ#< zXs-SYQ|)nx!h|{sj;FKE{ozKVsN+xG@STT=j16U!~PR)+oUxEeceFX~wIVVO43)fQ4j1#!ri6vNQ)BTfJEt?EYI|3JL h=gtd#QQkYX2e;Eb)>No8PrzKoah$!J4mvK4{TJsRB60u# diff --git a/src/main/resources/assets/firmalife/textures/item/pie_pan.png b/src/main/resources/assets/firmalife/textures/item/pie_pan.png index ce6d84a712a5006ff2e7de553a347e6a2e12a8f9..33173b319b82ace42ac504ac5bb05f1b8a6ee88b 100644 GIT binary patch delta 175 zcmV;g08szjF3JIrBYyw^b5ch_0Itp)=>Px#gh@m}R5*=eU>F4h4;Ya-99;bWiP7}q z+ef%QID>lZH*Wq_u>F5D2f0en0>L}`YBPhY+;{P^~f zk%=T-SODCBipm_KH6g1-3B6QQh002ovPDHLkV1ktGOy2+i literal 5980 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 HMkN0W;IGF! diff --git a/src/main/resources/data/firmalife/advancements/story/all_cheese.json b/src/main/resources/data/firmalife/advancements/story/all_cheese.json index 03c55cf2..41a97d42 100644 --- a/src/main/resources/data/firmalife/advancements/story/all_cheese.json +++ b/src/main/resources/data/firmalife/advancements/story/all_cheese.json @@ -105,7 +105,7 @@ "feta" ], [ - "rayja_metok" + "rajya_metok" ], [ "shosha" diff --git a/src/main/resources/data/firmalife/recipes/crafting/pumpkin_chunks_bulk.json b/src/main/resources/data/firmalife/recipes/crafting/pumpkin_chunks_bulk.json index 3a6a0117..40fc097b 100644 --- a/src/main/resources/data/firmalife/recipes/crafting/pumpkin_chunks_bulk.json +++ b/src/main/resources/data/firmalife/recipes/crafting/pumpkin_chunks_bulk.json @@ -8,28 +8,52 @@ "tag": "tfc:hammers" }, { - "item": "tfc:pumpkin" + "type": "tfc:not_rotten", + "ingredient": { + "item": "tfc:pumpkin" + } }, { - "item": "tfc:pumpkin" + "type": "tfc:not_rotten", + "ingredient": { + "item": "tfc:pumpkin" + } }, { - "item": "tfc:pumpkin" + "type": "tfc:not_rotten", + "ingredient": { + "item": "tfc:pumpkin" + } }, { - "item": "tfc:pumpkin" + "type": "tfc:not_rotten", + "ingredient": { + "item": "tfc:pumpkin" + } }, { - "item": "tfc:pumpkin" + "type": "tfc:not_rotten", + "ingredient": { + "item": "tfc:pumpkin" + } }, { - "item": "tfc:pumpkin" + "type": "tfc:not_rotten", + "ingredient": { + "item": "tfc:pumpkin" + } }, { - "item": "tfc:pumpkin" + "type": "tfc:not_rotten", + "ingredient": { + "item": "tfc:pumpkin" + } }, { - "item": "tfc:pumpkin" + "type": "tfc:not_rotten", + "ingredient": { + "item": "tfc:pumpkin" + } } ], "result": { diff --git a/src/main/resources/data/tfc/tags/items/compost_greens.json b/src/main/resources/data/tfc/tags/items/compost_greens.json new file mode 100644 index 00000000..0381724a --- /dev/null +++ b/src/main/resources/data/tfc/tags/items/compost_greens.json @@ -0,0 +1,7 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "replace": false, + "values": [ + "firmalife:food/nightshade_berry" + ] +} \ No newline at end of file