From b7247368c14242fd9c1eb54dc34ed7cf09707865 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Tue, 6 Aug 2019 19:03:00 +0200
Subject: [PATCH] updated mappings

---
 gradle.properties                                 | 4 ++--
 src/main/java/carpet/mixins/ItemEntityMixin.java  | 2 +-
 src/main/java/carpet/script/value/BlockValue.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e4f21a91..e1903516 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=1.14.4
-	yarn_mappings=1.14.4+build.1
-	loader_version=0.4.8+build.155
+	yarn_mappings=1.14.4+build.8
+	loader_version=0.4.8+build.158
 
 # Mod Properties
 	mod_version = 1.0.3+v190803
diff --git a/src/main/java/carpet/mixins/ItemEntityMixin.java b/src/main/java/carpet/mixins/ItemEntityMixin.java
index b5b1731c..79ac755d 100644
--- a/src/main/java/carpet/mixins/ItemEntityMixin.java
+++ b/src/main/java/carpet/mixins/ItemEntityMixin.java
@@ -52,7 +52,7 @@ public abstract class ItemEntityMixin extends Entity implements IItemEntity {
     }
 
     @Redirect(
-            method = "method_20397",
+            method = "tryMerge(Lnet/minecraft/entity/ItemEntity;)V",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/item/ItemStack;getMaxCount()I"
diff --git a/src/main/java/carpet/script/value/BlockValue.java b/src/main/java/carpet/script/value/BlockValue.java
index a6277555..7e7de4c5 100644
--- a/src/main/java/carpet/script/value/BlockValue.java
+++ b/src/main/java/carpet/script/value/BlockValue.java
@@ -393,7 +393,7 @@ public class BlockValue extends Value
 
         @Override
         public Direction getPlayerFacing() {
-            return this.facing.getAxis() == Direction.Axis.field_11052 ? Direction.NORTH : this.facing;
+            return this.facing.getAxis() == Direction.Axis.Y ? Direction.NORTH : this.facing;
         }
 
         @Override