From 20ed1ed2d4455b68c8a39e026cb2a05d970c7508 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Fri, 14 Jun 2024 17:18:58 -0400
Subject: [PATCH] Set core version to 1.21

---
 .../io/github/gaming32/worldhost/ResourceLocations.java   | 8 ++++----
 .../gaming32/worldhost/mixin/MixinGameRenderer.java       | 4 ++--
 src/main/resources/META-INF/neoforge.mods.toml            | 4 ++--
 src/main/resources/fabric.mod.json                        | 4 ++--
 versions/mainProject                                      | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/github/gaming32/worldhost/ResourceLocations.java b/src/main/java/io/github/gaming32/worldhost/ResourceLocations.java
index 2ddf700..a6f384b 100644
--- a/src/main/java/io/github/gaming32/worldhost/ResourceLocations.java
+++ b/src/main/java/io/github/gaming32/worldhost/ResourceLocations.java
@@ -13,9 +13,9 @@ private ResourceLocations() {
 
     public static ResourceLocation minecraft(String path) {
         //#if MC >= 1.21
-        //$$ return ResourceLocation.withDefaultNamespace(path);
+        return ResourceLocation.withDefaultNamespace(path);
         //#else
-        return new ResourceLocation(ResourceLocation.DEFAULT_NAMESPACE, path);
+        //$$ return new ResourceLocation(ResourceLocation.DEFAULT_NAMESPACE, path);
         //#endif
     }
 
@@ -29,9 +29,9 @@ public static ResourceLocation worldHost(String path) {
 
     public static ResourceLocation namespaced(String namespace, String path) {
         //#if MC >= 1.21
-        //$$ return ResourceLocation.fromNamespaceAndPath(namespace, path);
+        return ResourceLocation.fromNamespaceAndPath(namespace, path);
         //#else
-        return new ResourceLocation(namespace, path);
+        //$$ 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
index 2dca594..0fe2e5a 100644
--- a/src/main/java/io/github/gaming32/worldhost/mixin/MixinGameRenderer.java
+++ b/src/main/java/io/github/gaming32/worldhost/mixin/MixinGameRenderer.java
@@ -55,9 +55,9 @@ private void toastRender(CallbackInfo ci) {
             //#endif
             mouseX, mouseY,
             //#if MC >= 1.21
-            //$$ minecraft.getTimer().getRealtimeDeltaTicks()
+            minecraft.getTimer().getRealtimeDeltaTicks()
             //#else
-            minecraft.getFrameTime()
+            //$$ minecraft.getFrameTime()
             //#endif
         );
     }
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml
index 0a3cb7c..b959c0e 100644
--- a/src/main/resources/META-INF/neoforge.mods.toml
+++ b/src/main/resources/META-INF/neoforge.mods.toml
@@ -27,9 +27,9 @@ side = "BOTH"
 [[dependencies.world_host]]
 modId = "minecraft"
 ##if MC == 1.20.6
-versionRange = "[1.20.5,1.20.7)"
+#?? versionRange = "[1.20.5,1.20.7)"
 ##else
-#?? versionRange = "[$mc_version]"
+versionRange = "[$mc_version]"
 ##endif
 type = "required"
 ordering = "NONE"
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 0ad2861..333c8b2 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -35,9 +35,9 @@
     //#elseif MC == 1.20.4
     //?? "minecraft": ">=1.20.3- <1.20.5",
     //#elseif MC == 1.20.6
-    "minecraft": ">=1.20.5- <1.20.7",
+    //?? "minecraft": ">=1.20.5- <1.20.7",
     //#else
-    //?? "minecraft": "$mc_version",
+    "minecraft": "$mc_version",
     //#endif
     "fabric-resource-loader-v0": "*"
   },
diff --git a/versions/mainProject b/versions/mainProject
index 304eaac..dfdd511 100644
--- a/versions/mainProject
+++ b/versions/mainProject
@@ -1 +1 @@
-1.20.6-fabric
\ No newline at end of file
+1.21-fabric
\ No newline at end of file