fix: #67

Author: HttpRafa

.github/workflows/build_publish.yml

@@ -16,14 +16,14 @@ jobs:
         java: [
           21,    # Current Java LTS & minimum supported by Minecraft
         ]
-        os: [ubuntu-22.04]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'microsoft'
@@ -34,14 +34,14 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: upload to modrinth
-        if: "github.ref == 'refs/heads/multi/latest' && !contains(github.event.head_commit.message, 'upload skip')"
+        if: "github.ref == 'refs/heads/multi/1.21.5' && !contains(github.event.head_commit.message, 'upload skip')"
         run: ./gradlew modrinth
         env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}
           GITHUB_RUN_NUMBER: ${{ github.run_number }}
           GITHUB_EVENT_RAW_PATH: ${{ github.event_path }}
       - name: upload to curseforge
-        if: "github.ref == 'refs/heads/multi/latest' && !contains(github.event.head_commit.message, 'upload skip')"
+        if: "github.ref == 'refs/heads/multi/1.21.5' && !contains(github.event.head_commit.message, 'upload skip')"
         run: ./gradlew publishCurseForge
         env:
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_UPLOAD_TOKEN }}

common/src/main/java/de/rafael/modflared/binary/download/DownloadedCloudflared.java

@@ -124,6 +124,8 @@ public CompletableFuture<Pair<Boolean, String>> isUptoDate() {
 
                     // Check if file is corrupt
                     if(fileHash.compareTo(file)) {
+                        Modflared.LOGGER.info("Preparing cloudflared binary...");
+                        prepareFile(file);
                         Modflared.LOGGER.info("Download finished of cloudflared version {}!", version);
                         return;
                     } else {
@@ -139,6 +141,20 @@ public CompletableFuture<Pair<Boolean, String>> isUptoDate() {
         }, Modflared.EXECUTOR);
     }
 
+    private void prepareFile(File file) throws IOException, InterruptedException {
+        switch (Platform.get()) {
+            case MACOSX:
+                new ProcessBuilder("tar", "-xzf", file.getName()).directory(file.getParentFile()).start().waitFor();
+                new ProcessBuilder("mv", "cloudflared", file.getName()).directory(file.getParentFile()).start().waitFor();
+                //Fallthrough
+            case LINUX:
+                new ProcessBuilder("chmod", "+x", file.getName()).directory(file.getParentFile()).start();
+                break;
+            default:
+                break;
+        }
+    }
+
     private @NotNull File syncDownloadFile() throws IOException, InterruptedException {
         File output = new File(TunnelManager.DATA_FOLDER, download.fileName());
         if(!output.getParentFile().exists()) output.getParentFile().mkdirs();
@@ -152,17 +168,6 @@ public CompletableFuture<Pair<Boolean, String>> isUptoDate() {
             fileOutputStream.flush();
         }
 
-        switch (Platform.get()) {
-            case MACOSX:
-                new ProcessBuilder("tar", "-xzf", output.getName()).directory(output.getParentFile()).start().waitFor();
-                new ProcessBuilder("mv", "cloudflared", output.getName()).directory(output.getParentFile()).start().waitFor();
-                //Fallthrough
-            case LINUX:
-                new ProcessBuilder("chmod", "+x", output.getName()).directory(output.getParentFile()).start();
-                break;
-            default:
-                break;
-        }
         return output;
     }
 

fabric/build.gradle

@@ -7,7 +7,7 @@ import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import java.nio.file.Files
 
 plugins {
-    id "com.gradleup.shadow" version "9.0.0-beta11"
+    id "com.gradleup.shadow" version "9.0.0-beta17"
     id "com.modrinth.minotaur" version "2.+"
     id 'net.darkhax.curseforgegradle' version '1.1.15'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -7,7 +7,7 @@ import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import java.nio.file.Files
 
 plugins {
-    id "com.gradleup.shadow" version "9.0.0-beta11"
+    id "com.gradleup.shadow" version "9.0.0-beta17"
     id "com.modrinth.minotaur" version "2.+"
     id 'net.darkhax.curseforgegradle' version '1.1.15'
 }