Add new music discs, models, and update release workflow; remove obsolete files

.github/workflows/zip.yml

@@ -0,0 +1,58 @@
+name: Zip and Release
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  zip-and-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Create zip (flat root, exclude .git)
+        run: |
+          zip -9 -r repo.zip . -x ".git/*" "repo.zip"
+
+      - name: Generate release metadata and body
+        id: meta
+        shell: bash
+        run: |
+          set -euo pipefail
+          TS=$(date -u +'%Y%m%d-%H%M%S')
+          RAND=$(openssl rand -hex 4)
+          NAME="Release-${TS}-${RAND}"
+          TAG="tag-${TS}-${RAND}"
+          echo "name=$NAME" >> "$GITHUB_OUTPUT"
+          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+          {
+            echo "Automated release for $GITHUB_REF at $TS (commit $GITHUB_SHA)."
+            if jq -e '.commits | length > 0' "$GITHUB_EVENT_PATH" >/dev/null 2>&1; then
+              echo
+              echo "Changes:"
+              jq -r '.commits[] | "- " + (.message | gsub("\r"; "")) + " (" + ((.author.username // .author.name) // "unknown") + ")"' "$GITHUB_EVENT_PATH"
+            else
+              echo
+              echo "Changes:"
+              git log -1 --pretty=format:'- %s (%an)'
+            fi
+          } > RELEASE_BODY.md
+
+      - name: Create GitHub release and upload asset
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.meta.outputs.tag }}
+          name: ${{ steps.meta.outputs.name }}
+          body_path: RELEASE_BODY.md
+          files: repo.zip
+          draft: false
+          prerelease: false

assets/minecraft/items/music_disc_13.json

@@ -0,0 +1,61 @@
+{
+  "model": {
+    "type": "select",
+    "property": "custom_model_data",
+    "fallback": {
+      "type": "model",
+      "model": "item/music_disc_13"
+    },
+    "cases": [
+      {
+        "when": "interior_shop0",
+        "model": {
+          "type": "model",
+          "model": "item/interior_shop0"
+        }
+      },
+      {
+        "when": "pawn_shop1",
+        "model": {
+          "type": "model",
+          "model": "item/pawn_shop1"
+        }
+      },
+      {
+        "when": "food_mart2",
+        "model": {
+          "type": "model",
+          "model": "item/food_mart2"
+        }
+      },
+      {
+        "when": "hat_shop3",
+        "model": {
+          "type": "model",
+          "model": "item/hat_shop3"
+        }
+      },
+      {
+        "when": "clothing_shop4",
+        "model": {
+          "type": "model",
+          "model": "item/clothing_shop4"
+        }
+      },
+      {
+        "when": "jump_up5",
+        "model": {
+          "type": "model",
+          "model": "item/jump_up5"
+        }
+      },
+      {
+        "when": "city_under_siege6",
+        "model": {
+          "type": "model",
+          "model": "item/city_under_siege6"
+        }
+      }
+    ]
+  }
+}

assets/minecraft/models/item/clothing_shop4.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "item/clothing_shop0"
+    "layer0": "item/clothing_shop4"
   }
 }

assets/minecraft/models/item/food_mart2.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "item/pawn_shop4"
+    "layer0": "item/food_mart2"
   }
 }

assets/minecraft/models/item/hat_shop3.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "item/hat_shop2"
+    "layer0": "item/hat_shop3"
   }
 }

assets/minecraft/models/item/interior_shop0.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "item/interior_shop3"
+    "layer0": "item/interior_shop0"
   }
 }

assets/minecraft/models/item/music_disc_13.json

@@ -1,50 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "item/music_disc_13"
-  },
-  "overrides": [
-    {
-      "predicate": {
-        "custom_model_data": 37000
-      },
-      "model": "item/clothing_shop0"
-    },
-    {
-      "predicate": {
-        "custom_model_data": 37001
-      },
-      "model": "item/food_mart1"
-    },
-    {
-      "predicate": {
-        "custom_model_data": 37002
-      },
-      "model": "item/hat_shop2"
-    },
-    {
-      "predicate": {
-        "custom_model_data": 37003
-      },
-      "model": "item/interior_shop3"
-    },
-    {
-      "predicate": {
-        "custom_model_data": 37004
-      },
-      "model": "item/pawn_shop4"
-    },
-    {
-      "predicate": {
-        "custom_model_data": 37005
-      },
-      "model": "item/jump_up5"
-    },
-    {
-      "predicate": {
-        "custom_model_data": 37006
-      },
-      "model": "item/city_under_siege6"
-    }
-  ]
-}

assets/minecraft/models/item/pawn_shop1.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "item/food_mart1"
+    "layer0": "item/pawn_shop1"
   }
 }

assets/minecraft/sounds.json

@@ -1,40 +1,40 @@
 {
-  "music_disc.clothing_shop0": {
+  "music_disc.interior_shop0": {
     "sounds": [
       {
-        "name": "records/music_disc_clothing_shop0",
+        "name": "records/music_disc_interior_shop0",
         "stream": true
       }
     ]
   },
-  "music_disc.food_mart1": {
+  "music_disc.pawn_shop1": {
     "sounds": [
       {
-        "name": "records/music_disc_food_mart1",
+        "name": "records/music_disc_pawn_shop1",
         "stream": true
       }
     ]
   },
-  "music_disc.hat_shop2": {
+  "music_disc.food_mart2": {
     "sounds": [
       {
-        "name": "records/music_disc_hat_shop2",
+        "name": "records/music_disc_food_mart2",
         "stream": true
       }
     ]
   },
-  "music_disc.interior_shop3": {
+  "music_disc.hat_shop3": {
     "sounds": [
       {
-        "name": "records/music_disc_interior_shop3",
+        "name": "records/music_disc_hat_shop3",
         "stream": true
       }
     ]
   },
-  "music_disc.pawn_shop4": {
+  "music_disc.clothing_shop4": {
     "sounds": [
       {
-        "name": "records/music_disc_pawn_shop4",
+        "name": "records/music_disc_clothing_shop4",
         "stream": true
       }
     ]

data/new_music/function/city_under_siege6.mcfunction

@@ -1,2 +1,2 @@
 #give City under siege to player
-give @s minecraft:music_disc_13[minecraft:jukebox_playable={song:"new_music:city_under_siege6"},minecraft:custom_model_data=37006]
+give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:city_under_siege6",minecraft:custom_model_data={strings:["city_under_siege6"]}]

data/new_music/function/clothing_shop0.mcfunction

@@ -1,2 +0,0 @@
-#give Clothing Shop to player
-give @s minecraft:music_disc_13[minecraft:jukebox_playable={song:"new_music:clothing_shop0"},minecraft:custom_model_data=37000]

data/new_music/function/clothing_shop4.mcfunction

@@ -0,0 +1,2 @@
+#give Clothing Shop to player
+give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:clothing_shop4",minecraft:custom_model_data={strings:["clothing_shop4"]}]

data/new_music/function/food_mart1.mcfunction

@@ -1,2 +0,0 @@
-#give Food Mart to player
-give @s minecraft:music_disc_13[minecraft:jukebox_playable={song:"new_music:food_mart1"},minecraft:custom_model_data=37001]

data/new_music/function/food_mart2.mcfunction

@@ -0,0 +1,2 @@
+#give Food Mart to player
+give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:food_mart2",minecraft:custom_model_data={strings:["food_mart2"]}]

data/new_music/function/hat_shop2.mcfunction

@@ -1,2 +0,0 @@
-#give Hat Shop to player
-give @s minecraft:music_disc_13[minecraft:jukebox_playable={song:"new_music:hat_shop2"},minecraft:custom_model_data=37002]

data/new_music/function/hat_shop3.mcfunction

@@ -0,0 +1,2 @@
+#give Hat Shop to player
+give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:hat_shop3",minecraft:custom_model_data={strings:["hat_shop3"]}]

data/new_music/function/interior_shop0.mcfunction

@@ -0,0 +1,2 @@
+#give Interior Shop to player
+give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:interior_shop0",minecraft:custom_model_data={strings:["interior_shop0"]}]

data/new_music/function/interior_shop3.mcfunction

@@ -1,2 +0,0 @@
-#give Interior Shop to player
-give @s minecraft:music_disc_13[minecraft:jukebox_playable={song:"new_music:interior_shop3"},minecraft:custom_model_data=37003]

data/new_music/function/jump_up5.mcfunction

@@ -1,2 +1,2 @@
 #give Jump Up to player
-give @s minecraft:music_disc_13[minecraft:jukebox_playable={song:"new_music:jump_up5"},minecraft:custom_model_data=37005]
+give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:jump_up5",minecraft:custom_model_data={strings:["jump_up5"]}]

data/new_music/function/pawn_shop1.mcfunction

@@ -0,0 +1,2 @@
+#give Pawn Shop to player
+give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:pawn_shop1",minecraft:custom_model_data={strings:["pawn_shop1"]}]

data/new_music/function/pawn_shop4.mcfunction

@@ -1,2 +0,0 @@
-#give Pawn Shop to player
-give @s minecraft:music_disc_13[minecraft:jukebox_playable={song:"new_music:pawn_shop4"},minecraft:custom_model_data=37004]

data/new_music/jukebox_song/city_under_siege6.json

@@ -1,7 +1,7 @@
 {
   "comparator_output": 1,
   "description": "Author - City under siege",
-  "length_in_seconds": 362.100979,
+  "length_in_seconds": 362,
   "sound_event": {
     "sound_id": "minecraft:music_disc.city_under_siege6"
   }

data/new_music/jukebox_song/clothing_shop4.json

@@ -1,8 +1,8 @@
 {
   "comparator_output": 1,
   "description": "Author - Clothing Shop",
-  "length_in_seconds": 93.936326,
+  "length_in_seconds": 93,
   "sound_event": {
-    "sound_id": "minecraft:music_disc.clothing_shop0"
+    "sound_id": "minecraft:music_disc.clothing_shop4"
   }
 }

data/new_music/jukebox_song/food_mart2.json

@@ -1,8 +1,8 @@
 {
   "comparator_output": 1,
   "description": "Author - Food Mart",
-  "length_in_seconds": 89.340979,
+  "length_in_seconds": 89,
   "sound_event": {
-    "sound_id": "minecraft:music_disc.food_mart1"
+    "sound_id": "minecraft:music_disc.food_mart2"
   }
 }

data/new_music/jukebox_song/hat_shop3.json

@@ -1,8 +1,8 @@
 {
   "comparator_output": 1,
   "description": "Author - Hat Shop",
-  "length_in_seconds": 80.22204,
+  "length_in_seconds": 80,
   "sound_event": {
-    "sound_id": "minecraft:music_disc.hat_shop2"
+    "sound_id": "minecraft:music_disc.hat_shop3"
   }
 }

data/new_music/jukebox_song/interior_shop0.json

@@ -1,8 +1,8 @@
 {
   "comparator_output": 1,
   "description": "Author - Interior Shop",
-  "length_in_seconds": 77.400816,
+  "length_in_seconds": 77,
   "sound_event": {
-    "sound_id": "minecraft:music_disc.interior_shop3"
+    "sound_id": "minecraft:music_disc.interior_shop0"
   }
 }

data/new_music/jukebox_song/jump_up5.json

@@ -1,7 +1,7 @@
 {
   "comparator_output": 1,
   "description": "Author - Jump Up",
-  "length_in_seconds": 223.572979,
+  "length_in_seconds": 223,
   "sound_event": {
     "sound_id": "minecraft:music_disc.jump_up5"
   }

data/new_music/jukebox_song/pawn_shop1.json

@@ -1,8 +1,8 @@
 {
   "comparator_output": 1,
   "description": "Author - Pawn Shop",
-  "length_in_seconds": 88.21551,
+  "length_in_seconds": 88,
   "sound_event": {
-    "sound_id": "minecraft:music_disc.pawn_shop4"
+    "sound_id": "minecraft:music_disc.pawn_shop1"
   }
 }

manifest.json

@@ -1,53 +1,53 @@
 {
   "packTitle": "Friends CMP",
   "packDescription": "§7Friends CMP §c§lExtras§f §7Pack",
-  "packVersion": 34,
+  "packVersion": 47,
   "packIcon": "pack.png",
   "songs": [
-    {
-      "title": "Clothing Shop",
-      "author": "Author",
-      "length": 93.936326,
-      "filePath": "assets/minecraft/sounds/records/music_disc_clothing_shop0.ogg",
-      "imagePath": "assets/minecraft/textures/item/clothing_shop0.png",
-      "animated": false
-    },
-    {
-      "title": "Food Mart",
-      "author": "Author",
-      "length": 89.340979,
-      "filePath": "assets/minecraft/sounds/records/music_disc_food_mart1.ogg",
-      "imagePath": "assets/minecraft/textures/item/food_mart1.png",
-      "animated": false
-    },
-    {
-      "title": "Hat Shop",
-      "author": "Author",
-      "length": 80.22204,
-      "filePath": "assets/minecraft/sounds/records/music_disc_hat_shop2.ogg",
-      "imagePath": "assets/minecraft/textures/item/hat_shop2.png",
-      "animated": false
-    },
     {
       "title": "Interior Shop",
       "author": "Author",
-      "length": 77.400816,
+      "length": 77,
-      "filePath": "assets/minecraft/sounds/records/music_disc_interior_shop3.ogg",
+      "filePath": "assets/minecraft/sounds/records/music_disc_interior_shop0.ogg",
-      "imagePath": "assets/minecraft/textures/item/interior_shop3.png",
+      "imagePath": "assets/minecraft/textures/item/interior_shop0.png",
       "animated": false
     },
     {
       "title": "Pawn Shop",
       "author": "Author",
-      "length": 88.21551,
+      "length": 88,
-      "filePath": "assets/minecraft/sounds/records/music_disc_pawn_shop4.ogg",
+      "filePath": "assets/minecraft/sounds/records/music_disc_pawn_shop1.ogg",
-      "imagePath": "assets/minecraft/textures/item/pawn_shop4.png",
+      "imagePath": "assets/minecraft/textures/item/pawn_shop1.png",
+      "animated": false
+    },
+    {
+      "title": "Food Mart",
+      "author": "Author",
+      "length": 89,
+      "filePath": "assets/minecraft/sounds/records/music_disc_food_mart2.ogg",
+      "imagePath": "assets/minecraft/textures/item/food_mart2.png",
+      "animated": false
+    },
+    {
+      "title": "Hat Shop",
+      "author": "Author",
+      "length": 80,
+      "filePath": "assets/minecraft/sounds/records/music_disc_hat_shop3.ogg",
+      "imagePath": "assets/minecraft/textures/item/hat_shop3.png",
+      "animated": false
+    },
+    {
+      "title": "Clothing Shop",
+      "author": "Author",
+      "length": 93,
+      "filePath": "assets/minecraft/sounds/records/music_disc_clothing_shop4.ogg",
+      "imagePath": "assets/minecraft/textures/item/clothing_shop4.png",
       "animated": false
     },
     {
       "title": "Jump Up",
       "author": "Author",
-      "length": 223.572979,
+      "length": 223,
       "filePath": "assets/minecraft/sounds/records/music_disc_jump_up5.ogg",
       "imagePath": "assets/minecraft/textures/item/jump_up5.png",
       "animated": false
@@ -55,7 +55,7 @@
     {
       "title": "City under siege",
       "author": "Author",
-      "length": 362.100979,
+      "length": 362,
       "filePath": "assets/minecraft/sounds/records/music_disc_city_under_siege6.ogg",
       "imagePath": "assets/minecraft/textures/item/city_under_siege6.png",
       "animated": false

pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 34,
+    "pack_format": 47,
     "supported_formats": [
       34,
       79