Support host|host,port|host/port to find local dat files

diff --git a/java/com/irtimaled/bbor/ClientProxy.java b/java/com/irtimaled/bbor/ClientProxy.java
index 530fe1ce6b06c4bffbc7e6a3801305ab91e53ace..05219e506d3b988071dd82805188e2206f6ca748 100644 (file)
--- a/java/com/irtimaled/bbor/ClientProxy.java
+++ b/java/com/irtimaled/bbor/ClientProxy.java
@@ -91,12 +91,19 @@ public class ClientProxy extends CommonProxy {
         File localStructuresFolder = new File(configManager.configDir, path);
         Logger.info("Looking for local structures (folder=%s)", localStructuresFolder.getAbsolutePath());
         if (!localStructuresFolder.exists()) {
-            path = String.format("%s,%d", path, port);
+            path = String.format("BBOutlineReloaded%s%s,%d", File.separator, host, port);
             localStructuresFolder = new File(configManager.configDir, path);
             Logger.info("Looking for local structures (folder=%s)", localStructuresFolder.getAbsolutePath());
         }
-        if (!localStructuresFolder.exists())
+        if (!localStructuresFolder.exists()) {
+            path = String.format("BBOutlineReloaded%s%s%s%d", File.separator, host, File.separator, port);
+            localStructuresFolder = new File(configManager.configDir, path);
+            Logger.info("Looking for local structures (folder=%s)", localStructuresFolder.getAbsolutePath());
+        }
+        if (!localStructuresFolder.exists())        {
+            Logger.info("No local structures folders found");
             return;
+        }
         loadLevelDat(localStructuresFolder);
         loadNetherStructures(localStructuresFolder);
         loadOverworldStructures(localStructuresFolder);