diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/burnt_bone_in_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/burnt_bone_in_steak.json new file mode 100644 index 0000000..a0beed8 --- /dev/null +++ b/PlateUp Resource-Pack/assets/plateup/models/item/burnt_bone_in_steak.json @@ -0,0 +1,7 @@ +{ + "parent": "plateup:item/template/bone_in_steak", + "textures": { + "0": "block/coal_block", + "particle": "block/coal_block" + } +} diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/burnt_thick_cut_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/burnt_thick_cut_steak.json new file mode 100644 index 0000000..30d6229 --- /dev/null +++ b/PlateUp Resource-Pack/assets/plateup/models/item/burnt_thick_cut_steak.json @@ -0,0 +1,7 @@ +{ + "parent": "plateup:item/template/thick_cut_steak", + "textures": { + "0": "block/coal_block", + "particle": "block/coal_block" + } +} diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/burnt_thin_cut_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/burnt_thin_cut_steak.json new file mode 100644 index 0000000..9bf3967 --- /dev/null +++ b/PlateUp Resource-Pack/assets/plateup/models/item/burnt_thin_cut_steak.json @@ -0,0 +1,7 @@ +{ + "parent": "plateup:item/template/thin_cut_steak", + "textures": { + "0": "block/coal_block", + "particle": "block/coal_block" + } +} diff --git a/data/plateup/function/load.mcfunction b/data/plateup/function/load.mcfunction index bd79057..f4c2ce1 100644 --- a/data/plateup/function/load.mcfunction +++ b/data/plateup/function/load.mcfunction @@ -35,8 +35,8 @@ bossbar set timer color yellow kill @e[type=!minecraft:player] execute as @a run attribute @s generic.jump_strength base set 0.25 -execute positioned 59.5 -60.0 14.5 run function plateup:workstations/counter-make -execute positioned 58.5 -60.0 14.5 run function plateup:workstations/counter-make +execute positioned 59.5 -60.0 14.5 run function plateup:workstations/bin-make +execute positioned 58.5 -60.0 14.5 run function plateup:workstations/stove-make execute positioned 57.5 -60.0 14.5 run function plateup:workstations/stove-make execute positioned 56.5 -60.0 14.5 run function plateup:workstations/stove-make execute positioned 55.5 -60.0 14.5 run function plateup:workstations/stove-make @@ -48,9 +48,12 @@ execute positioned 52.5 -60.0 14.5 run function plateup:workstations/fridge-make item replace block 52 -62 14 container.0 with plateup:raw_thick_cut_steak execute positioned 51.5 -60.0 14.5 run function plateup:workstations/fridge-make item replace block 51 -62 14 container.0 with plateup:raw_thin_cut_steak -execute positioned 51.5 -60.0 10.5 run function plateup:workstations/bin-make -execute positioned 52.5 -60.0 10.5 run function plateup:workstations/crate-make -item replace block 52 -62 10 container.0 with plateup:plate +execute positioned 59.5 -60.0 10.5 run function plateup:workstations/counter-make +execute positioned 58.5 -60.0 10.5 run function plateup:workstations/counter-make +execute positioned 57.5 -60.0 10.5 run function plateup:workstations/counter-make +execute positioned 56.5 -60.0 10.5 run function plateup:workstations/counter-make +execute positioned 51.5 -60.0 10.5 run function plateup:workstations/crate-make +item replace block 51 -62 10 container.0 with plateup:plate team add aqua "aqua" team modify aqua color aqua diff --git a/data/plateup/function/recipes/combine/medium_bone_in_steak.mcfunction b/data/plateup/function/recipes/combine/medium_bone_in_steak.mcfunction new file mode 100644 index 0000000..045711a --- /dev/null +++ b/data/plateup/function/recipes/combine/medium_bone_in_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:medium_bone_in_steak if items block ~ ~-1.5 ~ container.26 plateup:plate run scoreboard players set generic doprog 1 +execute if items block ~ ~-1.5 ~ container.0 plateup:plate if items block ~ ~-1.5 ~ container.26 plateup:medium_bone_in_steak run scoreboard players set generic doprog 1 +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with plateup:plated_medium_bone_in_steak +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.26 with air +execute if score generic doprog matches 1.. run data remove entity @s interaction \ No newline at end of file diff --git a/data/plateup/function/recipes/combine/medium_thick_cut_steak.mcfunction b/data/plateup/function/recipes/combine/medium_thick_cut_steak.mcfunction new file mode 100644 index 0000000..87bf946 --- /dev/null +++ b/data/plateup/function/recipes/combine/medium_thick_cut_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:medium_thick_cut_steak if items block ~ ~-1.5 ~ container.26 plateup:plate run scoreboard players set generic doprog 1 +execute if items block ~ ~-1.5 ~ container.0 plateup:plate if items block ~ ~-1.5 ~ container.26 plateup:medium_thick_cut_steak run scoreboard players set generic doprog 1 +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with plateup:plated_medium_thick_cut_steak +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.26 with air +execute if score generic doprog matches 1.. run data remove entity @s interaction \ No newline at end of file diff --git a/data/plateup/function/recipes/combine/medium_thin_cut_steak.mcfunction b/data/plateup/function/recipes/combine/medium_thin_cut_steak.mcfunction new file mode 100644 index 0000000..22c9b87 --- /dev/null +++ b/data/plateup/function/recipes/combine/medium_thin_cut_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:medium_thin_cut_steak if items block ~ ~-1.5 ~ container.26 plateup:plate run scoreboard players set generic doprog 1 +execute if items block ~ ~-1.5 ~ container.0 plateup:plate if items block ~ ~-1.5 ~ container.26 plateup:medium_thin_cut_steak run scoreboard players set generic doprog 1 +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with plateup:plated_medium_thin_cut_steak +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.26 with air +execute if score generic doprog matches 1.. run data remove entity @s interaction \ No newline at end of file diff --git a/data/plateup/function/recipes/combine/rare_bone_in_steak.mcfunction b/data/plateup/function/recipes/combine/rare_bone_in_steak.mcfunction new file mode 100644 index 0000000..b1de174 --- /dev/null +++ b/data/plateup/function/recipes/combine/rare_bone_in_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:rare_bone_in_steak if items block ~ ~-1.5 ~ container.26 plateup:plate run scoreboard players set generic doprog 1 +execute if items block ~ ~-1.5 ~ container.0 plateup:plate if items block ~ ~-1.5 ~ container.26 plateup:rare_bone_in_steak run scoreboard players set generic doprog 1 +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with plateup:plated_rare_bone_in_steak +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.26 with air +execute if score generic doprog matches 1.. run data remove entity @s interaction \ No newline at end of file diff --git a/data/plateup/function/recipes/combine/rare_thick_cut_steak.mcfunction b/data/plateup/function/recipes/combine/rare_thick_cut_steak.mcfunction new file mode 100644 index 0000000..01d5790 --- /dev/null +++ b/data/plateup/function/recipes/combine/rare_thick_cut_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:rare_thick_cut_steak if items block ~ ~-1.5 ~ container.26 plateup:plate run scoreboard players set generic doprog 1 +execute if items block ~ ~-1.5 ~ container.0 plateup:plate if items block ~ ~-1.5 ~ container.26 plateup:rare_thick_cut_steak run scoreboard players set generic doprog 1 +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with plateup:plated_rare_thick_cut_steak +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.26 with air +execute if score generic doprog matches 1.. run data remove entity @s interaction \ No newline at end of file diff --git a/data/plateup/function/recipes/combine/rare_thin_cut_steak.mcfunction b/data/plateup/function/recipes/combine/rare_thin_cut_steak.mcfunction new file mode 100644 index 0000000..0713cdc --- /dev/null +++ b/data/plateup/function/recipes/combine/rare_thin_cut_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:rare_thin_cut_steak if items block ~ ~-1.5 ~ container.26 plateup:plate run scoreboard players set generic doprog 1 +execute if items block ~ ~-1.5 ~ container.0 plateup:plate if items block ~ ~-1.5 ~ container.26 plateup:rare_thin_cut_steak run scoreboard players set generic doprog 1 +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with plateup:plated_rare_thin_cut_steak +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.26 with air +execute if score generic doprog matches 1.. run data remove entity @s interaction \ No newline at end of file diff --git a/data/plateup/function/recipes/combine/welldone_bone_in_steak.mcfunction b/data/plateup/function/recipes/combine/welldone_bone_in_steak.mcfunction new file mode 100644 index 0000000..9eee47c --- /dev/null +++ b/data/plateup/function/recipes/combine/welldone_bone_in_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:well_done_bone_in_steak if items block ~ ~-1.5 ~ container.26 plateup:plate run scoreboard players set generic doprog 1 +execute if items block ~ ~-1.5 ~ container.0 plateup:plate if items block ~ ~-1.5 ~ container.26 plateup:well_done_bone_in_steak run scoreboard players set generic doprog 1 +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with plateup:plated_well_done_bone_in_steak +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.26 with air +execute if score generic doprog matches 1.. run data remove entity @s interaction \ No newline at end of file diff --git a/data/plateup/function/recipes/combine/welldone_thick_cut_steak.mcfunction b/data/plateup/function/recipes/combine/welldone_thick_cut_steak.mcfunction new file mode 100644 index 0000000..707837f --- /dev/null +++ b/data/plateup/function/recipes/combine/welldone_thick_cut_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:well_done_thick_cut_steak if items block ~ ~-1.5 ~ container.26 plateup:plate run scoreboard players set generic doprog 1 +execute if items block ~ ~-1.5 ~ container.0 plateup:plate if items block ~ ~-1.5 ~ container.26 plateup:well_done_thick_cut_steak run scoreboard players set generic doprog 1 +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with plateup:plated_well_done_thick_cut_steak +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.26 with air +execute if score generic doprog matches 1.. run data remove entity @s interaction \ No newline at end of file diff --git a/data/plateup/function/recipes/combine/welldone_thin_cut_steak.mcfunction b/data/plateup/function/recipes/combine/welldone_thin_cut_steak.mcfunction new file mode 100644 index 0000000..e92f313 --- /dev/null +++ b/data/plateup/function/recipes/combine/welldone_thin_cut_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:well_done_thin_cut_steak if items block ~ ~-1.5 ~ container.26 plateup:plate run scoreboard players set generic doprog 1 +execute if items block ~ ~-1.5 ~ container.0 plateup:plate if items block ~ ~-1.5 ~ container.26 plateup:well_done_thin_cut_steak run scoreboard players set generic doprog 1 +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with plateup:plated_well_done_thin_cut_steak +execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.26 with air +execute if score generic doprog matches 1.. run data remove entity @s interaction \ No newline at end of file diff --git a/data/plateup/function/recipes/stove/welldone_bone_in_steak.mcfunction b/data/plateup/function/recipes/stove/welldone_bone_in_steak.mcfunction index c9d3e2c..de67216 100644 --- a/data/plateup/function/recipes/stove/welldone_bone_in_steak.mcfunction +++ b/data/plateup/function/recipes/stove/welldone_bone_in_steak.mcfunction @@ -1,5 +1,5 @@ execute unless items block ~ ~-1.5 ~ container.0 plateup:well_done_bone_in_steak run return fail scoreboard players add @s progress 13 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:burnt_food +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:burnt_bone_in_steak execute if score @s progress matches 1000.. run scoreboard players set @s progress 0 function plateup:progressbar \ No newline at end of file diff --git a/data/plateup/function/recipes/stove/welldone_thick_cut_steak.mcfunction b/data/plateup/function/recipes/stove/welldone_thick_cut_steak.mcfunction index 0a404bf..7f346e7 100644 --- a/data/plateup/function/recipes/stove/welldone_thick_cut_steak.mcfunction +++ b/data/plateup/function/recipes/stove/welldone_thick_cut_steak.mcfunction @@ -1,5 +1,5 @@ execute unless items block ~ ~-1.5 ~ container.0 plateup:well_done_thick_cut_steak run return fail scoreboard players add @s progress 6 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:burnt_food +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:burnt_thick_cut_steak execute if score @s progress matches 1000.. run scoreboard players set @s progress 0 function plateup:progressbar \ No newline at end of file diff --git a/data/plateup/function/recipes/stove/welldone_thin_cut_steak.mcfunction b/data/plateup/function/recipes/stove/welldone_thin_cut_steak.mcfunction index 5ee0dee..cd7f465 100644 --- a/data/plateup/function/recipes/stove/welldone_thin_cut_steak.mcfunction +++ b/data/plateup/function/recipes/stove/welldone_thin_cut_steak.mcfunction @@ -1,5 +1,5 @@ execute unless items block ~ ~-1.5 ~ container.0 plateup:well_done_thin_cut_steak run return fail scoreboard players add @s progress 50 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:burnt_food +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:burnt_thin_cut_steak execute if score @s progress matches 1000.. run scoreboard players set @s progress 0 function plateup:progressbar \ No newline at end of file diff --git a/data/plateup/tags/function/combine.json b/data/plateup/tags/function/combine.json index ffdb4a2..bc4c61c 100644 --- a/data/plateup/tags/function/combine.json +++ b/data/plateup/tags/function/combine.json @@ -2,6 +2,15 @@ "values": [ "plateup:recipes/combine/rare_steak", "plateup:recipes/combine/medium_steak", - "plateup:recipes/combine/welldone_steak" + "plateup:recipes/combine/welldone_steak", + "plateup:recipes/combine/rare_bone_in_steak", + "plateup:recipes/combine/medium_bone_in_steak", + "plateup:recipes/combine/welldone_bone_in_steak", + "plateup:recipes/combine/rare_thick_cut_steak", + "plateup:recipes/combine/medium_thick_cut_steak", + "plateup:recipes/combine/welldone_thick_cut_steak", + "plateup:recipes/combine/rare_thin_cut_steak", + "plateup:recipes/combine/medium_thin_cut_steak", + "plateup:recipes/combine/welldone_thin_cut_steak" ] } \ No newline at end of file diff --git a/useful.txt b/useful.txt index 72b8996..828c97b 100644 --- a/useful.txt +++ b/useful.txt @@ -1 +1 @@ -#https://wiki.plateupgame.com/ +https://wiki.plateupgame.com/