-
Notifications
You must be signed in to change notification settings - Fork 19
Implement the missing NEI integration pats, aswell as fix some bugs i found caused by missing code from 1.12.2 #37
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
Conversation
there were some issue related to porting from 1.12.2 i encountered while using MUI2, which i fix here
|
discord username: miya_kopie |
|
i think the interface needs doc/comments, but i dont really know how to write those good |
brachy84
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure about the NEI parts. You need to adjust the code style. Use a space after ìf` and around operators. The opening { goes on the same line as the method declaration. Avoid multiple empty lines. Always use { } in if statements if they are multiline. Use lower camel case for field names (at StackPositioner). You added line breaks to some places for no reason.
src/main/java/com/cleanroommc/modularui/value/sync/FluidSlotSyncHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/com/cleanroommc/modularui/widgets/slot/ModularCraftingSlot.java
Show resolved
Hide resolved
I come from c#, so i forgot to follow the java coding style |
|
Is this better? |
It's easier to sync with upstream this way. |
You barely did anything i asked for. |
i see |
i removed the line breaks, and put the { on the same line as the if, and used camel case, not sure what else there is? guess the spaces around operators? |
src/main/java/com/cleanroommc/modularui/integration/nei/GuiContainerWrapperOverlayHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/com/cleanroommc/modularui/integration/nei/GuiContainerWrapperStackPositioner.java
Show resolved
Hide resolved
src/main/java/com/cleanroommc/modularui/integration/nei/INEIRecipeTransfer.java
Show resolved
Hide resolved
src/main/java/com/cleanroommc/modularui/integration/nei/NEIModularUIConfig.java
Outdated
Show resolved
Hide resolved
src/main/java/com/cleanroommc/modularui/mixins/late/nei/ModularIdentMixin.java
Outdated
Show resolved
Hide resolved
src/main/java/com/cleanroommc/modularui/utils/fluid/FluidInteractions.java
Outdated
Show resolved
Hide resolved
src/main/java/com/cleanroommc/modularui/value/sync/FluidSlotSyncHandler.java
Outdated
Show resolved
Hide resolved
src/main/java/com/cleanroommc/modularui/widgets/slot/ModularCraftingSlot.java
Show resolved
Hide resolved
…e, but i didnt place that one)
|
@brachy84 can you re check the pr? thanks |
src/main/java/com/cleanroommc/modularui/mixins/late/nei/ModularIdentMixin.java
Outdated
Show resolved
Hide resolved
src/main/java/com/cleanroommc/modularui/mixins/late/nei/RecipeInfoMixin.java
Outdated
Show resolved
Hide resolved
|
I'll review in a couple hours once i'm on pc. |
|
yeah thats okay |
|
also, could you clarify what exactly this PR fixes so i can better justify the code and what it's doing? |
|
the fix for fluid slot was making sure it doesnt drain x fluid from fluid container if it doesnt have that amount |
src/main/java/com/cleanroommc/modularui/value/sync/FluidSlotSyncHandler.java
Show resolved
Hide resolved
|
I haven't found any issues with the code, but this should probably get approved by a mui2 dev, since it does change some behaviour |
brachy84
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The mui part looks fine. No idea about the nei part
Most of the changed code is commented with reasons why i changed it, the NEI is probably not the best implementation, but its working and i think its good