From e80fcde9e699d7074f9cca4adff2dd46cd914f37 Mon Sep 17 00:00:00 2001 From: Chloe Date: Sun, 2 Aug 2026 01:34:39 -0400 Subject: [PATCH] Refactor music disc commands to use direct give syntax and add custom model data for various shops --- assets/minecraft/items/music_disc_13.json | 61 +++++++++++++++++++ .../function/city_under_siege6.mcfunction | 2 +- .../function/clothing_shop4.mcfunction | 2 +- data/new_music/function/food_mart2.mcfunction | 2 +- data/new_music/function/hat_shop3.mcfunction | 2 +- .../function/interior_shop0.mcfunction | 2 +- data/new_music/function/jump_up5.mcfunction | 2 +- data/new_music/function/pawn_shop1.mcfunction | 2 +- 8 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 assets/minecraft/items/music_disc_13.json diff --git a/assets/minecraft/items/music_disc_13.json b/assets/minecraft/items/music_disc_13.json new file mode 100644 index 0000000..2bb34c0 --- /dev/null +++ b/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" + } + } + ] + } +} diff --git a/data/new_music/function/city_under_siege6.mcfunction b/data/new_music/function/city_under_siege6.mcfunction index 12e4cec..48531be 100644 --- a/data/new_music/function/city_under_siege6.mcfunction +++ b/data/new_music/function/city_under_siege6.mcfunction @@ -1,2 +1,2 @@ #give City under siege to player -function new_music:custom_items/give {item:"minecraft:paper", model:"city_under_siege6"} \ No newline at end of file +give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:city_under_siege6",minecraft:custom_model_data={strings:["city_under_siege6"]}] \ No newline at end of file diff --git a/data/new_music/function/clothing_shop4.mcfunction b/data/new_music/function/clothing_shop4.mcfunction index 4118b19..73c719a 100644 --- a/data/new_music/function/clothing_shop4.mcfunction +++ b/data/new_music/function/clothing_shop4.mcfunction @@ -1,2 +1,2 @@ #give Clothing Shop to player -function new_music:custom_items/give {item:"minecraft:paper", model:"clothing_shop4"} \ No newline at end of file +give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:clothing_shop4",minecraft:custom_model_data={strings:["clothing_shop4"]}] \ No newline at end of file diff --git a/data/new_music/function/food_mart2.mcfunction b/data/new_music/function/food_mart2.mcfunction index 0d477f7..c5834a1 100644 --- a/data/new_music/function/food_mart2.mcfunction +++ b/data/new_music/function/food_mart2.mcfunction @@ -1,2 +1,2 @@ #give Food Mart to player -function new_music:custom_items/give {item:"minecraft:paper", model:"food_mart2"} \ No newline at end of file +give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:food_mart2",minecraft:custom_model_data={strings:["food_mart2"]}] \ No newline at end of file diff --git a/data/new_music/function/hat_shop3.mcfunction b/data/new_music/function/hat_shop3.mcfunction index be13802..65050dc 100644 --- a/data/new_music/function/hat_shop3.mcfunction +++ b/data/new_music/function/hat_shop3.mcfunction @@ -1,2 +1,2 @@ #give Hat Shop to player -function new_music:custom_items/give {item:"minecraft:paper", model:"hat_shop3"} \ No newline at end of file +give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:hat_shop3",minecraft:custom_model_data={strings:["hat_shop3"]}] \ No newline at end of file diff --git a/data/new_music/function/interior_shop0.mcfunction b/data/new_music/function/interior_shop0.mcfunction index ea604d7..b75d382 100644 --- a/data/new_music/function/interior_shop0.mcfunction +++ b/data/new_music/function/interior_shop0.mcfunction @@ -1,2 +1,2 @@ #give Interior Shop to player -function new_music:custom_items/give {item:"minecraft:paper", model:"interior_shop0"} \ No newline at end of file +give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:interior_shop0",minecraft:custom_model_data={strings:["interior_shop0"]}] \ No newline at end of file diff --git a/data/new_music/function/jump_up5.mcfunction b/data/new_music/function/jump_up5.mcfunction index fbed8d1..69834ad 100644 --- a/data/new_music/function/jump_up5.mcfunction +++ b/data/new_music/function/jump_up5.mcfunction @@ -1,2 +1,2 @@ #give Jump Up to player -function new_music:custom_items/give {item:"minecraft:paper", model:"jump_up5"} \ No newline at end of file +give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:jump_up5",minecraft:custom_model_data={strings:["jump_up5"]}] \ No newline at end of file diff --git a/data/new_music/function/pawn_shop1.mcfunction b/data/new_music/function/pawn_shop1.mcfunction index 3411044..d16797f 100644 --- a/data/new_music/function/pawn_shop1.mcfunction +++ b/data/new_music/function/pawn_shop1.mcfunction @@ -1,2 +1,2 @@ #give Pawn Shop to player -function new_music:custom_items/give {item:"minecraft:paper", model:"pawn_shop1"} \ No newline at end of file +give @s minecraft:music_disc_13[minecraft:jukebox_playable="new_music:pawn_shop1",minecraft:custom_model_data={strings:["pawn_shop1"]}] \ No newline at end of file