Skip to content

[1.21.1] Implement Refabricated Skillet tweaks.#1062

Merged
vectorwing merged 3 commits intovectorwing:dev-1.21.1/1.3from
ChrysanthCow:feat/refabricated-skillet-1.21
Mar 30, 2026
Merged

[1.21.1] Implement Refabricated Skillet tweaks.#1062
vectorwing merged 3 commits intovectorwing:dev-1.21.1/1.3from
ChrysanthCow:feat/refabricated-skillet-1.21

Conversation

@ChrysanthCow
Copy link
Copy Markdown
Contributor

This Pull Request contains two major changes to the skillet item.

If you would like to request postponement (1.3 probably?) or removal of Skillet Flipping and just have the progress bar, I'd be happy to make a new PR.

Skillet Progress Bar

The Skillet now displays a progress bar instead of its durability whilst cooking.

This is a relatively light change, all things considered, and should not break anything.

java_qjZ4zsHjg1

Skillet Flipping

Skillet Flipping has been reworked heavily ever since #911.
The Skillet now also moves, the flipped food is only flipped 180 degrees rather than 360 degrees, and the movements are faster and less drastic in comparison to before.

You may activate this by pressing the Attack key whilst cooking with a skillet.

This is a breaking change on the user's end, as it adds a network handler so a packet may be sent to activate the skillet flip.

In first person:

java_pd80GzSjP6

In third person:

java_sjYsmVH7AX

@vectorwing
Copy link
Copy Markdown
Owner

Hello! Thanks for the patience. 🙏

I have finally finished porting the 1.3 update to 1.21.1, and it's on the dev-1.21.1/1.3 branch. As it contains the 1.20.1 implementation in there, this could cause conflicts with this PR.

Which strategy would you prefer here: should I comment out/delete the 1.20.1 code relevant to this PR, or leave it as-is for you to modify?

I'll await your decision before doing anything. 👍

@vectorwing
Copy link
Copy Markdown
Owner

Alternatively, I can also use this PR as a reference to manually update the implementations on this new branch.

@ChrysanthCow
Copy link
Copy Markdown
Contributor Author

ChrysanthCow commented Mar 26, 2026

Hello! Thanks for the patience. 🙏

I have finally finished porting the 1.3 update to 1.21.1, and it's on the dev-1.21.1/1.3 branch. As it contains the 1.20.1 implementation in there, this could cause conflicts with this PR.

Which strategy would you prefer here: should I comment out/delete the 1.20.1 code relevant to this PR, or leave it as-is for you to modify?

I'll await your decision before doing anything. 👍

I'd honestly leave it as is for me to modify, I can quite easily do a merge commit.

@ChrysanthCow ChrysanthCow changed the base branch from 1.21 to dev-1.21.1/1.3 March 26, 2026 07:22
@ChrysanthCow
Copy link
Copy Markdown
Contributor Author

I have changed the base branch, I will get to working on this tomorrow.

…bricated-skillet-1.21

# Conflicts:
#	src/main/java/vectorwing/farmersdelight/client/event/KeybindEvents.java
#	src/main/java/vectorwing/farmersdelight/common/item/SkilletItem.java
@ChrysanthCow
Copy link
Copy Markdown
Contributor Author

aaaaand merged!

@vectorwing
Copy link
Copy Markdown
Owner

Thanks for the changes! Looks ready to merge. 👍

@vectorwing vectorwing merged commit 174e2e7 into vectorwing:dev-1.21.1/1.3 Mar 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants