diff --git a/gradle.properties b/gradle.properties
index e8740202..93c9b5c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=1.18
-	yarn_mappings=1.18+build.1
+	minecraft_version=1.18.1
+	yarn_mappings=1.18.1+build.22
 	loader_version=0.12.12
-	fabric_version=0.43.1+1.18
+	fabric_version=0.46.1+1.18
 
 # Mod Properties
 	mod_version = 1.4.56
diff --git a/src/main/java/carpet/mixins/BlockItem_creativeNoClipMixin.java b/src/main/java/carpet/mixins/BlockItem_creativeNoClipMixin.java
index 329a72ff..eb1769b5 100644
--- a/src/main/java/carpet/mixins/BlockItem_creativeNoClipMixin.java
+++ b/src/main/java/carpet/mixins/BlockItem_creativeNoClipMixin.java
@@ -28,7 +28,7 @@ public class BlockItem_creativeNoClipMixin
         {
             // copy from canPlace
             VoxelShape voxelShape = state.getCollisionShape(world, pos, context);
-            return voxelShape.isEmpty() || world.intersectsEntities(player, voxelShape.offset(pos.getX(), pos.getY(), pos.getZ()));
+            return voxelShape.isEmpty() || world.doesNotIntersectEntities(player, voxelShape.offset(pos.getX(), pos.getY(), pos.getZ()));
 
         }
         return world.canPlace(state, pos, context);
diff --git a/src/main/java/carpet/mixins/WallStandingBlockItem_creativeNoClipMixin.java b/src/main/java/carpet/mixins/WallStandingBlockItem_creativeNoClipMixin.java
index d71bb474..14f0431c 100644
--- a/src/main/java/carpet/mixins/WallStandingBlockItem_creativeNoClipMixin.java
+++ b/src/main/java/carpet/mixins/WallStandingBlockItem_creativeNoClipMixin.java
@@ -30,7 +30,7 @@ public class WallStandingBlockItem_creativeNoClipMixin
         {
             // copy from canPlace
             VoxelShape voxelShape = state.getCollisionShape(worldView, pos, context);
-            return voxelShape.isEmpty() || worldView.intersectsEntities(player, voxelShape.offset(pos.getX(), pos.getY(), pos.getZ()));
+            return voxelShape.isEmpty() || worldView.doesNotIntersectEntities(player, voxelShape.offset(pos.getX(), pos.getY(), pos.getZ()));
 
         }
         return worldView.canPlace(state, pos, context);
diff --git a/src/main/java/carpet/script/value/NBTSerializableValue.java b/src/main/java/carpet/script/value/NBTSerializableValue.java
index 15345223..9f558475 100644
--- a/src/main/java/carpet/script/value/NBTSerializableValue.java
+++ b/src/main/java/carpet/script/value/NBTSerializableValue.java
@@ -26,10 +26,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.AbstractNbtList;
 import net.minecraft.nbt.AbstractNbtNumber;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtEnd;
 import net.minecraft.nbt.NbtInt;
 import net.minecraft.nbt.NbtList;
 import net.minecraft.nbt.NbtLong;
-import net.minecraft.nbt.NbtNull;
 import net.minecraft.nbt.StringNbtReader;
 import net.minecraft.nbt.NbtString;
 import net.minecraft.nbt.NbtElement;
@@ -342,7 +342,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
         }
         if (t instanceof NbtString)
             return StringValue.of(t.asString());
-        if (t instanceof NbtNull)
+        if (t instanceof NbtEnd)
             return Value.NULL;
 
         throw new InternalExpressionException("How did we get here: Unknown nbt element class: "+t.getNbtType().getCrashReportName());