Bump MTR Version

LHMTR · Apr 20, 2024 · 19d7af1 · 19d7af1
1 parent 4128f93
commit 19d7af1
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 9 deletions.
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
     mappings "net.fabricmc:yarn:${yarn_version}:v2"
-    modImplementation "org.mtr:MTR-fabric-${rootProject.minecraft_version}:${rootProject.mtr_version}"
+    modImplementation "org.mtr:MTR-fabric:${rootProject.mtr_version}+${rootProject.minecraft_version}"
     modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
     modApi "com.terraformersmc:modmenu:${mod_menu_version}"

diff --git a/fabric/src/main/java/com/lx862/jcm/mod/render/block/ButterflyLightRenderer.java b/fabric/src/main/java/com/lx862/jcm/mod/render/block/ButterflyLightRenderer.java
@@ -13,7 +13,7 @@
 import org.mtr.mapping.holder.*;
 import org.mtr.mapping.mapper.GraphicsHolder;
 import org.mtr.mod.InitClient;
-import org.mtr.mod.client.MinecraftClientData;
+import org.mtr.mod.data.ArrivalsCache;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +34,7 @@ public void renderCurated(ButterflyLightBlockEntity blockEntity, GraphicsHolder
         Platform closestPlatform = !closestPlatforms.isEmpty() ? closestPlatforms.get(0) : null;
         if (closestPlatform == null) return;
 
-        ArrivalsResponse arrivals = MinecraftClientData.getInstance().requestArrivals(pos.asLong(), LongImmutableList.of(closestPlatform.getId()), 1, 0, true);
+        ArrivalsResponse arrivals = ArrivalsCache.INSTANCE.requestArrivals(pos.asLong(), LongImmutableList.of(closestPlatform.getId()), 1, 0, true);
         ArrivalResponse firstArrival = arrivals.getArrivals().isEmpty() ? null : arrivals.getArrivals().get(0);
         if (firstArrival == null) return;
 

diff --git a/fabric/src/main/java/com/lx862/jcm/mod/render/block/DepartureTimerRenderer.java b/fabric/src/main/java/com/lx862/jcm/mod/render/block/DepartureTimerRenderer.java
@@ -15,7 +15,7 @@
 import org.mtr.mapping.holder.World;
 import org.mtr.mapping.mapper.GraphicsHolder;
 import org.mtr.mod.InitClient;
-import org.mtr.mod.client.MinecraftClientData;
+import org.mtr.mod.data.ArrivalsCache;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,7 +41,7 @@ public void renderCurated(DepartureTimerBlockEntity blockEntity, GraphicsHolder
         Platform closestPlatform = !closestPlatforms.isEmpty() ? closestPlatforms.get(0) : null;
         if (closestPlatform == null) return;
 
-        ArrivalsResponse arrivals = MinecraftClientData.getInstance().requestArrivals(pos.asLong(), LongImmutableList.of(closestPlatform.getId()), 1, 0, true);
+        ArrivalsResponse arrivals = ArrivalsCache.INSTANCE.requestArrivals(pos.asLong(), LongImmutableList.of(closestPlatform.getId()), 1, 0, true);
         ArrivalResponse firstArrival = arrivals.getArrivals().isEmpty() ? null : arrivals.getArrivals().get(0);
         if (firstArrival == null) return;