diff --git a/build.gradle.kts b/build.gradle.kts
index 9fa18aa..bdbc6d8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -75,7 +75,7 @@ allprojects {
         compileOnly("org.jetbrains:annotations:24.1.0")
         compileOnly("io.th0rgal:oraxen:1.182.0")
         compileOnly("com.github.LoneDev6:API-ItemsAdder:3.6.3-beta-14")
-        compileOnly("com.mineinabyss:geary-papermc:0.27.0")
+        compileOnly("com.mineinabyss:geary-papermc:0.31.0-dev.4")
         compileOnly("it.unimi.dsi:fastutil:8.5.13")
         compileOnly("com.denizenscript:denizen:1.2.7-SNAPSHOT")
         compileOnly("io.lumine:Mythic-Dist:5.2.1")
@@ -110,11 +110,11 @@ allprojects {
 
 dependencies {
     implementation(project(path = ":common"))
-    implementation(project(path = ":v1_19_R3", configuration = "reobf"))
-    implementation(project(path = ":v1_20_R1", configuration = "reobf"))
-    implementation(project(path = ":v1_20_R2", configuration = "reobf"))
-    implementation(project(path = ":v1_20_R3", configuration = "reobf"))
-    implementation(project(path = ":v1_20_R4", configuration = "reobf"))
+    //implementation(project(path = ":v1_19_R3", configuration = "reobf"))
+    //implementation(project(path = ":v1_20_R1", configuration = "reobf"))
+    //implementation(project(path = ":v1_20_R2", configuration = "reobf"))
+    //implementation(project(path = ":v1_20_R3", configuration = "reobf"))
+    //implementation(project(path = ":v1_20_R4", configuration = "reobf"))
     implementation(project(path = ":v1_21_R1", configuration = "reobf"))
 }
 
@@ -140,11 +140,11 @@ tasks {
     }
 
     shadowJar {
-        dependsOn(":v1_19_R3:reobfJar")
-        dependsOn(":v1_20_R1:reobfJar")
-        dependsOn(":v1_20_R2:reobfJar")
-        dependsOn(":v1_20_R3:reobfJar")
-        dependsOn(":v1_20_R4:reobfJar")
+        //dependsOn(":v1_19_R3:reobfJar")
+        //dependsOn(":v1_20_R1:reobfJar")
+        //dependsOn(":v1_20_R2:reobfJar")
+        //dependsOn(":v1_20_R3:reobfJar")
+        //dependsOn(":v1_20_R4:reobfJar")
         dependsOn(":v1_21_R1:reobfJar")
         mergeServiceFiles()
 
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index c126806..8b94ab3 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -4,7 +4,7 @@
 tasks {
     compileJava {
         options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
+        options.release.set(21)
     }
 
     javadoc {
diff --git a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/items/HookGeary.java b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/items/HookGeary.java
index 4d2a3ef..a7ff5ba 100644
--- a/common/src/main/java/me/lojosho/hibiscuscommons/hooks/items/HookGeary.java
+++ b/common/src/main/java/me/lojosho/hibiscuscommons/hooks/items/HookGeary.java
@@ -1,6 +1,11 @@
 package me.lojosho.hibiscuscommons.hooks.items;
 
+import com.mineinabyss.geary.papermc.GearyPaper;
+import com.mineinabyss.geary.papermc.GearyPaperKt;
+import com.mineinabyss.geary.papermc.GearyPaperModule;
+import com.mineinabyss.geary.papermc.GearyPaperModuleKt;
 import com.mineinabyss.geary.papermc.tracking.items.ItemTrackingKt;
+import com.mineinabyss.geary.papermc.tracking.items.ItemTrackingModule;
 import com.mineinabyss.geary.prefabs.PrefabKey;
 import me.lojosho.hibiscuscommons.hooks.Hook;
 import me.lojosho.hibiscuscommons.hooks.HookFlag;
@@ -12,6 +17,8 @@ import org.jetbrains.annotations.NotNull;
  */
 public class HookGeary extends Hook {
 
+    private ItemTrackingModule itemTracking = null;
+
     public HookGeary() {
         super("geary", HookFlag.ITEM_SUPPORT);
     }
@@ -21,8 +28,9 @@ public class HookGeary extends Hook {
      */
     @Override
     public ItemStack getItem(@NotNull String itemId) {
+        if (itemTracking == null) itemTracking = GearyPaperModuleKt.getGearyPaper().getWorldManager().getGlobal().getAddon(ItemTrackingKt.getItemTracking());
         PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId);
         if (prefabKey == null) return null;
-        return ItemTrackingKt.getGearyItems().createItem(prefabKey, null);
+        return itemTracking.createItem(prefabKey, null);
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 46166c6..6cca7e8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,10 +8,10 @@ pluginManagement {
 rootProject.name = "HibiscusCommons"
 include(
     "common",
-    "v1_19_R3",
-    "v1_20_R1",
-    "v1_20_R2",
-    "v1_20_R3",
-    "v1_20_R4",
+    //"v1_19_R3",
+    //"v1_20_R1",
+    //"v1_20_R2",
+    //"v1_20_R3",
+    //"v1_20_R4",
     "v1_21_R1"
 )
\ No newline at end of file