General work

Author: TheRandomLabs

build.gradle

@@ -28,6 +28,8 @@ dependencies {
 	testRuntimeOnly "org.apache.logging.log4j:log4j-core:2.12.1"
 	testRuntimeOnly "org.apache.logging.log4j:log4j-slf4j18-impl:2.12.1"
 
+	testImplementation "com.github.TheRandomLabs:TRLUtils-IO:master-SNAPSHOT"
+
 	testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.0-M1"
 	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.6.0-M1"
 	testImplementation "org.assertj:assertj-core:3.14.0"

src/main/java/com/therandomlabs/curseapi/minecraft/modpack/CurseModpack.java

@@ -1,10 +1,13 @@
 package com.therandomlabs.curseapi.minecraft.modpack;
 
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
 
+import com.therandomlabs.curseapi.CurseException;
 import com.therandomlabs.curseapi.file.MinimalCurseFile;
 import com.therandomlabs.curseapi.minecraft.MCVersion;
+import com.therandomlabs.curseapi.util.MoshiUtils;
 
 /**
  * Represents a CurseForge Minecraft modpack.
@@ -101,4 +104,41 @@ public interface CurseModpack {
 	 * @return this {@link CurseModpack}.
 	 */
 	CurseModpack files(Collection<? extends MinimalCurseFile> files);
+
+	/**
+	 * Returns this modpack as a JSON string.
+	 *
+	 * @return this modpack as a JSON string.
+	 */
+	String toJSON();
+
+	/**
+	 * Writes this modpack as a JSON string to the specified {@link Path}.
+	 *
+	 * @param path a {@link Path}.
+	 * @throws CurseException if an error occurs.
+	 */
+	void toJSON(Path path) throws CurseException;
+
+	/**
+	 * Creates a {@link CurseModpack} instance from a JSON string.
+	 *
+	 * @param json a JSON string.
+	 * @return a {@link CurseModpack} instance.
+	 * @throws CurseException if an error occurs.
+	 */
+	static CurseModpack fromJSON(String json) throws CurseException {
+		return MoshiUtils.fromJSON(json, DefaultCurseModpack.class);
+	}
+
+	/**
+	 * Parses the specified JSON string to create a {@link CurseModpack} instance.
+	 *
+	 * @param json a JSON string.
+	 * @return a {@link CurseModpack} instance.
+	 * @throws CurseException if an error occurs.
+	 */
+	static CurseModpack fromJSON(Path json) throws CurseException {
+		return MoshiUtils.fromJSON(json, DefaultCurseModpack.class);
+	}
 }

src/main/java/com/therandomlabs/curseapi/minecraft/modpack/DefaultCurseModpack.java

@@ -1,14 +1,18 @@
 package com.therandomlabs.curseapi.minecraft.modpack;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import com.google.common.base.Preconditions;
+import com.therandomlabs.curseapi.CurseAPI;
+import com.therandomlabs.curseapi.CurseException;
 import com.therandomlabs.curseapi.file.MinimalCurseFile;
 import com.therandomlabs.curseapi.minecraft.MCVersion;
 import com.therandomlabs.curseapi.minecraft.MCVersions;
+import com.therandomlabs.curseapi.util.MoshiUtils;
 
 @SuppressWarnings("squid:S1068")
 final class DefaultCurseModpack implements CurseModpack {
@@ -22,6 +26,14 @@ private static final class ModLoaderInfo {
 		List<ModLoaderInfo> modLoaders = Collections.singletonList(new ModLoaderInfo());
 	}
 
+	private static final class FileInfo extends MinimalCurseFile.Immutable {
+		boolean required = true;
+
+		FileInfo() {
+			super(CurseAPI.MIN_PROJECT_ID, CurseAPI.MIN_FILE_ID);
+		}
+	}
+
 	private MinecraftInfo minecraft = new MinecraftInfo();
 	private String manifestType = "minecraftModpack";
 	private int manifestVersion = 1;
@@ -30,7 +42,7 @@ private static final class ModLoaderInfo {
 	private String author = "";
 	//This files field is used for Moshi so that it knows that files should be converted t o
 	//MinimalCurseFile.Immutables.
-	private List<MinimalCurseFile.Immutable> files = new ArrayList<>();
+	private List<FileInfo> files = new ArrayList<>();
 	//This files field is used for everything else and uses the MinimalCurseFile type.
 	private transient List<MinimalCurseFile> actualFiles;
 
@@ -121,4 +133,14 @@ public CurseModpack files(Collection<? extends MinimalCurseFile> files) {
 		this.actualFiles.addAll(files);
 		return this;
 	}
+
+	@Override
+	public String toJSON() {
+		return MoshiUtils.toJSON(this, DefaultCurseModpack.class);
+	}
+
+	@Override
+	public void toJSON(Path path) throws CurseException {
+		MoshiUtils.toJSON(this, DefaultCurseModpack.class, path);
+	}
 }

src/test/java/com/therandomlabs/curseapi/minecraft/modpack/CurseModpackTest.java

@@ -0,0 +1,35 @@
+package com.therandomlabs.curseapi.minecraft.modpack;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+import com.therandomlabs.curseapi.CurseAPI;
+import com.therandomlabs.curseapi.minecraft.MCVersions;
+import com.therandomlabs.utils.io.ZipFile;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+public class CurseModpackTest {
+	@Test
+	public void atm4ShouldBeValid(@TempDir Path tempDirectory) throws Exception {
+		final Optional<Path> optionalPath =
+				CurseAPI.downloadFileToDirectory(316059, 2839369, tempDirectory);
+		assertThat(optionalPath).isPresent();
+
+		final Path path = optionalPath.get();
+		assertThat(path).isRegularFile();
+
+		try (ZipFile zipFile = new ZipFile(path)) {
+			final CurseModpack modpack = CurseModpack.fromJSON(zipFile.getEntry("manifest.json"));
+			assertThat(modpack.mcVersion()).isEqualTo(MCVersions.V1_14_4);
+			assertThat(modpack.forgeVersion()).isEqualTo("1.14.4-28.1.104");
+			assertThat(modpack.name()).isEqualTo("All the Mods 4");
+			assertThat(modpack.version()).isEqualTo("0.2.5");
+			assertThat(modpack.author()).isEqualTo("ATMTeam");
+			assertThat(modpack.files()).isNotEmpty();
+			assertThat(modpack.toJSON()).isNotNull();
+		}
+	}
+}