Skip to content

Conversation

@LordIdra
Copy link
Contributor

Just a ton of small things both codewise and in-game, there were too many to really split it up into many PRs without completely losing my sanity (sorry). Here is the list of changes. Half of this typed out on 1 hour sleep sorry if no makey sense

  • Fixes yet more references to enriched netherrack that were not changed when it was renamed
  • Move fields to the start of each block class for consistency
  • Store item display stacks as ItemStackBuilder to remove boilerplate
  • Updates blocks to use new blockface methods added in core PR
  • Updates blocks to use new PylonDirectionalBlock design
  • Adds PylonDirectionBlock to a lot of blocks which should have it but don't
  • Makes diesel machines fully respect their placed direction
  • Adds diesel / hydraulic fluid buffer settings and placeholders to all diesel / hydraulic machines
  • Adds fluid display bars to all hydraulic machine WAILAs
  • Adds displays to creative fluid source which change material to indicate the fluid
  • Adds fluid type to creative fluid source WAILA
  • Removes deltaSeconds usage in line with companion core PR
  • Makes settings not static where they don't need to be static
  • Changes some fluid blocks (eg filter, valve) to place in a more consistent orientation (input facing towards player)
  • Changes hydraulic / diesel machines to consume hydraulic fluid / diesel gradually, instead of all in one go (where practical)
  • Pretty much rewrites strainer to take advantage of all the new stuff
  • Changes fluid blocks to make use of fluidTickInterval as in companion core PR
  • Makes coal-fired purification tower use a registry instead of reading from settings
  • Adds WAILA override to hydraulic core drill hatch casings
  • Made hydraulic grindstone turner not a multiblock
  • Make hydraulic mixing attachment not a multiblock
  • Fix hydraulic hammer head going down too far
  • Made hydraulic press piston not a multiblock
  • Removed pylon craft events as per companion core PR
  • Make mixing pot not a multiblock
  • Reworked hammer logic to be a bit less cursed and not consume and then drop the items it doesn't use (this looked really awkward with the hammer press)
  • Lots of other small code style / formatting changes to make everything consistent

Tested pretty much all blocks (multiple times) but have likely introduced plenty of bugs due to the scope of the changes :(

Pretty much ignored smeltery here, still can't conjure the courage to go and fight that particular boss battle

@LordIdra LordIdra changed the title Idras little fixes [ref:idras-little-fixes] Idras little fixes Dec 26, 2025
private double rotation;
@Setter
private boolean locked;
public boolean locked;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why has this been made public?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be useful to be able to get the value from outside of the pedestal

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not the getter/setter then

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not public? We use public basically everywhere so I just made it public. I don't think it matters whether it's public or has @Getter @Setter especially in this context

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Consistency
  2. Best practices
  3. What else do we use lombok for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we really going to argue about this? Does it really matter? Does it affect anything? Most fields across base are just public in case someone wants to access something for some unknown reason.

Copy link
Contributor Author

@LordIdra LordIdra Dec 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like I'll change it if you insist but it just feels a little like you picked the smallest, most insignificant possible thing from this PR to comment on XD

@Seggan
Copy link
Member

Seggan commented Dec 27, 2025

I've taken the liberty to de-delta the smeltery in my own PR

@LordIdra
Copy link
Contributor Author

I've taken the liberty to de-delta the smeltery in my own PR

Do you want me to remove the changes I made here then?

@Seggan
Copy link
Member

Seggan commented Dec 27, 2025

Yeah I've changed it more comprehensively

@LordIdra
Copy link
Contributor Author

Ok I'm gonna have to keep the changes since I've removed deltaSeconds entirely in core, so this won't compile in that case. Is it OK if we keep them, and then you merge this PR (I'm assuming this PR will be merged into master before yours) into your PR, or just override my changes completely?

@LordIdra LordIdra requested a review from Seggan December 28, 2025 23:15
@Seggan
Copy link
Member

Seggan commented Dec 29, 2025

Yeyeye ofc

@LordIdra LordIdra merged commit bde12b4 into moar-diesel-thingies Dec 30, 2025
1 check passed
@LordIdra LordIdra deleted the idras-little-fixes branch December 30, 2025 12:53
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.

3 participants