Skip to content

Commit

Permalink
add bomb model (#55)
Browse files Browse the repository at this point in the history
  • Loading branch information
FLOATINGCRETIN authored Jan 1, 2024
1 parent fd65aec commit 8695ad9
Show file tree
Hide file tree
Showing 53 changed files with 3,086 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
execute if entity @s[tag=aj.bomb.root] run function animated_java:bomb/zzzzzzzz/apply_variant/default/as_root
execute if entity @s[tag=!aj.bomb.root] run tellraw @a ["",{"text":"["},{"text":"Animated Java","color":"aqua"},{"text":"] "},{"text":"ERROR ☠","color":"red"},{"text":" > ","color":"gray"},[{"text":"The function","color":"yellow"},{"text":" animated_java:bomb/apply_variant/default ","color":"blue"},{"text":"must be run"},{"text":" as ","color":"red"},{"text":"the root entity!"}]]
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
execute as @e[type=minecraft:item_display,tag=aj.bomb.root] run function animated_java:bomb/zzzzzzzz/remove/as_root
kill @e[tag=aj.bomb.rig_entity]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
execute as @e[type=minecraft:item_display,tag=aj.bomb.root] run function animated_java:bomb/zzzzzzzz/remove/as_root
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
execute if entity @s[tag=aj.bomb.root] run function animated_java:bomb/zzzzzzzz/remove/as_root
execute if entity @s[tag=!aj.bomb.root] run tellraw @a ["",{"text":"["},{"text":"Animated Java","color":"aqua"},{"text":"] "},{"text":"ERROR ☠","color":"red"},{"text":" > ","color":"gray"},[{"text":"The function","color":"yellow"},{"text":" animated_java:bomb/remove/this ","color":"blue"},{"text":"must be run"},{"text":" as ","color":"red"},{"text":"the root entity!"}]]
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
summon minecraft:item_display ~ ~ ~ {id:"minecraft:item_display",Tags:["aj.new","aj.bomb.rig_entity","aj.bomb.bone","aj.bomb.bone.bone","aj.new","aj.bomb.rig_entity","aj.bomb.root","aj.rig_root"],transformation:[-1.25f,0f,1.5308084989341916e-16f,0f,0f,1.25f,0f,0f,-1.5308084989341916e-16f,0f,-1.25f,0f,0f,0f,0f,1f],interpolation_duration:1,item_display:"head",item:{id:"minecraft:white_dye",Count:1b,tag:{CustomModelData:84}},CustomName:"[{\"text\":\"[\",\"color\":\"gray\"},{\"text\":\"AJ\",\"color\":\"aqua\"},\"] \",[\"\",{\"text\":\"bomb\",\"color\":\"light_purple\"},\".\",{\"text\":\"bone\",\"color\":\"white\"},\"[\",{\"text\":\"bone\",\"color\":\"yellow\"},\"]\"]]",height:30f,width:10f}
execute as @e[type=minecraft:item_display,tag=aj.bomb.root,tag=aj.new,limit=1,distance=..0.1] run function animated_java:bomb/zzzzzzzz/summon/as_root
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
scoreboard objectives remove aj.i
scoreboard objectives remove aj.id
scoreboard objectives remove aj.tween_time
scoreboard objectives remove aj.anim_time
scoreboard objectives remove aj.life_time
scoreboard objectives remove aj.bomb.export_version
scoreboard objectives remove aj.bomb.rig_loaded
tellraw @a ["",{"text":"["},{"text":"Animated Java","color":"aqua"},{"text":"] "},[{"text":"INFO ℹ","color":"green"},{"text":" > ","color":"gray"},{"text":"The bomb Rig has been uninstalled successfully.\n"},{"text":"Please remove the Rig's functions from the datapack before reloading.","color":"gray"}]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
execute if entity @s[tag=aj.bomb.bone.bone] run data modify entity @s item.tag.CustomModelData set value 84
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
function animated_java:bomb/zzzzzzzz/apply_variant/default/as_bone
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
scoreboard objectives add aj.i dummy
scoreboard objectives add aj.id dummy
scoreboard objectives add aj.tween_time dummy
scoreboard objectives add aj.anim_time dummy
scoreboard objectives add aj.life_time dummy
scoreboard objectives add aj.bomb.export_version dummy
scoreboard objectives add aj.bomb.rig_loaded dummy
scoreboard players set $aj.bomb.variant.default aj.id 0
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 reset * aj.bomb.rig_loaded
execute as @e[type=minecraft:item_display,tag=aj.bomb.root] run function animated_java:bomb/zzzzzzzz/on_load
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
scoreboard players operation @s aj.bomb.export_version = aj.bomb.export_version aj.i
data modify entity @s Glowing set value 1
data modify entity @s glow_color_override set value 16711680
data modify entity @s Glowing set value 1
data modify entity @s glow_color_override set value 16711680
tellraw @a ["",{"text":"["},{"text":"Animated Java","color":"aqua"},{"text":"] "},[{"text":"ERROR ☠","color":"red"},{"text":" > ","color":"gray"},{"text":"An existing rig is out-of-date!"},{"text":" Please re-summon the highlighted rig to update it to the newly exported version.","color":"yellow"}]]
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
scoreboard players set @s aj.bomb.rig_loaded 1
execute unless score @s aj.bomb.export_version = aj.bomb.export_version aj.i at @s run function animated_java:bomb/zzzzzzzz/mark_outdated_rig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
execute at @s run function #animated_java:bomb/on_remove/as_root


kill @s
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
scoreboard players operation @s aj.id = .aj.last_id aj.id
tag @s remove aj.new
function #animated_java:bomb/on_summon/as_rig_entities
execute if entity @s[tag=aj.bomb.bone] run function #animated_java:bomb/zzzzzzzz/on_summon/as_bones

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
execute unless score #frame aj.i = #frame aj.i run scoreboard players set #frame aj.i 0
execute unless score #variant aj.i = #variant aj.i run scoreboard players set #variant aj.i 0
execute unless score #animation aj.i = #animation aj.i run scoreboard players set #animation aj.i -1
scoreboard players set @s aj.anim_time 0
scoreboard players set @s aj.bomb.rig_loaded 1
scoreboard players operation @s aj.bomb.export_version = aj.bomb.export_version aj.i
execute store result score @s aj.id run scoreboard players add .aj.last_id aj.id 1
tp @s ~ ~ ~ ~ ~
execute at @s run function animated_java:bomb/zzzzzzzz/summon/as_rig_entities
execute if score #variant aj.i = $aj.bomb.variant.default aj.id run function animated_java:bomb/zzzzzzzz/apply_variant/default/as_root
execute if score #animation aj.i matches 0.. run scoreboard players operation @s aj.anim_time = #frame aj.i
execute at @s run function #animated_java:bomb/on_summon/as_root
tag @s remove aj.new
scoreboard players reset #frame aj.i
scoreboard players reset #variant aj.i
scoreboard players reset #animation aj.i
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
execute if entity @s[tag=aj.bomb.root] run function animated_java:bomb/zzzzzzzz/tick_as_root
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
execute unless score @s aj.bomb.rig_loaded = @s aj.bomb.rig_loaded run function animated_java:bomb/zzzzzzzz/on_load
scoreboard players add @s aj.life_time 1
execute at @s on passengers run tp @s ~ ~ ~ ~ ~
function animated_java:bomb/zzzzzzzz/animations/tick
function #animated_java:bomb/on_tick/as_root
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"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:bomb/zzzzzzzz/tick"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"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:bomb/zzzzzzzz/load"
]
}
58 changes: 58 additions & 0 deletions datapacks/omega-flowey/datapack.ajmeta
Original file line number Diff line number Diff line change
Expand Up @@ -3896,6 +3896,64 @@
"data\\animated_java\\tags\\entity_types\\locator_origin.json",
"data\\animated_java\\tags\\entity_types\\camera_origin.json"
]
},
"4c9c08dd-d6a5-e642-5c10-64b0cd42e8a6": {
"project_name": "bomb",
"file_list": [
"data\\minecraft\\tags\\functions\\load.json",
"data\\minecraft\\tags\\functions\\tick.json",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\load.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\on_load.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\mark_outdated_rig.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\tick.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\tick_as_root.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\summon\\as_root.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\summon\\as_rig_entities.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\apply_variant\\default\\as_root.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\apply_variant\\default\\as_bone.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\remove\\as_root.mcfunction",
"data\\animated_java\\functions\\bomb\\zzzzzzzz\\animations\\tick.mcfunction",
"data\\animated_java\\functions\\bomb\\uninstall.mcfunction",
"data\\animated_java\\functions\\bomb\\summon.mcfunction",
"data\\animated_java\\functions\\bomb\\apply_variant\\default.mcfunction",
"data\\animated_java\\functions\\bomb\\remove\\this.mcfunction",
"data\\animated_java\\functions\\bomb\\remove\\rigs.mcfunction",
"data\\animated_java\\functions\\bomb\\remove\\all.mcfunction",
"data\\animated_java\\functions\\tick.mcfunction",
"data\\animated_java\\tags\\functions\\rig_tick.json",
"data\\animated_java\\tags\\functions\\bomb\\on_load\\as_root.json",
"data\\animated_java\\tags\\functions\\bomb\\on_load\\as_rig_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_load\\as_bones.json",
"data\\animated_java\\tags\\functions\\bomb\\on_load\\as_locator_origins.json",
"data\\animated_java\\tags\\functions\\bomb\\on_load\\as_locator_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_load\\as_camera_origins.json",
"data\\animated_java\\tags\\functions\\bomb\\on_load\\as_camera_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_tick\\as_root.json",
"data\\animated_java\\tags\\functions\\bomb\\on_tick\\as_rig_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_tick\\as_bones.json",
"data\\animated_java\\tags\\functions\\bomb\\on_tick\\as_locator_origins.json",
"data\\animated_java\\tags\\functions\\bomb\\on_tick\\as_locator_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_tick\\as_camera_origins.json",
"data\\animated_java\\tags\\functions\\bomb\\on_tick\\as_camera_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_summon\\as_root.json",
"data\\animated_java\\tags\\functions\\bomb\\on_summon\\as_rig_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_summon\\as_bones.json",
"data\\animated_java\\tags\\functions\\bomb\\on_summon\\as_locator_origins.json",
"data\\animated_java\\tags\\functions\\bomb\\on_summon\\as_locator_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_summon\\as_camera_origins.json",
"data\\animated_java\\tags\\functions\\bomb\\on_summon\\as_camera_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_remove\\as_root.json",
"data\\animated_java\\tags\\functions\\bomb\\on_remove\\as_rig_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_remove\\as_bones.json",
"data\\animated_java\\tags\\functions\\bomb\\on_remove\\as_locator_origins.json",
"data\\animated_java\\tags\\functions\\bomb\\on_remove\\as_locator_entities.json",
"data\\animated_java\\tags\\functions\\bomb\\on_remove\\as_camera_origins.json",
"data\\animated_java\\tags\\functions\\bomb\\on_remove\\as_camera_entities.json",
"data\\animated_java\\tags\\entity_types\\root.json",
"data\\animated_java\\tags\\entity_types\\bone.json",
"data\\animated_java\\tags\\entity_types\\locator_origin.json",
"data\\animated_java\\tags\\entity_types\\camera_origin.json"
]
}
}
}
Loading

0 comments on commit 8695ad9

Please sign in to comment.