-
Notifications
You must be signed in to change notification settings - Fork 204
Port Singleblock Recipemap Machines + Generators to MUI2 #2808
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
base: master
Are you sure you want to change the base?
Conversation
d417cfc to
c35a8d2
Compare
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.
Did a first look through the code, did not test ingame.
| * @return this | ||
| */ | ||
| @Deprecated | ||
| @ApiStatus.ScheduledForRemoval(inVersion = "2.9") |
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.
Isn't our next release going to be 2.9? Probably ought to schedule removal for 2.10 or so.
use builder consumer
add a few more overloads
update as many singleblock machines to mui2
spotless
fix special texture use GTFluidSlot instead of FluidSlot use IDrawable.of() for slot overlays
set max inputs before ui build split overlay maps into Int2Obj maps pull pos out of make slot methods
simplify usesMui2 checks
add todos for fluid slot
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 fluid amount overlay on slots seems to be slightly adjusted from what it was before. Was that something touched in this PR, or am I just crazy?
src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java
Outdated
Show resolved
Hide resolved
src/main/java/gregtech/common/metatileentities/steam/boiler/SteamLavaBoiler.java
Show resolved
Hide resolved
src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java
Outdated
Show resolved
Hide resolved
src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java
Outdated
Show resolved
Hide resolved
src/main/java/gregtech/api/metatileentity/SimpleGeneratorMetaTileEntity.java
Outdated
Show resolved
Hide resolved
address todo
add debug names clarify some variable names calculate the grid size for both items and fluids
|
Painting a machine doesn't change its UI color and the |
|
Also, we think that we should implement the side column, like in multiblocks and hatches, for clearing out some space in the GUI. See the discussion starting here: https://discord.com/channels/701354865217110096/904846945095385138/1408285204795359292 |
use qualified references for old gui class references
improve overlay map
fix generator ui
remove `+ 9`
move special machine widgets around
construct panel in map ui adjust height to remove empty space
add heat tooltip + lang in SteamBoiler add todo for SteamMetaTileEntity
What
Ports every singleblock Recipemap machine and generator, along with steam machines/boilers, to MUI2
Built off of the
sb-recipe-map-muibranchImplementation Details
adds
usesMui2()to SimpleGeneratorMTE, SimpleMachineMTE, and SteamMTE to defer to recipe map ui'susesMui2()steam boilers ui is manually constructed, and therefore ported directly to Mui2
slot overlays for mui2 are stored in an Int2Obj map, with the key being the slot index
adds
RecipeProgressWidgetto allow for JEI searchingadds
RecipeMapUIBuilderfor building the mui2 slot overlaysdeprecate old mui code and methods
Outcome
the last set of uis should be ported to mui2