Trying to add selection Screen, Pull is not finished yet!

core/src/main/java/pl/skidam/automodpack_core/GlobalVariables.java

@@ -5,6 +5,7 @@
 import pl.skidam.automodpack_core.config.Jsons;
 import pl.skidam.automodpack_core.loader.*;
 import pl.skidam.automodpack_core.modpack.ModpackExecutor;
+import pl.skidam.automodpack_core.modpack.FullServerPack;
 import pl.skidam.automodpack_core.protocol.netty.NettyServer;
 
 import java.nio.file.Path;
@@ -23,9 +24,11 @@ public class GlobalVariables {
     public static GameCallService GAME_CALL = new NullGameCall();
     public static Path THIZ_JAR;
     public static Path MODS_DIR;
+    // new modpack class, now gen about the Executor
     public static ModpackExecutor modpackExecutor;
+    public static FullServerPack fullpacks;
     public static NettyServer hostServer;
-    public static Jsons.ServerConfigFieldsV2 serverConfig;
+    public static Jsons.ServerConfigFieldsV3 serverConfig;
     public static Jsons.ClientConfigFieldsV2 clientConfig;
     public static Jsons.KnownHostsFields knownHosts;
     public static final Path automodpackDir = Path.of("automodpack");
@@ -34,8 +37,8 @@ public class GlobalVariables {
     // Main - required
     // Addons - optional addon packs
     // Switches - optional or required packs, chosen by the player, only one can be installed at a time
-    public static final Path hostContentModpackDir = hostModpackDir.resolve("main");
-    public static Path hostModpackContentFile = hostModpackDir.resolve("automodpack-content.json");
+    public static final Path mainHostContentModpackDir = hostModpackDir.resolve("main");
+    public static final Path hostModpackContentFile = hostModpackDir.resolve("automodpack-content.json");
     public static Path serverConfigFile = automodpackDir.resolve("automodpack-server.json");
     public static Path serverCoreConfigFile = automodpackDir.resolve("automodpack-core.json");
     public static final Path privateDir = automodpackDir.resolve(".private");
@@ -50,6 +53,7 @@ public class GlobalVariables {
     public static final Path clientConfigFile = automodpackDir.resolve("automodpack-client.json");
     public static final Path clientSecretsFile = privateDir.resolve("automodpack-client-secrets.json");
     public static final Path modpacksDir = automodpackDir.resolve("modpacks");
+    public static final Path hostFullServerPackDir = automodpackDir.resolve("serverpack");
 
     public static final String clientConfigFileOverrideResource = "overrides-automodpack-client.json";
     public static String clientConfigOverride; // read from inside a jar file on preload, used instead of clientConfigFile if exists

core/src/main/java/pl/skidam/automodpack_core/Server.java

@@ -2,17 +2,22 @@
 
 import pl.skidam.automodpack_core.config.ConfigTools;
 import pl.skidam.automodpack_core.config.Jsons;
+import pl.skidam.automodpack_core.modpack.FullServerPackContent;
 import pl.skidam.automodpack_core.modpack.ModpackExecutor;
-import pl.skidam.automodpack_core.modpack.ModpackContent;
+import pl.skidam.automodpack_core.modpack.FullServerPack;
 import pl.skidam.automodpack_core.protocol.netty.NettyServer;
+import pl.skidam.automodpack_core.utils.CustomFileUtils;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
 
 import static pl.skidam.automodpack_core.GlobalVariables.*;
 
 public class Server {
 
+    //hostmodpack folder
+    private static final Path hostContentModpackDir = CustomFileUtils.getPathFromCWD("automodpack/host-modpack");
+
+
     // TODO Finish this class that it will be able to host the server without mod
     public static void main(String[] args) {
 
@@ -31,13 +36,12 @@ public static void main(String[] args) {
 
         modpackDir.toFile().mkdirs();
 
-        hostModpackContentFile = modpackDir.resolve("automodpack-content.json");
+//        hostModpackContentFile = modpackDir.resolve("automodpack-content.json");
         serverConfigFile = modpackDir.resolve("automodpack-server.json");
         serverCoreConfigFile = modpackDir.resolve("automodpack-core.json");
 
-        serverConfig = ConfigTools.load(serverConfigFile, Jsons.ServerConfigFieldsV2.class);
+        serverConfig = ConfigTools.load(serverConfigFile, Jsons.ServerConfigFieldsV3.class);
         if (serverConfig != null) {
-            serverConfig.syncedFiles = new ArrayList<>();
             serverConfig.validateSecrets = false;
             ConfigTools.save(serverConfigFile, serverConfig);
 
@@ -60,18 +64,45 @@ public static void main(String[] args) {
         mainModpackDir.toFile().mkdirs();
 
         ModpackExecutor modpackExecutor = new ModpackExecutor();
-        ModpackContent modpackContent = new ModpackContent(serverConfig.modpackName, null, mainModpackDir, serverConfig.syncedFiles, serverConfig.allowEditsInFiles, serverConfig.forceCopyFilesToStandardLocation, modpackExecutor.getExecutor());
-        boolean generated = modpackExecutor.generateNew(modpackContent);
+//        ModpackContent modpackContent = new ModpackContent(serverConfig.modpackName, null, mainModpackDir, serverConfig.syncedFiles, serverConfig.allowEditsInFiles, serverConfig.forceCopyFilesToStandardLocation, modpackExecutor.getExecutor());
+//        boolean generated = modpackExecutor.generateNew(modpackContent);
+
+//        if (generated) {
+//            LOGGER.info("Modpack generated!");
+//        } else {
+//            LOGGER.error("Failed to generate modpack!");
+//        }
+
+        //beta modpack Executor 
+        //modpackExecutor.stop();
+
+        // change hostPort to bindPort?
+        //LOGGER.info("Starting server on port {}", serverConfig.bindPort);
 
-        if (generated) {
-            LOGGER.info("Modpack generated!");
+        FullServerPack fullserverpack = new FullServerPack(modpackExecutor);
+
+        String modpackName = serverConfig.groups.get("host").groupName;
+        FullServerPackContent fullServerPackContent = new FullServerPackContent(modpackName, hostContentModpackDir, fullserverpack.executor.getExecutor());
+        boolean fullpackgenerated = fullserverpack.generateNew(fullServerPackContent);
+
+        if (fullpackgenerated) {
+            LOGGER.info("FullServerPack generated!");
         } else {
-            LOGGER.error("Failed to generate modpack!");
+            LOGGER.error("Failed to generate serverpack!");
         }
 
         modpackExecutor.stop();
+        fullserverpack.shutdownExecutor();
+        //port from Config
+        Jsons.GroupDeclaration hostGroup = serverConfig.groups.get("host");
+        if (hostGroup == null) {
+            LOGGER.error("Host group not found in server config!");
+            return;
+        }
+
+        int port = serverConfig.bindPort;
+        LOGGER.info("Starting server on port {}", port);
 
-        LOGGER.info("Starting server on port {}", serverConfig.bindPort);
         server.start();
         // wait for server to stop
         while (server.isRunning()) {

core/src/main/java/pl/skidam/automodpack_core/config/ConfigTools.java

@@ -2,13 +2,25 @@
 package pl.skidam.automodpack_core.config;
 
 import com.google.gson.*;
-import pl.skidam.automodpack_core.utils.AddressHelpers;
-
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
 import java.lang.reflect.Type;
 import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.io.Reader;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import pl.skidam.automodpack_core.utils.AddressHelpers;
+
 
 import static pl.skidam.automodpack_core.GlobalVariables.*;
 
@@ -91,6 +103,7 @@ public static <T> T load(Path configFile, Class<T> configClass) {
         }
     }
 
+
     public static <T> T load(String json, Class<T> configClass) {
         try {
             if (json != null) {
@@ -123,19 +136,19 @@ public static void save(Path configFile, Object configObject) {
 
 
     // Modpack content stuff
-    public static Jsons.ModpackContentFields loadModpackContent(Path modpackContentFile) {
+    public static Jsons.ModpackGroupFields loadModpackContent(Path modpackContentFile) {
         try {
             if (Files.isRegularFile(modpackContentFile)) {
                 String json = Files.readString(modpackContentFile);
-                return GSON.fromJson(json, Jsons.ModpackContentFields.class);
+                return GSON.fromJson(json, Jsons.ModpackGroupFields.class);
             }
         } catch (Exception e) {
             LOGGER.error("Couldn't load modpack content! {}", modpackContentFile.toAbsolutePath().normalize(), e);
         }
         return null;
     }
 
-    public static void saveModpackContent(Path modpackContentFile, Jsons.ModpackContentFields configObject) {
+    public static void saveModpackContent(Path modpackContentFile, Jsons.ModpackGroupFields configObject) {
         try {
             if (!Files.isDirectory(modpackContentFile.getParent())) {
                 Files.createDirectories(modpackContentFile.getParent());
@@ -147,4 +160,37 @@ public static void saveModpackContent(Path modpackContentFile, Jsons.ModpackCont
             e.printStackTrace();
         }
     }
+
+    public static void saveFullServerPackContent(Path modpackContentFile, Jsons.FullServerPackContentFields configObject) {
+        try {
+            if (!Files.isDirectory(modpackContentFile.getParent())) {
+                Files.createDirectories(modpackContentFile.getParent());
+            }
+
+            Files.writeString(modpackContentFile, GSON.toJson(configObject), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+        } catch (Exception e) {
+            LOGGER.error("Couldn't save full server pack content! " + configObject.getClass());
+            e.printStackTrace();
+        }
+    }
+
+    public static Set<String> loadFullServerPackExclude(Path serverConfigPath) {
+        Set<String> excludedFiles = new HashSet<>();
+
+        if (!Files.exists(serverConfigPath)) return excludedFiles;
+
+        try (Reader reader = Files.newBufferedReader(serverConfigPath)) {
+            JsonObject json = JsonParser.parseReader(reader).getAsJsonObject();
+            JsonArray excluded = json.getAsJsonArray("ServerPackExcluded");
+            if (excluded != null) {
+                for (JsonElement e : excluded) {
+                    excludedFiles.add(e.getAsString());
+                }
+            }
+        } catch (IOException | JsonParseException e) {
+            LOGGER.error("Error in automodpack-server.json with FullServerPack exclude", e);
+        }
+
+        return excludedFiles;
+    }
 }