diff --git a/assets/minecraft/items/music_disc_13.json b/assets/minecraft/items/paper.json similarity index 96% rename from assets/minecraft/items/music_disc_13.json rename to assets/minecraft/items/paper.json index 81e36b7..e4c5ea5 100644 --- a/assets/minecraft/items/music_disc_13.json +++ b/assets/minecraft/items/paper.json @@ -4,7 +4,7 @@ "property": "custom_model_data", "fallback": { "type": "model", - "model": "item/music_disc_13" + "model": "item/generated" }, "cases": [ { @@ -58,4 +58,4 @@ } ] } -} \ No newline at end of file +} diff --git a/data/new_music/function/city_under_siege6.mcfunction b/data/new_music/function/city_under_siege6.mcfunction index 48531be..12e4cec 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 -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 +function new_music:custom_items/give {item:"minecraft:paper", model:"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 73c719a..4118b19 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 -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 +function new_music:custom_items/give {item:"minecraft:paper", model:"clothing_shop4"} \ No newline at end of file diff --git a/data/new_music/function/custom_items/give.mcfunction b/data/new_music/function/custom_items/give.mcfunction new file mode 100644 index 0000000..2b70fca --- /dev/null +++ b/data/new_music/function/custom_items/give.mcfunction @@ -0,0 +1,4 @@ +# Generic helper for giving custom items with a custom model. +# Example usage: +# function new_music:custom_items/give {item:"minecraft:paper", model:"city_under_siege6"} +give @s $(item)[minecraft:custom_model_data={strings:["$(model)"]}] diff --git a/data/new_music/function/custom_items/register.mcfunction b/data/new_music/function/custom_items/register.mcfunction new file mode 100644 index 0000000..90ae662 --- /dev/null +++ b/data/new_music/function/custom_items/register.mcfunction @@ -0,0 +1,6 @@ +# Generic registration helper for custom item models. +# This keeps the item namespace separate from the display model name. +# Usage: function new_music:custom_items/register {item:"minecraft:paper", model:"city_under_siege6"} + +# The resource pack handles the visual model via the shared item selector. +# This function exists as a general entry point for future custom items. diff --git a/data/new_music/function/food_mart2.mcfunction b/data/new_music/function/food_mart2.mcfunction index c5834a1..0d477f7 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 -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 +function new_music:custom_items/give {item:"minecraft:paper", model:"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 65050dc..be13802 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 -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 +function new_music:custom_items/give {item:"minecraft:paper", model:"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 b75d382..ea604d7 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 -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 +function new_music:custom_items/give {item:"minecraft:paper", model:"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 69834ad..fbed8d1 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 -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 +function new_music:custom_items/give {item:"minecraft:paper", model:"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 d16797f..3411044 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 -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 +function new_music:custom_items/give {item:"minecraft:paper", model:"pawn_shop1"} \ No newline at end of file