diff --git a/build.gradle b/build.gradle
index 71a0302..b63d10e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.10-SNAPSHOT'
+    id 'fabric-loom' version '1.1-SNAPSHOT'
     id 'maven-publish'
 }
 
@@ -7,7 +7,7 @@ sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
-version = project.mod_version
+version = "${project.mod_version}-mc${project.minecraft_version}"
 group = project.maven_group
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index ee4f7d4..716c8ff 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.18.2
-yarn_mappings=1.18.2+build.2
-loader_version=0.13.3
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.10
+loader_version=0.14.22
 # Mod Properties
 mod_version=1.3.2
 maven_group=me.techchrism
 archives_base_name=ticktock
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.48.0+1.18.2
+fabric_version=0.89.0+1.20.1
diff --git a/src/main/java/me/techchrism/ticktock/Ticktock.java b/src/main/java/me/techchrism/ticktock/Ticktock.java
index a4de3cc..7ca4ea2 100644
--- a/src/main/java/me/techchrism/ticktock/Ticktock.java
+++ b/src/main/java/me/techchrism/ticktock/Ticktock.java
@@ -60,11 +60,14 @@ private void tick(ServerWorld world)
                 Profiler profiler = world.getProfiler();
                 int startX = chunk.getPos().getStartX();
                 int startZ = chunk.getPos().getStartZ();
-                for(ChunkSection chunkSection : chunk.getSectionArray())
+                int bottomY = chunk.getBottomY();
+                ChunkSection[] chunkSections = chunk.getSectionArray();
+                for (int i = 0; i < chunkSections.length; i++)
                 {
+                    ChunkSection chunkSection = chunkSections[i];
                     if(chunkSection != null && chunkSection.hasRandomTicks())
                     {
-                        int yOffset = chunkSection.getYOffset();
+                        int yOffset = bottomY + i * 16;
                         for(int m = 0; m < randomTickSpeed; m++)
                         {
                             BlockPos randomPosInChunk = world.getRandomPosInChunk(startX, yOffset, startZ, 15);
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index e367482..d8c5a47 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -19,7 +19,7 @@
   "depends": {
     "fabricloader": ">=0.10.1+build.209",
     "fabric": "*",
-    "minecraft": "1.18.2"
+    "minecraft": ">=1.20.1"
   },
   "mixins": [
     "ticktock.mixins.json"