From 8ce1ec677228feec06f687d93282430966b63d2e Mon Sep 17 00:00:00 2001
From: skidam <skidamdev@proton.me>
Date: Tue, 22 Jul 2025 13:19:51 +0200
Subject: [PATCH] Add ModflaredApi #398

---
 ModflaredApi.jar                              | Bin 0 -> 2076 bytes
 build.fabric.gradle.kts                       |   1 +
 build.forge.gradle.kts                        |   1 +
 build.neoforge.gradle.kts                     |   1 +
 core/build.gradle.kts                         |   2 ++
 .../automodpack_loader_core/Preload.java      |   2 +-
 .../client/ModpackUpdater.java                |   9 ++++--
 loader/loader-fabric-core.gradle.kts          |   1 +
 loader/loader-forge.gradle.kts                |   1 +
 loader/loader-neoforge.gradle.kts             |   1 +
 .../networking/packet/DataC2SPacket.java      |  26 +++++++++++-------
 11 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 ModflaredApi.jar

diff --git a/ModflaredApi.jar b/ModflaredApi.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f6f78a4ad6cb9b772bd8740c8e387cbe954b604b
GIT binary patch
literal 2076
zcmWIWW@Zs#;Nak3U|>)LVgwKYGJRb`9CbbY-1L1N{XE@VgG2Ou-CFz4t~%tv<MzFE
zpL2Xdo8Mo@U83s?c9tqWvfCEeH22Jel`+4+DNQY7IhcFy<aB*egSmz!uR4TI6wZ{K
zyZj{ooR+Mw+>7}39yeMY&B1us<KLXks}@;rytSD1|D`v@Mqbg4%Z_SREj=3}{$BE8
z?Bv%!bIcwo*1lb{T<q$zdy4jF4c0!XlAOA>W22bG{=Y#IdnJ0A3+=Cb)hO&SyydcW
zLFdQb^>6+yU*8rN{~_$o+4_bDwjW*J9!UBSkUUecTtiHn>E&e=U%3Epc8*xPX8EH)
zPflWFU<kk&44lZpzzkH#4hkv;CJ+GxxHU2ZWm8i1NzuXu(NdI{mYAADl1@-$0WE{-
z%*{_p%SkLsO(Dq)2^?l57G#oSjuswsd|@tgEXdSL&PgmTF6}$(bvQtvb${mN{St5c
zca<o1tl)lsEOvE(%R+(G32*<I?Yuh0MAPu=-XpCK4zYh&=pwW_<?>mB;&XHIpS}M5
zSlA*x+~Py8*O!pl0cVrzrCuHR;ib=1`q})exFfG%l=0t1p(_@<ms-!1)L$DYcI)Wg
z%Q>za*#GW6_#)9_Pf@FJ`Q6qMNmsRyW~Ia_*|7_6aW7KXD{#vFcyhZHuQYe`hD*yI
zL|Vjj>pt4$wD)<d<*9{UYaKh6CBz=vCparlVCKUjJHwM6{!YpzcWzvM7@_WHw%+Bp
zU7XsyoqSG*?NoIfGE!_7w4}UO+``zZ;PCXx+}`VV-Z5N_pO||f@+;qLhq-J2e~5eM
z;Ce43HBqx=^RCIv+V-F{7A^c~nlLb79>kkC<?#e{NoigliK)nfuyLNqF&F~20uql?
z`_B3uau8`fpR3LB@5AyVOTBO0II=@oO{$mEGf<d=yWIIXlk+V<V_lVfll{RF*)y|g
zS3~dS8IymW+gX0@`SsuI4cS{br%$R?Ue=^+f2~N0^YA6{m7hMRPAYivo!$P6S?J=X
zsg5nboYu6+ccwhE_Z5?Qmb#;5v+PIi*(xR>-(Iifb=ocbXRYKjH`UE?`+qxqcxH8)
zGj3Jy)S7ihheAL6UuWx7{F|TYE2plax$is6r!GZ8`-H4^Td_v3uvXi`d%WuCZR<VO
zx-$c~Lk{(yt~ivYq9%A-&r0NCghc9n=?M7(yX&7KB?ODlsVRrFS7kcY1qe>(;Ip~$
zxGBI%l23{u&!K?P;@#}M7g++B7*{M{eNgjuQCD-)t%G)a-1i+>-3tnmHjCXBtY}HT
z!nHP<_2Cwd_qEKR$Y%6vyJ!K7XaiuW65!3qB*K6wl95X(P%cLW*a~QL6F@p(#TBSD
zLjZQ5op2NIX#<sI2;czJ1}tpwX#kaE2v7{s04<&H=|lD5S`>YVQVpL8pi&G0KH@L|
zRHmVuf}G_*Wf%fj0)r1*=?XFhIX^&h0=l^%b70{Q%CHEq1Q@Qk%!OuObi<I73MjiG
bz-PjS;mo`N-mGjOlQ@B}6zJB8tRNl$@PtJ?

literal 0
HcmV?d00001

diff --git a/build.fabric.gradle.kts b/build.fabric.gradle.kts
index fbc31398e..189631415 100644
--- a/build.fabric.gradle.kts
+++ b/build.fabric.gradle.kts
@@ -17,6 +17,7 @@ loom {
 dependencies {
     implementation(project(":core"))
     implementation(project(":loader-core"))
+    implementation(files(rootDir.resolve("ModflaredApi.jar")))
 
     minecraft("com.mojang:minecraft:${property("deps.minecraft")}")
     mappings(loom.layered {
diff --git a/build.forge.gradle.kts b/build.forge.gradle.kts
index 332229a0f..a14c3c2e0 100644
--- a/build.forge.gradle.kts
+++ b/build.forge.gradle.kts
@@ -26,6 +26,7 @@ legacyForge {
 dependencies {
     implementation(project(":core"))
     implementation(project(":loader-core"))
+    implementation(files(rootDir.resolve("ModflaredApi.jar")))
 
     compileOnly("net.fabricmc.fabric-api:fabric-api:0.92.2+1.20.1")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${property("deps.mixin-extras")}")!!)
diff --git a/build.neoforge.gradle.kts b/build.neoforge.gradle.kts
index 7e1bba8fd..eb480695b 100644
--- a/build.neoforge.gradle.kts
+++ b/build.neoforge.gradle.kts
@@ -22,6 +22,7 @@ neoForge {
 dependencies {
     implementation(project(":core"))
     implementation(project(":loader-core"))
+    implementation(files(rootDir.resolve("ModflaredApi.jar")))
 
     compileOnly("net.fabricmc.fabric-api:fabric-api:0.92.2+1.20.1")
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index ce131a635..d02e4b7a9 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -25,6 +25,8 @@ dependencies {
     implementation("org.apache.httpcomponents.client5:httpclient5:5.5")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.2")
+
+    implementation(files(rootDir.resolve("ModflaredApi.jar")))
 }
 
 java {
diff --git a/loader/core/src/main/java/pl/skidam/automodpack_loader_core/Preload.java b/loader/core/src/main/java/pl/skidam/automodpack_loader_core/Preload.java
index 60217a188..ade005068 100644
--- a/loader/core/src/main/java/pl/skidam/automodpack_loader_core/Preload.java
+++ b/loader/core/src/main/java/pl/skidam/automodpack_loader_core/Preload.java
@@ -85,7 +85,7 @@ private void updateAll() {
             CustomFileUtils.deleteDummyFiles(Path.of(System.getProperty("user.dir")), latestModpackContent == null ? null : latestModpackContent.list);
 
             // Update modpack
-            new ModpackUpdater().prepareUpdate(latestModpackContent, modpackAddresses, secret, selectedModpackDir);
+            new ModpackUpdater().prepareUpdate(latestModpackContent, modpackAddresses, secret, selectedModpackDir, null);
         }
     }
 
diff --git a/loader/core/src/main/java/pl/skidam/automodpack_loader_core/client/ModpackUpdater.java b/loader/core/src/main/java/pl/skidam/automodpack_loader_core/client/ModpackUpdater.java
index fe18cbc7c..308f74243 100644
--- a/loader/core/src/main/java/pl/skidam/automodpack_loader_core/client/ModpackUpdater.java
+++ b/loader/core/src/main/java/pl/skidam/automodpack_loader_core/client/ModpackUpdater.java
@@ -36,17 +36,18 @@ public class ModpackUpdater {
     private Secrets.Secret modpackSecret;
     private Path modpackDir;
     private Path modpackContentFile;
-
+    private Runnable callback;
 
     public String getModpackName() {
         return serverModpackContent.modpackName;
     }
 
-    public void prepareUpdate(Jsons.ModpackContentFields modpackContent, Jsons.ModpackAddresses modpackAddresses, Secrets.Secret secret, Path modpackPath) {
+    public void prepareUpdate(Jsons.ModpackContentFields modpackContent, Jsons.ModpackAddresses modpackAddresses, Secrets.Secret secret, Path modpackPath, Runnable callback) {
         this.serverModpackContent = modpackContent;
         this.modpackAddresses = modpackAddresses;
         this.modpackSecret = secret;
         this.modpackDir = modpackPath;
+        this.callback = callback;
 
         if (this.modpackAddresses.isAnyEmpty() || modpackPath.toString().isEmpty()) {
             throw new IllegalArgumentException("Address or modpackPath is null or empty");
@@ -377,6 +378,10 @@ public void startUpdate() {
             // Downloads completed
             Files.writeString(modpackContentFile, modpackContentJson);
 
+            if (callback != null) {
+                callback.run();
+            }
+
             Path cwd = Path.of(System.getProperty("user.dir"));
             CustomFileUtils.deleteDummyFiles(cwd, serverModpackContent.list);
 
diff --git a/loader/loader-fabric-core.gradle.kts b/loader/loader-fabric-core.gradle.kts
index 8f0a1c3a0..7d9e7839d 100644
--- a/loader/loader-fabric-core.gradle.kts
+++ b/loader/loader-fabric-core.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
     compileOnly(project(":loader-core"))
     compileOnly(project(":loader-fabric-15"))
     compileOnly(project(":loader-fabric-16"))
+    implementation(files(rootDir.resolve("ModflaredApi.jar")))
 
     compileOnly("com.google.code.gson:gson:2.10.1")
     compileOnly("org.apache.logging.log4j:log4j-core:2.8.1")
diff --git a/loader/loader-forge.gradle.kts b/loader/loader-forge.gradle.kts
index a6399dfbd..9e01609ae 100644
--- a/loader/loader-forge.gradle.kts
+++ b/loader/loader-forge.gradle.kts
@@ -19,6 +19,7 @@ legacyForge {
 dependencies {
     compileOnly(project(":core"))
     compileOnly(project(":loader-core"))
+    implementation(files(rootDir.resolve("ModflaredApi.jar")))
 
     compileOnly("com.google.code.gson:gson:2.10.1")
     compileOnly("org.apache.logging.log4j:log4j-core:2.8.1")
diff --git a/loader/loader-neoforge.gradle.kts b/loader/loader-neoforge.gradle.kts
index 955b9c902..1ce8bc478 100644
--- a/loader/loader-neoforge.gradle.kts
+++ b/loader/loader-neoforge.gradle.kts
@@ -19,6 +19,7 @@ neoForge {
 dependencies {
     compileOnly(project(":core"))
     compileOnly(project(":loader-core"))
+    implementation(files(rootDir.resolve("ModflaredApi.jar")))
 
     compileOnly("com.google.code.gson:gson:2.10.1")
     compileOnly("org.apache.logging.log4j:log4j-core:2.8.1")
diff --git a/src/main/java/pl/skidam/automodpack/networking/packet/DataC2SPacket.java b/src/main/java/pl/skidam/automodpack/networking/packet/DataC2SPacket.java
index 64dafbf0e..9143dbb86 100644
--- a/src/main/java/pl/skidam/automodpack/networking/packet/DataC2SPacket.java
+++ b/src/main/java/pl/skidam/automodpack/networking/packet/DataC2SPacket.java
@@ -1,5 +1,6 @@
 package pl.skidam.automodpack.networking.packet;
 
+import de.rafael.modflared.api.ModflaredApi;
 import io.netty.buffer.Unpooled;
 import pl.skidam.automodpack.mixin.core.ClientConnectionAccessor;
 import pl.skidam.automodpack.mixin.core.ClientLoginNetworkHandlerAccessor;
@@ -17,7 +18,6 @@
 import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import net.minecraft.client.Minecraft;
@@ -76,7 +76,6 @@ public static CompletableFuture<FriendlyByteBuf> receive(Minecraft Minecraft, Cl
 
             LOGGER.info("Modpack address: {}:{} Requires to follow magic protocol: {}", modpackAddress.getHostString(), modpackAddress.getPort(), requiresMagic);
 
-            Boolean needsDisconnecting = null;
             FriendlyByteBuf response = new FriendlyByteBuf(Unpooled.buffer());
 
             Path modpackDir = ModpackUtils.getModpackPath(modpackAddress, modpackName);
@@ -87,9 +86,20 @@ public static CompletableFuture<FriendlyByteBuf> receive(Minecraft Minecraft, Cl
                 boolean update = ModpackUtils.isUpdate(optionalServerModpackContent.get(), modpackDir);
 
                 if (update) {
+                    String connectedAddressString = connectedAddress.getHostString();
+                    int connectedPort = connectedAddress.getPort();
+                    if (ModflaredApi.IAPITUNNEL != null && ModflaredApi.IAPITUNNEL.isModflaredTunnel(connectedAddressString, connectedPort)) {
+                        ModflaredApi.IAPITUNNEL.addTunnelDependency(connectedAddress.getHostString(), connectedAddress.getPort(), "automodpack");
+                    }
+
+                    Runnable callback = () -> {
+                        if (ModflaredApi.IAPITUNNEL != null) {
+                            ModflaredApi.IAPITUNNEL.removeTunnelDependency(connectedAddressString, connectedPort, "automodpack");
+                        }
+                    };
+
                     disconnectImmediately(handler);
-                    new ModpackUpdater().prepareUpdate(optionalServerModpackContent.get(), modpackAddresses, secret, modpackDir);
-                    needsDisconnecting = true;
+                    new ModpackUpdater().prepareUpdate(optionalServerModpackContent.get(), modpackAddresses, secret, modpackDir, callback);
                 } else {
                     boolean selectedModpackChanged = ModpackUtils.selectModpack(modpackDir, modpackAddresses, Set.of());
 
@@ -103,21 +113,17 @@ public static CompletableFuture<FriendlyByteBuf> receive(Minecraft Minecraft, Cl
                         SecretsStore.saveClientSecret(clientConfig.selectedModpack, secret);
                         disconnectImmediately(handler);
                         new ReLauncher(modpackDir, UpdateType.SELECT, null).restart(false);
-                        needsDisconnecting = true;
-                    } else {
-                        needsDisconnecting = false;
                     }
                 }
             } else if (ModpackUtils.canConnectModpackHost(modpackAddresses)) { // Can't download modpack because e.g. certificate is not verified but it can connect to the modpack host
-                needsDisconnecting = true;
+                disconnectImmediately(handler);
             }
 
             if (clientConfig.selectedModpack != null && !clientConfig.selectedModpack.isBlank()) {
                 SecretsStore.saveClientSecret(clientConfig.selectedModpack, secret);
             }
 
-            response.writeUtf(String.valueOf(needsDisconnecting), Short.MAX_VALUE);
-
+            response.writeUtf("false", Short.MAX_VALUE);
             return CompletableFuture.completedFuture(response);
         } catch (Exception e) {
             LOGGER.error("Error while handling data packet", e);