diff --git a/gradle.properties b/gradle.properties index d99c5f8..eb0f636 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ mod_version = 0.3+1.18.2 maven_group = io.github.foundationgames archives_base_name = phonos -arrp_version=0.5.5 +arrp_version=0.5.7 libgui_version=5.2.0+1.18 jsonem_version=0.1.1 diff --git a/src/main/java/io/github/foundationgames/phonos/resource/PhonosAssets.java b/src/main/java/io/github/foundationgames/phonos/resource/PhonosAssets.java index 8937235..c6fc0c9 100644 --- a/src/main/java/io/github/foundationgames/phonos/resource/PhonosAssets.java +++ b/src/main/java/io/github/foundationgames/phonos/resource/PhonosAssets.java @@ -11,7 +11,7 @@ import net.minecraft.util.Identifier; public class PhonosAssets { - public static final RuntimeResourcePack PHONOS_ASSETS = RuntimeResourcePack.create("phonos:assets"); + public static final RuntimeResourcePack PHONOS_ASSETS = RuntimeResourcePack.create("phonos_assets"); public static void init() { RuntimeResourcePack pack = PHONOS_ASSETS; diff --git a/src/main/java/io/github/foundationgames/phonos/resource/PhonosData.java b/src/main/java/io/github/foundationgames/phonos/resource/PhonosData.java index 8e820a4..cff68ee 100644 --- a/src/main/java/io/github/foundationgames/phonos/resource/PhonosData.java +++ b/src/main/java/io/github/foundationgames/phonos/resource/PhonosData.java @@ -11,7 +11,7 @@ import net.minecraft.util.Identifier; public class PhonosData { - public static final RuntimeResourcePack PHONOS_DATA = RuntimeResourcePack.create("phonos:data"); + public static final RuntimeResourcePack PHONOS_DATA = RuntimeResourcePack.create("phonos_data"); public static void registerData() { RuntimeResourcePack pack = PHONOS_DATA; @@ -57,6 +57,33 @@ public static void registerData() { "radio_jukebox", 1, "#planks", "iron_ingot", "$redstone_chip", "#stone_crafting_materials", "diamond" ); + shaped(pack, "player_piano", + new String[]{ + "AAA", + "BCB", + "DED" + }, + "player_piano", 1, + "#wooden_slabs", "bone_meal", "polished_blackstone_button", "$radio_note_block", "#planks" + ); + shaped(pack, "radio_recorder", + new String[]{ + "ABA", + "ACA", + "ADA" + }, + "radio_recorder", 1, + "#planks", "$redstone_chip", "iron_nugget", "$loudspeaker" + ); + shaped(pack, "empty_piano_roll", + new String[]{ + "A", + "B", + "C" + }, + "empty_piano_roll", 1, + "stick", "paper", "iron_nugget" + ); shaped(pack, "boombox", new String[]{ " C ", @@ -93,6 +120,10 @@ public static void registerData() { "copper_ingot", "$redstone_chip", "#stone_crafting_materials", "iron_ingot" ); + shapeless(pack, "radio_player_piano", + "radio_player_piano", 1, + "$player_piano", "$redstone_chip" + ); shapeless(pack, "gourd_speaker", "gourd_speaker", 1, "$loudspeaker", "carved_pumpkin" @@ -130,6 +161,9 @@ public static void registerData() { defaultLoot(pack, Phonos.id("loudspeaker")); defaultLoot(pack, Phonos.id("radio_note_block")); defaultLoot(pack, Phonos.id("radio_jukebox")); + defaultLoot(pack, Phonos.id("player_piano")); + defaultLoot(pack, Phonos.id("radio_player_piano")); + defaultLoot(pack, Phonos.id("radio_recorder")); defaultLoot(pack, Phonos.id("gourd_speaker")); defaultLoot(pack, Phonos.id("speak_o_lantern")); defaultLoot(pack, Phonos.id("tiny_potato_speaker")); diff --git a/src/main/resources/assets/phonos/models/item/player_piano.json b/src/main/resources/assets/phonos/models/item/player_piano.json index ec2e2b0..056111b 100644 --- a/src/main/resources/assets/phonos/models/item/player_piano.json +++ b/src/main/resources/assets/phonos/models/item/player_piano.json @@ -6,6 +6,8 @@ "4": "phonos:block/piano_top_left", "5": "phonos:block/piano_top_right", "6": "phonos:block/speaker_bottom", + "7": "phonos:entity/keyboard", + "8": "phonos:entity/piano_roll", "particle": "phonos:block/wood_texture_half" }, "elements": [ @@ -320,9 +322,224 @@ "up": {"uv": [14, 0, 16, 6], "texture": "#6"}, "down": {"uv": [14, 0, 16, 6], "texture": "#6"} } + }, + { + "from": [12.5, 8, 2.5], + "to": [20, 9, 5], + "faces": { + "north": {"uv": [0, 0, 15, 2], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "south": {"uv": [0, 0, 15, 2], "texture": "#7"}, + "west": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "up": {"uv": [0, 0, 15, 5], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 5], "texture": "#7"} + } + }, + { + "from": [5, 8, 2.5], + "to": [12.5, 9, 5], + "faces": { + "north": {"uv": [0, 0, 15, 2], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "south": {"uv": [0, 0, 15, 2], "texture": "#7"}, + "west": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "up": {"uv": [0, 0, 15, 5], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 5], "texture": "#7"} + } + }, + { + "from": [-2.5, 8, 2.5], + "to": [5, 9, 5], + "faces": { + "north": {"uv": [0, 0, 15, 2], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "south": {"uv": [0, 0, 15, 2], "texture": "#7"}, + "west": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "up": {"uv": [0, 0, 15, 5], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 5], "texture": "#7"} + } + }, + { + "from": [-4, 8, 2.5], + "to": [-2.5, 9, 5], + "faces": { + "north": {"uv": [0, 0, 3, 2], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "south": {"uv": [0, 0, 3, 2], "texture": "#7"}, + "west": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "up": {"uv": [0, 0, 3, 5], "texture": "#7"}, + "down": {"uv": [0, 0, 3, 5], "texture": "#7"} + } + }, + { + "from": [18, 8.5, 3.5], + "to": [19, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [16.5, 8.5, 3.5], + "to": [17.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [15, 8.5, 3.5], + "to": [16, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [12, 8.5, 3.5], + "to": [13, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [10.5, 8.5, 3.5], + "to": [11.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [1.5, 8.5, 3.5], + "to": [2.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [0, 8.5, 3.5], + "to": [1, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [7.5, 8.5, 3.5], + "to": [8.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [6, 8.5, 3.5], + "to": [7, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [4.5, 8.5, 3.5], + "to": [5.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [-3, 8.5, 3.5], + "to": [-2, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [4, 12.5, 6.5], + "to": [5, 14.5, 8.5], + "faces": { + "north": {"uv": [0, 2, 2, 3], "rotation": 90, "texture": "#8"}, + "east": {"uv": [4, 0, 6, 2], "texture": "#8"}, + "south": {"uv": [4, 2, 6, 3], "rotation": 90, "texture": "#8"}, + "west": {"uv": [2, 0, 4, 2], "texture": "#8"}, + "up": {"uv": [6, 2, 8, 3], "rotation": 90, "texture": "#8"}, + "down": {"uv": [2, 2, 4, 3], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [11, 12.5, 6.5], + "to": [12, 14.5, 8.5], + "faces": { + "north": {"uv": [0, 2, 2, 3], "rotation": 90, "texture": "#8"}, + "east": {"uv": [4, 0, 6, 2], "texture": "#8"}, + "south": {"uv": [4, 2, 6, 3], "rotation": 90, "texture": "#8"}, + "west": {"uv": [2, 0, 4, 2], "texture": "#8"}, + "up": {"uv": [6, 2, 8, 3], "rotation": 90, "texture": "#8"}, + "down": {"uv": [2, 2, 4, 3], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [5, 13, 7], + "to": [11, 14, 8], + "faces": { + "north": {"uv": [0, 4, 1, 10], "rotation": 90, "texture": "#8"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#8"}, + "south": {"uv": [2, 4, 3, 10], "rotation": 90, "texture": "#8"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#8"}, + "up": {"uv": [1, 4, 2, 10], "rotation": 90, "texture": "#8"}, + "down": {"uv": [3, 4, 4, 10], "rotation": 90, "texture": "#8"} + } } ], - "display": {}, "groups": [ { "name": "player_piano_right", @@ -335,6 +552,24 @@ "origin": [8, 8, 8], "color": 0, "children": [12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23] - } + }, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41 ] } \ No newline at end of file diff --git a/src/main/resources/assets/phonos/models/item/radio_player_piano.json b/src/main/resources/assets/phonos/models/item/radio_player_piano.json index 558f68a..bd27fd4 100644 --- a/src/main/resources/assets/phonos/models/item/radio_player_piano.json +++ b/src/main/resources/assets/phonos/models/item/radio_player_piano.json @@ -7,6 +7,8 @@ "4": "phonos:block/piano_top_left", "5": "phonos:block/piano_top_right", "6": "phonos:block/speaker_bottom", + "7": "phonos:entity/keyboard", + "8": "phonos:entity/piano_roll", "particle": "phonos:block/wood_texture_half" }, "elements": [ @@ -334,9 +336,224 @@ "up": {"uv": [14, 0, 16, 6], "texture": "#6"}, "down": {"uv": [14, 0, 16, 6], "texture": "#6"} } + }, + { + "from": [12.5, 8, 2.5], + "to": [20, 9, 5], + "faces": { + "north": {"uv": [0, 0, 15, 2], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "south": {"uv": [0, 0, 15, 2], "texture": "#7"}, + "west": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "up": {"uv": [0, 0, 15, 5], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 5], "texture": "#7"} + } + }, + { + "from": [5, 8, 2.5], + "to": [12.5, 9, 5], + "faces": { + "north": {"uv": [0, 0, 15, 2], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "south": {"uv": [0, 0, 15, 2], "texture": "#7"}, + "west": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "up": {"uv": [0, 0, 15, 5], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 5], "texture": "#7"} + } + }, + { + "from": [-2.5, 8, 2.5], + "to": [5, 9, 5], + "faces": { + "north": {"uv": [0, 0, 15, 2], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "south": {"uv": [0, 0, 15, 2], "texture": "#7"}, + "west": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "up": {"uv": [0, 0, 15, 5], "texture": "#7"}, + "down": {"uv": [0, 0, 15, 5], "texture": "#7"} + } + }, + { + "from": [-4, 8, 2.5], + "to": [-2.5, 9, 5], + "faces": { + "north": {"uv": [0, 0, 3, 2], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "south": {"uv": [0, 0, 3, 2], "texture": "#7"}, + "west": {"uv": [0, 0, 5, 2], "texture": "#7"}, + "up": {"uv": [0, 0, 3, 5], "texture": "#7"}, + "down": {"uv": [0, 0, 3, 5], "texture": "#7"} + } + }, + { + "from": [18, 8.5, 3.5], + "to": [19, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [16.5, 8.5, 3.5], + "to": [17.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [15, 8.5, 3.5], + "to": [16, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [12, 8.5, 3.5], + "to": [13, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [10.5, 8.5, 3.5], + "to": [11.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [1.5, 8.5, 3.5], + "to": [2.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [0, 8.5, 3.5], + "to": [1, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [7.5, 8.5, 3.5], + "to": [8.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [6, 8.5, 3.5], + "to": [7, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [4.5, 8.5, 3.5], + "to": [5.5, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [-3, 8.5, 3.5], + "to": [-2, 9.5, 5], + "faces": { + "north": {"uv": [0, 8, 2, 10], "rotation": 180, "texture": "#7"}, + "east": {"uv": [0, 7, 2, 10], "rotation": 270, "texture": "#7"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#7"}, + "west": {"uv": [0, 7, 2, 10], "rotation": 90, "texture": "#7"}, + "up": {"uv": [0, 7, 2, 10], "texture": "#7"}, + "down": {"uv": [0, 7, 2, 10], "texture": "#7"} + } + }, + { + "from": [4, 12.5, 6.5], + "to": [5, 14.5, 8.5], + "faces": { + "north": {"uv": [0, 2, 2, 3], "rotation": 90, "texture": "#8"}, + "east": {"uv": [4, 0, 6, 2], "texture": "#8"}, + "south": {"uv": [4, 2, 6, 3], "rotation": 90, "texture": "#8"}, + "west": {"uv": [2, 0, 4, 2], "texture": "#8"}, + "up": {"uv": [6, 2, 8, 3], "rotation": 90, "texture": "#8"}, + "down": {"uv": [2, 2, 4, 3], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [11, 12.5, 6.5], + "to": [12, 14.5, 8.5], + "faces": { + "north": {"uv": [0, 2, 2, 3], "rotation": 90, "texture": "#8"}, + "east": {"uv": [4, 0, 6, 2], "texture": "#8"}, + "south": {"uv": [4, 2, 6, 3], "rotation": 90, "texture": "#8"}, + "west": {"uv": [2, 0, 4, 2], "texture": "#8"}, + "up": {"uv": [6, 2, 8, 3], "rotation": 90, "texture": "#8"}, + "down": {"uv": [2, 2, 4, 3], "rotation": 90, "texture": "#8"} + } + }, + { + "from": [5, 13, 7], + "to": [11, 14, 8], + "faces": { + "north": {"uv": [0, 4, 1, 10], "rotation": 90, "texture": "#8"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#8"}, + "south": {"uv": [2, 4, 3, 10], "rotation": 90, "texture": "#8"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#8"}, + "up": {"uv": [1, 4, 2, 10], "rotation": 90, "texture": "#8"}, + "down": {"uv": [3, 4, 4, 10], "rotation": 90, "texture": "#8"} + } } ], - "display": {}, "groups": [ { "name": "player_piano_right", @@ -349,6 +566,24 @@ "origin": [8, 8, 8], "color": 0, "children": [12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] - } + }, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42 ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json index f6f25ad..88605aa 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -4,6 +4,10 @@ "phonos:loudspeaker", "phonos:radio_jukebox", "phonos:radio_note_block", + "phonos:piano", + "phonos:player_piano", + "phonos:radio_player_piano", + "phonos:radio_recorder", "phonos:gourd_speaker", "phonos:speak_o_lantern", "phonos:tiny_potato_speaker"