From 7a5218dfe16c0d55f0756cd1fb8444f4d4ddd692 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 16 Aug 2023 17:56:34 +0100
Subject: [PATCH] Added "Apple Pie with Hoofprint" and adjust apple pie to be
 closer in line with farmer's delight's pies

---
 .../unicopia/block/PieBlock.java              |  24 +++++++++----
 .../unicopia/block/UBlocks.java               |  23 +++++--------
 .../minelittlepony/unicopia/item/UItems.java  |  32 +++++++-----------
 .../item/group/ItemGroupRegistry.java         |  14 ++++++++
 .../unicopia/item/group/UItemGroups.java      |   2 +-
 .../resources/assets/unicopia/lang/en_us.json |   1 +
 .../unicopia/models/block/pie_corner.json     |   4 +--
 .../unicopia/models/block/pie_elbow.json      |   6 ++--
 .../unicopia/models/block/pie_full.json       |   4 +--
 .../unicopia/models/block/pie_straight.json   |   4 +--
 .../unicopia/models/item/apple_pie_hoof.json  |   6 ++++
 .../unicopia/textures/item/apple_pie.png      | Bin 6677 -> 6912 bytes
 .../unicopia/textures/item/apple_pie_hoof.png | Bin 0 -> 7148 bytes
 .../cutting/apple_pie_from_apple_pie.json     |   9 +++++
 .../cutting/apple_pie_to_apple_pie.json       |   9 +++++
 15 files changed, 88 insertions(+), 50 deletions(-)
 create mode 100644 src/main/resources/assets/unicopia/models/item/apple_pie_hoof.json
 create mode 100644 src/main/resources/assets/unicopia/textures/item/apple_pie_hoof.png
 create mode 100644 src/main/resources/data/unicopia/recipes/cutting/apple_pie_from_apple_pie.json
 create mode 100644 src/main/resources/data/unicopia/recipes/cutting/apple_pie_to_apple_pie.json

diff --git a/src/main/java/com/minelittlepony/unicopia/block/PieBlock.java b/src/main/java/com/minelittlepony/unicopia/block/PieBlock.java
index 1ebb41af..7c9db33a 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/PieBlock.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/PieBlock.java
@@ -1,6 +1,7 @@
 package com.minelittlepony.unicopia.block;
 
 import com.minelittlepony.unicopia.*;
+import com.minelittlepony.unicopia.item.UItems;
 import com.minelittlepony.unicopia.util.SoundEmitter;
 
 import net.minecraft.block.*;
@@ -35,11 +36,11 @@ public class PieBlock extends Block implements Waterloggable {
 
     private static final VoxelShape[] SHAPES;
     static {
-        final int PIE_HEIGHT = 5;
-        final VoxelShape WEDGE = Block.createCuboidShape(1, 0, 1, 8, PIE_HEIGHT, 8);
-        final float OFFSET_AMOUNT = 7F/16F;
+        final int PIE_HEIGHT = 4;
+        final VoxelShape WEDGE = Block.createCuboidShape(2, 0, 2, 8, PIE_HEIGHT, 8);
+        final float OFFSET_AMOUNT = 6F/16F;
         SHAPES = new VoxelShape[] {
-                Block.createCuboidShape(1, 0, 1, 15, PIE_HEIGHT, 15),
+                Block.createCuboidShape(2, 0, 2, 14, PIE_HEIGHT, 14),
                 VoxelShapes.union(WEDGE, WEDGE.offset(OFFSET_AMOUNT, 0, 0), WEDGE.offset(OFFSET_AMOUNT, 0, OFFSET_AMOUNT)),
                 VoxelShapes.union(WEDGE, WEDGE.offset(OFFSET_AMOUNT, 0, 0)),
                 WEDGE
@@ -47,11 +48,15 @@ public class PieBlock extends Block implements Waterloggable {
     }
 
     private final ItemConvertible sliceItem;
+    private final ItemConvertible normalItem;
+    private final ItemConvertible stompedItem;
 
-    public PieBlock(Settings settings, ItemConvertible sliceItem) {
+    public PieBlock(Settings settings, ItemConvertible sliceItem, ItemConvertible normalItem, ItemConvertible stompedItem) {
         super(settings);
         setDefaultState(getDefaultState().with(STOMPED, false).with(WATERLOGGED, false));
         this.sliceItem = sliceItem;
+        this.normalItem = normalItem;
+        this.stompedItem = stompedItem;
     }
 
     @Deprecated
@@ -122,6 +127,11 @@ public class PieBlock extends Block implements Waterloggable {
         }
     }
 
+    @Override
+    public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
+        return (state.get(STOMPED) ? stompedItem : normalItem).asItem().getDefaultStack();
+    }
+
     @Override
     public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) {
         if (state.get(STOMPED)) {
@@ -179,7 +189,9 @@ public class PieBlock extends Block implements Waterloggable {
     @Deprecated
     @Override
     public BlockState getPlacementState(ItemPlacementContext ctx) {
-        return super.getDefaultState().with(WATERLOGGED, ctx.getWorld().getFluidState(ctx.getBlockPos()).getFluid() == Fluids.WATER);
+        return super.getDefaultState()
+                .with(WATERLOGGED, ctx.getWorld().getFluidState(ctx.getBlockPos()).getFluid() == Fluids.WATER)
+                .with(STOMPED, ctx.getStack().isOf(UItems.APPLE_PIE_HOOF));
     }
 
     @Deprecated
diff --git a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
index 6e7d3437..e313f357 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java
@@ -7,9 +7,6 @@ import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.item.UItems;
 import com.minelittlepony.unicopia.item.group.ItemGroupRegistry;
 import com.minelittlepony.unicopia.server.world.UTreeGen;
-import com.terraformersmc.terraform.boat.api.TerraformBoatType;
-import com.terraformersmc.terraform.boat.api.TerraformBoatTypeRegistry;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
 import net.fabricmc.fabric.api.registry.StrippableBlockRegistry;
@@ -102,26 +99,30 @@ public interface UBlocks {
     Block SOUR_APPLE = register("sour_apple", new FruitBlock(Settings.create().mapColor(MapColor.GREEN), Direction.DOWN, SOUR_APPLE_LEAVES, FruitBlock.DEFAULT_SHAPE));
     Block SOUR_APPLE_SPROUT = register("sour_apple_sprout", new SproutBlock(0xE5FFCC88, () -> UItems.SOUR_APPLE_SEEDS, () -> UTreeGen.SOUR_APPLE_TREE.sapling().map(Block::getDefaultState).get()));
 
-    Block APPLE_PIE = register("apple_pie", new PieBlock(Settings.create().solid().mapColor(MapColor.ORANGE).strength(0.5F).sounds(BlockSoundGroup.WET_GRASS).pistonBehavior(PistonBehavior.DESTROY), () -> UItems.APPLE_PIE_SLICE));
+    Block APPLE_PIE = register("apple_pie", new PieBlock(Settings.create().solid().mapColor(MapColor.ORANGE).strength(0.5F).sounds(BlockSoundGroup.WOOL).pistonBehavior(PistonBehavior.DESTROY),
+            () -> UItems.APPLE_PIE_SLICE,
+            () -> UItems.APPLE_PIE,
+            () -> UItems.APPLE_PIE_HOOF
+    ));
 
     SegmentedCropBlock OATS = register("oats", SegmentedCropBlock.create(11, 5, AbstractBlock.Settings.copy(Blocks.WHEAT), () -> UItems.OAT_SEEDS, null, () -> UBlocks.OATS_STEM));
     SegmentedCropBlock OATS_STEM = register("oats_stem", OATS.createNext(5));
     SegmentedCropBlock OATS_CROWN = register("oats_crown", OATS_STEM.createNext(5));
 
-    static <T extends Block> T register(String name, T item) {
+    private static <T extends Block> T register(String name, T item) {
         return register(Unicopia.id(name), item);
     }
 
-    static <T extends Block> T register(String name, T block, RegistryKey<ItemGroup> group) {
+    private static <T extends Block> T register(String name, T block, RegistryKey<ItemGroup> group) {
         return register(Unicopia.id(name), block, group);
     }
 
     static <T extends Block> T register(Identifier id, T block, RegistryKey<ItemGroup> group) {
-        BlockItem.BLOCK_ITEMS.put(block, UItems.register(id, ItemGroupRegistry.register(new BlockItem(block, new Item.Settings()), group)));
+        ItemGroupRegistry.register(id, new BlockItem(block, new Item.Settings()), group);
         return register(id, block);
     }
 
-    static <T extends Block> T register(Identifier id, T block) {
+    private static <T extends Block> T register(Identifier id, T block) {
         if (block instanceof TintedBlock) {
             TintedBlock.REGISTRY.add(block);
         }
@@ -151,11 +152,5 @@ public interface UBlocks {
         FlammableBlockRegistry.getDefaultInstance().add(BANANAS, 5, 20);
 
         UBlockEntities.bootstrap();
-
-        Registry.register(TerraformBoatTypeRegistry.INSTANCE, Unicopia.id("palm"), new TerraformBoatType.Builder()
-                .planks(PALM_PLANKS.asItem())
-                .item(UItems.PALM_BOAT)
-                .build());
-
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java
index a2d47ea6..7c3c2650 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java
@@ -1,8 +1,5 @@
 package com.minelittlepony.unicopia.item;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.minelittlepony.unicopia.*;
 import com.minelittlepony.unicopia.block.UBlocks;
 import com.minelittlepony.unicopia.block.UWoodTypes;
@@ -12,6 +9,8 @@ import com.minelittlepony.unicopia.item.enchantment.UEnchantments;
 import com.minelittlepony.unicopia.item.group.ItemGroupRegistry;
 import com.minelittlepony.unicopia.item.group.UItemGroups;
 import com.minelittlepony.unicopia.item.toxin.UFoodComponents;
+import com.terraformersmc.terraform.boat.api.TerraformBoatType;
+import com.terraformersmc.terraform.boat.api.TerraformBoatTypeRegistry;
 import com.terraformersmc.terraform.boat.api.item.TerraformBoatItemHelper;
 
 import net.minecraft.entity.vehicle.BoatEntity;
@@ -21,16 +20,12 @@ import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.fabricmc.fabric.api.registry.CompostingChanceRegistry;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.util.Identifier;
 import net.minecraft.util.Rarity;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.Registries;
 
 public interface UItems {
-
-    List<Item> ITEMS = new ArrayList<>();
-
     Item GREEN_APPLE = register("green_apple", AppleItem.registerTickCallback(new Item(new Item.Settings().food(FoodComponents.APPLE))), ItemGroups.FOOD_AND_DRINK);
     Item SWEET_APPLE = register("sweet_apple", AppleItem.registerTickCallback(new Item(new Item.Settings().food(FoodComponents.APPLE))), ItemGroups.FOOD_AND_DRINK);
     Item SOUR_APPLE = register("sour_apple", AppleItem.registerTickCallback(new Item(new Item.Settings().food(FoodComponents.APPLE))), ItemGroups.FOOD_AND_DRINK);
@@ -96,6 +91,7 @@ public interface UItems {
     Item JUICE = register("juice", new DrinkableItem(new Item.Settings().recipeRemainder(Items.GLASS_BOTTLE).maxCount(1).food(UFoodComponents.JUICE)), ItemGroups.FOOD_AND_DRINK);
     Item BURNED_JUICE = register("burned_juice", new DrinkableItem(new Item.Settings().recipeRemainder(Items.GLASS_BOTTLE).maxCount(1).food(UFoodComponents.BURNED_JUICE)), ItemGroups.FOOD_AND_DRINK);
     Item APPLE_PIE = register("apple_pie", new BlockItem(UBlocks.APPLE_PIE, new Item.Settings().maxCount(1)), ItemGroups.FOOD_AND_DRINK);
+    Item APPLE_PIE_HOOF = register("apple_pie_hoof", new AliasedBlockItem(UBlocks.APPLE_PIE, new Item.Settings().maxCount(1)), ItemGroups.FOOD_AND_DRINK);
     Item APPLE_PIE_SLICE = register("apple_pie_slice", new Item(new Item.Settings().maxCount(16).food(UFoodComponents.PIE)), ItemGroups.FOOD_AND_DRINK);
 
     Item LOVE_BOTTLE = register("love_bottle", new DrinkableItem(new Item.Settings().food(UFoodComponents.LOVE_BOTTLE).maxCount(1).recipeRemainder(Items.GLASS_BOTTLE)), ItemGroups.FOOD_AND_DRINK);
@@ -157,21 +153,12 @@ public interface UItems {
     Item BAT_BADGE = register(Race.BAT);
     Item CHANGELING_BADGE = register(Race.CHANGELING);
 
-    static <T extends Item> T register(String name, T item, RegistryKey<ItemGroup> group) {
-        return ItemGroupRegistry.register(register(name, item), group);
+    private static <T extends Item> T register(String name, T item, RegistryKey<ItemGroup> group) {
+        return ItemGroupRegistry.register(Unicopia.id(name), item, group);
     }
 
-    @Deprecated
-    static <T extends Item> T register(String name, T item) {
-        return register(Unicopia.id(name), item);
-    }
-
-    static <T extends Item> T register(Identifier id, T item) {
-        if (item instanceof BlockItem bi && bi.getBlock() == null) {
-            throw new NullPointerException("Registered block item did not have a block " + id);
-        }
-        ITEMS.add(item);
-        return Registry.register(Registries.ITEM, id, item);
+    private static <T extends Item> T register(String name, T item) {
+        return ItemGroupRegistry.register(Unicopia.id(name), item);
     }
 
     static MusicDiscItem register(String name, SoundEvent sound, int seconds) {
@@ -221,5 +208,10 @@ public interface UItems {
         UEnchantments.bootstrap();
         URecipes.bootstrap();
         UItemGroups.bootstrap();
+
+        Registry.register(TerraformBoatTypeRegistry.INSTANCE, Unicopia.id("palm"), new TerraformBoatType.Builder()
+                .planks(UBlocks.PALM_PLANKS.asItem())
+                .item(PALM_BOAT)
+                .build());
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/item/group/ItemGroupRegistry.java b/src/main/java/com/minelittlepony/unicopia/item/group/ItemGroupRegistry.java
index 071f258f..3998f13b 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/group/ItemGroupRegistry.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/group/ItemGroupRegistry.java
@@ -16,9 +16,11 @@ import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 
 public interface ItemGroupRegistry {
+    List<Item> ITEMS = new ArrayList<>();
     Map<RegistryKey<ItemGroup>, Set<Item>> REGISTRY = new HashMap<>();
 
     static List<ItemStack> getVariations(Item item) {
@@ -33,6 +35,18 @@ public interface ItemGroupRegistry {
         return item;
     }
 
+    static <T extends Item> T register(Identifier id, T item, RegistryKey<ItemGroup> group) {
+        return register(register(id, item), group);
+    }
+
+    static <T extends Item> T register(Identifier id, T item) {
+        if (item instanceof BlockItem bi && bi.getBlock() == null) {
+            throw new NullPointerException("Registered block item did not have a block " + id);
+        }
+        ITEMS.add(item);
+        return Registry.register(Registries.ITEM, id, item);
+    }
+
     static RegistryKey<ItemGroup> createDynamic(String name, Supplier<ItemStack> icon, Supplier<Stream<Item>> items) {
         RegistryKey<ItemGroup> key = RegistryKey.of(RegistryKeys.ITEM_GROUP, Unicopia.id(name));
         Registry.register(Registries.ITEM_GROUP, key.getValue(), FabricItemGroup.builder().entries((context, entries) -> {
diff --git a/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java b/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java
index 080a07b0..077863d4 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java
@@ -13,7 +13,7 @@ import net.minecraft.registry.RegistryKey;
 
 public interface UItemGroups {
     RegistryKey<ItemGroup> ALL_ITEMS = ItemGroupRegistry.createDynamic("items", UItems.EMPTY_JAR::getDefaultStack, () -> {
-        return Stream.concat(Stream.of(Items.APPLE), UItems.ITEMS.stream()
+        return Stream.concat(Stream.of(Items.APPLE), ItemGroupRegistry.ITEMS.stream()
                 .filter(item -> !(item instanceof ChameleonItem) || ((ChameleonItem)item).isFullyDisguised()));
     });
     RegistryKey<ItemGroup> HORSE_FEED = ItemGroupRegistry.createDynamic("horsefeed", UItems.ZAP_APPLE::getDefaultStack, () -> {
diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json
index 57d1b0dc..0850d8cc 100644
--- a/src/main/resources/assets/unicopia/lang/en_us.json
+++ b/src/main/resources/assets/unicopia/lang/en_us.json
@@ -103,6 +103,7 @@
   "item.unicopia.green_apple_seeds": "Granny Smith Apple Seeds",
   "item.unicopia.sweet_apple_seeds": "Sweet Apple Seeds",
   "item.unicopia.sour_apple_seeds": "Sour Apple Seeds",
+  "item.unicopia.apple_pie_hoof": "Apple Pie with a Hoofprint",
   "item.unicopia.apple_pie_slice": "Slice Of Apple Pie",
 
   "item.unicopia.oats": "Oats",
diff --git a/src/main/resources/assets/unicopia/models/block/pie_corner.json b/src/main/resources/assets/unicopia/models/block/pie_corner.json
index b9094606..4051e694 100644
--- a/src/main/resources/assets/unicopia/models/block/pie_corner.json
+++ b/src/main/resources/assets/unicopia/models/block/pie_corner.json
@@ -3,8 +3,8 @@
         "particle": "#top"
     },
     "elements": [
-        {   "from": [ 1, 0, 1 ],
-            "to": [ 8, 5, 8 ],
+        {   "from": [ 2, 0, 2 ],
+            "to": [ 8, 4, 8 ],
             "faces": {
                 "up": { "uv": [ 1, 1, 8, 8 ], "texture": "#top" },
                 "down": { "uv": [ 1, 8, 8, 15 ], "texture": "#bottom" },
diff --git a/src/main/resources/assets/unicopia/models/block/pie_elbow.json b/src/main/resources/assets/unicopia/models/block/pie_elbow.json
index 4059b688..bfd91d78 100644
--- a/src/main/resources/assets/unicopia/models/block/pie_elbow.json
+++ b/src/main/resources/assets/unicopia/models/block/pie_elbow.json
@@ -3,8 +3,8 @@
         "particle": "#top"
     },
     "elements": [
-        {   "from": [ 1, 0, 1 ],
-            "to": [ 15, 5, 8 ],
+        {   "from": [ 2, 0, 2 ],
+            "to": [ 14, 4, 8 ],
             "faces": {
                 "up": { "uv": [ 1, 1, 15, 8 ], "texture": "#top" },
                 "down": { "uv": [ 1, 8, 15, 15 ], "texture": "#bottom" },
@@ -15,7 +15,7 @@
             }
         },
         {   "from": [ 8, 0, 8 ],
-            "to": [ 15, 5, 15 ],
+            "to": [ 14, 4, 14 ],
             "faces": {
                 "up": { "uv": [ 8, 8, 15, 15 ], "texture": "#top" },
                 "down": { "uv": [ 8, 1, 15, 8 ], "texture": "#bottom" },
diff --git a/src/main/resources/assets/unicopia/models/block/pie_full.json b/src/main/resources/assets/unicopia/models/block/pie_full.json
index 15099405..f0687e00 100644
--- a/src/main/resources/assets/unicopia/models/block/pie_full.json
+++ b/src/main/resources/assets/unicopia/models/block/pie_full.json
@@ -3,8 +3,8 @@
         "particle": "#top"
     },
     "elements": [
-        {   "from": [ 1, 0, 1 ],
-            "to": [ 15, 5, 15 ],
+        {   "from": [ 2, 0, 2 ],
+            "to": [ 14, 4, 14 ],
             "faces": {
                 "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" },
                 "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#bottom" },
diff --git a/src/main/resources/assets/unicopia/models/block/pie_straight.json b/src/main/resources/assets/unicopia/models/block/pie_straight.json
index 78c39eb5..9d1b6ba7 100644
--- a/src/main/resources/assets/unicopia/models/block/pie_straight.json
+++ b/src/main/resources/assets/unicopia/models/block/pie_straight.json
@@ -3,8 +3,8 @@
         "particle": "#top"
     },
     "elements": [
-        {   "from": [ 1, 0, 1 ],
-            "to": [ 15, 5, 8 ],
+        {   "from": [ 2, 0, 2 ],
+            "to": [ 14, 4, 8 ],
             "faces": {
                 "up": { "uv": [ 1, 1, 15, 8 ], "texture": "#top" },
                 "down": { "uv": [ 1, 8, 15, 15 ], "texture": "#bottom" },
diff --git a/src/main/resources/assets/unicopia/models/item/apple_pie_hoof.json b/src/main/resources/assets/unicopia/models/item/apple_pie_hoof.json
new file mode 100644
index 00000000..ec8b8f2d
--- /dev/null
+++ b/src/main/resources/assets/unicopia/models/item/apple_pie_hoof.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "unicopia:item/apple_pie_hoof"
+    }
+}
diff --git a/src/main/resources/assets/unicopia/textures/item/apple_pie.png b/src/main/resources/assets/unicopia/textures/item/apple_pie.png
index 2a77e66fc6da58e2caf84d4a81fa2497724d1841..a88f10a6273c13b3c3e66959d2dd870c18f81b94 100644
GIT binary patch
delta 2090
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
BLGb_p

delta 2220
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

diff --git a/src/main/resources/assets/unicopia/textures/item/apple_pie_hoof.png b/src/main/resources/assets/unicopia/textures/item/apple_pie_hoof.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e6e8b97d4d3954071962647ff5381a7d64eb0f4
GIT binary patch
literal 7148
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
C+=>1G

literal 0
HcmV?d00001

diff --git a/src/main/resources/data/unicopia/recipes/cutting/apple_pie_from_apple_pie.json b/src/main/resources/data/unicopia/recipes/cutting/apple_pie_from_apple_pie.json
new file mode 100644
index 00000000..9ae5f5c2
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/cutting/apple_pie_from_apple_pie.json
@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    { "item": "farmersdelight:apple_pie" }
+  ],
+  "result": {
+    "item": "unicopia:apple_pie"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/unicopia/recipes/cutting/apple_pie_to_apple_pie.json b/src/main/resources/data/unicopia/recipes/cutting/apple_pie_to_apple_pie.json
new file mode 100644
index 00000000..0fc42b7f
--- /dev/null
+++ b/src/main/resources/data/unicopia/recipes/cutting/apple_pie_to_apple_pie.json
@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    { "item": "unicopia:apple_pie" }
+  ],
+  "result": {
+    "item": "farmersdelight:apple_pie"
+  }
+}
\ No newline at end of file