From fa732bf91fd795eb096e3150bd95a612874393cf Mon Sep 17 00:00:00 2001
From: Merith <merith.tk@gmail.com>
Date: Sun, 5 Mar 2023 19:48:20 +0000
Subject: [PATCH] update build files

---
 .minecraft/pack.toml                          |   4 +--
 Makefile                                      |  32 ++++++++++--------
 ...llia_icon.png => vanillia-modpack_icon.png | Bin
 3 files changed, 20 insertions(+), 16 deletions(-)
 rename vanillia_icon.png => vanillia-modpack_icon.png (100%)

diff --git a/.minecraft/pack.toml b/.minecraft/pack.toml
index 62d3abc..290f0c1 100644
--- a/.minecraft/pack.toml
+++ b/.minecraft/pack.toml
@@ -1,6 +1,6 @@
-name = "Vanillia Minecraft"
+name = "Vanillia"
 author = "Merith.TK, Daedreus"
-version = "1.3.1"
+version = "1.19.3-1.3.1"
 pack-format = "packwiz:1.1.0"
 
 [index]
diff --git a/Makefile b/Makefile
index 32126e9..106c0d1 100644
--- a/Makefile
+++ b/Makefile
@@ -14,44 +14,48 @@ default:
 	@echo ""
 	@echo "All will make all packs it can"
 	@echo ""
-	
+
+PACKNAME := $(notdir $(CURDIR))
+
 curseforge:
 	-mkdir .build
 	@echo "Making Curseforge pack"
-	packwiz curseforge export --pack-file .minecraft/pack.toml -o .build/
-	7z d .build/vanillia-curseforge.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml  overrides/index.toml	
+	packwiz curseforge export --pack-file .minecraft/pack.toml
+	mv ./*.zip ./.build/
 
 modrinth:
 	-mkdir .build
 	@echo "Making Modrinth pack"
 	packwiz modrinth export --pack-file .minecraft/pack.toml
-	7z d .build/vanillia-modrinth.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml  overrides/index.toml	
+	mv ./*.mrpack ./.build/
 
 multimc:
 	-mkdir .build
 	@echo "Making MultiMC pack"
-	7z d .build/vanillia-multimc.zip ./* -r
-	7z d .build/vanillia-multimc.zip ./.minecraft -r
-	7z a .build/vanillia-multimc.zip ./* -r
-	7z a .build/vanillia-multimc.zip ./.minecraft -r
-	7z d .build/vanillia-multimc.zip ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r
+	7z d .build/${PACKNAME}-multimc.zip ./* -r
+	7z d .build/${PACKNAME}-multimc.zip ./.minecraft -r
+	7z a .build/${PACKNAME}-multimc.zip ./* -r
+	7z a .build/${PACKNAME}-multimc.zip ./.minecraft -r
+	7z d .build/${PACKNAME}-multimc.zip ./.build ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r
 
 technic:
 	-mkdir .build
 	@echo "Making Technic pack"
 	-rm -rf .technic
 	-cp -r .minecraft .technic
-	cp vanillia_icon.png .technic/icon.png
+	cp ${PACKNAME}_icon.png .technic/icon.png
 	cd .technic && java -jar ../.minecraft/packwiz-installer-bootstrap.jar ../.minecraft/pack.toml && cd ..
 	-rm -rf .technic/packwiz* .technic/index.toml .technic/pack.toml .technic/mods/*.toml
-	7z d .build/vanillia-technic.zip ./* ./.* -r
-	7z a .build/vanillia-technic.zip ./.technic/* -r
+	7z d .build/${PACKNAME}-technic.zip ./* ./.* -r
+	7z a .build/${PACKNAME}-technic.zip ./.technic/* -r
 
-clean:
+preClean:
+	-rm -rf .build
+postClean:
 	-rm -rf .technic
 	-git gc --aggressive --prune
 
-all: curseforge modrinth multimc technic clean
+all: preClean curseforge modrinth multimc technic postClean
 
 update-packwiz:
 	go install github.com/packwiz/packwiz@latest
diff --git a/vanillia_icon.png b/vanillia-modpack_icon.png
similarity index 100%
rename from vanillia_icon.png
rename to vanillia-modpack_icon.png