diff --git a/build.gradle b/build.gradle
index 2050d0207..06be92b58 100755
--- a/build.gradle
+++ b/build.gradle
@@ -89,7 +89,7 @@ dependencies {
     mappings loom.layered() {
         officialMojangMappings()
         //technically optional, but really helpful in dev:
-        parchment("org.parchmentmc.data:parchment-1.17.1:2021.10.24@zip" as String)
+//        parchment("org.parchmentmc.data:parchment-1.17.1:2021.10.24@zip" as String)
     }
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     if (!compileType.equals("FORGE")) {
diff --git a/gradle.properties b/gradle.properties
index e3fdcf846..6b980966d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 org.gradle.jvmargs=-Xmx2048M
 
-mod_version=1.7.1
+mod_version=1.8.0
 maven_group=baritone
 archives_base_name=baritone
 
-minecraft_version=1.17.1
+minecraft_version=1.18-pre1
 forge_version=1.17.1-37.0.69
-fabric_version=0.11.6
+fabric_version=0.12.5
 
 # # un comment for forge debugging default (as opposed to fabric)
 # baritone.forge_build=true
diff --git a/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
index a1f321836..297aabeef 100644
--- a/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
+++ b/src/launch/java/baritone/launch/mixins/MixinClientPlayNetHandler.java
@@ -64,10 +64,10 @@ public class MixinClientPlayNetHandler {
     }*/
 
     @Inject(
-            method = "handleLevelChunk",
+            method = "handleLevelChunkWithLight",
             at = @At("RETURN")
     )
-    private void postHandleChunkData(ClientboundLevelChunkPacket packetIn, CallbackInfo ci) {
+    private void postHandleChunkData(ClientboundLevelChunkWithLightPacket packetIn, CallbackInfo ci) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
             LocalPlayer player = ibaritone.getPlayerContext().player();
             if (player != null && player.connection == (ClientPacketListener) (Object) this) {
diff --git a/src/launch/resources/fabric.mod.json b/src/launch/resources/fabric.mod.json
index a1bed3a99..9c9065f65 100644
--- a/src/launch/resources/fabric.mod.json
+++ b/src/launch/resources/fabric.mod.json
@@ -26,6 +26,6 @@
 
   "depends": {
     "fabricloader": ">=0.11.0",
-    "minecraft": "1.17.x"
+    "minecraft": "1.18.x"
   }
 }
\ No newline at end of file
diff --git a/src/main/java/baritone/cache/WorldScanner.java b/src/main/java/baritone/cache/WorldScanner.java
index 8a932555a..2ce865a8d 100644
--- a/src/main/java/baritone/cache/WorldScanner.java
+++ b/src/main/java/baritone/cache/WorldScanner.java
@@ -147,7 +147,7 @@ public enum WorldScanner implements IWorldScanner {
         boolean foundWithinY = false;
         for (int y0 : coordinateIterationOrder) {
             LevelChunkSection section = chunkInternalStorageArray[y0];
-            if (section == null || LevelChunkSection.isEmpty(section)) {
+            if (section == null || section.hasOnlyAir()) {
                 continue;
             }
             int yReal = y0 << 4;
diff --git a/src/main/java/baritone/utils/BlockStateInterface.java b/src/main/java/baritone/utils/BlockStateInterface.java
index c615ff4e1..7ea347d6d 100644
--- a/src/main/java/baritone/utils/BlockStateInterface.java
+++ b/src/main/java/baritone/utils/BlockStateInterface.java
@@ -169,7 +169,7 @@ public class BlockStateInterface {
     // get the block at x,y,z from this chunk WITHOUT creating a single blockpos object
     public static BlockState getFromChunk(LevelChunk chunk, int x, int y, int z) {
         LevelChunkSection section = chunk.getSections()[y >> 4];
-        if (LevelChunkSection.isEmpty(section)) {
+        if (section.hasOnlyAir()) {
             return AIR;
         }
         return section.getBlockState(x & 15, y & 15, z & 15);