fix: Merge conflicts

Author: HttpRafa

common/src/main/java/de/rafael/modflared/Modflared.java

@@ -22,6 +22,7 @@ public class Modflared {
     public static final TunnelManager TUNNEL_MANAGER = new TunnelManager();
 
     public static void init() {
+        TUNNEL_MANAGER.initDirectories();
         TUNNEL_MANAGER.prepareBinary();
         TUNNEL_MANAGER.loadForcedTunnels();
 

common/src/main/java/de/rafael/modflared/github/GithubAPI.java

@@ -9,6 +9,7 @@
 import de.rafael.modflared.Modflared;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
 
 import java.io.File;
 import java.io.IOException;
@@ -60,7 +61,7 @@ public class GithubAPI {
         }, Modflared.EXECUTOR);
     }
 
-    private static List<FileHash> extractHashes(@NotNull JsonObject data) {
+    private static @NotNull @Unmodifiable List<FileHash> extractHashes(@NotNull JsonObject data) {
         return Arrays.stream(data.get("body").getAsString().split("\n")).filter(item -> item.startsWith("cloudflared-") && item.contains(":")).map(item -> {
             var fileData = item.split(":");
             return new FileHash(fileData[0].trim(), fileData[1].trim());

common/src/main/java/de/rafael/modflared/tunnel/manager/TunnelManager.java

@@ -45,6 +45,10 @@ public class TunnelManager {
 
     private final List<RunningTunnel> runningTunnels = new ArrayList<>();
 
+    public void initDirectories() {
+        DATA_FOLDER.mkdirs();
+    }
+
     public RunningTunnel createTunnel(String host) {
         var binary = this.cloudflared.get();
         if (binary != null) {

gradle.properties

@@ -10,7 +10,7 @@ enabled_platforms=fabric,neoforge
 
 # Mod Properties
 archives_base_name=modflared
-mod_version=1.5.0
+mod_version=1.5.1
 maven_group=de.rafael
 mod_minecraft_version=1.21.8