From 337c0ffc28017029176361e191db0f649f1394b5 Mon Sep 17 00:00:00 2001
From: Merith-TK <merith.tk@gmail.com>
Date: Fri, 25 Feb 2022 11:48:07 -0800
Subject: [PATCH] add curseforge support

---
 .gitignore |  1 +
 Makefile   | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 99585bb..a533173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 
 ## Ignore Modpack Updater Script loose files
 .technic
+*.zip
 
 ## Add your modded folders/files to ignore here
 .minecraft/mods/
diff --git a/Makefile b/Makefile
index f2444fc..cf9433f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,41 @@
 default:
 	@echo "No Default make command configured"
 	@echo "Please use either"
+	@echo "   - make curseforge"
 	@echo "   - make multimc"
 	@echo "   - make technic"
 	@echo "   - make all"
 	@echo ""
-	@echo "MultiMC will make a pack with the updater.exe built in"
-	@echo "  along with the git history"
+	@echo "Curseforge will make a curseforge compatible zip"
+	@echo "Multimc will make a multimc zip file which contains"
+	@echo "   the packwiz updater"
 	@echo ""
-	@echo "Techic will make a pack that can be used for technic"
+	@echo "Technic will make a technic pack zip"
 	@echo ""
-	@echo "All will make both technic and MultiMC packs"
+	@echo "All will make all packs it can"
 	@echo ""
 	
+curseforge:
+	@echo "Making Curseforge pack"
+	@-mkdir ../modpack.curseforge
+	packwiz curseforge export --mods-folder packwiz-data/mods/ --pack-file packwiz-data/pack.toml
+	mv *.zip ../modpack-curseforge/
+
 multimc:
 	@echo "Making MultiMC pack"
-	7z d ../modpack.zip ./* -r
-	7z d ../modpack.zip ./.* -r
-	7z a ../modpack.zip ./* -r
-	7z a ../modpack.zip ./.minecraft -r
+	7z d ../modpack-mulitmc.zip ./* -r
+	7z d ../modpack-mulitmc.zip ./.* -r
+	7z a ../modpack-mulitmc.zip ./* -r
+	7z a ../modpack-mulitmc.zip ./.minecraft -r
 
 technic:
 	@echo "Making Technic pack"
 	-rm -rf .technic
 	-cp -r .minecraft .technic
 	mv .technic/modpack.icon.png .technic/icon.png
-	cd .technic && java -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/modpack-template/-/raw/packwiz/packwiz-data/pack.toml && cd ..
+	cd .technic && java -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/modpack-template/-/raw/main/packwiz-data/pack.toml && cd ..
 	-rm -rf .technic/packwiz*
 	7z d ../modpack-technic.zip ./* -r
 	7z a ../modpack-technic.zip ./.technic/* -r
 
-all: multimc technic
\ No newline at end of file
+all: curseforge multimc technic
\ No newline at end of file