fix false adresses from full modpack

Author: suerion

loader/core/src/main/java/pl/skidam/automodpack_loader_core/client/ModpackUpdater.java

@@ -48,12 +48,12 @@ public String getModpackName() {
         return serverModpackContent.modpackName;
     }
 
-    public void prepareUpdate(Jsons.ModpackContentFields modpackContent, InetSocketAddress address, Secrets.Secret secret) {
+    public void prepareUpdate(Jsons.ModpackContentFields modpackContent, Jsons.ModpackAddresses modpackAddresses, Secrets.Secret secret) {
         this.serverModpackContent = modpackContent;
-        this.modpackAddress = address;
+        this.modpackAddresses = modpackAddresses;
+        this.modpackAddress = modpackAddresses.hostAddress;
         this.modpackSecret = secret;
-        this.modpackDir = ModpackUtils.getModpackPath(address, modpackContent.modpackName);
-        this.modpackAddresses = new Jsons.ModpackAddresses(address, null); // falls nur hostAddress benötigt wird
+        this.modpackDir = ModpackUtils.getModpackPath(modpackAddresses, modpackContent.modpackName);
 
         // check out of selected Modpack
         SelectionManager.setSelectedPack(serverModpackContent.modpackName);
@@ -169,7 +169,7 @@ public void startLowUpdate() {}
     public void startServerUpdate() {}
     */
     public void startUpdate() {
-        modpackDir = ModpackUtils.getModpackPath(modpackAddress, serverModpackContent.modpackName);
+        modpackDir = ModpackUtils.getModpackPath(modpackAddresses, serverModpackContent.modpackName);
         LOGGER.info("Using modpack directory: {}", modpackDir);
         if (modpackSecret == null) {
             LOGGER.error("Cannot update modpack, secret is null");

loader/core/src/main/java/pl/skidam/automodpack_loader_core/client/ModpackUtils.java

@@ -415,12 +415,13 @@ public static void addModpackToList(String modpackName, Jsons.ModpackAddresses m
     }
 
     // Returns modpack name formatted for path or url if server doesn't provide modpack name
-    public static Path getModpackPath(InetSocketAddress address, String modpackName) {
+    public static Path getModpackPath(Jsons.ModpackAddresses address, String modpackName) {
         if (modpackName.equalsIgnoreCase("fullserver")) {
             return hostFullServerPackDir.resolve("fullserver");
         }
 
-        String strAddress = address.getHostString() + ":" + address.getPort();
+        InetSocketAddress Address = address.hostAddress;
+        String strAddress = Address.getHostString() + ":" + Address.getPort();
         String correctedName = strAddress;
 
         if (FileInspection.isInValidFileName(strAddress)) {

src/main/java/pl/skidam/automodpack/networking/packet/DataC2SPacket.java

@@ -68,16 +68,17 @@ public static CompletableFuture<PacketByteBuf> receive(MinecraftClient minecraft
             Boolean needsDisconnecting = null;
             PacketByteBuf response = new PacketByteBuf(Unpooled.buffer());
 
-            Path modpackDir = ModpackUtils.getModpackPath(modpackAddress, modpackName);
+
             Jsons.ModpackAddresses modpackAddresses = new Jsons.ModpackAddresses(modpackAddress, serverAddress);
+            Path modpackDir = ModpackUtils.getModpackPath(modpackAddresses, modpackName);
             var optionalServerModpackContent = ModpackUtils.requestServerModpackContent(modpackAddresses, secret, true);
 
             if (optionalServerModpackContent.isPresent()) {
                 boolean update = ModpackUtils.isUpdate(optionalServerModpackContent.get(), modpackDir);
 
                 if (update) {
                     disconnectImmediately(handler);
-                    new ModpackUpdater().prepareUpdate(optionalServerModpackContent.get(), address, secret);
+                    new ModpackUpdater().prepareUpdate(optionalServerModpackContent.get(), modpackAddresses, secret);
                     needsDisconnecting = true;
                 } else {
                     boolean selectedModpackChanged = ModpackUtils.selectModpack(modpackDir, modpackAddresses, Set.of());