succesfully moved all data from navidad/ to holidayPack/

This commit is contained in:
UndeadMaelys 2021-02-05 23:18:05 +01:00
parent 4e540b0ffa
commit 7cc83edc54
22 changed files with 23 additions and 23 deletions

View File

@ -1 +1 @@
give @s minecraft:carrot_on_a_stick{CustomModelData:310,display:{Name:'[{"text":"Pa amb tomàquet i pernil ibèric"}]'}} 1
give @s minecraft:cooked_porkchop{CustomModelData:310,display:{Name:'[{"text":"Pa amb tomàquet i pernil ibèric"}]'}} 1

View File

@ -1 +1 @@
give @p written_book{pages:['["",{"text":"Introduction","bold":true,"italic":true,"underlined":true},{"text":"\\n\\n<introducción>","color":"reset"}]','["",{"text":"Table of Contents","italic":true,"color":"gold"},{"text":"\\n\\n","color":"reset"},{"text":"- Hot Chocolate","clickEvent":{"action":"change_page","value":3}},{"text":"\\n"},{"text":"- Jamón","clickEvent":{"action":"change_page","value":5}},{"text":"\\n"},{"text":"- Festive Cookies","clickEvent":{"action":"change_page","value":7}},{"text":"\\n"},{"text":"- Pa amb tomàquet","clickEvent":{"action":"change_page","value":9}},{"text":"\\n"},{"text":"- Pà amb tomàquet i pernil ibèric","clickEvent":{"action":"change_page","value":11}}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Hot chocolate","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Classic","italic":true,"color":"gold"},{"text":"\\n\\nThe popularity of this recipe as a remedy to fight off cold temperatures has elevated this dish to legendary status.","color":"reset"}]','["",{"text":"Recipe for one:","bold":true},{"text":"\\n\\nRequires:\\nx3 Cocoa Bean\\nx1 Milk Bucket*\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function navidad:recipes/chocolate"}},{"text":"\\n\\n*Bucket will not be consumed\\n ","color":"reset"}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Jamón","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Spanish","italic":true,"color":"gold"},{"text":"\\n\\nSomehow we datapack witches turned all spanish cops into minecraft pigs.\\n\\nAlso, spanish cops are trash, so you can use rotten flesh as well!","color":"reset"}]','["",{"text":"Recipe for five:","bold":true},{"text":"\\n\\nRequires:\\nx1 Raw Porkchop\\n\\n","color":"reset"},{"text":"Recipe for one:","bold":true},{"text":"\\n\\nRequires:\\nx5 Rotten Flesh\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function navidad:recipes/jamon"}},{"text":"\\n\\n ","color":"reset"}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Festive Cookies","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Random assortment","italic":true,"color":"gold"},{"text":"\\n\\nThe designs these cookies have are really beautiful and captivating...\\n\\nWait, was that from Shrek?","color":"reset"}]','["",{"text":"Recipe for three:","bold":true},{"text":"\\n\\nRequires:\\nx2 Cocoa Beans\\nx2 Wheat\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function navidad:recipes/festive_cookies"}},{"text":"\\n ","color":"reset"}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Pa amb tomàquet","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Catalan, which is just better than spanish","italic":true,"color":"gold"},{"text":"\\n\\nThis is literally the most precious dish of the world.\\n\\nYou would need tomatoes, but we don\'t care.","color":"reset"}]','["",{"text":"Recipe for two:","bold":true},{"text":"\\n\\nRequires:\\nx1 Bread\\nx1 Imaginary Tomato\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function navidad:recipes/pantumaca"}}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Pa amb tomàquet i pernil ibèric","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Catalan, which is just better than spanish","italic":true,"color":"gold"},{"text":"\\n\\nThis is literally the most precious dish of the world combined with good old jamón.","color":"reset"}]','["",{"text":"Recipe for one:","bold":true},{"text":"\\n\\nRequires:\\nx1 Pa and tomàquet\\nx1 Jamón\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function navidad:recipes/hamtumaca"}}]'],title:"Cool Festive Recipes",author:"Biz and Myr"}
give @p written_book{pages:['["",{"text":"Introduction","bold":true,"italic":true,"underlined":true},{"text":"\\n\\n<introducción>","color":"reset"}]','["",{"text":"Table of Contents","italic":true,"color":"gold"},{"text":"\\n\\n","color":"reset"},{"text":"- Hot Chocolate","clickEvent":{"action":"change_page","value":3}},{"text":"\\n"},{"text":"- Jamón","clickEvent":{"action":"change_page","value":5}},{"text":"\\n"},{"text":"- Festive Cookies","clickEvent":{"action":"change_page","value":7}},{"text":"\\n"},{"text":"- Pa amb tomàquet","clickEvent":{"action":"change_page","value":9}},{"text":"\\n"},{"text":"- Pà amb tomàquet i pernil ibèric","clickEvent":{"action":"change_page","value":11}}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Hot chocolate","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Classic","italic":true,"color":"gold"},{"text":"\\n\\nThe popularity of this recipe as a remedy to fight off cold temperatures has elevated this dish to legendary status.","color":"reset"}]','["",{"text":"Recipe for one:","bold":true},{"text":"\\n\\nRequires:\\nx3 Cocoa Bean\\nx1 Milk Bucket*\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function holidayPack:recipes/chocolate"}},{"text":"\\n\\n*Bucket will not be consumed\\n ","color":"reset"}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Jamón","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Spanish","italic":true,"color":"gold"},{"text":"\\n\\nSomehow we datapack witches turned all spanish cops into minecraft pigs.\\n\\nAlso, spanish cops are trash, so you can use rotten flesh as well!","color":"reset"}]','["",{"text":"Recipe for five:","bold":true},{"text":"\\n\\nRequires:\\nx1 Raw Porkchop\\n\\n","color":"reset"},{"text":"Recipe for one:","bold":true},{"text":"\\n\\nRequires:\\nx5 Rotten Flesh\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function holidayPack:recipes/jamon"}},{"text":"\\n\\n ","color":"reset"}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Festive Cookies","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Random assortment","italic":true,"color":"gold"},{"text":"\\n\\nThe designs these cookies have are really beautiful and captivating...\\n\\nWait, was that from Shrek?","color":"reset"}]','["",{"text":"Recipe for three:","bold":true},{"text":"\\n\\nRequires:\\nx2 Cocoa Beans\\nx2 Wheat\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function holidayPack:recipes/festive_cookies"}},{"text":"\\n ","color":"reset"}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Pa amb tomàquet","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Catalan, which is just better than spanish","italic":true,"color":"gold"},{"text":"\\n\\nThis is literally the most precious dish of the world.\\n\\nYou would need tomatoes, but we don\'t care.","color":"reset"}]','["",{"text":"Recipe for two:","bold":true},{"text":"\\n\\nRequires:\\nx1 Bread\\nx1 Imaginary Tomato\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function holidayPack:recipes/pantumaca"}}]','["",{"text":"<return to TOC>","underlined":true,"color":"dark_blue","clickEvent":{"action":"change_page","value":2}},{"text":"\\n\\n","color":"reset"},{"text":"Pa amb tomàquet i pernil ibèric","bold":true,"italic":true},{"text":"\\n","color":"reset"},{"text":"Catalan, which is just better than spanish","italic":true,"color":"gold"},{"text":"\\n\\nThis is literally the most precious dish of the world combined with good old jamón.","color":"reset"}]','["",{"text":"Recipe for one:","bold":true},{"text":"\\n\\nRequires:\\nx1 Pa and tomàquet\\nx1 Jamón\\n\\n","color":"reset"},{"text":"<Click here to cook this recipe>","underlined":true,"color":"dark_blue","clickEvent":{"action":"run_command","value":"/function holidayPack:recipes/hamtumaca"}}]'],title:"Cool Festive Recipes",author:"Biz and Myr"}

View File

@ -2,13 +2,13 @@
function random:rand10
#List
execute if score $value random matches 0 run loot replace entity @s weapon.mainhand loot navidad:enchanted_book_50
execute if score $value random matches 0 run loot replace entity @s weapon.mainhand loot holidayPack:enchanted_book_50
execute if score $value random matches 1 run item entity @s weapon.mainhand replace minecraft:creeper_banner_pattern 1
execute if score $value random matches 2 run item entity @s weapon.mainhand replace minecraft:skull_banner_pattern 1
execute if score $value random matches 3 run item entity @s weapon.mainhand replace minecraft:experience_bottle 8
execute if score $value random matches 4 run item entity @s weapon.mainhand replace minecraft:dragon_breath 1
execute if score $value random matches 5 run item entity @s weapon.mainhand replace minecraft:elytra 1
execute if score $value random matches 6 run function navidad:gift/heads
execute if score $value random matches 6 run function holidayPack:gift/heads
execute if score $value random matches 7 run item entity @s weapon.mainhand replace minecraft:heart_of_the_sea 1
execute if score $value random matches 8 run item entity @s weapon.mainhand replace minecraft:nether_star 1
execute if score $value random matches 9 run item entity @s weapon.mainhand replace minecraft:totem_of_undying 1

View File

@ -1,5 +1,5 @@
#roscon_use
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:101}}}] run function navidad:roscon_use
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:101}}}] run function holidayPack:roscon_use
#Check si hay trozo roscon(con premio :D)
execute as @a[nbt={SelectedItem:{id:"minecraft:pumpkin_pie", tag:{Haba:1b}}}] run scoreboard players set @s Haba 2
@ -14,21 +14,21 @@ execute as @a[scores={comidacion=1,Gaspar=1..}] run give @s minecraft:carrot_on_
execute as @a[scores={comidacion=1,Melchor=1..}] run give @s minecraft:carrot_on_a_stick{CustomModelData:106,display:{Name:"{\"text\":\"Melchor\"}"}} 1
#Abrir regalines
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:111}}}] run loot replace entity @s weapon.mainhand loot navidad:common
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:112}}}] run function navidad:gift/uncommon
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:113}}}] run function navidad:gift/rare
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:114}}}] run function navidad:gift/epic
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:111}}}] run loot replace entity @s weapon.mainhand loot holidayPack:common
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:112}}}] run function holidayPack:gift/uncommon
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:113}}}] run function holidayPack:gift/rare
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:114}}}] run function holidayPack:gift/epic
#Socking over time (santa_was_here)
execute as @e[type=minecraft:item_frame,nbt={Item:{id:"minecraft:carrot_on_a_stick",tag:{CustomModelData:115}}}] run function navidad:santa_was_here
execute as @e[type=minecraft:item_frame,nbt={Item:{id:"minecraft:carrot_on_a_stick",tag:{CustomModelData:115}}}] run function holidayPack:santa_was_here
#Unsockear
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:116}}}] run function navidad:unsock/common
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:117}}}] run function navidad:unsock/uncommon
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:118}}}] run function navidad:unsock/rare
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:116}}}] run function holidayPack:unsock/common
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:117}}}] run function holidayPack:unsock/uncommon
execute as @a[scores={rightclick=1},nbt={SelectedItem:{id:"minecraft:carrot_on_a_stick", tag:{CustomModelData:118}}}] run function holidayPack:unsock/rare
#chocoreto
execute as @a[nbt={SelectedItem:{tag:{CustomModelData:301}}}] run function navidad:chocolate
execute as @a[nbt={SelectedItem:{tag:{CustomModelData:301}}}] run function holidayPack:chocolate
#Reset
scoreboard players set @a rightclick 0

View File

@ -8,39 +8,39 @@ scoreboard players set rojo roscon 4
scoreboard players set verde roscon 2
scoreboard players set naranja roscon 2
function navidad:roscon_random
function holidayPack:roscon_random
execute if score resultado roscon matches 1 run give @s minecraft:pumpkin_pie{Haba:1b,CustomModelData:103,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 2 run give @s minecraft:pumpkin_pie{Haba:1b,CustomModelData:102,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 3 run give @s minecraft:pumpkin_pie{Haba:1b,CustomModelData:104,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
function navidad:roscon_random
function holidayPack:roscon_random
execute if score resultado roscon matches 1 run give @s minecraft:pumpkin_pie{Baltasar:1b,CustomModelData:103,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 2 run give @s minecraft:pumpkin_pie{Baltasar:1b,CustomModelData:102,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 3 run give @s minecraft:pumpkin_pie{Baltasar:1b,CustomModelData:104,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
function navidad:roscon_random
function holidayPack:roscon_random
execute if score resultado roscon matches 1 run give @s minecraft:pumpkin_pie{Gaspar:1b,CustomModelData:103,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 2 run give @s minecraft:pumpkin_pie{Gaspar:1b,CustomModelData:102,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 3 run give @s minecraft:pumpkin_pie{Gaspar:1b,CustomModelData:104,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
function navidad:roscon_random
function holidayPack:roscon_random
execute if score resultado roscon matches 1 run give @s minecraft:pumpkin_pie{Melchor:1b,CustomModelData:103,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 2 run give @s minecraft:pumpkin_pie{Melchor:1b,CustomModelData:102,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 3 run give @s minecraft:pumpkin_pie{Melchor:1b,CustomModelData:104,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
#No thingies
function navidad:roscon_random
function holidayPack:roscon_random
execute if score resultado roscon matches 1 run give @s minecraft:pumpkin_pie{Void:1,CustomModelData:103,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 2 run give @s minecraft:pumpkin_pie{Void:1,CustomModelData:102,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 3 run give @s minecraft:pumpkin_pie{Void:1,CustomModelData:104,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
function navidad:roscon_random
function holidayPack:roscon_random
execute if score resultado roscon matches 1 run give @s minecraft:pumpkin_pie{Void:2,CustomModelData:103,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 2 run give @s minecraft:pumpkin_pie{Void:2,CustomModelData:102,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 3 run give @s minecraft:pumpkin_pie{Void:2,CustomModelData:104,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
function navidad:roscon_random
function holidayPack:roscon_random
execute if score resultado roscon matches 1 run give @s minecraft:pumpkin_pie{Void:3,CustomModelData:103,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 2 run give @s minecraft:pumpkin_pie{Void:3,CustomModelData:102,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 3 run give @s minecraft:pumpkin_pie{Void:3,CustomModelData:104,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
function navidad:roscon_random
function holidayPack:roscon_random
execute if score resultado roscon matches 1 run give @s minecraft:pumpkin_pie{Void:4,CustomModelData:103,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 2 run give @s minecraft:pumpkin_pie{Void:4,CustomModelData:102,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1
execute if score resultado roscon matches 3 run give @s minecraft:pumpkin_pie{Void:4,CustomModelData:104,display:{Name:"{\"text\":\"Trozo de Roscón\"}"}} 1

View File

@ -1,5 +1,5 @@
{
"values": [
"navidad:main"
"holidayPack:main"
]
}