From 4d72cdaeb1657f861624e42533f8b0100787caae Mon Sep 17 00:00:00 2001 From: EERussianguy Date: Sun, 3 Sep 2023 18:34:01 -0400 Subject: [PATCH] fix pumpkin pies (removes cooked pumpkin pie item, makes vanilla pumpkin pie a dynamic bowl food), fix drying mats working in snow, remove decay date rounding on food shelves (should fix time duplication), fix divide by zero error in vats, add sealed bricks as oven insulation --- gradle.properties | 2 +- resources/constants.py | 2 +- resources/data.py | 10 +++-- resources/metal_stuff.py | 2 +- resources/recipes.py | 7 +--- .../eerussianguy/firmalife/common/FLTags.java | 1 - .../blockentities/DryingMatBlockEntity.java | 11 +++--- .../blockentities/FoodShelfBlockEntity.java | 1 - .../common/items/DecayingContainerItem.java | 31 ---------------- .../firmalife/common/items/FLFood.java | 1 - .../firmalife/common/items/FLItems.java | 2 +- .../firmalife/common/recipes/VatRecipe.java | 2 +- .../recipes/data/AddPiePanModifier.java | 31 ++++++++++++++++ .../recipes/data/FLItemStackModifiers.java | 1 + .../minecraft/textures/item/pumpkin_pie.png | Bin 0 -> 408 bytes .../firmalife/recipes/oven/pumpkin_pie.json | 7 +++- .../tags/blocks/oven_insulation.json | 3 +- .../firmalife/tags/items/foods/washable.json | 2 +- .../tfc/food_items/cooked_pumpkin_pie.json | 10 ----- .../tags/blocks/replaceable.json} | 3 +- .../advancements/crafting/pumpkin_pie.json | 35 ------------------ .../tfc/recipes/crafting/pumpkin_pie.json | 11 ++---- .../resources/data/tfc/tags/items/foods.json | 4 +- .../data/tfc/tfc/food_items/pumpkin_pie.json | 7 ++++ 24 files changed, 72 insertions(+), 114 deletions(-) delete mode 100644 src/main/java/com/eerussianguy/firmalife/common/items/DecayingContainerItem.java create mode 100644 src/main/java/com/eerussianguy/firmalife/common/recipes/data/AddPiePanModifier.java create mode 100644 src/main/resources/assets/minecraft/textures/item/pumpkin_pie.png delete mode 100644 src/main/resources/data/firmalife/tfc/food_items/cooked_pumpkin_pie.json rename src/main/resources/data/{firmalife/tags/items/contains_pie_pan.json => minecraft/tags/blocks/replaceable.json} (57%) delete mode 100644 src/main/resources/data/tfc/advancements/crafting/pumpkin_pie.json create mode 100644 src/main/resources/data/tfc/tfc/food_items/pumpkin_pie.json diff --git a/gradle.properties b/gradle.properties index e94aefd1..0ee7b5df 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=4616004 +tfc_identifier=4723717 jade_version=3970956 top_version=3965688 \ No newline at end of file diff --git a/resources/constants.py b/resources/constants.py index cd8ee6c0..831a544b 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -131,7 +131,7 @@ class Wood(NamedTuple): 'fig': Fruit(20, 35, 125, 215) } -DISABLED_TFC_RECIPES = ('barrel/curdling', 'barrel/cheese', 'barrel/milk_vinegar') +DISABLED_TFC_RECIPES = ('barrel/curdling', 'barrel/cheese', 'barrel/milk_vinegar', 'crafting/pumpkin_pie') GENETIC_DISEASES = ['Malformed Rectum', 'Malphigian Tubule Iridescence', 'Rectal Stones', 'Poor Osmoregulation', 'Nosemosis', 'Broken Wings'] PARASITIC_INFECTIONS = ['Chalkbrood', 'Stonebrood', 'Foulbrood', 'Wax Moths', 'Hive Beetles', 'Mites'] diff --git a/resources/data.py b/resources/data.py index d78c6c17..aafb4119 100644 --- a/resources/data.py +++ b/resources/data.py @@ -57,9 +57,8 @@ def generate(rm: ResourceManager): rm.item_tag('pumpkin_knapping', 'tfc:pumpkin') rm.item_tag('foods/heatable', 'firmalife:food/raw_pizza', 'firmalife:food/filled_pie', 'firmalife:food/raw_pumpkin_pie', 'firmalife:food/corn_tortilla', 'firmalife:food/masa', '#firmalife:foods/slices', 'firmalife:food/cocoa_beans', 'firmalife:food/bacon') rm.item_tag('foods/dynamic', 'firmalife:food/raw_pizza', 'firmalife:food/filled_pie', 'firmalife:food/cooked_pizza', 'firmalife:food/cooked_pie', 'firmalife:food/burrito', 'firmalife:food/taco', 'firmalife:food/stinky_soup') - rm.item_tag('foods/washable', 'firmalife:food/filled_pie', 'firmalife:food/cooked_pie', 'firmalife:food/raw_pumpkin_pie', 'firmalife:food/cooked_pumpkin_pie', 'firmalife:food/stinky_soup') + rm.item_tag('foods/washable', 'firmalife:food/filled_pie', 'firmalife:food/cooked_pie', 'firmalife:food/raw_pumpkin_pie', 'minecraft:pumpkin_pie', 'firmalife:food/stinky_soup') rm.item_tag('pie_pans', 'firmalife:pie_pan') - 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') @@ -70,7 +69,7 @@ def generate(rm: ResourceManager): block_and_item_tag(rm, 'tfc:wild_fruits', 'firmalife:plant/pineapple_bush', 'firmalife:plant/nightshade_bush', 'firmalife:plant/fig_sapling', 'firmalife:plant/cocoa_sapling') - rm.block_tag('oven_insulation', 'minecraft:bricks', '#tfc:forge_insulation', '#firmalife:oven_blocks', 'minecraft:brick_stairs', 'minecraft:brick_slab') + rm.block_tag('oven_insulation', 'minecraft:bricks', '#tfc:forge_insulation', '#firmalife:oven_blocks', 'minecraft:brick_stairs', 'minecraft:brick_slab', 'firmalife:sealed_bricks') rm.block_tag('minecraft:mineable/pickaxe', '#firmalife:oven_blocks') rm.block_tag('planters', *['firmalife:%s_planter' % p for p in PLANTERS]) rm.block_tag('bee_restoration_plants', *['tfc:plant/%s' % p for p in TFC_FLOWERS]) @@ -204,7 +203,6 @@ def generate(rm: ResourceManager): food_item(rm, 'pumpkin_chunks', 'firmalife:food/pumpkin_chunks', Category.fruit, 4, 1, 5, 1.5, fruit=0.75) decayable(rm, 'pumpkin_pie_dough', 'firmalife:food/pumpkin_pie_dough', Category.other) decayable(rm, 'raw_pumpkin_pie', 'firmalife:food/raw_pumpkin_pie', Category.other) - decayable(rm, 'cooked_pumpkin_pie', 'firmalife:food/cooked_pumpkin_pie', Category.other) decayable(rm, 'cocoa_beans', 'firmalife:food/cocoa_beans', Category.other, decay=0.25) food_item(rm, 'fig', 'firmalife:food/fig', Category.fruit, 4, 1, 5, 0.8, fruit=0.9) decayable(rm, 'roasted_cocoa_beans', 'firmalife:food/roasted_cocoa_beans', Category.other) @@ -233,6 +231,10 @@ def generate(rm: ResourceManager): dynamic_food_item(rm, 'burrito', 'firmalife:food/burrito', 'dynamic') dynamic_food_item(rm, 'taco', 'firmalife:food/taco', 'dynamic') + rm.domain = 'tfc' + dynamic_food_item(rm, 'pumpkin_pie', 'minecraft:pumpkin_pie', 'dynamic_bowl') + rm.domain = 'firmalife' + item_size(rm, 'jars', '#firmalife:jars', Size.very_large, Weight.medium) item_size(rm, 'beehive_frame', 'firmalife:beehive_frame', Size.very_small, Weight.very_heavy) item_size(rm, 'cheese_wheels', '#firmalife:cheese_wheels', Size.very_large, Weight.very_heavy) diff --git a/resources/metal_stuff.py b/resources/metal_stuff.py index a3ae13cd..e837ba68 100644 --- a/resources/metal_stuff.py +++ b/resources/metal_stuff.py @@ -78,7 +78,7 @@ def item(_variant: str) -> str: casting_recipe(rm, '%s_%s' % (metal, item), item, metal, item_data.smelt_amount, 0.1 if item == 'ingot' else 1) if item == 'ingot': casting_recipe(rm, '%s_%s_fire' % (metal, item), 'fire_ingot', metal, item_data.smelt_amount, 0.01, 'firmalife:metal/ingot/%s' % metal) - rm.blockstate(('fluid', 'metal', metal)).with_block_model({'particle': 'block/lava_still'}, parent=None).with_lang(lang('Molten %s', metal)) + rm.blockstate(('fluid', 'metal', metal)).with_block_model({'particle': 'block/lava_still'}, parent=None).with_lang(lang('Molten %s', metal)).with_tag('minecraft:replaceable') rm.lang('fluid.firmalife.metal.%s' % metal, lang('Molten %s', metal)) rm.fluid_tag(metal, 'firmalife:metal/%s' % metal, 'firmalife:metal/flowing_%s' % metal) rm.fluid_tag('tfc:molten_metals', *['firmalife:metal/%s' % metal]) diff --git a/resources/recipes.py b/resources/recipes.py index 0c43ac38..88d374d8 100644 --- a/resources/recipes.py +++ b/resources/recipes.py @@ -81,15 +81,10 @@ def craft_decorations(recipe_name: str, base_block: str): rm.crafting_shapeless('crafting/pickled_egg', ('minecraft:clay_ball', 'tfc:powder/wood_ash', 'tfc:powder/salt', 'tfc:food/boiled_egg'), 'firmalife:food/pickled_egg') rm.crafting_shaped('crafting/seed_ball', [' X ', 'XYX', ' X '], {'X': '#tfc:seeds', 'Y': 'tfc:compost'}, 'firmalife:seed_ball').with_advancement('tfc:compost') rm.crafting_shapeless('crafting/raw_pumpkin_pie', ('firmalife:food/pumpkin_pie_dough', 'firmalife:pie_pan'), 'firmalife:food/raw_pumpkin_pie').with_advancement('firmalife:food/pumpkin_pie_dough') - #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', *(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' - rm.crafting_shapeless('crafting/pumpkin_pie', ({'type': 'forge:nbt', 'item': 'firmalife:food/cooked_pumpkin_pie'},), 'minecraft:pumpkin_pie').with_advancement('firmalife:food/cooked_pumpkin_pie') - rm.domain = 'firmalife' damage_shapeless(rm, 'crafting/pineapple_fiber', (not_rotten(has_trait('firmalife:food/pineapple', trait='firmalife:dried')), '#tfc:knives'), 'firmalife:pineapple_fiber').with_advancement('firmalife:food/pineapple') damage_shapeless(rm, 'crafting/pineapple_yarn', ('tfc:spindle', 'firmalife:pineapple_fiber'), '8 firmalife:pineapple_yarn').with_advancement('firmalife:pineapple_fiber') rm.crafting_shapeless('crafting/toast_with_jam', ('firmalife:food/toast', '#firmalife:foods/preserves'), 'firmalife:food/toast_with_jam').with_advancement('firmalife:food/toast') @@ -223,7 +218,7 @@ def chisel_stair_slab(name: str, ingredient: str): oven_recipe(rm, 'cooked_pie', not_rotten('firmalife:food/filled_pie'), 400, result_item=item_stack_provider('firmalife:food/cooked_pie', other_modifier='firmalife:copy_dynamic_food', remove_trait='firmalife:raw')) oven_recipe(rm, 'cooked_pizza', not_rotten('firmalife:food/raw_pizza'), 400, result_item=item_stack_provider('firmalife:food/cooked_pizza', other_modifier='firmalife:copy_dynamic_food', remove_trait='firmalife:raw')) - oven_recipe(rm, 'pumpkin_pie', not_rotten('firmalife:food/raw_pumpkin_pie'), 400, result_item=item_stack_provider('firmalife:food/cooked_pumpkin_pie')) + oven_recipe(rm, 'pumpkin_pie', not_rotten('firmalife:food/raw_pumpkin_pie'), 400, result_item=item_stack_provider('minecraft:pumpkin_pie', other_modifier='firmalife:add_pie_pan')) oven_recipe(rm, 'roasted_cocoa_beans', not_rotten('firmalife:food/cocoa_beans'), 400, result_item=item_stack_provider('firmalife:food/roasted_cocoa_beans')) oven_recipe(rm, 'taco_shell', not_rotten('firmalife:food/corn_tortilla'), 400, result_item=item_stack_provider('firmalife:food/taco_shell')) diff --git a/src/main/java/com/eerussianguy/firmalife/common/FLTags.java b/src/main/java/com/eerussianguy/firmalife/common/FLTags.java index 89ea6a3e..28468d7e 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/FLTags.java +++ b/src/main/java/com/eerussianguy/firmalife/common/FLTags.java @@ -41,7 +41,6 @@ public static class Items public static final TagKey OVEN_FUEL = create("oven_fuel"); public static final TagKey PUMPKIN_KNAPPING = create("pumpkin_knapping"); public static final TagKey PIE_PANS = create("pie_pans"); - public static final TagKey CONTAINS_PIE_PAN = create("contains_pie_pan"); public static final TagKey CAN_BE_HUNG = create("can_be_hung"); public static final TagKey USABLE_IN_STOVETOP_SOUP = create("usable_in_stovetop_soup"); public static final TagKey BEEKEEPER_ARMOR = create("beekeeper_armor"); diff --git a/src/main/java/com/eerussianguy/firmalife/common/blockentities/DryingMatBlockEntity.java b/src/main/java/com/eerussianguy/firmalife/common/blockentities/DryingMatBlockEntity.java index 34cf5946..b918e554 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blockentities/DryingMatBlockEntity.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blockentities/DryingMatBlockEntity.java @@ -1,7 +1,9 @@ package com.eerussianguy.firmalife.common.blockentities; import java.util.function.Supplier; - +import com.eerussianguy.firmalife.common.FLHelpers; +import com.eerussianguy.firmalife.common.recipes.DryingRecipe; +import com.eerussianguy.firmalife.config.FLConfig; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; @@ -9,12 +11,9 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import com.eerussianguy.firmalife.common.FLHelpers; -import com.eerussianguy.firmalife.common.recipes.DryingRecipe; -import com.eerussianguy.firmalife.config.FLConfig; - import net.dries007.tfc.common.capabilities.PartialItemHandler; import net.dries007.tfc.common.recipes.inventory.ItemStackInventory; +import net.dries007.tfc.util.EnvironmentHelpers; public class DryingMatBlockEntity extends SimpleItemRecipeBlockEntity { @@ -35,7 +34,7 @@ public static void serverTick(Level level, BlockPos pos, BlockState state, Dryin mat.resetCounter(); } // reset when it rains - if (level.getGameTime() % 60 == 0 && level.isRainingAt(pos.above())) + if (level.getGameTime() % 60 == 0 && EnvironmentHelpers.isRainingOrSnowing(level, pos) && level.canSeeSky(pos)) { mat.resetCounter(); } 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 12bfd66f..7f0ad963 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/blockentities/FoodShelfBlockEntity.java +++ b/src/main/java/com/eerussianguy/firmalife/common/blockentities/FoodShelfBlockEntity.java @@ -126,7 +126,6 @@ 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/items/DecayingContainerItem.java b/src/main/java/com/eerussianguy/firmalife/common/items/DecayingContainerItem.java deleted file mode 100644 index 9a346446..00000000 --- a/src/main/java/com/eerussianguy/firmalife/common/items/DecayingContainerItem.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.eerussianguy.firmalife.common.items; - -import net.minecraft.world.item.ItemStack; - -import com.eerussianguy.firmalife.common.FLTags; -import net.dries007.tfc.common.items.DecayingItem; -import net.dries007.tfc.util.Helpers; - -public class DecayingContainerItem extends DecayingItem -{ - public DecayingContainerItem(Properties properties) - { - super(properties); - } - - @Override - public boolean hasContainerItem(ItemStack stack) - { - return Helpers.isItem(stack, FLTags.Items.CONTAINS_PIE_PAN); - } - - @Override - public ItemStack getContainerItem(ItemStack stack) - { - if (Helpers.isItem(stack, FLTags.Items.CONTAINS_PIE_PAN)) - { - return new ItemStack(FLItems.PIE_PAN.get()); - } - return ItemStack.EMPTY; - } -} 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 90863251..abf5a779 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/items/FLFood.java +++ b/src/main/java/com/eerussianguy/firmalife/common/items/FLFood.java @@ -45,7 +45,6 @@ public enum FLFood PIE_DOUGH, PUMPKIN_PIE_DOUGH, RAW_PUMPKIN_PIE, - COOKED_PUMPKIN_PIE, PIZZA_DOUGH, SHREDDED_CHEESE, PICKLED_EGG, diff --git a/src/main/java/com/eerussianguy/firmalife/common/items/FLItems.java b/src/main/java/com/eerussianguy/firmalife/common/items/FLItems.java index 6255d6d8..f71364a0 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/items/FLItems.java +++ b/src/main/java/com/eerussianguy/firmalife/common/items/FLItems.java @@ -67,7 +67,7 @@ public class FLItems public static final RegistryObject BEEKEEPER_BOOTS = register("beekeeper_boots", () -> new ArmorItem(FLArmorMaterials.BEEKEEPER, EquipmentSlot.FEET, new Item.Properties().tab(TAB_COMBAT))); public static final Map> SPICES = Helpers.mapOfKeys(Spice.class, spice -> register("spice/" + spice.name(), MISC)); - public static final Map> FOODS = Helpers.mapOfKeys(FLFood.class, food -> register("food/" + food.name(), () -> new DecayingContainerItem(new Item.Properties().food(food.getFoodProperties()).tab(FOOD)))); + public static final Map> FOODS = Helpers.mapOfKeys(FLFood.class, food -> register("food/" + food.name(), () -> new DecayingItem(new Item.Properties().food(food.getFoodProperties()).tab(FOOD)))); public static final Map> FRUITS = Helpers.mapOfKeys(FLFruit.class, food -> register("food/" + food.name(), () -> new DecayingItem(new Item.Properties().food(food.getFoodProperties()).tab(FOOD)))); public static final Map> FINISHES = Helpers.mapOfKeys(OvenType.class, type -> type != OvenType.BRICK, type -> register(type.getTrueName() + "_finish", () -> new FinishItem(prop(), type))); diff --git a/src/main/java/com/eerussianguy/firmalife/common/recipes/VatRecipe.java b/src/main/java/com/eerussianguy/firmalife/common/recipes/VatRecipe.java index 89f5d80c..812fc7bd 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/recipes/VatRecipe.java +++ b/src/main/java/com/eerussianguy/firmalife/common/recipes/VatRecipe.java @@ -133,7 +133,7 @@ public boolean matches(VatBlockEntity.VatInventory container, Level level) && inputFluid.test(container.getFluidInTank(0)) && (inputFluid.amount() == 0 || outputFluid.getAmount() == 0 - || container.getFluidInTank(0).getAmount() / this.inputFluid.amount() <= container.getStackInSlot(0).getCount() / this.inputItem.count() + || (inputItem.count() > 0 && inputFluid.amount() > 0 && container.getFluidInTank(0).getAmount() / this.inputFluid.amount() <= container.getStackInSlot(0).getCount() / this.inputItem.count()) ); } diff --git a/src/main/java/com/eerussianguy/firmalife/common/recipes/data/AddPiePanModifier.java b/src/main/java/com/eerussianguy/firmalife/common/recipes/data/AddPiePanModifier.java new file mode 100644 index 00000000..c16c8e14 --- /dev/null +++ b/src/main/java/com/eerussianguy/firmalife/common/recipes/data/AddPiePanModifier.java @@ -0,0 +1,31 @@ +package com.eerussianguy.firmalife.common.recipes.data; + +import com.eerussianguy.firmalife.common.items.FLItems; +import net.minecraft.world.item.ItemStack; + +import net.dries007.tfc.common.capabilities.food.FoodCapability; +import net.dries007.tfc.common.items.DynamicBowlFood; +import net.dries007.tfc.common.recipes.outputs.ItemStackModifier; + +public enum AddPiePanModifier implements ItemStackModifier.SingleInstance +{ + INSTANCE; + + @Override + public AddPiePanModifier instance() + { + return INSTANCE; + } + + @Override + public ItemStack apply(ItemStack stack, ItemStack input) + { + stack.getCapability(FoodCapability.CAPABILITY).ifPresent(cap -> { + if (cap instanceof DynamicBowlFood.DynamicBowlHandler handler) + { + handler.setBowl(new ItemStack(FLItems.PIE_PAN.get())); + } + }); + return stack; + } +} diff --git a/src/main/java/com/eerussianguy/firmalife/common/recipes/data/FLItemStackModifiers.java b/src/main/java/com/eerussianguy/firmalife/common/recipes/data/FLItemStackModifiers.java index b47c340f..030bdce0 100644 --- a/src/main/java/com/eerussianguy/firmalife/common/recipes/data/FLItemStackModifiers.java +++ b/src/main/java/com/eerussianguy/firmalife/common/recipes/data/FLItemStackModifiers.java @@ -9,6 +9,7 @@ public class FLItemStackModifiers public static void init() { register("pie", PieModifier.INSTANCE); + register("add_pie_pan", AddPiePanModifier.INSTANCE); register("pizza", PizzaModifier.INSTANCE); register("copy_dynamic_food", CopyDynamicFoodModifier.INSTANCE); register("burrito", BurritoModifier.INSTANCE); diff --git a/src/main/resources/assets/minecraft/textures/item/pumpkin_pie.png b/src/main/resources/assets/minecraft/textures/item/pumpkin_pie.png new file mode 100644 index 0000000000000000000000000000000000000000..8e25fe6bd5450b9a6872755a2b5f10424cb7d43d GIT binary patch literal 408 zcmV;J0cZY+P)Px$Qb|NXR5*>*k-tkqQ545NSEZ#eQAtA(gm8(RTAIQ|NC>AQh!Dyk8k$=h`!hs~ z#*DHsD59aF8Y0?UAHC=EiAaHjKN`%N7Y!QgJKgg==llI0&V_#uF^HV=4z&mIt80s5 zVK@7;L05Qkwk^4`p~-hLndvhUz2bCwrBfJ9DpplVa(i6hvrD6{iBQBnLbu0-!|4Q| zQL8CDK0C=|hSTzgu=S=?tSV!nAmdY$0NfpB$sg?Da5_7}uNki|fLU(<;E-yg$yg|e zb$d)v@1$9EL40Yse}f)KgU5>_Cj8$`t1g&NZSea1qTIn72`Yzm0GRcL6c_a>TjwnR zVsVXdG@>My4GpuT_ivDT3bQ_X&(3vAHcerIVOI>ylFsISQ`Yhur$=n<;hC5+oQTg7 zjU@>9eQ3JDWg$l{f5rPvfrq!2Pz<^z`~qF^-@qrg%!PnR-V+i40000