1.21 compiles

Gaming32 · Jun 14, 2024 · c24d4e0 · c24d4e0
1 parent cdb54fd
commit c24d4e0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/main/java/io/github/gaming32/worldhost/ResourceLocations.java b/src/main/java/io/github/gaming32/worldhost/ResourceLocations.java
@@ -3,14 +3,28 @@
 import net.minecraft.resources.ResourceLocation;
 
 public final class ResourceLocations {
+    private static final ResourceLocation WORLD_HOST_TEMPLATE = namespaced("world-host", "");
+
     private ResourceLocations() {
     }
 
     public static ResourceLocation minecraft(String path) {
+        //#if MC >= 1.21
+        //$$ return ResourceLocation.withDefaultNamespace(path);
+        //#else
         return new ResourceLocation(ResourceLocation.DEFAULT_NAMESPACE, path);
+        //#endif
     }
 
     public static ResourceLocation worldHost(String path) {
-        return new ResourceLocation("world-host", path);
+        return WORLD_HOST_TEMPLATE.withPath(path);
+    }
+
+    public static ResourceLocation namespaced(String namespace, String path) {
+        //#if MC >= 1.21
+        //$$ return ResourceLocation.fromNamespaceAndPath(namespace, path);
+        //#else
+        return new ResourceLocation(namespace, path);
+        //#endif
     }
 }
diff --git a/src/main/java/io/github/gaming32/worldhost/mixin/MixinGameRenderer.java b/src/main/java/io/github/gaming32/worldhost/mixin/MixinGameRenderer.java
@@ -53,7 +53,12 @@ private void toastRender(CallbackInfo ci) {
             //#else
             new GuiGraphics(minecraft, renderBuffers.bufferSource()),
             //#endif
-            mouseX, mouseY, minecraft.getFrameTime()
+            mouseX, mouseY,
+            //#if MC >= 1.21
+            //$$ minecraft.getTimer().getRealtimeDeltaTicks()
+            //#else
+            minecraft.getFrameTime()
+            //#endif
         );
     }
     //#endif