Pull Changes to Beta

README.md

@@ -79,8 +79,3 @@ This project is licensed under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.
 #### Compiling
 
 The build script uses the [PackMake](https://github.com/iJustLeyxo/PackMake/) resource pack compiler, which is automatically downloaded and used to interpret the source file structure.
-
-
-#### Compressing
-
-The compress script uses the [OptiPNG](https://optipng.sourceforge.net/) png file optimizer, which is required to compress the source files. Compilation does not require the compress script or OptiPNG.

build.sh

@@ -4,52 +4,35 @@
 
 rm -rf PackMake.jar PackMake.zip PackMake/ target/
 
-PM_VER="0.0.2"
-# Newest PM_VER=$(echo $(curl -s https://api.github.com/repos/iJustLeyxo/PackMake/releases/latest) | jq -r '.tag_name')
-PM_URL="https://github.com/iJustLeyxo/PackMake/archive/refs/tags/$PM_VER.zip"
+PM_VER="0.0.5"
 
-if [ -z "$PM_URL" ]; then
-    echo "Faulty download url"
-    exit 1
-fi
-
-echo "Downloading resourcepack compiler from $PM_URL"
-curl -sLo "PackMake.zip" $PM_URL
-
-echo "Extracting resourcepack compiler"
-unzip -q PackMake.zip
-rm -f PackMake.zip
-
-PM_DIR="PackMake-$PM_VER/"
-cd "$PM_DIR"
 
-echo "Compiling resourcepack compiler"
-mvn -q clean package
-cd ..
-cp "$PM_DIR/target/PackMake.jar" "PackMake.jar"
-rm -rf "$PM_DIR"
+if [ ! -e "PackMake-${PM_VER}.jar" ]; then # Download PackMake if not exists
+    # Newest PM_VER=$(echo $(curl -s https://api.github.com/repos/iJustLeyxo/PackMake/releases/latest) | jq -r '.tag_name')
+    PM_URL="https://github.com/iJustLeyxo/PackMake/archive/refs/tags/$PM_VER.zip"
+
+    if [ -z "$PM_URL" ]; then
+        echo "Faulty download url"
+        exit 1
+    fi
+
+    echo "Downloading resourcepack compiler from $PM_URL"
+    curl -sLo "PackMake-${PM_VER}.zip" $PM_URL
+
+    echo "Extracting resourcepack compiler"
+    unzip -q "PackMake-${PM_VER}.zip"
+    rm -f "PackMake-${PM_VER}.zip"
+
+    PM_DIR="PackMake-$PM_VER/"
+    cd "$PM_DIR"
+
+    echo "Compiling resourcepack compiler"
+    mvn -q clean package
+    cd ..
+    rm -f *.jar
+    cp "$PM_DIR/target/PackMake.jar" "PackMake-${PM_VER}.jar"
+    rm -rf "$PM_DIR"
+fi
 
 echo "Compiling resourcepack"
-java -jar PackMake.jar
-rm -f PackMake.jar
-
-# Resourcepack packaging
-
-cd target/
-
-for item in *; do
-    if [ -d "$item" ]; then
-        if [ "$item" != "." ] && [ "$item" != ".." ]; then
-            dir="${item}/"
-            file="Vanitas-${1}-${item}.zip"
-            echo "Packaging ${file}"
-            cp "../LICENSE" "$dir"
-            cp "../README.md" "$dir"
-            cd "$dir"
-            zip -rq0 "$file" *
-            cp "$file" "../$file"
-            cd ..
-            rm -rf "$dir"
-        fi
-    fi
-done
+java -jar "PackMake-${PM_VER}.jar"

pm.yml

@@ -1,2 +1,4 @@
+name: "Vanitas"
 formats: [ 1, 3, 5, 15, 18, 22, 32, 34, 42, 46 ]
-extensions: [ ".png", ".mcmeta" ]
+include: [ "LICENSE", "README.md" ]
+extensions: [ ".png", ".mcmeta", ".json" ]