From 4a667e351cddd4d09938dfa9fc19e5af650854ac Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Wed, 10 Jan 2024 20:46:41 -0500 Subject: [PATCH] add AJ export files for parent commit --- .../functions/bomb/zzzzzzzz/load.mcfunction | 2 +- .../upper_eye/zzzzzzzz/load.mcfunction | 2 +- .../tags/functions/rig_tick.json | 6 +- .../data/minecraft/tags/functions/load.json | 6 +- .../animated_java/models/item/bomb/bone.json | 90 +++++++++---------- .../models/item/upper_eye/bright/dark.json | 4 +- .../models/item/upper_eye/bright/diag.json | 4 +- .../models/item/upper_eye/bright/iris.json | 4 +- .../models/item/upper_eye/bright/light.json | 4 +- .../models/item/upper_eye/bright/pupil.json | 4 +- .../models/item/upper_eye/bright/sclera.json | 4 +- .../models/item/upper_eye/colorful/dark.json | 4 +- .../models/item/upper_eye/colorful/diag.json | 4 +- .../models/item/upper_eye/colorful/iris.json | 4 +- .../models/item/upper_eye/colorful/light.json | 4 +- .../models/item/upper_eye/colorful/pupil.json | 4 +- .../item/upper_eye/colorful/sclera.json | 4 +- .../models/item/upper_eye/dark/dark.json | 4 +- .../models/item/upper_eye/dark/diag.json | 4 +- .../models/item/upper_eye/dark/iris.json | 4 +- .../models/item/upper_eye/dark/light.json | 4 +- .../models/item/upper_eye/dark/pupil.json | 4 +- .../models/item/upper_eye/dark/sclera.json | 4 +- .../models/item/upper_eye/diag.json | 50 +++++------ .../models/item/upper_eye/iris.json | 38 ++++---- .../models/item/upper_eye/pupil.json | 14 +-- 26 files changed, 140 insertions(+), 140 deletions(-) diff --git a/datapacks/omega-flowey/data/animated_java/functions/bomb/zzzzzzzz/load.mcfunction b/datapacks/omega-flowey/data/animated_java/functions/bomb/zzzzzzzz/load.mcfunction index deb4a8ceb..fa210e3d1 100644 --- a/datapacks/omega-flowey/data/animated_java/functions/bomb/zzzzzzzz/load.mcfunction +++ b/datapacks/omega-flowey/data/animated_java/functions/bomb/zzzzzzzz/load.mcfunction @@ -10,6 +10,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.bomb.export_version aj.i -1178425653 +scoreboard players set aj.bomb.export_version aj.i -502345955 scoreboard players reset * aj.bomb.rig_loaded execute as @e[type=minecraft:item_display,tag=aj.bomb.root] run function animated_java:bomb/zzzzzzzz/on_load \ No newline at end of file diff --git a/datapacks/omega-flowey/data/animated_java/functions/upper_eye/zzzzzzzz/load.mcfunction b/datapacks/omega-flowey/data/animated_java/functions/upper_eye/zzzzzzzz/load.mcfunction index 6382635af..9cc2989fc 100644 --- a/datapacks/omega-flowey/data/animated_java/functions/upper_eye/zzzzzzzz/load.mcfunction +++ b/datapacks/omega-flowey/data/animated_java/functions/upper_eye/zzzzzzzz/load.mcfunction @@ -16,6 +16,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.upper_eye.export_version aj.i 382849128 +scoreboard players set aj.upper_eye.export_version aj.i -375220021 scoreboard players reset * aj.upper_eye.rig_loaded execute as @e[type=minecraft:item_display,tag=aj.upper_eye.root] run function animated_java:upper_eye/zzzzzzzz/on_load \ No newline at end of file diff --git a/datapacks/omega-flowey/data/animated_java/tags/functions/rig_tick.json b/datapacks/omega-flowey/data/animated_java/tags/functions/rig_tick.json index 91a4677ae..26cce27ac 100644 --- a/datapacks/omega-flowey/data/animated_java/tags/functions/rig_tick.json +++ b/datapacks/omega-flowey/data/animated_java/tags/functions/rig_tick.json @@ -1,12 +1,10 @@ { "replace": false, "values": [ - "animated_java:bomb/zzzzzzzz/tick", "animated_java:projectile_star/zzzzzzzz/tick", "animated_java:friendliness_pellet/zzzzzzzz/tick", "animated_java:dentata_snake_ball/zzzzzzzz/tick", "animated_java:nose/zzzzzzzz/tick", - "animated_java:upper_eye/zzzzzzzz/tick", "animated_java:lower_eye/zzzzzzzz/tick", "animated_java:pipe_upper_eye/zzzzzzzz/tick", "animated_java:homing_vine_blinking_lane/zzzzzzzz/tick", @@ -15,6 +13,8 @@ "animated_java:finger_gun_bullet/zzzzzzzz/tick", "animated_java:finger_gun_laser/zzzzzzzz/tick", "animated_java:finger_gun/zzzzzzzz/tick", - "animated_java:tv_screen/zzzzzzzz/tick" + "animated_java:tv_screen/zzzzzzzz/tick", + "animated_java:bomb/zzzzzzzz/tick", + "animated_java:upper_eye/zzzzzzzz/tick" ] } \ No newline at end of file diff --git a/datapacks/omega-flowey/data/minecraft/tags/functions/load.json b/datapacks/omega-flowey/data/minecraft/tags/functions/load.json index 734ab0e5e..4e30a238e 100644 --- a/datapacks/omega-flowey/data/minecraft/tags/functions/load.json +++ b/datapacks/omega-flowey/data/minecraft/tags/functions/load.json @@ -1,12 +1,10 @@ { "replace": false, "values": [ - "animated_java:bomb/zzzzzzzz/load", "animated_java:projectile_star/zzzzzzzz/load", "animated_java:friendliness_pellet/zzzzzzzz/load", "animated_java:dentata_snake_ball/zzzzzzzz/load", "animated_java:nose/zzzzzzzz/load", - "animated_java:upper_eye/zzzzzzzz/load", "animated_java:lower_eye/zzzzzzzz/load", "animated_java:pipe_upper_eye/zzzzzzzz/load", "animated_java:homing_vine_blinking_lane/zzzzzzzz/load", @@ -15,6 +13,8 @@ "animated_java:finger_gun_bullet/zzzzzzzz/load", "animated_java:finger_gun_laser/zzzzzzzz/load", "animated_java:finger_gun/zzzzzzzz/load", - "animated_java:tv_screen/zzzzzzzz/load" + "animated_java:tv_screen/zzzzzzzz/load", + "animated_java:bomb/zzzzzzzz/load", + "animated_java:upper_eye/zzzzzzzz/load" ] } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/bomb/bone.json b/resourcepack/assets/animated_java/models/item/bomb/bone.json index 48992e4e6..d540224e3 100644 --- a/resourcepack/assets/animated_java/models/item/bomb/bone.json +++ b/resourcepack/assets/animated_java/models/item/bomb/bone.json @@ -2,8 +2,8 @@ "textures": { "0": "minecraft:block/netherite_block", "1": "minecraft:block/anvil", - "4": "minecraft:block/cauldron_inner", - "5": "animated_java:item/attacks/flowery" + "2": "minecraft:block/cauldron_inner", + "3": "animated_java:item/attacks/flowery" }, "elements": [ { @@ -766,7 +766,7 @@ 7, 1 ], - "texture": "#4" + "texture": "#2" }, "east": { "uv": [ @@ -775,7 +775,7 @@ 2, 13 ], - "texture": "#4" + "texture": "#2" }, "south": { "uv": [ @@ -784,7 +784,7 @@ 16, 13 ], - "texture": "#4" + "texture": "#2" }, "west": { "uv": [ @@ -793,7 +793,7 @@ 2, 1 ], - "texture": "#4" + "texture": "#2" }, "up": { "uv": [ @@ -802,7 +802,7 @@ 11, 3 ], - "texture": "#4" + "texture": "#2" } } }, @@ -825,7 +825,7 @@ 7, 1 ], - "texture": "#4" + "texture": "#2" }, "east": { "uv": [ @@ -834,7 +834,7 @@ 2, 1 ], - "texture": "#4" + "texture": "#2" }, "south": { "uv": [ @@ -843,7 +843,7 @@ 6, 13 ], - "texture": "#4" + "texture": "#2" }, "west": { "uv": [ @@ -852,7 +852,7 @@ 16, 13 ], - "texture": "#4" + "texture": "#2" }, "up": { "uv": [ @@ -861,7 +861,7 @@ 15, 2 ], - "texture": "#4" + "texture": "#2" } } }, @@ -884,7 +884,7 @@ 16, 13 ], - "texture": "#4" + "texture": "#2" }, "east": { "uv": [ @@ -893,7 +893,7 @@ 2, 1 ], - "texture": "#4" + "texture": "#2" }, "south": { "uv": [ @@ -902,7 +902,7 @@ 7, 1 ], - "texture": "#4" + "texture": "#2" }, "west": { "uv": [ @@ -911,7 +911,7 @@ 2, 13 ], - "texture": "#4" + "texture": "#2" }, "up": { "uv": [ @@ -920,7 +920,7 @@ 8, 3 ], - "texture": "#4" + "texture": "#2" } } }, @@ -943,7 +943,7 @@ 5, 1 ], - "texture": "#4" + "texture": "#2" }, "south": { "uv": [ @@ -952,7 +952,7 @@ 2, 1 ], - "texture": "#4" + "texture": "#2" }, "west": { "uv": [ @@ -961,7 +961,7 @@ 7, 13 ], - "texture": "#4" + "texture": "#2" }, "up": { "uv": [ @@ -970,7 +970,7 @@ 3, 6 ], - "texture": "#4" + "texture": "#2" } } }, @@ -993,7 +993,7 @@ 2, 1 ], - "texture": "#4" + "texture": "#2" }, "east": { "uv": [ @@ -1002,7 +1002,7 @@ 5, 1 ], - "texture": "#4" + "texture": "#2" }, "west": { "uv": [ @@ -1011,7 +1011,7 @@ 14, 13 ], - "texture": "#4" + "texture": "#2" }, "up": { "uv": [ @@ -1020,7 +1020,7 @@ 2, 5 ], - "texture": "#4" + "texture": "#2" } } }, @@ -1043,7 +1043,7 @@ 2, 1 ], - "texture": "#4" + "texture": "#2" }, "east": { "uv": [ @@ -1052,7 +1052,7 @@ 6, 13 ], - "texture": "#4" + "texture": "#2" }, "west": { "uv": [ @@ -1061,7 +1061,7 @@ 5, 1 ], - "texture": "#4" + "texture": "#2" }, "up": { "uv": [ @@ -1070,7 +1070,7 @@ 3, 7 ], - "texture": "#4" + "texture": "#2" } } }, @@ -1093,7 +1093,7 @@ 7, 13 ], - "texture": "#4" + "texture": "#2" }, "east": { "uv": [ @@ -1102,7 +1102,7 @@ 16, 13 ], - "texture": "#4" + "texture": "#2" }, "south": { "uv": [ @@ -1111,7 +1111,7 @@ 7, 1 ], - "texture": "#4" + "texture": "#2" }, "west": { "uv": [ @@ -1120,7 +1120,7 @@ 2, 1 ], - "texture": "#4" + "texture": "#2" }, "up": { "uv": [ @@ -1129,7 +1129,7 @@ 16, 3 ], - "texture": "#4" + "texture": "#2" } } }, @@ -1152,7 +1152,7 @@ 14, 13 ], - "texture": "#4" + "texture": "#2" }, "south": { "uv": [ @@ -1161,7 +1161,7 @@ 2, 1 ], - "texture": "#4" + "texture": "#2" }, "west": { "uv": [ @@ -1170,7 +1170,7 @@ 5, 1 ], - "texture": "#4" + "texture": "#2" }, "up": { "uv": [ @@ -1179,7 +1179,7 @@ 3, 10 ], - "texture": "#4" + "texture": "#2" } } }, @@ -1202,7 +1202,7 @@ 16, 16 ], - "texture": "#4" + "texture": "#2" }, "east": { "uv": [ @@ -1211,7 +1211,7 @@ 16, 16 ], - "texture": "#4" + "texture": "#2" }, "south": { "uv": [ @@ -1220,7 +1220,7 @@ 16, 16 ], - "texture": "#4" + "texture": "#2" }, "west": { "uv": [ @@ -1229,7 +1229,7 @@ 16, 16 ], - "texture": "#4" + "texture": "#2" }, "up": { "uv": [ @@ -1238,7 +1238,7 @@ 16, 16 ], - "texture": "#4" + "texture": "#2" }, "down": { "uv": [ @@ -1247,7 +1247,7 @@ 16, 16 ], - "texture": "#4" + "texture": "#2" } } }, @@ -1388,7 +1388,7 @@ 16, 13 ], - "texture": "#5" + "texture": "#3" }, "east": { "uv": [ diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/bright/dark.json b/resourcepack/assets/animated_java/models/item/upper_eye/bright/dark.json index dfd96597b..58fc70f8f 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/bright/dark.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/bright/dark.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/dark", "textures": { "0": "animated_java:item/upper_eye/bright_quartz_block_side", - "3": "animated_java:item/upper_eye/bright_light_gray_concrete", - "4": "animated_java:item/upper_eye/bright_coal_block" + "2": "animated_java:item/upper_eye/bright_light_gray_concrete", + "3": "animated_java:item/upper_eye/bright_coal_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/bright/diag.json b/resourcepack/assets/animated_java/models/item/upper_eye/bright/diag.json index cf15c82b6..407513233 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/bright/diag.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/bright/diag.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/diag", "textures": { "0": "animated_java:item/upper_eye/bright_quartz_block_side", - "3": "animated_java:item/upper_eye/bright_light_gray_concrete", - "4": "animated_java:item/upper_eye/bright_coal_block" + "2": "animated_java:item/upper_eye/bright_light_gray_concrete", + "3": "animated_java:item/upper_eye/bright_coal_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/bright/iris.json b/resourcepack/assets/animated_java/models/item/upper_eye/bright/iris.json index 8b49cd08a..42b39d3da 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/bright/iris.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/bright/iris.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/iris", "textures": { "0": "animated_java:item/upper_eye/bright_quartz_block_side", - "3": "animated_java:item/upper_eye/bright_light_gray_concrete", - "4": "animated_java:item/upper_eye/bright_coal_block" + "2": "animated_java:item/upper_eye/bright_light_gray_concrete", + "3": "animated_java:item/upper_eye/bright_coal_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/bright/light.json b/resourcepack/assets/animated_java/models/item/upper_eye/bright/light.json index 1da7f0f20..b5df29ab7 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/bright/light.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/bright/light.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/light", "textures": { "0": "animated_java:item/upper_eye/bright_quartz_block_side", - "3": "animated_java:item/upper_eye/bright_light_gray_concrete", - "4": "animated_java:item/upper_eye/bright_coal_block" + "2": "animated_java:item/upper_eye/bright_light_gray_concrete", + "3": "animated_java:item/upper_eye/bright_coal_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/bright/pupil.json b/resourcepack/assets/animated_java/models/item/upper_eye/bright/pupil.json index 3fa96e72f..8802beff9 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/bright/pupil.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/bright/pupil.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/pupil", "textures": { "0": "animated_java:item/upper_eye/bright_quartz_block_side", - "3": "animated_java:item/upper_eye/bright_light_gray_concrete", - "4": "animated_java:item/upper_eye/bright_coal_block" + "2": "animated_java:item/upper_eye/bright_light_gray_concrete", + "3": "animated_java:item/upper_eye/bright_coal_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/bright/sclera.json b/resourcepack/assets/animated_java/models/item/upper_eye/bright/sclera.json index cb2d6cd89..173a1c342 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/bright/sclera.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/bright/sclera.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/sclera", "textures": { "0": "animated_java:item/upper_eye/bright_quartz_block_side", - "3": "animated_java:item/upper_eye/bright_light_gray_concrete", - "4": "animated_java:item/upper_eye/bright_coal_block" + "2": "animated_java:item/upper_eye/bright_light_gray_concrete", + "3": "animated_java:item/upper_eye/bright_coal_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/dark.json b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/dark.json index 0c899d67b..5d5444217 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/dark.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/dark.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/dark", "textures": { "0": "animated_java:item/upper_eye/colorful_sclera", - "3": "animated_java:item/upper_eye/colorful_iris", - "4": "animated_java:item/upper_eye/colorful_pupil" + "2": "animated_java:item/upper_eye/colorful_iris", + "3": "animated_java:item/upper_eye/colorful_pupil" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/diag.json b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/diag.json index 49fbc3de0..79c1b8a0a 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/diag.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/diag.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/diag", "textures": { "0": "animated_java:item/upper_eye/colorful_sclera", - "3": "animated_java:item/upper_eye/colorful_iris", - "4": "animated_java:item/upper_eye/colorful_pupil" + "2": "animated_java:item/upper_eye/colorful_iris", + "3": "animated_java:item/upper_eye/colorful_pupil" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/iris.json b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/iris.json index c5a358de6..d6546a270 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/iris.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/iris.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/iris", "textures": { "0": "animated_java:item/upper_eye/colorful_sclera", - "3": "animated_java:item/upper_eye/colorful_iris", - "4": "animated_java:item/upper_eye/colorful_pupil" + "2": "animated_java:item/upper_eye/colorful_iris", + "3": "animated_java:item/upper_eye/colorful_pupil" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/light.json b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/light.json index ddb15f832..133a43972 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/light.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/light.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/light", "textures": { "0": "animated_java:item/upper_eye/colorful_sclera", - "3": "animated_java:item/upper_eye/colorful_iris", - "4": "animated_java:item/upper_eye/colorful_pupil" + "2": "animated_java:item/upper_eye/colorful_iris", + "3": "animated_java:item/upper_eye/colorful_pupil" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/pupil.json b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/pupil.json index a5af36fae..959e93e26 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/pupil.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/pupil.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/pupil", "textures": { "0": "animated_java:item/upper_eye/colorful_sclera", - "3": "animated_java:item/upper_eye/colorful_iris", - "4": "animated_java:item/upper_eye/colorful_pupil" + "2": "animated_java:item/upper_eye/colorful_iris", + "3": "animated_java:item/upper_eye/colorful_pupil" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/sclera.json b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/sclera.json index 99c18f836..c3cae34c1 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/colorful/sclera.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/colorful/sclera.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/sclera", "textures": { "0": "animated_java:item/upper_eye/colorful_sclera", - "3": "animated_java:item/upper_eye/colorful_iris", - "4": "animated_java:item/upper_eye/colorful_pupil" + "2": "animated_java:item/upper_eye/colorful_iris", + "3": "animated_java:item/upper_eye/colorful_pupil" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/dark/dark.json b/resourcepack/assets/animated_java/models/item/upper_eye/dark/dark.json index 98360242f..609a49c5f 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/dark/dark.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/dark/dark.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/dark", "textures": { "0": "minecraft:block/coal_block", - "3": "minecraft:block/coal_block", - "4": "minecraft:block/redstone_block" + "2": "minecraft:block/coal_block", + "3": "minecraft:block/redstone_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/dark/diag.json b/resourcepack/assets/animated_java/models/item/upper_eye/dark/diag.json index 4f04a2e69..1812e9bac 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/dark/diag.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/dark/diag.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/diag", "textures": { "0": "minecraft:block/coal_block", - "3": "minecraft:block/coal_block", - "4": "minecraft:block/redstone_block" + "2": "minecraft:block/coal_block", + "3": "minecraft:block/redstone_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/dark/iris.json b/resourcepack/assets/animated_java/models/item/upper_eye/dark/iris.json index 1f26e94ac..8298feae9 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/dark/iris.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/dark/iris.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/iris", "textures": { "0": "minecraft:block/coal_block", - "3": "minecraft:block/coal_block", - "4": "minecraft:block/redstone_block" + "2": "minecraft:block/coal_block", + "3": "minecraft:block/redstone_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/dark/light.json b/resourcepack/assets/animated_java/models/item/upper_eye/dark/light.json index 897572ff9..b710039b1 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/dark/light.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/dark/light.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/light", "textures": { "0": "minecraft:block/coal_block", - "3": "minecraft:block/coal_block", - "4": "minecraft:block/redstone_block" + "2": "minecraft:block/coal_block", + "3": "minecraft:block/redstone_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/dark/pupil.json b/resourcepack/assets/animated_java/models/item/upper_eye/dark/pupil.json index c4669ae1c..50c30222c 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/dark/pupil.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/dark/pupil.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/pupil", "textures": { "0": "minecraft:block/coal_block", - "3": "minecraft:block/coal_block", - "4": "minecraft:block/redstone_block" + "2": "minecraft:block/coal_block", + "3": "minecraft:block/redstone_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/dark/sclera.json b/resourcepack/assets/animated_java/models/item/upper_eye/dark/sclera.json index e238d61da..3e4e90333 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/dark/sclera.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/dark/sclera.json @@ -2,7 +2,7 @@ "parent": "animated_java:item/upper_eye/sclera", "textures": { "0": "minecraft:block/coal_block", - "3": "minecraft:block/coal_block", - "4": "minecraft:block/redstone_block" + "2": "minecraft:block/coal_block", + "3": "minecraft:block/redstone_block" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/diag.json b/resourcepack/assets/animated_java/models/item/upper_eye/diag.json index 6fba4ace8..fc3af29fb 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/diag.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/diag.json @@ -1,6 +1,6 @@ { "textures": { - "3": "minecraft:block/light_gray_concrete" + "2": "minecraft:block/light_gray_concrete" }, "elements": [ { @@ -32,7 +32,7 @@ 1 ], "rotation": 90, - "texture": "#3" + "texture": "#2" }, "east": { "uv": [ @@ -42,7 +42,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "south": { "uv": [ @@ -52,7 +52,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "west": { "uv": [ @@ -62,7 +62,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "up": { "uv": [ @@ -72,7 +72,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "down": { "uv": [ @@ -82,7 +82,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" } } }, @@ -115,7 +115,7 @@ 1 ], "rotation": 90, - "texture": "#3" + "texture": "#2" }, "east": { "uv": [ @@ -125,7 +125,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "south": { "uv": [ @@ -135,7 +135,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "west": { "uv": [ @@ -145,7 +145,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "up": { "uv": [ @@ -155,7 +155,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "down": { "uv": [ @@ -165,7 +165,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" } } }, @@ -198,7 +198,7 @@ 1 ], "rotation": 90, - "texture": "#3" + "texture": "#2" }, "east": { "uv": [ @@ -208,7 +208,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "south": { "uv": [ @@ -218,7 +218,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "west": { "uv": [ @@ -228,7 +228,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "up": { "uv": [ @@ -238,7 +238,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "down": { "uv": [ @@ -248,7 +248,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" } } }, @@ -281,7 +281,7 @@ 1 ], "rotation": 90, - "texture": "#3" + "texture": "#2" }, "east": { "uv": [ @@ -291,7 +291,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "south": { "uv": [ @@ -301,7 +301,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "west": { "uv": [ @@ -311,7 +311,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "up": { "uv": [ @@ -321,7 +321,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" }, "down": { "uv": [ @@ -331,7 +331,7 @@ 1 ], "rotation": 270, - "texture": "#3" + "texture": "#2" } } } diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/iris.json b/resourcepack/assets/animated_java/models/item/upper_eye/iris.json index 4e6497da7..efeae9339 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/iris.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/iris.json @@ -1,6 +1,6 @@ { "textures": { - "3": "minecraft:block/light_gray_concrete" + "2": "minecraft:block/light_gray_concrete" }, "elements": [ { @@ -31,7 +31,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "east": { "uv": [ @@ -40,7 +40,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "south": { "uv": [ @@ -49,7 +49,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "west": { "uv": [ @@ -58,7 +58,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "up": { "uv": [ @@ -67,7 +67,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "down": { "uv": [ @@ -76,7 +76,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" } } }, @@ -108,7 +108,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "east": { "uv": [ @@ -117,7 +117,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "south": { "uv": [ @@ -126,7 +126,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "west": { "uv": [ @@ -135,7 +135,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "up": { "uv": [ @@ -144,7 +144,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "down": { "uv": [ @@ -153,7 +153,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" } } }, @@ -185,7 +185,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "east": { "uv": [ @@ -194,7 +194,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "south": { "uv": [ @@ -203,7 +203,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "west": { "uv": [ @@ -212,7 +212,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "up": { "uv": [ @@ -221,7 +221,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" }, "down": { "uv": [ @@ -230,7 +230,7 @@ 1, 3 ], - "texture": "#3" + "texture": "#2" } } } diff --git a/resourcepack/assets/animated_java/models/item/upper_eye/pupil.json b/resourcepack/assets/animated_java/models/item/upper_eye/pupil.json index 85f524a89..eb62532e0 100644 --- a/resourcepack/assets/animated_java/models/item/upper_eye/pupil.json +++ b/resourcepack/assets/animated_java/models/item/upper_eye/pupil.json @@ -1,6 +1,6 @@ { "textures": { - "4": "minecraft:block/coal_block" + "3": "minecraft:block/coal_block" }, "elements": [ { @@ -31,7 +31,7 @@ 1, 3 ], - "texture": "#4" + "texture": "#3" }, "east": { "uv": [ @@ -40,7 +40,7 @@ 1, 3 ], - "texture": "#4" + "texture": "#3" }, "south": { "uv": [ @@ -49,7 +49,7 @@ 1, 3 ], - "texture": "#4" + "texture": "#3" }, "west": { "uv": [ @@ -58,7 +58,7 @@ 1, 3 ], - "texture": "#4" + "texture": "#3" }, "up": { "uv": [ @@ -67,7 +67,7 @@ 1, 3 ], - "texture": "#4" + "texture": "#3" }, "down": { "uv": [ @@ -76,7 +76,7 @@ 1, 3 ], - "texture": "#4" + "texture": "#3" } } }