From 84e6180682f1b5b13e7ca191e31ab19d7e7186b3 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Thu, 28 Dec 2023 18:20:53 -0500 Subject: [PATCH] update `lower_eye` ajmodel exports - some blockbench update removed unnecessary texture declarations - committing them explicitly for useful diff analysis --- .../functions/lower_eye/zzzzzzzz/load.mcfunction | 2 +- .../data/animated_java/tags/functions/rig_tick.json | 4 ++-- .../omega-flowey/data/minecraft/tags/functions/load.json | 4 ++-- .../animated_java/models/item/lower_eye/bright/black.json | 8 -------- .../animated_java/models/item/lower_eye/bright/dark.json | 8 -------- .../animated_java/models/item/lower_eye/bright/diag.json | 8 -------- .../animated_java/models/item/lower_eye/bright/iris.json | 8 -------- .../animated_java/models/item/lower_eye/bright/light.json | 8 -------- .../models/item/lower_eye/bright/outer_lid.json | 8 -------- .../animated_java/models/item/lower_eye/bright/pupil.json | 8 -------- .../models/item/lower_eye/bright/sclera.json | 8 -------- .../animated_java/models/item/lower_eye/dark/black.json | 8 -------- .../animated_java/models/item/lower_eye/dark/dark.json | 8 -------- .../animated_java/models/item/lower_eye/dark/diag.json | 8 -------- .../animated_java/models/item/lower_eye/dark/iris.json | 8 -------- .../animated_java/models/item/lower_eye/dark/light.json | 8 -------- .../models/item/lower_eye/dark/outer_lid.json | 8 -------- .../animated_java/models/item/lower_eye/dark/pupil.json | 8 -------- .../animated_java/models/item/lower_eye/dark/sclera.json | 8 -------- 19 files changed, 5 insertions(+), 133 deletions(-) diff --git a/datapacks/omega-flowey/data/animated_java/functions/lower_eye/zzzzzzzz/load.mcfunction b/datapacks/omega-flowey/data/animated_java/functions/lower_eye/zzzzzzzz/load.mcfunction index 98116b043..af295565a 100644 --- a/datapacks/omega-flowey/data/animated_java/functions/lower_eye/zzzzzzzz/load.mcfunction +++ b/datapacks/omega-flowey/data/animated_java/functions/lower_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.lower_eye.export_version aj.i 319098150 +scoreboard players set aj.lower_eye.export_version aj.i 43330454 scoreboard players reset * aj.lower_eye.rig_loaded execute as @e[type=minecraft:item_display,tag=aj.lower_eye.root] run function animated_java:lower_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 9d639d25d..72f2ba4d7 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 @@ -7,10 +7,10 @@ "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", "animated_java:homing_vine/zzzzzzzz/tick", - "animated_java:friendliness_pellet_ring/zzzzzzzz/tick" + "animated_java:friendliness_pellet_ring/zzzzzzzz/tick", + "animated_java:lower_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 30db640f4..af40241c9 100644 --- a/datapacks/omega-flowey/data/minecraft/tags/functions/load.json +++ b/datapacks/omega-flowey/data/minecraft/tags/functions/load.json @@ -7,10 +7,10 @@ "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", "animated_java:homing_vine/zzzzzzzz/load", - "animated_java:friendliness_pellet_ring/zzzzzzzz/load" + "animated_java:friendliness_pellet_ring/zzzzzzzz/load", + "animated_java:lower_eye/zzzzzzzz/load" ] } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/bright/black.json b/resourcepack/assets/animated_java/models/item/lower_eye/bright/black.json index 0f36c8170..5244289f0 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/bright/black.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/bright/black.json @@ -4,14 +4,6 @@ "0": "animated_java:item/lower_eye/bright_quartz_block_side", "1": "animated_java:item/lower_eye/bright_light_gray_concrete", "2": "animated_java:item/lower_eye/bright_light_gray_concrete", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/lower_eye/bright_light_gray_concrete" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/bright/dark.json b/resourcepack/assets/animated_java/models/item/lower_eye/bright/dark.json index 9fd6a59f4..b1ab6f5cb 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/bright/dark.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/bright/dark.json @@ -4,14 +4,6 @@ "0": "animated_java:item/lower_eye/bright_quartz_block_side", "1": "animated_java:item/lower_eye/bright_light_gray_concrete", "2": "animated_java:item/lower_eye/bright_light_gray_concrete", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/lower_eye/bright_light_gray_concrete" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/bright/diag.json b/resourcepack/assets/animated_java/models/item/lower_eye/bright/diag.json index 7a3a77b19..36e3f3e28 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/bright/diag.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/bright/diag.json @@ -4,14 +4,6 @@ "0": "animated_java:item/lower_eye/bright_quartz_block_side", "1": "animated_java:item/lower_eye/bright_light_gray_concrete", "2": "animated_java:item/lower_eye/bright_light_gray_concrete", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/lower_eye/bright_light_gray_concrete" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/bright/iris.json b/resourcepack/assets/animated_java/models/item/lower_eye/bright/iris.json index 6e30610c0..4c0676239 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/bright/iris.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/bright/iris.json @@ -4,14 +4,6 @@ "0": "animated_java:item/lower_eye/bright_quartz_block_side", "1": "animated_java:item/lower_eye/bright_light_gray_concrete", "2": "animated_java:item/lower_eye/bright_light_gray_concrete", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/lower_eye/bright_light_gray_concrete" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/bright/light.json b/resourcepack/assets/animated_java/models/item/lower_eye/bright/light.json index a15d4e8a3..08882300b 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/bright/light.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/bright/light.json @@ -4,14 +4,6 @@ "0": "animated_java:item/lower_eye/bright_quartz_block_side", "1": "animated_java:item/lower_eye/bright_light_gray_concrete", "2": "animated_java:item/lower_eye/bright_light_gray_concrete", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/lower_eye/bright_light_gray_concrete" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/bright/outer_lid.json b/resourcepack/assets/animated_java/models/item/lower_eye/bright/outer_lid.json index 4b559ed1d..37535d798 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/bright/outer_lid.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/bright/outer_lid.json @@ -4,14 +4,6 @@ "0": "animated_java:item/lower_eye/bright_quartz_block_side", "1": "animated_java:item/lower_eye/bright_light_gray_concrete", "2": "animated_java:item/lower_eye/bright_light_gray_concrete", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/lower_eye/bright_light_gray_concrete" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/bright/pupil.json b/resourcepack/assets/animated_java/models/item/lower_eye/bright/pupil.json index c81ca7965..c51cd0390 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/bright/pupil.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/bright/pupil.json @@ -4,14 +4,6 @@ "0": "animated_java:item/lower_eye/bright_quartz_block_side", "1": "animated_java:item/lower_eye/bright_light_gray_concrete", "2": "animated_java:item/lower_eye/bright_light_gray_concrete", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/lower_eye/bright_light_gray_concrete" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/bright/sclera.json b/resourcepack/assets/animated_java/models/item/lower_eye/bright/sclera.json index 5cbe889e1..7332ee80e 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/bright/sclera.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/bright/sclera.json @@ -4,14 +4,6 @@ "0": "animated_java:item/lower_eye/bright_quartz_block_side", "1": "animated_java:item/lower_eye/bright_light_gray_concrete", "2": "animated_java:item/lower_eye/bright_light_gray_concrete", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/lower_eye/bright_light_gray_concrete" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/dark/black.json b/resourcepack/assets/animated_java/models/item/lower_eye/dark/black.json index 4003aee12..0f3218dbe 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/dark/black.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/dark/black.json @@ -4,14 +4,6 @@ "0": "animated_java:item/black", "1": "animated_java:item/black", "2": "minecraft:block/redstone_block", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/black" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/dark/dark.json b/resourcepack/assets/animated_java/models/item/lower_eye/dark/dark.json index 97931398f..d809353a5 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/dark/dark.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/dark/dark.json @@ -4,14 +4,6 @@ "0": "animated_java:item/black", "1": "animated_java:item/black", "2": "minecraft:block/redstone_block", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/black" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/dark/diag.json b/resourcepack/assets/animated_java/models/item/lower_eye/dark/diag.json index 28588e4c5..5f98e9ad0 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/dark/diag.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/dark/diag.json @@ -4,14 +4,6 @@ "0": "animated_java:item/black", "1": "animated_java:item/black", "2": "minecraft:block/redstone_block", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/black" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/dark/iris.json b/resourcepack/assets/animated_java/models/item/lower_eye/dark/iris.json index c2e636f61..2dea346ad 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/dark/iris.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/dark/iris.json @@ -4,14 +4,6 @@ "0": "animated_java:item/black", "1": "animated_java:item/black", "2": "minecraft:block/redstone_block", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/black" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/dark/light.json b/resourcepack/assets/animated_java/models/item/lower_eye/dark/light.json index 9d5fcc152..28eee0a4d 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/dark/light.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/dark/light.json @@ -4,14 +4,6 @@ "0": "animated_java:item/black", "1": "animated_java:item/black", "2": "minecraft:block/redstone_block", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/black" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/dark/outer_lid.json b/resourcepack/assets/animated_java/models/item/lower_eye/dark/outer_lid.json index 10505d4cf..851266d74 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/dark/outer_lid.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/dark/outer_lid.json @@ -4,14 +4,6 @@ "0": "animated_java:item/black", "1": "animated_java:item/black", "2": "minecraft:block/redstone_block", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/black" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/dark/pupil.json b/resourcepack/assets/animated_java/models/item/lower_eye/dark/pupil.json index 2a10918ca..45a3fee8c 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/dark/pupil.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/dark/pupil.json @@ -4,14 +4,6 @@ "0": "animated_java:item/black", "1": "animated_java:item/black", "2": "minecraft:block/redstone_block", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/black" } } \ No newline at end of file diff --git a/resourcepack/assets/animated_java/models/item/lower_eye/dark/sclera.json b/resourcepack/assets/animated_java/models/item/lower_eye/dark/sclera.json index 7b933af1b..debbfaeeb 100644 --- a/resourcepack/assets/animated_java/models/item/lower_eye/dark/sclera.json +++ b/resourcepack/assets/animated_java/models/item/lower_eye/dark/sclera.json @@ -4,14 +4,6 @@ "0": "animated_java:item/black", "1": "animated_java:item/black", "2": "minecraft:block/redstone_block", - "3": "animated_java:item/black", - "4": "animated_java:item/lower_eye/bright_light_gray_concrete", - "5": "animated_java:item/lower_eye/bright_quartz_block_side", - "6": "minecraft:block/redstone_block", - "7": "animated_java:item/lower_eye/colorful_iris", - "8": "animated_java:item/lower_eye/colorful_pupil", - "9": "animated_java:item/lower_eye/colorful_sclera", - "10": "minecraft:block/granite", "11": "animated_java:item/black" } } \ No newline at end of file