Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor, cleanup, API, bugfixes #19

Open
wants to merge 34 commits into
base: master
Choose a base branch
from

Conversation

fluxionary
Copy link

list of changes:

  • remove dead code (e.g. the "chests")

  • refactor into smaller files, clean up (fixes Various issues/typos #16, fixes Crash to menu when repairing a tool with no wear #18)

  • remove hard dependencies on minetest_game (fixes General error in mineclone 2 #14, fixes From my Server #17)

  • many more settings

  • unified public/private/protected UI and API

  • tried to maintain backward compatibility

  • stamina integration (if present)

  • unified_inventory integration (e.g. threshing recipes)

  • anvil can optionally (via minetest.conf) work as it did before (via a formspec) or by placing tools directly "on" it via right-click as in the stand-alone anvil mod

  • anvil HUD will no longer get stuck on-screen occasionally

  • anvil repair amount is configurable

  • barrel can now store fluids

  • API to allow more fluids to be registered w/ the barrel

  • API to register feldweg variants of nodes

  • use player_monoids to manage sitting/lying down physics (if it is present) (fixes Fix getting stuck on benches. #15)

  • use player_api to manage sitting/lying down animations, if it is present

  • pitchfork no longer clones dirt (fixes pitchfork clones dirt #11 and Fix dirt duplication with the pitchfork #12)

  • renamed handmill to quern

  • quern particles and noises

  • quern no longer spams chat (its state is visible as infotext)

  • threshing floor now has an API to register new recipes

  • threshing floor particles and noises

  • threshing floor no longer spams chat (its state is visible as infotext)

  • tree-trunk well can no longer get stuck in an unusable state

  • tree-trunk well now has particles and sound

probably some other stuff i'm forgetting.

@fluxionary
Copy link
Author

offtopic but it seems like Sokomine won't update this or even merge your pull request can you make a Cottages (flux fork) package on ContentDB instead? would be really nice :-)

possibly. i was hoping to avoid adopting yet another big mod, i'll ask soko about this the next time i see her.

@fluxionary
Copy link
Author

@Sokomine just a heads up, if you can't figure out how to log into github and start reviewing this by 2023-02-01, i will do a hard fork.

@Niklp09
Copy link

Niklp09 commented Jan 21, 2023

@fluxionary
Reproduce: place a block on a straw mat

2023-01-21 09:15:50: ERROR[Main]: ServerError: AsyncErr: Lua: Runtime error from mod 'default' in callback item_OnPlace(): ...etest-5.6.1/bin/../mods/cottages/modules/straw/nodes.lua:44: attempt to call field 'sleep_in_bed' (a nil value)
2023-01-21 09:15:50: ERROR[Main]: stack traceback:
2023-01-21 09:15:50: ERROR[Main]:     ...etest-5.6.1/bin/../mods/cottages/modules/straw/nodes.lua:44: in function 'on_rightclick'
2023-01-21 09:15:50: ERROR[Main]:     ...nik/minetest/minetest-5.6.1/bin/../builtin/game/item.lua:308: in function <...nik/minetest/minetest-5.6.1/bin/../builtin/game/item.lua:301>

@fluxionary
Copy link
Author

Reproduce: place a block on a straw mat

it looks like sleeping on a straw mat wasn't working at all, should be fixed now. would you mind retesting? thank you :)

@Niklp09
Copy link

Niklp09 commented Jan 23, 2023

would you mind retesting? thank you :)

works:)

@fluxionary
Copy link
Author

apparently i needed to rebase, which has been done.

@Sokomine
Copy link
Owner

Sokomine commented Feb 3, 2023

Sorry that it took me so long to reply! I had trouble accessing my repositories here (I hate 2FA).

It may in the end only be possible to merge part of this. Some improvements are great, while others pose a problem.

I tried to avoid external dependencies as far as possible. With contentdb, it's a little less tricky than it used to be in the past, but still - too many dependencies may prevent people from using the mod. It's understandable that one wants to use libraries, but libaries still are not available by default. These are even two dependencies, and none of them was ever introduced on the forum it seems. Furthermore, the license of these mods may make server owners reluctant to use the mod.

There's an outright problem with the barrels. Sure, I never finished the formspec and functionality - which often confused players who rightfully expected there to be something - which wasn't there. With this PR, you can fill barrels with buckets of water. A lot of water fits in. And then...they're partially or fully filled. You can fill buckets with the water from the barrel now. But if you think that's too dedious a work - you have to cry for someone with WorldEdit priv to get rid of that nasty barrel that now refuses to be digged unless each bucket of water is taken out manually again.

Already placed barrels on the map end up in an undefined stage and can't be removed anymore either. At least they can be made public and digged afterwards.

Copy link
Owner

@Sokomine Sokomine left a comment

Choose a reason for hiding this comment

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

That's a big No from me to this part of the PR (the "ladders as attached nodes" part).

Attached nodes are a pain for builders and cause more griefing than anything else.

@fluxionary
Copy link
Author

dependency of futil

removed

That's a big No from me to this part of the PR (the "ladders as attached nodes" part).

this was already removed after you provided me w/ that schema

if you think that's too tedious a work - you have to cry for someone with WorldEdit priv to get rid of that nasty barrel that now refuses to be digged unless each bucket of water is taken out manually again

how would you like the barrels to work now? i'm open to suggestions.

Already placed barrels on the map end up in an undefined stage and can't be removed anymore either. At least they can be made public and digged afterwards.

i thought i'd tested that thoroughly, i'll have to see what's going on.

fluxionary and others added 3 commits August 23, 2023 10:34
* compatibility w/ broken tools

* use staminoid if available

* right, no fmod

* don't include carts texture when carts is not available

* change rope recipe to avoid conflict w/ ethereal

* change barrel recipe to avoid conflict w/ wine

* staminoid integration: use more stamina

* change recipe for glass pane to avoid conflict w/ xdecor

* tree trunk well: compatibility w/ bucket redo

* anvil: more stamina usage

* anvils: more expensive, and not movable

* allow filling glasses of water when using bucket redo

* get safe short description when reporting about tool on anvil

* make sure slabs are registered when using the moreblocks 3.0
* Replace deprecated `set_physics_override()` calls

* Run stylua to fix CI
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants