diff --git a/.spyglassrc.json b/.spyglassrc.json new file mode 100644 index 0000000..686864b --- /dev/null +++ b/.spyglassrc.json @@ -0,0 +1,8 @@ +{ + "env": { + "gameVersion": "1.21.1" + }, + "lint": { + "idOmitDefaultNamespace": false + } + } \ No newline at end of file diff --git a/PlateUp Resource-Pack/assets/minecraft/models/item/emerald.json b/PlateUp Resource-Pack/assets/minecraft/models/item/emerald.json deleted file mode 100644 index 2a00c3d..0000000 --- a/PlateUp Resource-Pack/assets/minecraft/models/item/emerald.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/emerald" - }, - "overrides" : [ - { - "predicate": { - "custom_model_data": 0 - }, - "model": "plateup:item/burn" - }, - { - "predicate": { - "custom_model_data": 1 - }, - "model": "plateup:block/counter" - }, - { - "predicate": { - "custom_model_data": 2 - }, - "model": "plateup:block/stove" - }, - { - "predicate": { - "custom_model_data": 3 - }, - "model": "plateup:block/fridge" - }, - { - "predicate": { - "custom_model_data": 4 - }, - "model": "plateup:block/bin" - }, - { - "predicate": { - "custom_model_data": 5 - }, - "model": "plateup:item/plate" - }, - { - "predicate": { - "custom_model_data": 6 - }, - "model": "plateup:block/crate" - }, - { - "predicate": { - "custom_model_data": 10 - }, - "model": "plateup:item/raw_steak" - }, - { - "predicate": { - "custom_model_data": 11 - }, - "model": "plateup:item/rare_steak" - }, - { - "predicate": { - "custom_model_data": 12 - }, - "model": "plateup:item/medium_steak" - }, - { - "predicate": { - "custom_model_data": 13 - }, - "model": "plateup:item/welldone_steak" - }, - { - "predicate": { - "custom_model_data": 14 - }, - "model": "plateup:item/chopped_steak" - }, - { - "predicate": { - "custom_model_data": 16 - }, - "model": "plateup:item/plated_rare_steak" - }, - { - "predicate": { - "custom_model_data": 17 - }, - "model": "plateup:item/plated_medium_steak" - }, - { - "predicate": { - "custom_model_data": 18 - }, - "model": "plateup:item/plated_welldone_steak" - }, - { - "predicate": { - "custom_model_data": 20 - }, - "model": "plateup:item/raw_bone-in_steak" - }, - { - "predicate": { - "custom_model_data": 21 - }, - "model": "plateup:item/rare_bone-in_steak" - }, - { - "predicate": { - "custom_model_data": 22 - }, - "model": "plateup:item/medium_bone-in_steak" - }, - { - "predicate": { - "custom_model_data": 23 - }, - "model": "plateup:item/welldone_bone-in_steak" - }, - { - "predicate": { - "custom_model_data": 30 - }, - "model": "plateup:item/raw_thick_cut_steak" - }, - { - "predicate": { - "custom_model_data": 31 - }, - "model": "plateup:item/rare_thick_cut_steak" - }, - { - "predicate": { - "custom_model_data": 32 - }, - "model": "plateup:item/medium_thick_cut_steak" - }, - { - "predicate": { - "custom_model_data": 33 - }, - "model": "plateup:item/welldone_thick_cut_steak" - }, - { - "predicate": { - "custom_model_data": 40 - }, - "model": "plateup:item/raw_thin_cut_steak" - }, - { - "predicate": { - "custom_model_data": 41 - }, - "model": "plateup:item/rare_thin_cut_steak" - }, - { - "predicate": { - "custom_model_data": 42 - }, - "model": "plateup:item/medium_thin_cut_steak" - }, - { - "predicate": { - "custom_model_data": 43 - }, - "model": "plateup:item/welldone_thin_cut_steak" - } - ] -} diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/coal_block.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/coal_block.png deleted file mode 100644 index b9a9adf..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/coal_block.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/hay_block_top.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/hay_block_top.png deleted file mode 100644 index da382dd..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/hay_block_top.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_bars.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_bars.png deleted file mode 100644 index 20881ba..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_bars.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_block.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_block.png deleted file mode 100644 index edd266b..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_block.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_door_bottom.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_door_bottom.png deleted file mode 100644 index 329f7a9..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_door_bottom.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_door_top.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_door_top.png deleted file mode 100644 index 37f6c61..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/iron_door_top.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/magma.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/magma.png deleted file mode 100644 index 9e99315..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/magma.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/magma.png.mcmeta b/PlateUp Resource-Pack/assets/minecraft/textures/block/magma.png.mcmeta deleted file mode 100644 index ffc3e52..0000000 --- a/PlateUp Resource-Pack/assets/minecraft/textures/block/magma.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "animation": { - "frametime": 8, - "interpolate": true, - "frames": [ - 0, - 1, - 2 - ] - } -} diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/oak_planks.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/oak_planks.png deleted file mode 100644 index 571465f..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/oak_planks.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/packed_ice.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/packed_ice.png deleted file mode 100644 index ba0c434..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/packed_ice.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/minecraft/textures/block/stripped_spruce_log.png b/PlateUp Resource-Pack/assets/minecraft/textures/block/stripped_spruce_log.png deleted file mode 100644 index d573701..0000000 Binary files a/PlateUp Resource-Pack/assets/minecraft/textures/block/stripped_spruce_log.png and /dev/null differ diff --git a/PlateUp Resource-Pack/assets/plateup/models/block/bin.json b/PlateUp Resource-Pack/assets/plateup/models/item/bin.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/block/bin.json rename to PlateUp Resource-Pack/assets/plateup/models/item/bin.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/burn.json b/PlateUp Resource-Pack/assets/plateup/models/item/burnt_food.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/item/burn.json rename to PlateUp Resource-Pack/assets/plateup/models/item/burnt_food.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/block/counter.json b/PlateUp Resource-Pack/assets/plateup/models/item/counter.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/block/counter.json rename to PlateUp Resource-Pack/assets/plateup/models/item/counter.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/block/crate.json b/PlateUp Resource-Pack/assets/plateup/models/item/crate.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/block/crate.json rename to PlateUp Resource-Pack/assets/plateup/models/item/crate.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/block/fridge.json b/PlateUp Resource-Pack/assets/plateup/models/item/fridge.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/block/fridge.json rename to PlateUp Resource-Pack/assets/plateup/models/item/fridge.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/medium_bone-in_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/medium_bone-in_steak.json deleted file mode 100644 index 8e608d1..0000000 --- a/PlateUp Resource-Pack/assets/plateup/models/item/medium_bone-in_steak.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "plateup:item/raw_bone-in_steak", - "textures": { - "0": "plateup:item/medium_bone-in_steak", - "particle": "plateup:item/medium_bone-in_steak" - } -} diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/medium_bone_in_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/medium_bone_in_steak.json new file mode 100644 index 0000000..9c4528a --- /dev/null +++ b/PlateUp Resource-Pack/assets/plateup/models/item/medium_bone_in_steak.json @@ -0,0 +1,7 @@ +{ + "parent": "plateup:item/raw_bone_in_steak", + "textures": { + "0": "plateup:item/medium_bone_in_steak", + "particle": "plateup:item/medium_bone_in_steak" + } +} diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/plated_welldone_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/plated_well_done_steak.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/item/plated_welldone_steak.json rename to PlateUp Resource-Pack/assets/plateup/models/item/plated_well_done_steak.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/rare_bone-in_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/rare_bone-in_steak.json deleted file mode 100644 index 3b53294..0000000 --- a/PlateUp Resource-Pack/assets/plateup/models/item/rare_bone-in_steak.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "plateup:item/raw_bone-in_steak", - "textures": { - "0": "plateup:item/rare_bone-in_steak", - "particle": "plateup:item/rare_bone-in_steak" - } -} diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/rare_bone_in_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/rare_bone_in_steak.json new file mode 100644 index 0000000..abda675 --- /dev/null +++ b/PlateUp Resource-Pack/assets/plateup/models/item/rare_bone_in_steak.json @@ -0,0 +1,7 @@ +{ + "parent": "plateup:item/raw_bone_in_steak", + "textures": { + "0": "plateup:item/rare_bone_in_steak", + "particle": "plateup:item/rare_bone_in_steak" + } +} diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/raw_bone-in_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/raw_bone_in_steak.json similarity index 95% rename from PlateUp Resource-Pack/assets/plateup/models/item/raw_bone-in_steak.json rename to PlateUp Resource-Pack/assets/plateup/models/item/raw_bone_in_steak.json index be2a356..5cd7536 100644 --- a/PlateUp Resource-Pack/assets/plateup/models/item/raw_bone-in_steak.json +++ b/PlateUp Resource-Pack/assets/plateup/models/item/raw_bone_in_steak.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "plateup:item/raw_bone-in_steak", - "particle": "plateup:item/raw_bone-in_steak" + "0": "plateup:item/raw_bone_in_steak", + "particle": "plateup:item/raw_bone_in_steak" }, "elements": [ { @@ -68,4 +68,4 @@ "translation": [0, 0, 7] } } -} \ No newline at end of file +} diff --git a/PlateUp Resource-Pack/assets/plateup/models/block/stove.json b/PlateUp Resource-Pack/assets/plateup/models/item/stove.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/block/stove.json rename to PlateUp Resource-Pack/assets/plateup/models/item/stove.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/well_done_bone_in_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/well_done_bone_in_steak.json new file mode 100644 index 0000000..1e2fddf --- /dev/null +++ b/PlateUp Resource-Pack/assets/plateup/models/item/well_done_bone_in_steak.json @@ -0,0 +1,7 @@ +{ + "parent": "plateup:item/raw_bone_in_steak", + "textures": { + "0": "plateup:item/welldone_bone_in_steak", + "particle": "plateup:item/welldone_bone_in_steak" + } +} diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/welldone_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/well_done_steak.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/item/welldone_steak.json rename to PlateUp Resource-Pack/assets/plateup/models/item/well_done_steak.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/welldone_thick_cut_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/well_done_thick_cut_steak.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/item/welldone_thick_cut_steak.json rename to PlateUp Resource-Pack/assets/plateup/models/item/well_done_thick_cut_steak.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/welldone_thin_cut_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/well_done_thin_cut_steak.json similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/models/item/welldone_thin_cut_steak.json rename to PlateUp Resource-Pack/assets/plateup/models/item/well_done_thin_cut_steak.json diff --git a/PlateUp Resource-Pack/assets/plateup/models/item/welldone_bone-in_steak.json b/PlateUp Resource-Pack/assets/plateup/models/item/welldone_bone-in_steak.json deleted file mode 100644 index 8a9be33..0000000 --- a/PlateUp Resource-Pack/assets/plateup/models/item/welldone_bone-in_steak.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "plateup:item/raw_bone-in_steak", - "textures": { - "0": "plateup:item/welldone_bone-in_steak", - "particle": "plateup:item/welldone_bone-in_steak" - } -} diff --git a/PlateUp Resource-Pack/assets/plateup/textures/item/chopped_steak.png b/PlateUp Resource-Pack/assets/plateup/textures/item/chopped_steak.png index fe7414f..9169c79 100644 Binary files a/PlateUp Resource-Pack/assets/plateup/textures/item/chopped_steak.png and b/PlateUp Resource-Pack/assets/plateup/textures/item/chopped_steak.png differ diff --git a/PlateUp Resource-Pack/assets/plateup/textures/item/medium_bone-in_steak.png b/PlateUp Resource-Pack/assets/plateup/textures/item/medium_bone_in_steak.png similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/textures/item/medium_bone-in_steak.png rename to PlateUp Resource-Pack/assets/plateup/textures/item/medium_bone_in_steak.png diff --git a/PlateUp Resource-Pack/assets/plateup/textures/item/rare_bone-in_steak.png b/PlateUp Resource-Pack/assets/plateup/textures/item/rare_bone_in_steak.png similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/textures/item/rare_bone-in_steak.png rename to PlateUp Resource-Pack/assets/plateup/textures/item/rare_bone_in_steak.png diff --git a/PlateUp Resource-Pack/assets/plateup/textures/item/raw_bone-in_steak.png b/PlateUp Resource-Pack/assets/plateup/textures/item/raw_bone_in_steak.png similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/textures/item/raw_bone-in_steak.png rename to PlateUp Resource-Pack/assets/plateup/textures/item/raw_bone_in_steak.png diff --git a/PlateUp Resource-Pack/assets/plateup/textures/item/welldone_bone-in_steak.png b/PlateUp Resource-Pack/assets/plateup/textures/item/welldone_bone_in_steak.png similarity index 100% rename from PlateUp Resource-Pack/assets/plateup/textures/item/welldone_bone-in_steak.png rename to PlateUp Resource-Pack/assets/plateup/textures/item/welldone_bone_in_steak.png diff --git a/PlateUp Resource-Pack/pack.png b/PlateUp Resource-Pack/pack.png index 3fd54bf..361599d 100644 Binary files a/PlateUp Resource-Pack/pack.png and b/PlateUp Resource-Pack/pack.png differ diff --git a/data/minecraft/tags/functions/load.json b/data/minecraft/tags/function/load.json similarity index 100% rename from data/minecraft/tags/functions/load.json rename to data/minecraft/tags/function/load.json diff --git a/data/minecraft/tags/functions/tick.json b/data/minecraft/tags/function/tick.json similarity index 100% rename from data/minecraft/tags/functions/tick.json rename to data/minecraft/tags/function/tick.json diff --git a/data/plateup/functions/buyphase.mcfunction b/data/plateup/function/buyphase.mcfunction similarity index 100% rename from data/plateup/functions/buyphase.mcfunction rename to data/plateup/function/buyphase.mcfunction diff --git a/data/plateup/functions/dayphse.mcfunction b/data/plateup/function/dayphase.mcfunction similarity index 100% rename from data/plateup/functions/dayphse.mcfunction rename to data/plateup/function/dayphase.mcfunction diff --git a/data/plateup/functions/load.mcfunction b/data/plateup/function/load.mcfunction similarity index 90% rename from data/plateup/functions/load.mcfunction rename to data/plateup/function/load.mcfunction index 1f0e121..bacc528 100644 --- a/data/plateup/functions/load.mcfunction +++ b/data/plateup/function/load.mcfunction @@ -34,22 +34,23 @@ bossbar set timer players @a 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 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 execute positioned 54.5 -60.0 14.5 run function plateup:workstations/fridge-make -item replace block 54 -62 14 container.0 with emerald[minecraft:custom_model_data=10] +item replace block 54 -62 14 container.0 with plateup:raw_steak execute positioned 53.5 -60.0 14.5 run function plateup:workstations/fridge-make -item replace block 53 -62 14 container.0 with emerald[minecraft:custom_model_data=20] +item replace block 53 -62 14 container.0 with plateup:raw_bone_in_steak execute positioned 52.5 -60.0 14.5 run function plateup:workstations/fridge-make -item replace block 52 -62 14 container.0 with emerald[minecraft:custom_model_data=30] +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 emerald[minecraft:custom_model_data=40] +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 emerald[minecraft:custom_model_data=30] +item replace block 52 -62 10 container.0 with plateup:raw_thick_cut_steak team add aqua "aqua" team modify aqua color aqua diff --git a/data/plateup/function/progressbar.mcfunction b/data/plateup/function/progressbar.mcfunction new file mode 100644 index 0000000..9b6b774 --- /dev/null +++ b/data/plateup/function/progressbar.mcfunction @@ -0,0 +1,18 @@ +execute if score @s progress matches 0001..0055 run data modify entity @n[type=text_display] text set value '[{"text":"|", "color":"green"},{"text":"|||||||||||||||||", "color":"gray"}]' +execute if score @s progress matches 0056..0111 run data modify entity @n[type=text_display] text set value '[{"text":"||", "color":"green"},{"text":"||||||||||||||||", "color":"gray"}]' +execute if score @s progress matches 0112..0166 run data modify entity @n[type=text_display] text set value '[{"text":"|||", "color":"green"},{"text":"|||||||||||||||", "color":"gray"}]' +execute if score @s progress matches 0167..0222 run data modify entity @n[type=text_display] text set value '[{"text":"||||", "color":"green"},{"text":"||||||||||||||", "color":"gray"}]' +execute if score @s progress matches 0223..0277 run data modify entity @n[type=text_display] text set value '[{"text":"|||||", "color":"green"},{"text":"|||||||||||||", "color":"gray"}]' +execute if score @s progress matches 0278..0333 run data modify entity @n[type=text_display] text set value '[{"text":"||||||", "color":"green"},{"text":"||||||||||||", "color":"gray"}]' +execute if score @s progress matches 0334..0388 run data modify entity @n[type=text_display] text set value '[{"text":"|||||||", "color":"green"},{"text":"|||||||||||", "color":"gray"}]' +execute if score @s progress matches 0389..0444 run data modify entity @n[type=text_display] text set value '[{"text":"||||||||", "color":"green"},{"text":"||||||||||", "color":"gray"}]' +execute if score @s progress matches 0445..0500 run data modify entity @n[type=text_display] text set value '[{"text":"|||||||||", "color":"green"},{"text":"|||||||||", "color":"gray"}]' +execute if score @s progress matches 0501..0555 run data modify entity @n[type=text_display] text set value '[{"text":"||||||||||", "color":"green"},{"text":"||||||||", "color":"gray"}]' +execute if score @s progress matches 0556..0611 run data modify entity @n[type=text_display] text set value '[{"text":"|||||||||||", "color":"green"},{"text":"|||||||", "color":"gray"}]' +execute if score @s progress matches 0612..0666 run data modify entity @n[type=text_display] text set value '[{"text":"||||||||||||", "color":"green"},{"text":"||||||", "color":"gray"}]' +execute if score @s progress matches 0667..0722 run data modify entity @n[type=text_display] text set value '[{"text":"|||||||||||||", "color":"green"},{"text":"|||||", "color":"gray"}]' +execute if score @s progress matches 0723..0777 run data modify entity @n[type=text_display] text set value '[{"text":"||||||||||||||", "color":"green"},{"text":"||||", "color":"gray"}]' +execute if score @s progress matches 0778..0833 run data modify entity @n[type=text_display] text set value '[{"text":"|||||||||||||||", "color":"green"},{"text":"|||", "color":"gray"}]' +execute if score @s progress matches 0834..0888 run data modify entity @n[type=text_display] text set value '[{"text":"||||||||||||||||", "color":"green"},{"text":"||", "color":"gray"}]' +execute if score @s progress matches 0889..0944 run data modify entity @n[type=text_display] text set value '[{"text":"|||||||||||||||||", "color":"green"},{"text":"|", "color":"gray"}]' +execute if score @s progress matches 0945.. run data modify entity @n[type=text_display] text set value '[{"text":"||||||||||||||||||", "color":"green"},{"text":"", "color":"gray"}]' diff --git a/data/plateup/function/recipes/combine/medium_steak.mcfunction b/data/plateup/function/recipes/combine/medium_steak.mcfunction new file mode 100644 index 0000000..e9fa922 --- /dev/null +++ b/data/plateup/function/recipes/combine/medium_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:medium_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_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_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_steak.mcfunction b/data/plateup/function/recipes/combine/rare_steak.mcfunction new file mode 100644 index 0000000..335b80e --- /dev/null +++ b/data/plateup/function/recipes/combine/rare_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:rare_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_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_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_steak.mcfunction b/data/plateup/function/recipes/combine/welldone_steak.mcfunction new file mode 100644 index 0000000..82af291 --- /dev/null +++ b/data/plateup/function/recipes/combine/welldone_steak.mcfunction @@ -0,0 +1,6 @@ +scoreboard players set generic doprog 0 +execute if items block ~ ~-1.5 ~ container.0 plateup:well_done_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_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_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/functions/recipes/counter/raw_steak.mcfunction b/data/plateup/function/recipes/counter/raw_steak.mcfunction similarity index 51% rename from data/plateup/functions/recipes/counter/raw_steak.mcfunction rename to data/plateup/function/recipes/counter/raw_steak.mcfunction index bc3dea5..6db719d 100644 --- a/data/plateup/functions/recipes/counter/raw_steak.mcfunction +++ b/data/plateup/function/recipes/counter/raw_steak.mcfunction @@ -1,4 +1,4 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=10] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:raw_steak run return fail scoreboard players add @s progress 25 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=14] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:chopped_steak execute if score @s progress matches 1000.. run scoreboard players set @s progress 0 diff --git a/data/plateup/functions/recipes/stove/rare_bone-in_steak.mcfunction b/data/plateup/function/recipes/stove/medium_bone_in_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/rare_bone-in_steak.mcfunction rename to data/plateup/function/recipes/stove/medium_bone_in_steak.mcfunction index c388542..b70c919 100644 --- a/data/plateup/functions/recipes/stove/rare_bone-in_steak.mcfunction +++ b/data/plateup/function/recipes/stove/medium_bone_in_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=21] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:medium_bone_in_steak run return fail scoreboard players add @s progress 17 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=22] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:well_done_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/functions/recipes/stove/medium_steak.mcfunction b/data/plateup/function/recipes/stove/medium_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/medium_steak.mcfunction rename to data/plateup/function/recipes/stove/medium_steak.mcfunction index 4181f4b..3e6e832 100644 --- a/data/plateup/functions/recipes/stove/medium_steak.mcfunction +++ b/data/plateup/function/recipes/stove/medium_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=12] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:medium_steak run return fail scoreboard players add @s progress 25 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=13] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:well_done_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/functions/recipes/stove/medium_thick_cut_steak.mcfunction b/data/plateup/function/recipes/stove/medium_thick_cut_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/medium_thick_cut_steak.mcfunction rename to data/plateup/function/recipes/stove/medium_thick_cut_steak.mcfunction index 43a1fd3..f4e6bd8 100644 --- a/data/plateup/functions/recipes/stove/medium_thick_cut_steak.mcfunction +++ b/data/plateup/function/recipes/stove/medium_thick_cut_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=32] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:medium_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 emerald[minecraft:custom_model_data=33] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:well_done_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/functions/recipes/stove/medium_thin_cut_steak.mcfunction b/data/plateup/function/recipes/stove/medium_thin_cut_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/medium_thin_cut_steak.mcfunction rename to data/plateup/function/recipes/stove/medium_thin_cut_steak.mcfunction index 7010db6..395005c 100644 --- a/data/plateup/functions/recipes/stove/medium_thin_cut_steak.mcfunction +++ b/data/plateup/function/recipes/stove/medium_thin_cut_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=42] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:medium_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 emerald[minecraft:custom_model_data=43] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:well_done_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/functions/recipes/stove/medium_bone-in_steak.mcfunction b/data/plateup/function/recipes/stove/rare_bone_in_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/medium_bone-in_steak.mcfunction rename to data/plateup/function/recipes/stove/rare_bone_in_steak.mcfunction index 9c40b83..99db7b1 100644 --- a/data/plateup/functions/recipes/stove/medium_bone-in_steak.mcfunction +++ b/data/plateup/function/recipes/stove/rare_bone_in_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=22] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:rare_bone_in_steak run return fail scoreboard players add @s progress 17 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=23] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:medium_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/functions/recipes/stove/rare_steak.mcfunction b/data/plateup/function/recipes/stove/rare_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/rare_steak.mcfunction rename to data/plateup/function/recipes/stove/rare_steak.mcfunction index b748914..bcbf64c 100644 --- a/data/plateup/functions/recipes/stove/rare_steak.mcfunction +++ b/data/plateup/function/recipes/stove/rare_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=11] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:rare_steak run return fail scoreboard players add @s progress 25 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=12] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:medium_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/functions/recipes/stove/rare_thick_cut_steak.mcfunction b/data/plateup/function/recipes/stove/rare_thick_cut_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/rare_thick_cut_steak.mcfunction rename to data/plateup/function/recipes/stove/rare_thick_cut_steak.mcfunction index 3268855..2f355ff 100644 --- a/data/plateup/functions/recipes/stove/rare_thick_cut_steak.mcfunction +++ b/data/plateup/function/recipes/stove/rare_thick_cut_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=31] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:rare_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 emerald[minecraft:custom_model_data=32] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:medium_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/functions/recipes/stove/rare_thin_cut_steak.mcfunction b/data/plateup/function/recipes/stove/rare_thin_cut_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/rare_thin_cut_steak.mcfunction rename to data/plateup/function/recipes/stove/rare_thin_cut_steak.mcfunction index 5a24898..d11eb38 100644 --- a/data/plateup/functions/recipes/stove/rare_thin_cut_steak.mcfunction +++ b/data/plateup/function/recipes/stove/rare_thin_cut_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=41] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:rare_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 emerald[minecraft:custom_model_data=42] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:medium_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/functions/recipes/stove/raw_bone-in_steak.mcfunction b/data/plateup/function/recipes/stove/raw_bone_in_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/raw_bone-in_steak.mcfunction rename to data/plateup/function/recipes/stove/raw_bone_in_steak.mcfunction index 1802ee1..4840d10 100644 --- a/data/plateup/functions/recipes/stove/raw_bone-in_steak.mcfunction +++ b/data/plateup/function/recipes/stove/raw_bone_in_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=20] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:raw_bone_in_steak run return fail scoreboard players add @s progress 10 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=21] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:rare_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/functions/recipes/stove/raw_steak.mcfunction b/data/plateup/function/recipes/stove/raw_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/raw_steak.mcfunction rename to data/plateup/function/recipes/stove/raw_steak.mcfunction index a68cef8..10e0322 100644 --- a/data/plateup/functions/recipes/stove/raw_steak.mcfunction +++ b/data/plateup/function/recipes/stove/raw_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=10] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:raw_steak run return fail scoreboard players add @s progress 10 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=11] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:rare_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/functions/recipes/stove/raw_thick_cut_steak.mcfunction b/data/plateup/function/recipes/stove/raw_thick_cut_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/raw_thick_cut_steak.mcfunction rename to data/plateup/function/recipes/stove/raw_thick_cut_steak.mcfunction index ec080b4..9370115 100644 --- a/data/plateup/functions/recipes/stove/raw_thick_cut_steak.mcfunction +++ b/data/plateup/function/recipes/stove/raw_thick_cut_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=30] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:raw_thick_cut_steak run return fail scoreboard players add @s progress 5 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=31] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:rare_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/functions/recipes/stove/welldone_bone-in_steak.mcfunction b/data/plateup/function/recipes/stove/raw_thin_cut_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/welldone_bone-in_steak.mcfunction rename to data/plateup/function/recipes/stove/raw_thin_cut_steak.mcfunction index 8f7c728..49d7375 100644 --- a/data/plateup/functions/recipes/stove/welldone_bone-in_steak.mcfunction +++ b/data/plateup/function/recipes/stove/raw_thin_cut_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=23] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:raw_thin_cut_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 emerald[minecraft:custom_model_data=0] +execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with plateup:rare_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/functions/recipes/stove/raw_thin_cut_steak.mcfunction b/data/plateup/function/recipes/stove/welldone_bone_in_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/raw_thin_cut_steak.mcfunction rename to data/plateup/function/recipes/stove/welldone_bone_in_steak.mcfunction index 16bb9b9..c9d3e2c 100644 --- a/data/plateup/functions/recipes/stove/raw_thin_cut_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 emerald[minecraft:custom_model_data=40] run return fail +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 emerald[minecraft:custom_model_data=41] +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 scoreboard players set @s progress 0 function plateup:progressbar \ No newline at end of file diff --git a/data/plateup/functions/recipes/stove/welldone_steak.mcfunction b/data/plateup/function/recipes/stove/welldone_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/welldone_steak.mcfunction rename to data/plateup/function/recipes/stove/welldone_steak.mcfunction index 0399fe3..1490efc 100644 --- a/data/plateup/functions/recipes/stove/welldone_steak.mcfunction +++ b/data/plateup/function/recipes/stove/welldone_steak.mcfunction @@ -1,5 +1,5 @@ -execute unless items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=13] run return fail +execute unless items block ~ ~-1.5 ~ container.0 plateup:well_done_steak run return fail scoreboard players add @s progress 5 -execute if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=0] +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 scoreboard players set @s progress 0 function plateup:progressbar \ No newline at end of file diff --git a/data/plateup/functions/recipes/stove/welldone_thick_cut_steak.mcfunction b/data/plateup/function/recipes/stove/welldone_thick_cut_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/welldone_thick_cut_steak.mcfunction rename to data/plateup/function/recipes/stove/welldone_thick_cut_steak.mcfunction index 896eaa0..0a404bf 100644 --- a/data/plateup/functions/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 emerald[minecraft:custom_model_data=33] run return fail +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 emerald[minecraft:custom_model_data=0] +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 scoreboard players set @s progress 0 function plateup:progressbar \ No newline at end of file diff --git a/data/plateup/functions/recipes/stove/welldone_thin_cut_steak.mcfunction b/data/plateup/function/recipes/stove/welldone_thin_cut_steak.mcfunction similarity index 55% rename from data/plateup/functions/recipes/stove/welldone_thin_cut_steak.mcfunction rename to data/plateup/function/recipes/stove/welldone_thin_cut_steak.mcfunction index 0d5d87c..5ee0dee 100644 --- a/data/plateup/functions/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 emerald[minecraft:custom_model_data=43] run return fail +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 emerald[minecraft:custom_model_data=0] +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 scoreboard players set @s progress 0 function plateup:progressbar \ No newline at end of file diff --git a/data/plateup/functions/tick.mcfunction b/data/plateup/function/tick.mcfunction similarity index 95% rename from data/plateup/functions/tick.mcfunction rename to data/plateup/function/tick.mcfunction index 3649839..084b0b8 100644 --- a/data/plateup/functions/tick.mcfunction +++ b/data/plateup/function/tick.mcfunction @@ -2,4 +2,4 @@ effect give @a saturation infinite 10 true effect give @a instant_health infinite 10 true execute if score generic phase matches 0 run function plateup:buyphase -execute unless score generic phase matches 0 run function plateup:dayphse \ No newline at end of file +execute unless score generic phase matches 0 run function plateup:dayphase \ No newline at end of file diff --git a/data/plateup/functions/workstations/bin-make.mcfunction b/data/plateup/function/workstations/bin-make.mcfunction similarity index 91% rename from data/plateup/functions/workstations/bin-make.mcfunction rename to data/plateup/function/workstations/bin-make.mcfunction index ec61f1f..e9ad38f 100644 --- a/data/plateup/functions/workstations/bin-make.mcfunction +++ b/data/plateup/function/workstations/bin-make.mcfunction @@ -5,5 +5,5 @@ setblock ~ ~-1.5 ~ barrel[facing=up] summon marker ~ ~ ~ {Tags:[bin]} summon interaction ~ ~ ~ {Tags:[interaction], width:1.015625f, height:1.015625f} summon text_display ~ ~ ~ {Tags:[text], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,1.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], billboard:"vertical"} -summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"minecraft:emerald", components:{"minecraft:custom_model_data":4}}} +summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"plateup:bin"}} summon item_display ~ ~ ~ {Tags:[item], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f]} diff --git a/data/plateup/function/workstations/bin-tick.mcfunction b/data/plateup/function/workstations/bin-tick.mcfunction new file mode 100644 index 0000000..c6788d6 --- /dev/null +++ b/data/plateup/function/workstations/bin-tick.mcfunction @@ -0,0 +1,16 @@ +item replace entity @n[tag=item_display] container.0 from block ~ ~-1.5 ~ container.0 +data modify entity @n[tag=text] text set value '{"text":""}' + +execute as @n[tag=interaction] if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald +execute as @n[tag=interaction] unless score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with air +execute as @n[tag=interaction] if dimension the_nether if score @s progress matches 1000.. if data entity @s interaction on target unless items entity @s container.0 * run item replace entity @s container.0 with emerald +execute as @n[tag=interaction] if score @s progress matches 1000.. if data entity @s interaction on target unless items entity @s container.0 * run scoreboard players set @n[tag=interaction] progress 0 +execute as @n[tag=interaction] if score @s progress matches 1000.. run data remove entity @s interaction + +execute as @n[tag=interaction] run function plateup:progressbar + +execute as @n[tag=interaction] if score @s progress matches 1000.. run return fail + +execute as @n[tag=interaction] if data entity @s interaction on target if items entity @s container.0 * run scoreboard players add @n[tag=interaction] progress 500 +execute as @n[tag=interaction] if data entity @s interaction on target if items entity @s container.0 * run item replace entity @s container.0 with air +execute as @n[tag=interaction] run data remove entity @s interaction diff --git a/data/plateup/functions/workstations/counter-make.mcfunction b/data/plateup/function/workstations/counter-make.mcfunction similarity index 91% rename from data/plateup/functions/workstations/counter-make.mcfunction rename to data/plateup/function/workstations/counter-make.mcfunction index 962f78b..61d27fe 100644 --- a/data/plateup/functions/workstations/counter-make.mcfunction +++ b/data/plateup/function/workstations/counter-make.mcfunction @@ -5,5 +5,6 @@ setblock ~ ~-1.5 ~ barrel[facing=up] summon marker ~ ~ ~ {Tags:[counter]} summon interaction ~ ~ ~ {Tags:[interaction], width:0.9375f, height:1.03125f} summon text_display ~ ~ ~ {Tags:[text], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,1.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], billboard:"vertical"} -summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"minecraft:emerald", components:{"minecraft:custom_model_data":1}}} +summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"plateup:counter"}} summon item_display ~ ~ ~ {Tags:[item], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,1.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f]} +scoreboard players set @n[tag=interaction] doprog 0 \ No newline at end of file diff --git a/data/plateup/function/workstations/counter-tick.mcfunction b/data/plateup/function/workstations/counter-tick.mcfunction new file mode 100644 index 0000000..503494e --- /dev/null +++ b/data/plateup/function/workstations/counter-tick.mcfunction @@ -0,0 +1,18 @@ +item replace entity @n[tag=item] container.0 from block ~ ~-1.5 ~ container.0 +data modify entity @n[tag=text] text set value '{"text":""}' + +execute as @n[tag=interaction] if data entity @s interaction run scoreboard players set @s progress 0 +execute as @n[tag=interaction] if data entity @s interaction run scoreboard players set @s doprog 0 +execute as @n[tag=interaction] if data entity @s interaction on target run item replace block ~ ~-1.5 ~ container.26 from entity @s container.0 +execute as @n[tag=interaction] if data entity @s interaction on target run item replace entity @s container.0 with air +execute as @n[tag=interaction] if data entity @s interaction run function #plateup:combine +execute as @n[tag=interaction] if data entity @s interaction on target run item replace entity @s container.0 from block ~ ~-1.5 ~ container.0 +execute as @n[tag=interaction] if data entity @s interaction run item replace block ~ ~-1.5 ~ container.0 from block ~ ~-1.5 ~ container.26 +execute as @n[tag=interaction] if data entity @s interaction run item replace block ~ ~-1.5 ~ container.26 with air +execute as @n[tag=interaction] run data remove entity @s interaction + +execute as @n[tag=interaction] if score @s doprog matches 1.. run scoreboard players remove @s doprog 1 +execute as @n[tag=interaction] if data entity @s attack run scoreboard players set @s doprog 5 +execute as @n[tag=interaction] unless score @s doprog matches 0 run function #plateup:counter +execute as @n[tag=interaction] run function plateup:progressbar +execute as @n[tag=interaction] run data remove entity @s attack \ No newline at end of file diff --git a/data/plateup/functions/workstations/crate-make.mcfunction b/data/plateup/function/workstations/crate-make.mcfunction similarity index 88% rename from data/plateup/functions/workstations/crate-make.mcfunction rename to data/plateup/function/workstations/crate-make.mcfunction index d74e21e..8b2a8db 100644 --- a/data/plateup/functions/workstations/crate-make.mcfunction +++ b/data/plateup/function/workstations/crate-make.mcfunction @@ -3,5 +3,5 @@ setblock ~ ~-1.5 ~ barrel[facing=up] summon marker ~ ~ ~ {Tags:[crate]} summon interaction ~ ~ ~ {Tags:[interaction], width:1.015625f, height:1.015625f} -summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"minecraft:emerald", components:{"minecraft:custom_model_data":6}}} +summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"plateup:crate"}} summon item_display ~ ~ ~ {Tags:[item], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,1.3125f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f]} diff --git a/data/plateup/function/workstations/crate-tick.mcfunction b/data/plateup/function/workstations/crate-tick.mcfunction new file mode 100644 index 0000000..023a7b3 --- /dev/null +++ b/data/plateup/function/workstations/crate-tick.mcfunction @@ -0,0 +1,4 @@ +item replace entity @n[tag=item] container.0 from block ~ ~-1.5 ~ container.0 + +execute as @n[tag=interaction] if data entity @s interaction on target unless items entity @s container.0 * run item replace entity @s container.0 from block ~ ~-1.5 ~ container.0 +execute as @n[tag=interaction] run data remove entity @s interaction diff --git a/data/plateup/functions/workstations/fridge-make.mcfunction b/data/plateup/function/workstations/fridge-make.mcfunction similarity index 91% rename from data/plateup/functions/workstations/fridge-make.mcfunction rename to data/plateup/function/workstations/fridge-make.mcfunction index e9da397..c8320f3 100644 --- a/data/plateup/functions/workstations/fridge-make.mcfunction +++ b/data/plateup/function/workstations/fridge-make.mcfunction @@ -4,6 +4,6 @@ setblock ~ ~-1.5 ~ barrel[facing=up] summon marker ~ ~ ~ {Tags:[fridge]} summon interaction ~ ~ ~ {Tags:[interaction], width:1.015625f, height:2.015625f} -summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"minecraft:emerald", components:{"minecraft:custom_model_data":3}}} +summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"plateup:fridge"}} summon item_display ~ ~ ~ {Tags:[item], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,1.7500f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f]} summon item_display ~ ~ ~ {Tags:[item], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,1.8500f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f]} diff --git a/data/plateup/function/workstations/fridge-tick.mcfunction b/data/plateup/function/workstations/fridge-tick.mcfunction new file mode 100644 index 0000000..023a7b3 --- /dev/null +++ b/data/plateup/function/workstations/fridge-tick.mcfunction @@ -0,0 +1,4 @@ +item replace entity @n[tag=item] container.0 from block ~ ~-1.5 ~ container.0 + +execute as @n[tag=interaction] if data entity @s interaction on target unless items entity @s container.0 * run item replace entity @s container.0 from block ~ ~-1.5 ~ container.0 +execute as @n[tag=interaction] run data remove entity @s interaction diff --git a/data/plateup/functions/workstations/stove-make.mcfunction b/data/plateup/function/workstations/stove-make.mcfunction similarity index 91% rename from data/plateup/functions/workstations/stove-make.mcfunction rename to data/plateup/function/workstations/stove-make.mcfunction index 083a685..de8a805 100644 --- a/data/plateup/functions/workstations/stove-make.mcfunction +++ b/data/plateup/function/workstations/stove-make.mcfunction @@ -5,5 +5,5 @@ setblock ~ ~-1.5 ~ barrel[facing=up] summon marker ~ ~ ~ {Tags:[stove]} summon interaction ~ ~ ~ {Tags:[interaction], width:0.9375f, height:1.03125f} summon text_display ~ ~ ~ {Tags:[text], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,1.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], billboard:"vertical"} -summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"minecraft:emerald", components:{"minecraft:custom_model_data":2}}} +summon item_display ~ ~ ~ {Tags:[block], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,0.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f], item:{id:"plateup:stove"}} summon item_display ~ ~ ~ {Tags:[item], transformation:[1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f,0.0000f,1.5000f,0.0000f,0.0000f,1.0000f,0.0000f,0.0000f,0.0000f,0.0000f,1.0000f]} diff --git a/data/plateup/function/workstations/stove-tick.mcfunction b/data/plateup/function/workstations/stove-tick.mcfunction new file mode 100644 index 0000000..2917959 --- /dev/null +++ b/data/plateup/function/workstations/stove-tick.mcfunction @@ -0,0 +1,13 @@ +item replace entity @n[tag=item] container.0 from block ~ ~-1.5 ~ container.0 +data modify entity @n[tag=text] text set value '{"text":""}' + +execute as @n[tag=interaction] if data entity @s interaction run scoreboard players set @s progress 0 +execute as @n[tag=interaction] if data entity @s interaction on target run item replace block ~ ~-1.5 ~ container.26 from entity @s container.0 +execute as @n[tag=interaction] if data entity @s interaction on target run item replace entity @s container.0 with air +execute as @n[tag=interaction] if data entity @s interaction run function #plateup:combine +execute as @n[tag=interaction] if data entity @s interaction on target run item replace entity @s container.0 from block ~ ~-1.5 ~ container.0 +execute as @n[tag=interaction] if data entity @s interaction run item replace block ~ ~-1.5 ~ container.0 from block ~ ~-1.5 ~ container.26 +execute as @n[tag=interaction] if data entity @s interaction run item replace block ~ ~-1.5 ~ container.26 with air +execute as @n[tag=interaction] run data remove entity @s interaction + +execute as @n[tag=interaction] run function #plateup:stove \ No newline at end of file diff --git a/data/plateup/functions/progressbar.mcfunction b/data/plateup/functions/progressbar.mcfunction deleted file mode 100644 index 30332f4..0000000 --- a/data/plateup/functions/progressbar.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -execute if score @s progress matches 0001..0055 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"|", "color":"green"},{"text":"|||||||||||||||||", "color":"gray"}]' -execute if score @s progress matches 0056..0111 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"||", "color":"green"},{"text":"||||||||||||||||", "color":"gray"}]' -execute if score @s progress matches 0112..0166 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"|||", "color":"green"},{"text":"|||||||||||||||", "color":"gray"}]' -execute if score @s progress matches 0167..0222 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"||||", "color":"green"},{"text":"||||||||||||||", "color":"gray"}]' -execute if score @s progress matches 0223..0277 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"|||||", "color":"green"},{"text":"|||||||||||||", "color":"gray"}]' -execute if score @s progress matches 0278..0333 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"||||||", "color":"green"},{"text":"||||||||||||", "color":"gray"}]' -execute if score @s progress matches 0334..0388 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"|||||||", "color":"green"},{"text":"|||||||||||", "color":"gray"}]' -execute if score @s progress matches 0389..0444 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"||||||||", "color":"green"},{"text":"||||||||||", "color":"gray"}]' -execute if score @s progress matches 0445..0500 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"|||||||||", "color":"green"},{"text":"|||||||||", "color":"gray"}]' -execute if score @s progress matches 0501..0555 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"||||||||||", "color":"green"},{"text":"||||||||", "color":"gray"}]' -execute if score @s progress matches 0556..0611 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"|||||||||||", "color":"green"},{"text":"|||||||", "color":"gray"}]' -execute if score @s progress matches 0612..0666 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"||||||||||||", "color":"green"},{"text":"||||||", "color":"gray"}]' -execute if score @s progress matches 0667..0722 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"|||||||||||||", "color":"green"},{"text":"|||||", "color":"gray"}]' -execute if score @s progress matches 0723..0777 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"||||||||||||||", "color":"green"},{"text":"||||", "color":"gray"}]' -execute if score @s progress matches 0778..0833 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"|||||||||||||||", "color":"green"},{"text":"|||", "color":"gray"}]' -execute if score @s progress matches 0834..0888 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"||||||||||||||||", "color":"green"},{"text":"||", "color":"gray"}]' -execute if score @s progress matches 0889..0944 run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"|||||||||||||||||", "color":"green"},{"text":"|", "color":"gray"}]' -execute if score @s progress matches 0945.. run data modify entity @e[limit=1, sort=nearest, type=text_display] text set value '[{"text":"||||||||||||||||||", "color":"green"},{"text":"", "color":"gray"}]' diff --git a/data/plateup/functions/recipes/combine/medium_steak.mcfunction b/data/plateup/functions/recipes/combine/medium_steak.mcfunction deleted file mode 100644 index c248234..0000000 --- a/data/plateup/functions/recipes/combine/medium_steak.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -scoreboard players set generic doprog 0 -execute if items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=12] if items block ~ ~-1.5 ~ container.26 emerald[minecraft:custom_model_data=5] run scoreboard players set generic doprog 1 -execute if items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=5] if items block ~ ~-1.5 ~ container.26 emerald[minecraft:custom_model_data=12] run scoreboard players set generic doprog 1 -execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=17] -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/functions/recipes/combine/rare_steak.mcfunction b/data/plateup/functions/recipes/combine/rare_steak.mcfunction deleted file mode 100644 index 6bf5e4a..0000000 --- a/data/plateup/functions/recipes/combine/rare_steak.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -scoreboard players set generic doprog 0 -execute if items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=11] if items block ~ ~-1.5 ~ container.26 emerald[minecraft:custom_model_data=5] run scoreboard players set generic doprog 1 -execute if items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=5] if items block ~ ~-1.5 ~ container.26 emerald[minecraft:custom_model_data=11] run scoreboard players set generic doprog 1 -execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=16] -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/functions/recipes/combine/welldone_steak.mcfunction b/data/plateup/functions/recipes/combine/welldone_steak.mcfunction deleted file mode 100644 index b5a2bc3..0000000 --- a/data/plateup/functions/recipes/combine/welldone_steak.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -scoreboard players set generic doprog 0 -execute if items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=13] if items block ~ ~-1.5 ~ container.26 emerald[minecraft:custom_model_data=5] run scoreboard players set generic doprog 1 -execute if items block ~ ~-1.5 ~ container.0 emerald[minecraft:custom_model_data=5] if items block ~ ~-1.5 ~ container.26 emerald[minecraft:custom_model_data=13] run scoreboard players set generic doprog 1 -execute if score generic doprog matches 1.. run item replace block ~ ~-1.5 ~ container.0 with emerald[minecraft:custom_model_data=18] -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/functions/workstations/bin-tick.mcfunction b/data/plateup/functions/workstations/bin-tick.mcfunction deleted file mode 100644 index f537ce5..0000000 --- a/data/plateup/functions/workstations/bin-tick.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -item replace entity @e[distance=..0.1, sort=nearest, tag=item_display] container.0 from block ~ ~-1.5 ~ container.0 -data modify entity @e[limit=1, sort=nearest, tag=text] text set value '{"text":""}' - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with emerald -execute as @e[distance=..0.1, sort=nearest, tag=interaction] unless score @s progress matches 1000.. run item replace block ~ ~-1.5 ~ container.0 with air -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if dimension the_nether if score @s progress matches 1000.. if data entity @s interaction on target unless items entity @s container.0 * run item replace entity @s container.0 with emerald -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if score @s progress matches 1000.. if data entity @s interaction on target unless items entity @s container.0 * run scoreboard players set @e[distance=..0.1, sort=nearest, tag=interaction] progress 0 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if score @s progress matches 1000.. run data remove entity @s interaction - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] run function plateup:progressbar - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if score @s progress matches 1000.. run return fail - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target if items entity @s container.0 * run scoreboard players add @e[distance=..0.1, sort=nearest, tag=interaction] progress 500 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target if items entity @s container.0 * run item replace entity @s container.0 with air -execute as @e[distance=..0.1, sort=nearest, tag=interaction] run data remove entity @s interaction diff --git a/data/plateup/functions/workstations/counter-tick.mcfunction b/data/plateup/functions/workstations/counter-tick.mcfunction deleted file mode 100644 index 40c40ca..0000000 --- a/data/plateup/functions/workstations/counter-tick.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -item replace entity @e[distance=..0.1, sort=nearest, tag=item] container.0 from block ~ ~-1.5 ~ container.0 -data modify entity @e[limit=1, sort=nearest, tag=text] text set value '{"text":""}' - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction run scoreboard players set @s progress 0 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target run item replace block ~ ~-1.5 ~ container.26 from entity @s container.0 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target run item replace entity @s container.0 with air -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction run function #plateup:combine -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target run item replace entity @s container.0 from block ~ ~-1.5 ~ container.0 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction run item replace block ~ ~-1.5 ~ container.0 from block ~ ~-1.5 ~ container.26 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction run item replace block ~ ~-1.5 ~ container.26 with air -execute as @e[distance=..0.1, sort=nearest, tag=interaction] run data remove entity @s interaction - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if score @s doprog matches 1.. run scoreboard players remove @s doprog 1 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s attack run scoreboard players set @s doprog 5 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] unless score @s doprog matches 0 run function #plateup:counter -execute as @e[distance=..0.1, sort=nearest, tag=interaction] run function plateup:progressbar -execute as @e[distance=..0.1, sort=nearest, tag=interaction] run data remove entity @s attack \ No newline at end of file diff --git a/data/plateup/functions/workstations/crate-tick.mcfunction b/data/plateup/functions/workstations/crate-tick.mcfunction deleted file mode 100644 index bf2d51a..0000000 --- a/data/plateup/functions/workstations/crate-tick.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -item replace entity @e[distance=..0.1, sort=nearest, tag=item] container.0 from block ~ ~-1.5 ~ container.0 - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target unless items entity @s container.0 * run item replace entity @s container.0 from block ~ ~-1.5 ~ container.0 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] run data remove entity @s interaction diff --git a/data/plateup/functions/workstations/fridge-tick.mcfunction b/data/plateup/functions/workstations/fridge-tick.mcfunction deleted file mode 100644 index bf2d51a..0000000 --- a/data/plateup/functions/workstations/fridge-tick.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -item replace entity @e[distance=..0.1, sort=nearest, tag=item] container.0 from block ~ ~-1.5 ~ container.0 - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target unless items entity @s container.0 * run item replace entity @s container.0 from block ~ ~-1.5 ~ container.0 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] run data remove entity @s interaction diff --git a/data/plateup/functions/workstations/stove-tick.mcfunction b/data/plateup/functions/workstations/stove-tick.mcfunction deleted file mode 100644 index d5fd238..0000000 --- a/data/plateup/functions/workstations/stove-tick.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -item replace entity @e[distance=..0.1, sort=nearest, tag=item] container.0 from block ~ ~-1.5 ~ container.0 -data modify entity @e[limit=1, sort=nearest, tag=text] text set value '{"text":""}' - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction run scoreboard players set @s progress 0 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target run item replace block ~ ~-1.5 ~ container.26 from entity @s container.0 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target run item replace entity @s container.0 with air -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction run function #plateup:combine -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction on target run item replace entity @s container.0 from block ~ ~-1.5 ~ container.0 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction run item replace block ~ ~-1.5 ~ container.0 from block ~ ~-1.5 ~ container.26 -execute as @e[distance=..0.1, sort=nearest, tag=interaction] if data entity @s interaction run item replace block ~ ~-1.5 ~ container.26 with air -execute as @e[distance=..0.1, sort=nearest, tag=interaction] run data remove entity @s interaction - -execute as @e[distance=..0.1, sort=nearest, tag=interaction] run function #plateup:stove \ No newline at end of file diff --git a/data/plateup/tags/functions/combine.json b/data/plateup/tags/function/combine.json similarity index 100% rename from data/plateup/tags/functions/combine.json rename to data/plateup/tags/function/combine.json diff --git a/data/plateup/tags/functions/counter.json b/data/plateup/tags/function/counter.json similarity index 100% rename from data/plateup/tags/functions/counter.json rename to data/plateup/tags/function/counter.json diff --git a/data/plateup/tags/functions/stove.json b/data/plateup/tags/function/stove.json similarity index 100% rename from data/plateup/tags/functions/stove.json rename to data/plateup/tags/function/stove.json diff --git a/pack.mcmeta b/pack.mcmeta index 7d80e37..4074460 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,7 +1,6 @@ { "pack": { - "pack_format": 40, - "supported_formats": [34, 41], + "pack_format": 48, "description": [ { "text": "PlateUp!", diff --git a/pack.png b/pack.png index 3fd54bf..361599d 100644 Binary files a/pack.png and b/pack.png differ diff --git a/useful.txt b/useful.txt index 025d60b..72b8996 100644 --- a/useful.txt +++ b/useful.txt @@ -1 +1 @@ -https://wiki.plateupgame.com/ \ No newline at end of file +#https://wiki.plateupgame.com/