feat: abstract stove by Lordfirespeed · Pull Request #1265 · vectorwing/FarmersDelight

Lordfirespeed · 2026-03-28T16:34:10Z

No description provided.

Lordfirespeed · 2026-03-28T16:35:25Z

If you'd prefer I can rebase onto the 1.21 branch and target that. Let me know.

Edit: I have also rebased onto 1.21, I can cherry-pick any revisions from here onto there and it should be ready to go.

Lordfirespeed · 2026-03-29T18:21:24Z

I've only just noticed that indentation is buggered.

vectorwing

Alright, I did a first pass over the code, and found a few inconsistencies.

The code works when testing locally, and I can see you fixed the issue where the Stove won't spill its contents when blocked while unlit, which is good.

I can do a second pass after the current comments are addressed. 👍

vectorwing · 2026-03-30T21:44:09Z

+		super.stepOn(level, pos, state, entity);
+	}
+
+	protected void burnEntitySteppingOnStove(Level level, BlockPos pos, BlockState state, Entity entity) {


Not sure if this method needs to be separate, as it contains almost all of the code that would go into stepOn.

In the original version of the code, the base.stepOn() was invoked at the end of the method, but I wanted to use early-return pattern to make this method easier to read.

To keep the order of invocation the same and use early return pattern, I had to extract this method

vectorwing · 2026-03-30T23:27:43Z

-				inventoryChanged();
-				return true;
+	private void addSmokeParticles() {
+		assert this.level != null;


particleTick has access to the client level, so passing it to this method would eliminate the need for this assert. Also, IIRC, assert actually throws an exception when it's null; perhaps just returning early would be best in such cases.

assertions are not enabled by default

the assertion is here to make it clear to developers reading the code that the method must only be invoked in contexts where the level is definitely not null

vectorwing · 2026-03-30T23:40:18Z

+	}
+
+	private void cookAndOutputItems() {
+		assert this.level != null;


assert should be avoided in production code, as it throws exceptions on fail.
Here, it may be better to just return when null instead.

Assertions are not enabled by default
Edit: I verified this, assert false didn't throw any exception at runtime
of course, passing a null value to the level parameter of whatever function needs it would probably cause an exception, but the point of the assertion is to ensure that this.level is actually never null because developers know they must only call the function when this.level is definitely not null

As previous: this is primarily to signal to developers reading the code that the method must be invoked only when the level is definitely not null

vectorwing · 2026-04-06T16:13:23Z

I added a tiny change to the Stove, where it makes a sound when placing items on the grill. That might cause a small conflict, sorry about that. 😅

e.g. don't burn items!

…o `tab`

Lordfirespeed · 2026-04-07T18:11:37Z

Ready for second pass

vectorwing

Second pass done. Aside from a comment and a quick question, everything here seems in order. You managed to organize one of the oldest bits of code in FD, it's looking pretty tidy! 👍

I think we're ready for a merge. I can address the comment below on my own later, unless you'd like to.

vectorwing · 2026-04-09T16:08:42Z

+
+		if (heldStack.canPerformAction(ToolActions.SHOVEL_DIG)) {
+			if (!level.isClientSide()) {
+				level.levelEvent(null, 1009, pos, 0);


For level events, it would be more readable if we used the LevelEvent static fields directly, so that others reading the code know that 1009 is SOUND_EXTINGUISH_FIRE.

vectorwing · 2026-04-09T16:11:27Z

+
+		var newState = state.setValue(LIT, false);
+		level.setBlock(pos, newState, 11);
+		level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(entity, newState));


Question: why is this game event being sent twice?

vectorwing · 2026-04-13T20:32:41Z

+		return tryToPlaceFoodItem(state, level, pos, player, hand, hit);
+	}
+
+	protected InteractionResult tryToIgnite(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {


Igniting currently lacks the gameEvent call, so it doesn't trigger sculk sensors. Might be worth adding here too.

specifically, send all sounds from the server, don't play any local sounds

since extinguish does already

Lordfirespeed mentioned this pull request Mar 28, 2026

Abstract the Stove so it can be subclassed #807

Closed

vectorwing requested changes Mar 30, 2026

View reviewed changes

Lordfirespeed added 17 commits April 7, 2026 19:00

initial go at abstract stove classes

0a4a571

remove unused imports

61442ea

remove impl-specific particle stuff

bb95997

implement Clearable in the abstract class

e5fc48c

remove unused getGrillingArea

6b6ab1d

stove classes extend corresponding abstract classes

8fdf8f3

adjust default stove renderer to handle generic stove entity

f65b83e

fix: only burn living entities

4a5b0c9

e.g. don't burn items!

add editorconfig rule matching java files which sets indent_style t…

9da3c01

…o `tab`

style: standardise indents to use tabs instead of spaces

6fd1054

style: invert if condition and remove braces

3b1f0a1

style: invert if condition and remove braces

eebdad6

fix: water bucket tag has moved

8ad5c96

move suppress of deprecation warnings to AbstractStoveBlock

4adac6f

move addSmokeParticles from private to public

82620ed

remove unused field recipeType

e6368b1

revert to using ItemStackHandler

b71082d

Lordfirespeed force-pushed the feature/fd1.3-abstract-stove branch from cd04864 to b71082d Compare April 7, 2026 18:01

Lordfirespeed added 2 commits April 7, 2026 19:03

rewrite tryToPlaceFoodItem logic using early-return

9cba550

fix: addSmokeParticles needed adjusting for ItemStackHandler

ec70e57

vectorwing reviewed Apr 9, 2026

View reviewed changes

vectorwing reviewed Apr 13, 2026

View reviewed changes

Lordfirespeed added 2 commits April 13, 2026 22:09

fix: use SOUND_EXTINGUISH_FIRE const instead of literal 1009

9a334a7

fix: only trigger gameEvent once on extinguish

a8d5704

Lordfirespeed added 5 commits April 13, 2026 22:51

add gameEvent call when ignited

c0663f9

add ignite method to abstract stove entity, for subtypes to override

61851c2

fix: standardise how sounds are played

43cb648

specifically, send all sounds from the server, don't play any local sounds

replace isCreative checks with instabuild ability checks

9a226cd

ignition should probably also trigger a block update

3de71d0

since extinguish does already

vectorwing merged commit 2f49288 into vectorwing:dev/1.3 Apr 14, 2026

Lordfirespeed mentioned this pull request Apr 14, 2026

feat: abstract stove (1.21) #1273

Merged

Conversation

Lordfirespeed commented Mar 28, 2026

Uh oh!

Lordfirespeed commented Mar 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Lordfirespeed commented Mar 29, 2026

Uh oh!

vectorwing left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vectorwing Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Lordfirespeed Mar 31, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

vectorwing Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Lordfirespeed Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vectorwing Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Lordfirespeed Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vectorwing commented Apr 6, 2026

Uh oh!

Lordfirespeed commented Apr 7, 2026

Uh oh!

vectorwing left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vectorwing Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

vectorwing Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

vectorwing Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Lordfirespeed commented Mar 28, 2026 •

edited

Loading

vectorwing Mar 30, 2026 •

edited

Loading

Lordfirespeed Mar 31, 2026 •

edited

Loading

Lordfirespeed Mar 31, 2026 •

edited

Loading

vectorwing left a comment •

edited

Loading