diff --git a/gradle.properties b/gradle.properties
index 831a5cb..1e5fcc0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.14.22
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.6
 # Mod Properties
-mod_version=1.1.0
+mod_version=1.0.5
 maven_group=dev.zenithknight.mcmods
 archives_base_name=expandeddata
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.87.0+1.20.1
+fabric_version=0.95.0+1.20.4
diff --git a/src/main/java/dev/zenithknight/mcmods/expandeddata/ExpandedData.java b/src/main/java/dev/zenithknight/mcmods/expandeddata/ExpandedData.java
index baa7474..806c293 100644
--- a/src/main/java/dev/zenithknight/mcmods/expandeddata/ExpandedData.java
+++ b/src/main/java/dev/zenithknight/mcmods/expandeddata/ExpandedData.java
@@ -1,10 +1,24 @@
 package dev.zenithknight.mcmods.expandeddata;
 
 import net.fabricmc.api.ModInitializer;
+//import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+//import net.minecraft.block.Block;
+//import net.minecraft.block.Blocks;
+//import net.minecraft.block.DispenserBlock;
+//import net.minecraft.block.dispenser.BlockPlacementDispenserBehavior;
+//import net.minecraft.block.dispenser.ShearsDispenserBehavior;
+//import net.minecraft.item.BlockItem;
+//import net.minecraft.item.Item;
+//import net.minecraft.item.Items;
+//import net.minecraft.registry.Registries;
+//import net.minecraft.registry.Registry;
+//import net.minecraft.util.Identifier;
 
 public class ExpandedData implements ModInitializer {
     @Override
     public void onInitialize() {
         System.out.println("Initialized Expanded Data mod!");
+//        DispenserBlock.registerBehavior(Blocks.CAKE.asItem(), new BlockPlacementDispenserBehavior());
+//        DispenserBlock.registerBehavior(Items.BUCKET.asItem(), new ShearsDispenserBehavior());
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/zenithknight/mcmods/expandeddata/mixin/NbtPredicateMixin.java b/src/main/java/dev/zenithknight/mcmods/expandeddata/mixin/NbtPredicateMixin.java
index 38804d6..b932e02 100644
--- a/src/main/java/dev/zenithknight/mcmods/expandeddata/mixin/NbtPredicateMixin.java
+++ b/src/main/java/dev/zenithknight/mcmods/expandeddata/mixin/NbtPredicateMixin.java
@@ -6,6 +6,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtList;
+import net.minecraft.screen.PlayerScreenHandler;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -22,7 +23,8 @@ private static void entityToNbtMixin(Entity entity, CallbackInfoReturnable<NbtCo
                 nbtCompound.put("CursorItem", itemStack.writeNbt(new NbtCompound()));
             }
             if (!((PlayerEntity) entity).playerScreenHandler.getCraftingInput().isEmpty()) {
-                RecipeInputInventory craftingInput = ((PlayerEntity) entity).playerScreenHandler.getCraftingInput();
+                PlayerScreenHandler screenHandler = ((PlayerEntity) entity).playerScreenHandler;
+                RecipeInputInventory craftingInput = screenHandler.getCraftingInput();
                 NbtList nbtList = new NbtList();
                 for(int i = 0; i < craftingInput.size(); ++i) {
                     NbtCompound stackNbtCompound = craftingInput.getStack(i).writeNbt(new NbtCompound());
@@ -30,6 +32,9 @@ private static void entityToNbtMixin(Entity entity, CallbackInfoReturnable<NbtCo
                     nbtList.add(stackNbtCompound);
                 }
                 nbtCompound.put("CraftingItems", nbtList);
+                if (screenHandler.getSlot(screenHandler.getCraftingResultSlotIndex()).hasStack()) {
+                    nbtCompound.put("CraftingResult", screenHandler.getSlot(screenHandler.getCraftingResultSlotIndex()).getStack().writeNbt(new NbtCompound()));
+                }
             }
         }
         cir.setReturnValue(nbtCompound);
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 8cd3a79..c4517cb 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,7 +23,7 @@
     "expandeddata.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.17",
-    "minecraft": ">=1.20"
+    "fabricloader": ">=0.15.6",
+    "minecraft": ">=1.20.4"
   }
 }