Fix config serialization

Author: Matyrobbrt

.github/workflows/release.yml

@@ -16,12 +16,6 @@ jobs:
           java-version: 17
           distribution: 'zulu'
           check-latest: true
-      # - name: Build Changelog
-      #  id: build_changelog
-      #  uses: mikepenz/release-changelog-builder-action@v1
-      #  with:
-      #    commitMode: true
-      #    token: ${{ github.token }}
       - name: Setup ENV
         run: echo "TAG=${GITHUB_REF:10}" >> $GITHUB_ENV
       - name: Grant execute permission for gradlew
@@ -31,14 +25,20 @@ jobs:
         run: ./gradlew buildAll -Pversion=${{ env.TAG }}
         env:
           BUILD_NUMBER: ${{ github.run_number }}
+      - name: Make Changelog
+        uses: FabricMC/fabric-action-scripts@v1
+        id: changelog
+        with:
+          context: changelog
+          workflow_id: release.yml
       - name: Create release
         id: create_release
         uses: ncipollo/release-action@v1
         with:
           token: ${{ github.token }}
           tag: ${{ github.ref }}
           name: Release ${{ env.TAG }}
-          # body: ${{steps.build_changelog.outputs.changelog}}
+          body: ${{ steps.changelog.outputs.changelog }}
           artifactErrorsFailBuild: true
           artifacts: 'build/libs/**.jar'
           generateReleaseNotes: true

gradle.properties

@@ -1,2 +1,2 @@
 name = "ReLauncher"
-version = 1.1.0-dirty
+version = 2.0.0-dirty

src/api/java/com/mcmoddev/relauncher/api/BaseProcessManager.java

@@ -1,3 +1,23 @@
+/*
+ * ReLauncher - https://github.com/MinecraftModDevelopment/ReLauncher
+ * Copyright (C) 2016-2022 <MMD - MinecraftModDevelopment>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * Specifically version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ * https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+ */
 package com.mcmoddev.relauncher.api;
 
 import org.jetbrains.annotations.NotNull;

src/api/java/com/mcmoddev/relauncher/api/CustomScriptManager.java

@@ -1,3 +1,23 @@
+/*
+ * ReLauncher - https://github.com/MinecraftModDevelopment/ReLauncher
+ * Copyright (C) 2016-2022 <MMD - MinecraftModDevelopment>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * Specifically version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ * https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+ */
 package com.mcmoddev.relauncher.api;
 
 import java.util.List;

src/api/java/com/mcmoddev/relauncher/api/LauncherFactory.java

@@ -64,16 +64,22 @@ default Path getConfigPath(Path launcherDirectory) {
     @NotNull
     JarUpdater createUpdater(T config);
 
+    /**
+     * Creates a {@link CustomScriptManager}.
+     *
+     * @param config the launcher config
+     * @return the script manager
+     */
     default CustomScriptManager createScriptManager(T config) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException("Custom Script Managers are unsupported by this factory.");
     }
 
     /**
      * Creates a {@link DiscordIntegration}. <br>
      * The launcher only calls this method if Discord Integration is enabled in the config.
      *
      * @param config  the launcher config
-     * @param updater the {@link BaseProcessManager process manager}
+     * @param manager the {@link BaseProcessManager process manager}
      * @return the integration instance. Can be {@code null}.
      */
     @Nullable
@@ -96,5 +102,6 @@ default RepoInfo getLauncherRepo() {
     @Nullable
     String getSelfUpdateUrl(String tagName) throws IOException, InterruptedException;
 
-    record RepoInfo(String owner, String repo) {}
+    record RepoInfo(String owner, String repo) {
+    }
 }

src/launcher/java/com/mcmoddev/relauncher/Config.java

@@ -21,14 +21,20 @@
 package com.mcmoddev.relauncher;
 
 import com.mcmoddev.relauncher.api.LauncherConfig;
+import io.leangen.geantyref.TypeToken;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
+import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.hocon.HoconConfigurationLoader;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 import org.spongepowered.configurate.objectmapping.meta.Comment;
 import org.spongepowered.configurate.objectmapping.meta.Required;
 import org.spongepowered.configurate.objectmapping.meta.Setting;
+import org.spongepowered.configurate.serialize.SerializationException;
+import org.spongepowered.configurate.serialize.TypeSerializer;
 
+import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -48,6 +54,11 @@ public class Config implements LauncherConfig {
         - CUSTOM_SCRIPT => manages a custom java launch script, does NOT support updating""")
     public LauncherMode mode = LauncherMode.JAR;
 
+    @Override
+    public LauncherMode getLauncherMode() {
+        return mode;
+    }
+
     @Setting("jar_path")
     @Comment("Only if the mode is JAR, the path of the jar to launch.")
     public String jarPath = "file.jar";
@@ -164,6 +175,7 @@ public static <T> T load(final Path path, final Class<T> cfgType, final T defaul
             .emitComments(true)
             .prettyPrinting(true)
             .path(path)
+            .defaultOptions(opt -> opt.serializers(builder -> builder.register(TypeToken.get(LauncherMode.class), new ModeSerializer())))
             .build();
         final var configSerializer = Objects.requireNonNull(loader.defaultOptions().serializers().get(cfgType));
         final var type = io.leangen.geantyref.TypeToken.get(cfgType).getType();
@@ -185,12 +197,35 @@ public static <T> T load(final Path path, final Class<T> cfgType, final T defaul
         final var configRef = loader.loadToReference();
 
         { // Add new values to the config
-            final var inMemoryNode = CommentedConfigurationNode.factory().createNode();
+            final var inMemoryNode = CommentedConfigurationNode
+                .root(loader.defaultOptions());
             configSerializer.serialize(type, defaultValue, inMemoryNode);
             configRef.node().mergeFrom(inMemoryNode);
             configRef.save();
         }
 
         return configRef.referenceTo(cfgType).get();
     }
+
+    private static final class ModeSerializer implements TypeSerializer<LauncherMode> {
+
+        @Override
+        public LauncherMode deserialize(final Type type, final ConfigurationNode node) throws SerializationException {
+            final var str = node.getString();
+            if (str == null)
+                return null;
+            for (final var val : LauncherMode.class.getEnumConstants())
+                if (str.equalsIgnoreCase(val.toString()))
+                    return val;
+            return null;
+        }
+
+        @Override
+        public void serialize(final Type type, @Nullable final LauncherMode obj, final ConfigurationNode node) throws SerializationException {
+            if (obj == null)
+                node.raw(null);
+            else
+                node.set(obj.toString());
+        }
+    }
 }

src/launcher/java/com/mcmoddev/relauncher/Main.java

@@ -88,7 +88,7 @@ public final class Main {
     public static final ScheduledThreadPoolExecutor SERVICE;
 
     static {
-        final var service = (ScheduledThreadPoolExecutor) Executors.newScheduledThreadPool(1, r -> new Thread(THREAD_GROUP, r, "UpdatingLauncher"));
+        final var service = (ScheduledThreadPoolExecutor) Executors.newScheduledThreadPool(1, r -> new Thread(THREAD_GROUP, r, "ReLauncher"));
         service.setKeepAliveTime(1, TimeUnit.HOURS);
         SERVICE = service;
     }

src/launcher/java/com/mcmoddev/relauncher/WrappingFactory.java

@@ -21,6 +21,7 @@
 package com.mcmoddev.relauncher;
 
 import com.mcmoddev.relauncher.api.BaseProcessManager;
+import com.mcmoddev.relauncher.api.CustomScriptManager;
 import com.mcmoddev.relauncher.api.DiscordIntegration;
 import com.mcmoddev.relauncher.api.JarUpdater;
 import com.mcmoddev.relauncher.api.LauncherConfig;
@@ -68,4 +69,8 @@ public JarUpdater createUpdater(final Object config) {
         return delegate.getSelfUpdateUrl(tagName);
     }
 
+    @Override
+    public CustomScriptManager createScriptManager(final T config) {
+        return delegate.createScriptManager(config);
+    }
 }