diff --git a/datapacks/omega-flowey/data/animated_java/functions/tv_screen/zzzzzzzz/load.mcfunction b/datapacks/omega-flowey/data/animated_java/functions/tv_screen/zzzzzzzz/load.mcfunction index 00f6c7977..ae883112b 100644 --- a/datapacks/omega-flowey/data/animated_java/functions/tv_screen/zzzzzzzz/load.mcfunction +++ b/datapacks/omega-flowey/data/animated_java/functions/tv_screen/zzzzzzzz/load.mcfunction @@ -14,6 +14,6 @@ scoreboard players add .aj.last_id aj.id 0 scoreboard players set $aj.loop_mode.loop aj.i 0 scoreboard players set $aj.loop_mode.once aj.i 1 scoreboard players set $aj.loop_mode.hold aj.i 2 -scoreboard players set aj.tv_screen.export_version aj.i -41562086 +scoreboard players set aj.tv_screen.export_version aj.i -281196634 scoreboard players reset * aj.tv_screen.rig_loaded execute as @e[type=minecraft:item_display,tag=aj.tv_screen.root] run function animated_java:tv_screen/zzzzzzzz/on_load \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/tv_screen/box.json b/resourcepack/assets/animated_java/models/item/tv_screen/box.json index 0c6b37791..0dfaa688d 100644 --- a/resourcepack/assets/animated_java/models/item/tv_screen/box.json +++ b/resourcepack/assets/animated_java/models/item/tv_screen/box.json @@ -26,37 +26,37 @@ "faces": { "north": { "uv": [ - 2, - 2, + 0, 14, - 14 + 16, + 16 ], "texture": "#0" }, "east": { "uv": [ - 2, - 2, + 5, 14, - 14 + 16, + 16 ], "texture": "#0" }, "south": { "uv": [ - 2, - 2, + 1, 14, - 14 + 15, + 16 ], "texture": "#0" }, "west": { "uv": [ - 2, - 2, + 3, 14, - 14 + 14, + 16 ], "texture": "#0" }, @@ -72,10 +72,10 @@ }, "down": { "uv": [ - 2, - 2, - 14, - 14 + 0, + 6, + 16, + 12 ], "rotation": 180, "texture": "#0" @@ -106,36 +106,36 @@ "north": { "uv": [ 0, - 2, + 14, 16, - 6 + 16 ], "texture": "#0" }, "east": { "uv": [ - 2, - 2, + 5, 14, - 14 + 16, + 16 ], "texture": "#0" }, "south": { "uv": [ - 2, - 2, + 0, 14, - 14 + 16, + 16 ], "texture": "#0" }, "west": { "uv": [ - 2, - 2, + 0, 14, - 14 + 11, + 16 ], "texture": "#0" }, @@ -194,46 +194,46 @@ "east": { "uv": [ 2, - 2, - 14, - 14 + 0, + 5, + 16 ], "texture": "#0" }, "south": { "uv": [ 2, - 2, + 1, 14, - 14 + 16 ], "texture": "#0" }, "west": { "uv": [ - 2, - 2, + 11, + 0, 14, - 14 + 16 ], "texture": "#0" }, "up": { "uv": [ - 2, - 2, - 14, - 14 + 0, + 10, + 16, + 12 ], "rotation": 180, "texture": "#0" }, "down": { "uv": [ - 2, - 2, + 0, 14, - 14 + 16, + 16 ], "rotation": 180, "texture": "#0" @@ -272,47 +272,47 @@ }, "east": { "uv": [ - 2, - 2, - 14, - 14 + 0, + 0, + 3, + 13 ], "texture": "#0" }, "south": { "uv": [ - 2, - 2, - 14, - 14 + 0, + 0, + 16, + 16 ], "texture": "#0" }, "west": { "uv": [ - 2, - 2, - 14, - 14 + 13, + 0, + 16, + 13 ], "texture": "#0" }, "up": { "uv": [ - 2, - 2, - 14, - 14 + 0, + 0, + 16, + 2 ], "rotation": 180, "texture": "#0" }, "down": { "uv": [ - 2, - 2, + 1, 14, - 14 + 15, + 16 ], "rotation": 180, "texture": "#0" @@ -342,46 +342,46 @@ "faces": { "north": { "uv": [ - 2, - 2, - 14, - 14 + 16, + 0, + 0, + 2 ], "texture": "#0" }, "east": { "uv": [ - 2, - 2, - 14, - 14 + 5, + 0, + 16, + 2 ], "texture": "#0" }, "south": { "uv": [ - 2, - 2, - 14, - 14 + 0, + 7, + 16, + 9 ], "texture": "#0" }, "west": { "uv": [ - 2, - 2, - 14, - 14 + 0, + 0, + 11, + 2 ], "texture": "#0" }, "up": { "uv": [ - 2, - 2, - 14, - 14 + 0, + 9, + 16, + 15 ], "rotation": 180, "texture": "#0" @@ -421,27 +421,27 @@ "faces": { "north": { "uv": [ - 2, - 2, - 14, - 14 + 0, + 6, + 3, + 15 ], "texture": "#0" }, "east": { "uv": [ - 2, - 2, - 14, + 5, + 3, + 16, 14 ], "texture": "#0" }, "south": { "uv": [ - 2, - 2, 14, + 3, + 16, 14 ], "texture": "#0" @@ -500,10 +500,10 @@ "faces": { "north": { "uv": [ - 2, - 2, - 14, - 14 + 13, + 5, + 16, + 15 ], "texture": "#0" }, @@ -518,18 +518,18 @@ }, "south": { "uv": [ + 0, + 3, 2, - 2, - 14, 14 ], "texture": "#0" }, "west": { "uv": [ - 2, - 2, - 14, + 0, + 3, + 11, 14 ], "texture": "#0" diff --git a/resourcepack/assets/animated_java/models/item/tv_screen/screen.json b/resourcepack/assets/animated_java/models/item/tv_screen/screen.json index dbf284f26..b1374658a 100644 --- a/resourcepack/assets/animated_java/models/item/tv_screen/screen.json +++ b/resourcepack/assets/animated_java/models/item/tv_screen/screen.json @@ -27,9 +27,9 @@ "north": { "uv": [ 2, - 0.6999999999999975, + 0.7, 14, - 9.614290000000006 + 9.61429 ], "texture": "#1" }, @@ -37,8 +37,8 @@ "uv": [ 1.1, 0, - 14.900000000000004, - 9.814290000000005 + 14.9, + 9.81429 ], "rotation": 180, "texture": "#1" @@ -47,8 +47,8 @@ "uv": [ 1.1, 0, - 14.900000000000004, - 9.814290000000005 + 14.9, + 9.81429 ], "rotation": 180, "texture": "#1" @@ -57,8 +57,8 @@ "uv": [ 1.1, 0, - 14.900000000000004, - 9.814290000000005 + 14.9, + 9.81429 ], "rotation": 180, "texture": "#1" @@ -67,8 +67,8 @@ "uv": [ 1.1, 0, - 14.900000000000004, - 9.814290000000005 + 14.9, + 9.81429 ], "rotation": 180, "texture": "#1" @@ -77,8 +77,8 @@ "uv": [ 1.1, 0, - 14.900000000000004, - 9.814290000000005 + 14.9, + 9.81429 ], "rotation": 180, "texture": "#1" diff --git a/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/tv-screen.ajmodel b/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/tv-screen.ajmodel index 53cecb2a0..ad4c2ddcb 100644 --- a/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/tv-screen.ajmodel +++ b/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/tv-screen.ajmodel @@ -14,13 +14,13 @@ "rig_export_folder": "", "texture_export_folder": "", "enable_advanced_resource_pack_settings": false, - "resource_pack_mcmeta": "G:\\Coding\\omega-flowey-minecraft-remastered\\resourcepack\\pack.mcmeta", + "resource_pack_mcmeta": "C:\\Users\\adahy\\Desktop\\omega-flowey-minecraft-remastered\\resourcepack\\pack.mcmeta", "verbose": true, "exporter": "animated_java:datapack_exporter" }, "exporter_settings": { "animated_java:datapack_exporter": { - "datapack_mcmeta": "G:\\Coding\\omega-flowey-minecraft-remastered\\datapacks\\omega-flowey\\pack.mcmeta", + "datapack_mcmeta": "C:\\Users\\adahy\\Desktop\\omega-flowey-minecraft-remastered\\datapacks\\omega-flowey\\pack.mcmeta", "outdated_rig_warning": true, "root_entity_nbt": "{Tags:[\"omega-flowey-remastered\", \"omega-flowey\", \"omega-flowey-tv-screen\"]}", "include_variant_summon_functions": true, @@ -79,19 +79,19 @@ "origin": [5, 0, -24], "faces": { "north": { - "uv": [2, 2, 14, 14], + "uv": [0, 14, 16, 16], "texture": 0 }, "east": { - "uv": [2, 2, 14, 14], + "uv": [5, 14, 16, 16], "texture": 0 }, "south": { - "uv": [2, 2, 14, 14], + "uv": [1, 14, 15, 16], "texture": 0 }, "west": { - "uv": [2, 2, 14, 14], + "uv": [3, 14, 14, 16], "texture": 0 }, "up": { @@ -100,7 +100,7 @@ "texture": 0 }, "down": { - "uv": [2, 2, 14, 14], + "uv": [0, 6, 16, 12], "rotation": 180, "texture": 0 } @@ -122,19 +122,19 @@ "origin": [5, 0, -24], "faces": { "north": { - "uv": [0, 2, 16, 6], + "uv": [0, 14, 16, 16], "texture": 0 }, "east": { - "uv": [2, 2, 14, 14], + "uv": [5, 14, 16, 16], "texture": 0 }, "south": { - "uv": [2, 2, 14, 14], + "uv": [0, 14, 16, 16], "texture": 0 }, "west": { - "uv": [2, 2, 14, 14], + "uv": [0, 14, 11, 16], "texture": 0 }, "up": { @@ -165,15 +165,15 @@ "origin": [5, 0, -24], "faces": { "north": { - "uv": [2, 2, 14, 14], + "uv": [0, 6, 3, 15], "texture": 0 }, "east": { - "uv": [2, 2, 14, 14], + "uv": [5, 3, 16, 14], "texture": 0 }, "south": { - "uv": [2, 2, 14, 14], + "uv": [14, 3, 16, 14], "texture": 0 }, "west": { @@ -208,7 +208,7 @@ "origin": [5, 0, -24], "faces": { "north": { - "uv": [2, 2, 14, 14], + "uv": [13, 5, 16, 15], "texture": 0 }, "east": { @@ -216,11 +216,11 @@ "texture": 0 }, "south": { - "uv": [2, 2, 14, 14], + "uv": [0, 3, 2, 14], "texture": 0 }, "west": { - "uv": [2, 2, 14, 14], + "uv": [0, 3, 11, 14], "texture": 0 }, "up": { @@ -251,23 +251,23 @@ "origin": [5, 0, -24], "faces": { "north": { - "uv": [2, 2, 14, 14], + "uv": [16, 0, 0, 2], "texture": 0 }, "east": { - "uv": [2, 2, 14, 14], + "uv": [5, 0, 16, 2], "texture": 0 }, "south": { - "uv": [2, 2, 14, 14], + "uv": [0, 7, 16, 9], "texture": 0 }, "west": { - "uv": [2, 2, 14, 14], + "uv": [0, 0, 11, 2], "texture": 0 }, "up": { - "uv": [2, 2, 14, 14], + "uv": [0, 9, 16, 15], "rotation": 180, "texture": 0 }, @@ -298,24 +298,24 @@ "texture": 0 }, "east": { - "uv": [2, 2, 14, 14], + "uv": [2, 0, 5, 16], "texture": 0 }, "south": { - "uv": [2, 2, 14, 14], + "uv": [2, 1, 14, 16], "texture": 0 }, "west": { - "uv": [2, 2, 14, 14], + "uv": [11, 0, 14, 16], "texture": 0 }, "up": { - "uv": [2, 2, 14, 14], + "uv": [0, 10, 16, 12], "rotation": 180, "texture": 0 }, "down": { - "uv": [2, 2, 14, 14], + "uv": [0, 14, 16, 16], "rotation": 180, "texture": 0 } @@ -341,24 +341,24 @@ "texture": 0 }, "east": { - "uv": [2, 2, 14, 14], + "uv": [0, 0, 3, 13], "texture": 0 }, "south": { - "uv": [2, 2, 14, 14], + "uv": [0, 0, 16, 16], "texture": 0 }, "west": { - "uv": [2, 2, 14, 14], + "uv": [13, 0, 16, 13], "texture": 0 }, "up": { - "uv": [2, 2, 14, 14], + "uv": [0, 0, 16, 2], "rotation": 180, "texture": 0 }, "down": { - "uv": [2, 2, 14, 14], + "uv": [1, 14, 15, 16], "rotation": 180, "texture": 0 } @@ -487,11 +487,12 @@ "frame_order": "", "frame_interpolate": false, "visible": true, - "internal": false, - "saved": true, + "internal": true, + "saved": false, "uuid": "370b8b73-4e6c-b936-26ae-cafa974e6fc9", - "relative_path": "C:/Users/afro/AppData/Roaming/.minecraft/versions/1.20.2-pre1/1.20.2-pre1/assets/minecraft/textures/block/netherite_block.png", "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAWpJREFUOE+Fk09Lw0AQxWehoUnTiEawB0tQVFBv9tzv/wEEKYKCLb3kEqVr/rGByNt2trMS6FyS7M789r2ZjVouFn1ZNxRHIZ0KmYd3XZakXp6e+9k8ozRNT9WT3mlKzhKbh/fV2yspKMgeHmm9WVMy3W8Go8DBqrqiIAho1Bm71h32kOMB8jz3ElU4sQWmMw7YNxXVPVHTNpSepz6gKAoyxlCkiFCMZIawHMCQ0+6+aXp5RR/vq6MFVsAQSIVMeIZfDlhiQL7d+ABOgmfZB0CgkEP/atsvTwFbYH//R8LyAQdgsAfyVG4gT4WnAYs4BAo8C+yTPaNAWkKhhR0UOAAu0vzmziVz9yUAmzgVodraPi9m1/4YoYCL8cQU4BURjkMPoKuastv7PYAVFD+Fu4nW/8GrBOB0FCMGAUjox5GzIwvkVJJJZC1svz6PCjAm1zTxL8irLCFYt/cAFvBbeifEsf2U68nAGnL+AK7IFKyaYaryAAAAAElFTkSuQmCC", + "image_data": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAWpJREFUOE+Fk09Lw0AQxWehoUnTiEawB0tQVFBv9tzv/wEEKYKCLb3kEqVr/rGByNt2trMS6FyS7M789r2ZjVouFn1ZNxRHIZ0KmYd3XZakXp6e+9k8ozRNT9WT3mlKzhKbh/fV2yspKMgeHmm9WVMy3W8Go8DBqrqiIAho1Bm71h32kOMB8jz3ElU4sQWmMw7YNxXVPVHTNpSepz6gKAoyxlCkiFCMZIawHMCQ0+6+aXp5RR/vq6MFVsAQSIVMeIZfDlhiQL7d+ABOgmfZB0CgkEP/atsvTwFbYH//R8LyAQdgsAfyVG4gT4WnAYs4BAo8C+yTPaNAWkKhhR0UOAAu0vzmziVz9yUAmzgVodraPi9m1/4YoYCL8cQU4BURjkMPoKuastv7PYAVFD+Fu4nW/8GrBOB0FCMGAUjox5GzIwvkVJJJZC1svz6PCjAm1zTxL8irLCFYt/cAFvBbeifEsf2U68nAGnL+AK7IFKyaYaryAAAAAElFTkSuQmCC", + "relative_path": "../../../../../../../../../../../afro/AppData/Roaming/.minecraft/versions/1.20.2-pre1/1.20.2-pre1/assets/minecraft/textures/block/netherite_block.png", "mode": "bitmap" }, { @@ -514,15 +515,16 @@ "frame_order": "", "frame_interpolate": false, "visible": true, - "internal": false, - "saved": true, + "internal": true, + "saved": false, "uuid": "32717bc3-fe35-1fc8-9bbf-54407fe854d1", - "relative_path": "C:/Users/afro/AppData/Roaming/.minecraft/versions/1.20.2-pre1/1.20.2-pre1/assets/minecraft/textures/block/black_concrete.png", "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAPtJREFUOE99k9kSwiAMRUv7oK2Oy/9/a4tzooeJyMhLINwkN1s5b/c6z/PE2fd9KqXEHXkcx+Qfd3T5v9Y6le36rBguy9IMeHM0BqhTZBiW8pYwUIkTwUTkLSv1P4zWy6PqEUc91Qj9SQlcxsb9tN5qzqsHE9EUM5uWAjUwsqnkfBswFfeLKQyIAtDicUdnF5DWwDqhi0A4yMpR2wTr1A61LvQ1sJAWUCbORsYHg+zZnPsZEOM/0SN12mikvkUA0GVGGoptbezT0FAndsh3wzsHUhuN7Gg2WitJ4R9FC+gU5smM5eodjLbQOXFjfUdgi5jn3LXNi5W7ox75AoSGFC+2epdnAAAAAElFTkSuQmCC", + "image_data": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAPtJREFUOE99k9kSwiAMRUv7oK2Oy/9/a4tzooeJyMhLINwkN1s5b/c6z/PE2fd9KqXEHXkcx+Qfd3T5v9Y6le36rBguy9IMeHM0BqhTZBiW8pYwUIkTwUTkLSv1P4zWy6PqEUc91Qj9SQlcxsb9tN5qzqsHE9EUM5uWAjUwsqnkfBswFfeLKQyIAtDicUdnF5DWwDqhi0A4yMpR2wTr1A61LvQ1sJAWUCbORsYHg+zZnPsZEOM/0SN12mikvkUA0GVGGoptbezT0FAndsh3wzsHUhuN7Gg2WitJ4R9FC+gU5smM5eodjLbQOXFjfUdgi5jn3LXNi5W7ox75AoSGFC+2epdnAAAAAElFTkSuQmCC", + "relative_path": "../../../../../../../../../../../afro/AppData/Roaming/.minecraft/versions/1.20.2-pre1/1.20.2-pre1/assets/minecraft/textures/block/black_concrete.png", "mode": "bitmap" }, { - "path": "G:\\Coding\\omega-flowey-minecraft-remastered\\resourcepack\\assets\\animated_java\\textures\\item\\tv_screen\\warning.png", + "path": "C:\\Users\\adahy\\Desktop\\omega-flowey-minecraft-remastered\\resourcepack\\assets\\animated_java\\textures\\item\\tv_screen\\warning.png", "name": "warning", "folder": "", "namespace": "",