feat: add minimum stock to the postbox #10651
Conversation
|
|
I wouldn't touch this behavior. Otherwise level 0 huts could start having min stocks which is not allowed. I'd rather create a specific implementation of the min stock module and have a separate module producer. Use this new implementation for the postbox only, and give a way to change the implementation for getting the limit. |
src/main/java/com/minecolonies/core/colony/buildings/modules/MinimumStockModule.java
Outdated
Show resolved
Hide resolved
src/main/java/com/minecolonies/core/client/gui/WindowPostBox.java
Outdated
Show resolved
Hide resolved
This only uses 1 if the max hut level = 0, which AFAIK is only stash and postbox? not that stash would get minimum stock |
mcmanustfj
force-pushed
the
feature/postbox-minimum-stock
branch
from
3fe3bbc to
97ee572
Compare
mcmanustfj
force-pushed
the
feature/postbox-minimum-stock
branch
from
97ee572 to
12f0546
Compare
| final Random random = new Random(building.getID().hashCode()); | ||
| int offset = 0; | ||
| final int iconXOffset = xOffset+5; |
| @@ -32,12 +33,19 @@ public abstract class AbstractModuleWindow extends AbstractWindowSkeleton implem | |||
| * @param building {@link AbstractBuildingView}. | |||
| * @param res the resource String. | |||
| */ | |||
|
|
|||
There was a problem hiding this comment.
Remove newline (docs should be attached to class)
| public AbstractModuleWindow(final IBuildingView building, final String res) | ||
| { | ||
| super(res); | ||
| this.buildingView = building; | ||
| placeWindowModuleViews(this, building, -20, this.mc); | ||
|
|
| placeWindowModuleViews(this, building, -20, this.mc); | ||
|
|
||
| } | ||
| // need mc as its own arg because it's protected in Pane |
There was a problem hiding this comment.
Add newline between methods
|
|
||
| } | ||
| // need mc as its own arg because it's protected in Pane | ||
| static void placeWindowModuleViews(AbstractWindowSkeleton window, final IBuildingView building, int xOffset, Minecraft mc) { |
There was a problem hiding this comment.
Give methods the correct access modifier, if this is intended to be called by subclasses only, it should be protected
|
|
||
| return (int) (building.getBuildingLevel() * STOCK_PER_LEVEL * increase); | ||
| return (int) (buildingLevelOr5 * STOCK_PER_LEVEL * increase); |
There was a problem hiding this comment.
Again, please remove this change and override getBuildingLevel() of the postbox instead
|
I think after discussion in discord, it was decided that y'all don't want this implemented without changing the layout and adding an upgradable tier for the postbox or similar, which I'm not willing to do at this time. I welcome someone else picking this up, though |
Testing
Structural notes that might need changed:
As noted in discord, I copied a bunch of code, which doesn't feel great.
WindowPostBox extends AbstractWindowRequestTree extends AbstractWindowSkeleton, but the existing code for rendering those tabs is inAbstractModuleWindow extends AbstractWindowSkeleton. I copied the code to WindowPostBox because I don't see a good way of refactoring the inheritance to make it work without multiple inheritance (which isn't in Java)The Minimum Stock module gets the amount of minimum stocks based on the hut level. I added a check to use '1' if the building
getMaxBuildingLevel() == 0.Review please