Skip to content

Commit

Permalink
Now uses a mod to add custom dummy items, this is hopefully temporary…
Browse files Browse the repository at this point in the history
… but will speed up development drastically.
  • Loading branch information
skykittenpuppy committed Aug 20, 2024
1 parent c99bfe1 commit 72116ca
Show file tree
Hide file tree
Showing 88 changed files with 172 additions and 343 deletions.
8 changes: 8 additions & 0 deletions .spyglassrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"env": {
"gameVersion": "1.21.1"
},
"lint": {
"idOmitDefaultNamespace": false
}
}
170 changes: 0 additions & 170 deletions PlateUp Resource-Pack/assets/minecraft/models/item/emerald.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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"
}
}
Original file line number Diff line number Diff line change
@@ -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": [
{
Expand Down Expand Up @@ -68,4 +68,4 @@
"translation": [0, 0, 7]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -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"
}
}

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified PlateUp Resource-Pack/pack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions data/plateup/function/progressbar.mcfunction
Original file line number Diff line number Diff line change
@@ -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"}]'
6 changes: 6 additions & 0 deletions data/plateup/function/recipes/combine/medium_steak.mcfunction
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions data/plateup/function/recipes/combine/rare_steak.mcfunction
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 72116ca

Please sign in to comment.