Remove hardcoded 128 block train update limit

README.md

@@ -11,13 +11,19 @@ Currently supports 1.19.2 - 1.19.4
 - Use elapsed time to ensure server train runs at a consistent rate regardless of TPS.
 
 ## Config
-The config file are automatically generated in `config/mtrotp.json` once the client starts up.
+The client config file are automatically generated in `config/mtrotp.json` once the client starts up.
 
 | Config Key          | Default Value | Description                                                                                        | Effect   |
 |---------------------|---------------|----------------------------------------------------------------------------------------------------|----------|
 | cullTrain           | true          | Use frustum culling to skip rendering train cars that are outside of camera bounds to improve FPS. | Varies   |
 | dashboardLazyRender | true          | Optimize the dashboard world map to improve FPS.                                                   | Varies   |
 
+The server config file are automatically generated in `config/mtrotp_server.json` once the server starts up.
+
+| Config Key          | Default Value | Description                                                                                   | Effect |
+|---------------------|---------------|-----------------------------------------------------------------------------------------------|--------|
+| trainUpdateDistance | 128           | This removes the hardcoded 128 blocks radius train update in MTR, allowing for customization. | N/A    |
+
 ## Bugs/Suggestions
 You may open an GitHub issue [here](https://github.com/DistrictOfJoban/MTR-OTP/issues)
 

src/main/java/com/lx862/mtrotp/MTROTP.java

@@ -1,5 +1,6 @@
 package com.lx862.mtrotp;
 
+import com.lx862.mtrotp.config.ServerConfig;
 import net.fabricmc.api.ModInitializer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -9,6 +10,7 @@ public class MTROTP implements ModInitializer {
     @Override
     public void onInitialize() {
         TickManager.initialize();
+        ServerConfig.load();
         LOGGER.info("[MTR-OTP] MTR-OTP initialized \\(＾▽＾)/");
     }
 }

src/main/java/com/lx862/mtrotp/config/ClientConfig.java

@@ -1,7 +1,6 @@
 package com.lx862.mtrotp.config;
 
 import com.google.gson.*;
-import com.lx862.mtrotp.MTROTP;
 import com.lx862.mtrotp.MTROTPClient;
 import net.fabricmc.loader.api.FabricLoader;
 
@@ -17,12 +16,12 @@ public class ClientConfig {
 
     public static void load() {
         if(!Files.exists(CONFIG_PATH)) {
-            MTROTPClient.LOGGER.info("[MTR-OTP] Config not found, generating one...");
+            MTROTPClient.LOGGER.info("[MTR-OTP] Client config not found, generating one...");
             writeConfig();
             return;
         }
 
-        MTROTPClient.LOGGER.info("[MTR-OTP] Reading config...");
+        MTROTPClient.LOGGER.info("[MTR-OTP] Reading client config...");
         try {
             final JsonObject jsonConfig = new JsonParser().parse(String.join("", Files.readAllLines(CONFIG_PATH))).getAsJsonObject();
             try {
@@ -39,7 +38,7 @@ public static void load() {
     }
 
     public static void writeConfig() {
-        MTROTPClient.LOGGER.info("[MTR-OTP] Writing Config...");
+        MTROTPClient.LOGGER.info("[MTR-OTP] Writing client config...");
         final JsonObject jsonConfig = new JsonObject();
         jsonConfig.addProperty("cullTrain", cullTrain);
         jsonConfig.addProperty("dashboardLazyRender", dashboardLazyRender);

src/main/java/com/lx862/mtrotp/config/ServerConfig.java

@@ -0,0 +1,47 @@
+package com.lx862.mtrotp.config;
+
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.lx862.mtrotp.MTROTPClient;
+import net.fabricmc.loader.api.FabricLoader;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+
+public class ServerConfig {
+    private static final Path CONFIG_PATH = Paths.get(FabricLoader.getInstance().getConfigDir().toString(), "mtrotp_server.json");
+    public static int trainUpdateDistance = 128;
+
+    public static void load() {
+        if(!Files.exists(CONFIG_PATH)) {
+            MTROTPClient.LOGGER.info("[MTR-OTP] Server config not found, generating one...");
+            writeConfig();
+            return;
+        }
+
+        MTROTPClient.LOGGER.info("[MTR-OTP] Reading server config...");
+        try {
+            final JsonObject jsonConfig = JsonParser.parseString(String.join("", Files.readAllLines(CONFIG_PATH))).getAsJsonObject();
+            try {
+                trainUpdateDistance = jsonConfig.get("trainUpdateDistance").getAsInt();
+            } catch (Exception ignored) {}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void writeConfig() {
+        MTROTPClient.LOGGER.info("[MTR-OTP] Writing server config...");
+        final JsonObject jsonConfig = new JsonObject();
+        jsonConfig.addProperty("trainUpdateDistance", trainUpdateDistance);
+
+        try {
+            Files.write(CONFIG_PATH, Collections.singleton(new GsonBuilder().setPrettyPrinting().create().toJson(jsonConfig)));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/com/lx862/mtrotp/mixin/TrainServerMixin.java

@@ -0,0 +1,15 @@
+package com.lx862.mtrotp.mixin;
+
+import com.lx862.mtrotp.config.ServerConfig;
+import mtr.data.TrainServer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(value = TrainServer.class, remap = false)
+public class TrainServerMixin {
+    @ModifyArg(method = "handlePositions", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/AABB;inflate(D)Lnet/minecraft/world/phys/AABB;"))
+    public double modifyAABBBoundary(double d) {
+        return ServerConfig.trainUpdateDistance;
+    }
+}

src/main/resources/mtrotp.mixins.json

@@ -4,7 +4,8 @@
   "package": "com.lx862.mtrotp.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "SidingMixin"
+    "SidingMixin",
+    "TrainServerMixin"
   ],
   "client": [
     "JonModelTrainRendererMixin",