Merge branch 'main' of https://git.devbeni.lol/MineDivinity/pack

.gitea/workflows/build-and-release.yml

@@ -24,34 +24,49 @@ jobs:
     - name: Set up ZIP tool
       run: sudo apt-get install zip -y
 
-    - name: Create version info
+    - name: Calculate version number
       id: version
       run: |
-        # Get current date for versioning
-        DATE=$(date +"%Y.%m.%d")
-        echo "VERSION=$DATE" >> $GITHUB_ENV
-        
-        # Update versions.txt
-        if [ ! -f versions.txt ]; then
-          echo "Initial version: $DATE" > versions.txt
+        # Read current version from versions.txt or initialize
+        if [ -f versions.txt ]; then
+          CURRENT_VERSION=$(tail -1 versions.txt | awk '{print $NF}')
         else
-          echo "New version: $DATE" >> versions.txt
+          CURRENT_VERSION="1.0.0"
+          echo "Initial version: $CURRENT_VERSION" > versions.txt
         fi
-        
-        echo "Pack version: $DATE"
+
+        # Split version into components
+        MAJOR=$(echo $CURRENT_VERSION | cut -d. -f1)
+        MINOR=$(echo $CURRENT_VERSION | cut -d. -f2)
+        PATCH=$(echo $CURRENT_VERSION | cut -d. -f3)
+
+        # Increment version according to rules
+        if [ $PATCH -lt 9 ]; then
+          NEW_PATCH=$((PATCH + 1))
+          NEW_VERSION="$MAJOR.$MINOR.$NEW_PATCH"
+        else
+          NEW_MINOR=$((MINOR + 1))
+          NEW_VERSION="$MAJOR.$NEW_MINOR.0"
+        fi
+
+        echo "VERSION=$NEW_VERSION" >> $GITHUB_ENV
+        echo "New version: $NEW_VERSION" >> versions.txt
+        echo "New version calculated: $NEW_VERSION"
+
+    - name: Update pack.mcmeta
+      run: |
+        sudo apt-get update && sudo apt-get install -y jq
+        jq --arg version "v${{ env.VERSION }}" '.pack.description = [{"text": "MineDivinity Pack ", "bold": true, "color": "#FF5555"}, {"text": $version, "bold": true, "color": "#FFAA00"}]' pack/pack.mcmeta > pack/pack.mcmeta.tmp && mv pack/pack.mcmeta.tmp pack/pack.mcmeta
+        echo "pack.mcmeta updated with version v${{ env.VERSION }}"
 
     - name: Package texture pack
       run: |
-        # Create ZIP with consistent name
-        zip -r MineDivinity-Pack.zip \
-          pack.mcmeta \
-          pack.png \
-          assets/ \
-          LICENSE \
-          README.md
+        # Create ZIP with pack directory contents at root level
+        cd pack && zip -r ../MineDivinity-Pack.zip *
+        cd ..
         
         # Generate SHA1 checksum
-        sha1sum MineDivinity-Pack.zip > MineDivinity-Pack.zip.sha1
+        sha1sum MineDivinity-Pack.zip > MineDivinity-Pack.sha1.txt
         
         echo "ZIP file created: MineDivinity-Pack.zip"
         echo "SHA1 checksum generated"
@@ -62,38 +77,41 @@ jobs:
         git config --global user.email "actions@gitea"
         git remote set-url origin https://x:${{ secrets.TOKEN }}@git.devbeni.lol/MineDivinity/pack.git
 
-    - name: Commit version update
+    - name: Commit updates
       run: |
-        # Pull changes and handle potential merge conflicts
-        git pull origin main || true
-        
-        # If conflict occurs, keep both version entries
-        if git diff --name-only --diff-filter=U | grep -q "versions.txt"; then
-          git checkout --ours versions.txt
-          echo "New version: ${{ env.VERSION }}" >> versions.txt
-          git add versions.txt
-        fi
-        
-        git add versions.txt
-        git commit -m "Update to version ${{ env.VERSION }} [skip ci]" || echo "No changes to commit"
+        git pull origin main --rebase
+        git add versions.txt pack/pack.mcmeta MineDivinity-Pack.zip MineDivinity-Pack.sha1.txt
+        git commit -m "Update to version ${{ env.VERSION }} [skip ci]"
         git push origin main
 
+    - name: Delete existing release
+      run: |
+        RELEASE_ID=$(curl -s -H "Authorization: token ${{ secrets.TOKEN }}" "https://git.devbeni.lol/api/v1/repos/MineDivinity/pack/releases/tags/latest" | jq .id)
+        if [ "$RELEASE_ID" != "null" ] && [ ! -z "$RELEASE_ID" ]; then
+          echo "Deleting release with ID $RELEASE_ID"
+          curl -s -X DELETE -H "Authorization: token ${{ secrets.TOKEN }}" "https://git.devbeni.lol/api/v1/repos/MineDivinity/pack/releases/$RELEASE_ID"
+        else
+          echo "No existing 'latest' release found."
+        fi
+
+    - name: Update latest tag
+      run: |
+        git tag -d latest || true
+        git push --delete origin latest || true
+        git tag -a latest -m "Release v${{ env.VERSION }}"
+        git push origin latest
+
     - name: Create Release
       id: create-release
       uses: actions/create-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.TOKEN }}
       with:
-        tag_name: v${{ env.VERSION }}
-        release_name: MineDivinity Pack v${{ env.VERSION }}
+        tag_name: latest
+        release_name: MineDivinity Pack (Latest) v${{ env.VERSION }}
         body: |
           Minecraft Texture Pack Release
           Version: ${{ env.VERSION }}
-          
-          Contents:
-          - Packaged texture pack (consistent filename)
-          - SHA1 checksum for verification
-          - Version history in versions.txt
         draft: false
         prerelease: false
 
@@ -112,7 +130,7 @@ jobs:
           -X POST \
           -H "Authorization: token ${{ secrets.TOKEN }}" \
           -H "Content-Type: text/plain" \
-          --data-binary @MineDivinity-Pack.zip.sha1 \
-          "${{ steps.create-release.outputs.upload_url }}?name=MineDivinity-Pack.zip.sha1"
+          --data-binary @MineDivinity-Pack.sha1.txt \
+          "${{ steps.create-release.outputs.upload_url }}?name=MineDivinity-Pack.sha1.txt"
         
         echo "Artifacts uploaded successfully"

README.md

@@ -1,2 +1 @@
-# resource-pack
-
+# resource-pack

pack/assets/minecraft/font/default.json

@@ -2,11 +2,101 @@
     "providers": [
         {
             "type": "bitmap",
-            "file": "minecraft:gui/auth.png",
-            "ascent": 16,
-            "height": 16,
+            "file": "minecraft:ranks/admin.png",
+            "ascent": 7,
+            "height": 7,
             "chars": [
-                ""
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:ranks/admin+.png",
+            "ascent": 7,
+            "height": 7,
+            "chars": [
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:ranks/developer.png",
+            "ascent": 7,
+            "height": 7,
+            "chars": [
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:ranks/helper.png",
+            "ascent": 7,
+            "height": 7,
+            "chars": [
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:ranks/manager.png",
+            "ascent": 7,
+            "height": 7,
+            "chars": [
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:ranks/staff.png",
+            "ascent": 7,
+            "height": 7,
+            "chars": [
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:ranks/tulaj.png",
+            "ascent": 7,
+            "height": 7,
+            "chars": [
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:gui/auth.png",
+            "ascent": 10,
+            "height": 11,
+            "chars": [
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:gui/lobby.png",
+            "ascent": 10,
+            "height": 11,
+            "chars": [
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:gui/skyblock.png",
+            "ascent": 10,
+            "height": 11,
+            "chars": [
+                ""
+            ]
+        },
+        {
+            "type": "bitmap",
+            "file": "minecraft:gui/skypvp.png",
+            "ascent": 10,
+            "height": 11,
+            "chars": [
+                ""
             ]
         }
     ]

pack/pack.mcmeta

@@ -1,8 +1,17 @@
 {
-    "pack": {
-        "pack_format": 15,
-        "description": [
-            {"text": "MineDivinity Pack", "bold": true, "color": "#FF5555"}
-        ]
-    }
-}
+  "pack": {
+    "pack_format": 71,
+    "description": [
+      {
+        "text": "MineDivinity Pack ",
+        "bold": true,
+        "color": "#FF5555"
+      },
+      {
+        "text": "v1.2.3",
+        "bold": true,
+        "color": "#FFAA00"
+      }
+    ]
+  }
+}

versions.txt

@@ -1,3 +1,23 @@
-New version: 2025.06.22
-New version: 2025.06.22
-New version: 2025.06.22
+1.0.0New version: 1.0.1
+New version: 1.0.2
+New version: 1.0.3
+New version: 1.0.4
+New version: 1.0.5
+New version: 1.0.6
+New version: 1.0.7
+New version: 1.0.8
+New version: 1.0.9
+New version: 1.1.0
+New version: 1.1.1
+New version: 1.1.2
+New version: 1.1.3
+New version: 1.1.4
+New version: 1.1.5
+New version: 1.1.6
+New version: 1.1.7
+New version: 1.1.8
+New version: 1.1.9
+New version: 1.2.0
+New version: 1.2.1
+New version: 1.2.2
+New version: 1.2.3