diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/CreativeTabBuilderTest.java b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/CreativeTabBuilderTest.java
index a2c0f18..0003c26 100644
--- a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/CreativeTabBuilderTest.java
+++ b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/CreativeTabBuilderTest.java
@@ -3,7 +3,7 @@ package dev.zenfyr.pulsar.test.autotest;
 import dev.zenfyr.pulsar.creativetab.CreativeModeTabBuilder;
 import java.util.List;
 import net.fabricmc.api.ModInitializer;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Items;
 import org.assertj.core.api.Assertions;
@@ -14,7 +14,7 @@ public class CreativeTabBuilderTest implements ModInitializer {
 
   @Override
   public void onInitialize() {
-    tab = CreativeModeTabBuilder.create(ResourceLocation.fromNamespaceAndPath("pulsar", "test-tab"))
+    tab = CreativeModeTabBuilder.create(Identifier.fromNamespaceAndPath("pulsar", "test-tab"))
         .entries(entries -> {
           entries.appendStacks(
               List.of(Items.APPLE.getDefaultInstance(), Items.CALCITE.getDefaultInstance()), true);
diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/ServerReloadersEventTest.java b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/ServerReloadersEventTest.java
index 9793a0c..7477c91 100644
--- a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/ServerReloadersEventTest.java
+++ b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/ServerReloadersEventTest.java
@@ -9,13 +9,13 @@ import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.packs.resources.ResourceManager;
 
 public class ServerReloadersEventTest implements ModInitializer {
 
   public static final ReloaderType<TestReloader> TYPE =
-      ReloaderType.create(ResourceLocation.fromNamespaceAndPath("pulsar", "test-reloader"));
+      ReloaderType.create(Identifier.fromNamespaceAndPath("pulsar", "test-reloader"));
   private static String trigger = null;
 
   @Override
@@ -35,8 +35,8 @@ public class ServerReloadersEventTest implements ModInitializer {
     }
 
     @Override
-    public ResourceLocation getFabricId() {
-      return TYPE.location();
+    public Identifier getFabricId() {
+      return TYPE.identifier();
     }
 
     @Override
@@ -51,7 +51,7 @@ public class ServerReloadersEventTest implements ModInitializer {
                   .lookupOrThrow(Registries.DIMENSION_TYPE)
                   .get(ResourceKey.create(
                       Registries.DIMENSION_TYPE,
-                      ResourceLocation.withDefaultNamespace("overworld"))));
+                      Identifier.withDefaultNamespace("overworld"))));
     }
   }
 }
diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/client/CreativeTabAnimationTest.java b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/client/CreativeTabAnimationTest.java
index cbd3ecb..b613e1c 100644
--- a/src/testmod/java/dev/zenfyr/pulsar/test/autotest/client/CreativeTabAnimationTest.java
+++ b/src/testmod/java/dev/zenfyr/pulsar/test/autotest/client/CreativeTabAnimationTest.java
@@ -8,7 +8,7 @@ import dev.zenfyr.pulsar.test.util.AutoTest;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.Util;
+import net.minecraft.util.Util;
 import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
 import net.minecraft.world.item.Items;
 
diff --git a/src/testmod/java/dev/zenfyr/pulsar/test/client/PulsarTestmodClient.java b/src/testmod/java/dev/zenfyr/pulsar/test/client/PulsarTestmodClient.java
index 21ae78a..ca7830e 100644
--- a/src/testmod/java/dev/zenfyr/pulsar/test/client/PulsarTestmodClient.java
+++ b/src/testmod/java/dev/zenfyr/pulsar/test/client/PulsarTestmodClient.java
@@ -13,7 +13,7 @@ import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.flag.FeatureFlagSet;
-import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.gamerules.GameRules;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.LevelSettings;
 import net.minecraft.world.level.WorldDataConfiguration;