diff --git a/gradle.properties b/gradle.properties
index cbead656..ecbc27a3 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=20w20b
-	yarn_mappings=20w20b+build.1
-	loader_version=0.8.3+build.196
+	yarn_mappings=20w20b+build.13
+	loader_version=0.8.4+build.198
 
 # Mod Properties
 	mod_version = 1.3.23+v200513
diff --git a/src/main/java/carpet/mixins/SpawnHelperMixin.java b/src/main/java/carpet/mixins/SpawnHelperMixin.java
index be1179d1..e722281b 100644
--- a/src/main/java/carpet/mixins/SpawnHelperMixin.java
+++ b/src/main/java/carpet/mixins/SpawnHelperMixin.java
@@ -60,10 +60,10 @@ public class SpawnHelperMixin
         {
             return world.doesNotCollide(bb);
         }
-        int minX = MathHelper.floor(bb.x1);
-        int minY = MathHelper.floor(bb.y1);
-        int minZ = MathHelper.floor(bb.z1);
-        int maxY = MathHelper.ceil(bb.y2)-1;
+        int minX = MathHelper.floor(bb.minX);
+        int minY = MathHelper.floor(bb.minY);
+        int minZ = MathHelper.floor(bb.minZ);
+        int maxY = MathHelper.ceil(bb.maxY)-1;
         BlockPos.Mutable blockpos = new BlockPos.Mutable();
         if (bb.getXLength() <= 1) // small mobs
         {
@@ -86,8 +86,8 @@ public class SpawnHelperMixin
             return true;
         }
         // this code is only applied for mobs larger than 1 block in footprint
-        int maxX = MathHelper.ceil(bb.x2)-1;
-        int maxZ = MathHelper.ceil(bb.z2)-1;
+        int maxX = MathHelper.ceil(bb.maxX)-1;
+        int maxZ = MathHelper.ceil(bb.maxZ)-1;
         for (int y = minY; y <= maxY; y++)
             for (int x = minX; x <= maxX; x++)
                 for (int z = minZ; z <= maxZ; z++)
diff --git a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java
index 9fe05d26..08e98750 100644
--- a/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java
+++ b/src/main/java/carpet/mixins/WorldChunk_movableTEMixin.java
@@ -107,7 +107,7 @@ public abstract class WorldChunk_movableTEMixin implements WorldChunkInterface
             if (!this.world.isClient)
             {
                 if (!(oldBlock instanceof PistonExtensionBlock))//this is a movableTE special case, if condition wasn't there it would remove the blockentity that was carried for some reason
-                    oldBlockState.onBlockRemoved(this.world, blockPos_1, newBlockState, boolean_1);//this kills it
+                    oldBlockState.onStateReplaced(this.world, blockPos_1, newBlockState, boolean_1);//this kills it
             }
             else if (oldBlock != newBlock && oldBlock instanceof BlockEntityProvider)
             {
diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java
index 2fa464fd..efcd7a54 100644
--- a/src/main/java/carpet/utils/BlockInfo.java
+++ b/src/main/java/carpet/utils/BlockInfo.java
@@ -131,20 +131,20 @@ public class BlockInfo
         put(Material.PLANT          , "plant"        );
         put(Material.UNDERWATER_PLANT, "water_plant" );
         put(Material.REPLACEABLE_PLANT, "vine"       );
-        put(Material.SEAGRASS       , "sea_grass"    );
+        put(Material.REPLACEABLE_UNDERWATER_PLANT       , "sea_grass"    );
         put(Material.WATER          , "water"        );
         put(Material.BUBBLE_COLUMN  , "bubble_column");
         put(Material.LAVA           , "lava"         );
-        put(Material.SNOW           , "snow_layer"   );
+        put(Material.SNOW_LAYER           , "snow_layer"   );
         put(Material.FIRE           , "fire"         );
-        put(Material.PART           , "redstone_bits");
+        put(Material.SUPPORTED          , "redstone_bits");
         put(Material.COBWEB         , "cobweb"       );
         put(Material.REDSTONE_LAMP  , "redstone_lamp");
-        put(Material.CLAY           , "clay"         );
-        put(Material.EARTH          , "dirt"         );
-        put(Material.ORGANIC        , "grass"        );
-        put(Material.PACKED_ICE     , "packed_ice"   );
-        put(Material.SAND           , "sand"         );
+        put(Material.ORGANIC_PRODUCT           , "clay"         );
+        put(Material.SOIL         , "dirt"         );
+        put(Material.SOLID_ORGANIC        , "grass"        );
+        put(Material.DENSE_ICE     , "packed_ice"   );
+        put(Material.AGGREGATE          , "sand"         );
         put(Material.SPONGE         , "sponge"       );
         put(Material.SHULKER_BOX    , "shulker"      );
         put(Material.WOOD           , "wood"         );
@@ -160,11 +160,11 @@ public class BlockInfo
         put(Material.STONE          , "stone"        );
         put(Material.METAL          , "metal"        );
         put(Material.SNOW_BLOCK     , "snow"         );
-        put(Material.ANVIL          , "anvil"        );
+        put(Material.REPAIR_STATION          , "anvil"        );
         put(Material.BARRIER        , "barrier"      );
         put(Material.PISTON         , "piston"       );
         put(Material.UNUSED_PLANT   , "coral"        );
-        put(Material.PUMPKIN        , "gourd"        );
+        put(Material.GOURD        , "gourd"        );
         put(Material.EGG            , "dragon_egg"   );
         put(Material.CAKE           , "cake"         );
     }};
diff --git a/src/main/java/carpet/utils/MobAI.java b/src/main/java/carpet/utils/MobAI.java
index 0a726417..97c8cca4 100644
--- a/src/main/java/carpet/utils/MobAI.java
+++ b/src/main/java/carpet/utils/MobAI.java
@@ -107,7 +107,7 @@ public class MobAI
     {
         if (!e.isOnGround() && !e.isInsideWaterOrBubbleColumn() && !e.isInLava()) return;
         float m = e.world.getBlockState(e.getBlockPos()).getBlock().getJumpVelocityMultiplier();
-        float g = e.world.getBlockState(new BlockPos(e.getX(), e.getBoundingBox().y1 - 0.5000001D, e.getZ())).getBlock().getJumpVelocityMultiplier();
+        float g = e.world.getBlockState(new BlockPos(e.getX(), e.getBoundingBox().minY - 0.5000001D, e.getZ())).getBlock().getJumpVelocityMultiplier();
         float jumpVelocityMultiplier = (double) m == 1.0D ? g : m;
         float jumpStrength = (0.42F * jumpVelocityMultiplier);
         Vec3d vec3d = e.getVelocity();