diff --git a/main/assets/minecraft/font/default.json b/main/assets/minecraft/font/default.json index 61ee6c1..03dfc73 100644 --- a/main/assets/minecraft/font/default.json +++ b/main/assets/minecraft/font/default.json @@ -191,6 +191,17 @@ ] }, + { + "type": "bitmap", + "file": "vibecraft:gui/voting/pillars.png", + "ascent": 13, + "height": 138, + "chars": [ + "" + ] + }, + + { "type": "bitmap", "file": "vibecraft:gui/voting/notfound.png", diff --git a/main/assets/vibecraft/textures/gui/voting/pillars.png b/main/assets/vibecraft/textures/gui/voting/pillars.png new file mode 100644 index 0000000..12327ab Binary files /dev/null and b/main/assets/vibecraft/textures/gui/voting/pillars.png differ diff --git a/nnb_spawnsystem/data/nnb_spawnsystem/functions/__private__/switch_case/0/17.mcfunction b/nnb_spawnsystem/data/nnb_spawnsystem/functions/__private__/switch_case/0/17.mcfunction new file mode 100644 index 0000000..6fd7f57 --- /dev/null +++ b/nnb_spawnsystem/data/nnb_spawnsystem/functions/__private__/switch_case/0/17.mcfunction @@ -0,0 +1 @@ +function nnb_spawnsystem:call_bots {"sel_map":"nn_pillars"} \ No newline at end of file diff --git a/nnb_spawnsystem/main.jmc b/nnb_spawnsystem/main.jmc index d909493..9fcb9bb 100644 --- a/nnb_spawnsystem/main.jmc +++ b/nnb_spawnsystem/main.jmc @@ -153,6 +153,8 @@ switch(nn_map:map) { call_bots(sel_map="nn_abandonedoffice"); case 16: call_bots(sel_map="nn_flatgrass_arcade"); + case 17: + call_bots(sel_map="nn_pillars"); // default: // say "Unable to find anything"; } diff --git a/nnb_vote_system/data/nnb_vote/functions/assign.mcfunction b/nnb_vote_system/data/nnb_vote/functions/assign.mcfunction index af447f2..7d83a0e 100644 --- a/nnb_vote_system/data/nnb_vote/functions/assign.mcfunction +++ b/nnb_vote_system/data/nnb_vote/functions/assign.mcfunction @@ -83,7 +83,9 @@ execute if entity @e[name=nn_abandonedoffice,tag=map_2] run scoreboard objective execute if entity @e[name=nn_abandonedoffice,tag=map_3] run scoreboard objectives add sel_map_3 dummy {"text":""} - +execute if entity @e[name=nn_pillars,tag=map_1] run scoreboard objectives add sel_map_1 dummy {"text":""} +execute if entity @e[name=nn_pillars,tag=map_2] run scoreboard objectives add sel_map_2 dummy {"text":""} +execute if entity @e[name=nn_pillars,tag=map_3] run scoreboard objectives add sel_map_3 dummy {"text":""} @@ -91,4 +93,8 @@ execute if entity @e[name=nn_abandonedoffice,tag=map_3] run scoreboard objective # If we failed to detect map icon - use temp placeholder image scoreboard objectives add sel_map_1 dummy {"text":""} scoreboard objectives add sel_map_2 dummy {"text":""} -scoreboard objectives add sel_map_3 dummy {"text":""} \ No newline at end of file +scoreboard objectives add sel_map_3 dummy {"text":""} + + + +#> https://unicode.bayashi.net/?page=1801 <-- EUGHHHH STUPID UNICODEEEEEEEEEEEEEEEEEEEEEEE \ No newline at end of file diff --git a/nnb_vote_system/data/nnb_vote/functions/spawn_markers.mcfunction b/nnb_vote_system/data/nnb_vote/functions/spawn_markers.mcfunction index 1d1d3aa..a04727a 100644 --- a/nnb_vote_system/data/nnb_vote/functions/spawn_markers.mcfunction +++ b/nnb_vote_system/data/nnb_vote/functions/spawn_markers.mcfunction @@ -11,4 +11,6 @@ execute at @e[type=minecraft:armor_stand,tag=nn_hauntedmansion] run summon item_ execute at @e[type=minecraft:armor_stand,tag=nn_habitablezone] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}} execute at @e[type=minecraft:armor_stand,tag=nn_doomspire] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}} execute at @e[type=minecraft:armor_stand,tag=nn_topmodernhouse] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}} -execute at @e[type=minecraft:armor_stand,tag=nn_abandonedoffice] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}} \ No newline at end of file +execute at @e[type=minecraft:armor_stand,tag=nn_abandonedoffice] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}} +execute at @e[type=minecraft:armor_stand,tag=nn_flatgrass_a] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}} +execute at @e[type=minecraft:armor_stand,tag=nn_pillars] run summon item_display ~ ~ ~ {Tags:["spawn_marker"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,1f,0f],scale:[2f,2f,2f]},item:{id:"minecraft:beacon",Count:1b,tag:{CustomModelData:1}}} \ No newline at end of file