Team-EnderIO/EnderIO
1
0
Fork 0
Code Issues 114 Pull requests 13 Projects Releases 79 Packages Wiki Activity Actions

GUI Rewrite #715

Merged
Rover656 merged 21 commits from chore/gui-rewrite into dev/1.21 2024-07-07 20:25:54 +00:00
Conversation 2 Commits 21 Files changed 347 +3722 -2352
Rover656 commented 2024-06-26 21:25:06 +00:00 (Migrated from github.com)
Copy link

Description

This PR rewrites the code menu and screen logic across the entire mod. Tidying up legacy code, breaking all of our texture atlases up into sprites and starting down the path of our GUI redesign (starting with the Alloy Smelter).

I am creating this draft PR so that I can keep my TODO list handy.

TODO

  • Finish splitting up the GUI widget assets
  • Fix the IO overlay blocking tooltips - this will need to be a better overlay system in our base screen impls.
  • Re-add IO config button to all screens.
  • Tidy up the custom widgets across the machines module
  • Fully test all screens still work as expected.
  • Add hovered variant of the IO config button and lay groundwork for the hovered variant of the enum icons.

Breaking Changes

All menus and screens have been affected API wise, however no machine implementations have been changed, nor public APIs.

Checklist

  • My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you).
  • I have made corresponding changes to the documentation.
  • My changes are ready for review from a contributor.
# Description This PR rewrites the code menu and screen logic across the entire mod. Tidying up legacy code, breaking all of our texture atlases up into sprites and starting down the path of our GUI redesign (starting with the Alloy Smelter). I am creating this draft PR so that I can keep my TODO list handy. <!-- If you're submitting a Draft PR, consider providing a TODO list using checkboxes --> # TODO - [ ] Finish splitting up the GUI widget assets - [x] Fix the IO overlay blocking tooltips - this will need to be a better overlay system in our base screen impls. - [ ] Re-add IO config button to all screens. - [ ] Tidy up the custom widgets across the machines module - [ ] Fully test all screens still work as expected. - [ ] Add hovered variant of the IO config button and lay groundwork for the hovered variant of the enum icons. # Breaking Changes All menus and screens have been affected API wise, however no machine implementations have been changed, nor public APIs. <!-- For drafts, fill this in as you go; if you are leaving draft, make sure these are all complete. --> # Checklist - [ ] My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you). - [ ] I have made corresponding changes to the documentation. - [ ] My changes are ready for review from a contributor. <!-- Thanks to: https://embeddedartistry.com/blog/2017/08/04/a-github-pull-request-template-for-your-projects/ for the building blocks of this template -->
github-actions[bot] (Migrated from github.com) reviewed 2024-06-26 21:25:37 +00:00
src/core/java/com/enderio/core/common/menu/ArmorSlot.java
@ -0,0 +1,40 @@
package com.enderio.core.common.menu;
github-actions[bot] (Migrated from github.com) commented 2024-06-26 21:25:36 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck> reported by reviewdog 🐶
Using the '.' form of import should be avoided - net.minecraft.world.inventory.InventoryMenu..

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>Using the '.*' form of import should be avoided - net.minecraft.world.inventory.InventoryMenu.*.
src/machines/java/com/enderio/machines/client/gui/screen/AlloySmelterScreen.java
github-actions[bot] (Migrated from github.com) commented 2024-06-26 21:25:36 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.coding.MissingSwitchDefaultCheck> reported by reviewdog 🐶
switch without "default" clause.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.coding.MissingSwitchDefaultCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>switch without "default" clause.
src/machines/java/com/enderio/machines/client/gui/screen/base/MachineScreen.java
@ -0,0 +1,54 @@
package com.enderio.machines.client.gui.screen.base;
github-actions[bot] (Migrated from github.com) commented 2024-06-26 21:25:36 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck> reported by reviewdog 🐶
Missing package-info.java file.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>Missing package-info.java file.
src/machines/java/com/enderio/machines/client/gui/widget/NewProgressWidget.java
@ -0,0 +1,103 @@
package com.enderio.machines.client.gui.widget;
github-actions[bot] (Migrated from github.com) commented 2024-06-26 21:25:36 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck> reported by reviewdog 🐶
Each variable declaration must be in its own statement.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>Each variable declaration must be in its own statement.
src/machines/java/com/enderio/machines/common/menu/base/PoweredMachineMenu.java
@ -0,0 +1,41 @@
package com.enderio.machines.common.menu.base;
github-actions[bot] (Migrated from github.com) commented 2024-06-26 21:25:36 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck> reported by reviewdog 🐶
Missing package-info.java file.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>Missing package-info.java file.
src/main/java/com/enderio/base/client/gui/icon/EIOEnumIcons.java
@ -0,0 +1,33 @@
package com.enderio.base.client.gui.icon;
github-actions[bot] (Migrated from github.com) commented 2024-06-26 21:25:36 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck> reported by reviewdog 🐶
'static' modifier out of order with the JLS suggestions.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>'static' modifier out of order with the JLS suggestions.
github-actions[bot] (Migrated from github.com) commented 2024-06-26 21:25:36 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck> reported by reviewdog 🐶
'static' modifier out of order with the JLS suggestions.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>'static' modifier out of order with the JLS suggestions.
github-actions[bot] (Migrated from github.com) commented 2024-06-26 21:25:36 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck> reported by reviewdog 🐶
'static' modifier out of order with the JLS suggestions.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>'static' modifier out of order with the JLS suggestions.
github-actions[bot] (Migrated from github.com) commented 2024-06-26 21:25:36 +00:00
Copy link

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck> reported by reviewdog 🐶
'static' modifier out of order with the JLS suggestions.

🚫 **[checkstyle]** <com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck> <sub>reported by [reviewdog](https://github.com/reviewdog/reviewdog) :dog:</sub><br>'static' modifier out of order with the JLS suggestions.
Rover656 commented 2024-07-07 15:53:48 +00:00 (Migrated from github.com)
Copy link

In the interest of getting the project restructuring done - I am going to re-enable IO Config on all screens and then merge this in. All other outstanding work will be done afterwards :)

In the interest of getting the project restructuring done - I am going to re-enable IO Config on all screens and then merge this in. All other outstanding work will be done afterwards :)
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Area-Assets

   
Area-Backend

Backend work not usually visible to players.

  
Area-Conduits

Everything involving conduits

  
Area-Datapacks

   
Area-Lang

   
Area-Mod Compat

   
Area-Parity

1.12.2 missing features

  
Area-Rendering

Rendering code, might be shaders specific or general.

  
Good first issue

   
MC-1.19.2

   
MC-1.20.1

   
MC-1.20.4

   
MC-1.20.6

   
MC-1.21

   
MC-1.21.1

   
Modtoberfest

   
P-0-High

High priority, crash/breaking.

  
P-1-Medium

Medium priority. Potentially deleting items or breaking functionality.

  
P-2-Low

Low priority. Not hurting anyone, just annoying.

  
Status-Awaiting Response

Waiting for OP to respond

  
Status-Behind-Flag

This change is available but is placed behind a feature flag.

  
Status-Blocked

Blocked by a specific issue or protocol.

  
Status-Cannot Reproduce

   
Status-Duplicate

This issue or pull request already exists

  
Status-Help Wanted

We need some help to try and track this thing down..

  
Status-Incomplete Report

   
Status-Invalid

This doesn't seem right

  
Status-Needs LTS Backport

Fixed in latest but requires LTS backport.

  
Status-Needs Updating

Needs updating to a newer Minecraft version.

  
Status-Stale

This may not be updated by the OP any further.

  
Status-To Implement

   
Status-Triage

A Triage Member should take a look at this

  
Status-Wontfix

This will not be worked on

  
Status-Wontmerge

This PR won't be merged, but is left now for reference of ongoing or future works.

  
Type-Backport

   
Type-Bug

There is a problem.

  
Type-Documentation

Improvements or additions to documentation

  
Type-Enhancement

New feature or enhancement to existing feature.

  
Type-Question

Further information is requested

  
Type-RFC

Request for comments.

  
Type-Suggestion
No labels
Area-Assets
Area-Backend
Area-Conduits
Area-Datapacks
Area-Lang
Area-Mod Compat
Area-Parity
Area-Rendering
Good first issue
MC-1.19.2
MC-1.20.1
MC-1.20.4
MC-1.20.6
MC-1.21
MC-1.21.1
Modtoberfest
P-0-High
P-1-Medium
P-2-Low
Status-Awaiting Response
Status-Behind-Flag
Status-Blocked
Status-Cannot Reproduce
Status-Duplicate
Status-Help Wanted
Status-Incomplete Report
Status-Invalid
Status-Needs LTS Backport
Status-Needs Updating
Status-Stale
Status-To Implement
Status-Triage
Status-Wontfix
Status-Wontmerge
Type-Backport
Type-Bug
Type-Documentation
Type-Enhancement
Type-Question
Type-RFC
Type-Suggestion
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Team-EnderIO/EnderIO#715
No description provided.
Delete branch "chore/gui-rewrite"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?