update tv_screen AJ export files

TheAfroOfDoom · Jan 8, 2024 · 7106efa · 7106efa
1 parent 58f7d32
commit 7106efa
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 30 deletions.
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
@@ -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 -49431079
+scoreboard players set aj.tv_screen.export_version aj.i -41562086
 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
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
@@ -2,7 +2,6 @@
 	"replace": false,
 	"values": [
 		"animated_java:bomb/zzzzzzzz/tick",
-		"animated_java:tv_screen/zzzzzzzz/tick",
 		"animated_java:projectile_star/zzzzzzzz/tick",
 		"animated_java:friendliness_pellet/zzzzzzzz/tick",
 		"animated_java:dentata_snake_ball/zzzzzzzz/tick",
@@ -15,6 +14,7 @@
 		"animated_java:friendliness_pellet_ring/zzzzzzzz/tick",
 		"animated_java:finger_gun_bullet/zzzzzzzz/tick",
 		"animated_java:finger_gun_laser/zzzzzzzz/tick",
-		"animated_java:finger_gun/zzzzzzzz/tick"
+		"animated_java:finger_gun/zzzzzzzz/tick",
+		"animated_java:tv_screen/zzzzzzzz/tick"
 	]
 }
diff --git a/datapacks/omega-flowey/data/minecraft/tags/functions/load.json b/datapacks/omega-flowey/data/minecraft/tags/functions/load.json
@@ -2,7 +2,6 @@
 	"replace": false,
 	"values": [
 		"animated_java:bomb/zzzzzzzz/load",
-		"animated_java:tv_screen/zzzzzzzz/load",
 		"animated_java:projectile_star/zzzzzzzz/load",
 		"animated_java:friendliness_pellet/zzzzzzzz/load",
 		"animated_java:dentata_snake_ball/zzzzzzzz/load",
@@ -15,6 +14,7 @@
 		"animated_java:friendliness_pellet_ring/zzzzzzzz/load",
 		"animated_java:finger_gun_bullet/zzzzzzzz/load",
 		"animated_java:finger_gun_laser/zzzzzzzz/load",
-		"animated_java:finger_gun/zzzzzzzz/load"
+		"animated_java:finger_gun/zzzzzzzz/load",
+		"animated_java:tv_screen/zzzzzzzz/load"
 	]
 }
diff --git a/resourcepack/assets/animated_java/models/item/tv_screen/screen.json b/resourcepack/assets/animated_java/models/item/tv_screen/screen.json
@@ -26,59 +26,59 @@
 			"faces": {
 				"north": {
 					"uv": [
-						1.14286,
-						0,
-						14.51429,
-						11.314287142857157
+						2,
+						0.6999999999999975,
+						14,
+						9.614290000000006
 					],
 					"texture": "#1"
 				},
 				"east": {
 					"uv": [
+						1.1,
 						0,
-						0,
-						16,
-						11.314285714285731
+						14.900000000000004,
+						9.814290000000005
 					],
 					"rotation": 180,
 					"texture": "#1"
 				},
 				"south": {
 					"uv": [
+						1.1,
 						0,
-						0,
-						16,
-						11.314285714285731
+						14.900000000000004,
+						9.814290000000005
 					],
 					"rotation": 180,
 					"texture": "#1"
 				},
 				"west": {
 					"uv": [
+						1.1,
 						0,
-						0,
-						16,
-						11.314285714285731
+						14.900000000000004,
+						9.814290000000005
 					],
 					"rotation": 180,
 					"texture": "#1"
 				},
 				"up": {
 					"uv": [
+						1.1,
 						0,
-						0,
-						16,
-						11.314285714285731
+						14.900000000000004,
+						9.814290000000005
 					],
 					"rotation": 180,
 					"texture": "#1"
 				},
 				"down": {
 					"uv": [
+						1.1,
 						0,
-						0,
-						16,
-						11.314285714285731
+						14.900000000000004,
+						9.814290000000005
 					],
 					"rotation": 180,
 					"texture": "#1"

diff --git a/resourcepack/assets/animated_java/models/item/tv_screen/warning/box.json b/resourcepack/assets/animated_java/models/item/tv_screen/warning/box.json
@@ -1,8 +1,6 @@
 {
 	"parent": "animated_java:item/tv_screen/box",
 	"textures": {
-		"0": "minecraft:block/netherite_block",
-		"1": "animated_java:item/tv_screen/warning",
-		"2": "animated_java:item/tv_screen/warning"
+		"1": "animated_java:item/tv_screen/warning"
 	}
 }
diff --git a/resourcepack/assets/animated_java/models/item/tv_screen/warning/screen.json b/resourcepack/assets/animated_java/models/item/tv_screen/warning/screen.json
@@ -1,8 +1,6 @@
 {
 	"parent": "animated_java:item/tv_screen/screen",
 	"textures": {
-		"0": "minecraft:block/netherite_block",
-		"1": "animated_java:item/tv_screen/warning",
-		"2": "animated_java:item/tv_screen/warning"
+		"1": "animated_java:item/tv_screen/warning"
 	}
 }