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.

Sign up for GitHub

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

Jump to bottom

In house UI migration #2512

Draft
wants to merge 38 commits into
base: 1.20.1
Choose a base branch
from
Draft

In house UI migration #2512

wants to merge 38 commits into from
+29,513 −5,019

Conversation

Spicierspace153
Copy link
Contributor

@Spicierspace153 Spicierspace153 commented Dec 7, 2024 •
edited by screret
Loading

The current tasks needed for full GUI capability from owo lib are

  • Fluid containers
  • Multiblock GUI
  • XEI
  • Multiblock preview widget
  • XML/RTUI
  • Recreate any other missing widgets we don't have
  • make custom XSD format for autocomplete based on the owo-ui one
  • add player and carried stack awareness to components
  • component network syncing from client/server

@Spicierspace153 Spicierspace153 requested a review from a team as a code owner December 7, 2024 18:43
@Spicierspace153 Spicierspace153 marked this pull request as draft December 7, 2024 18:44
screret and others added 21 commits December 8, 2024 00:02
@screret
maybe fix event listener? I think?
0a6d78e
@YoungOnionMC
start of gui stuff and fluid/slot components
c9b8b23
@screret
it works (don't change window size (onion fix that))
26154b0
@YoungOnionMC
slot rendering
f990549
@screret
"fix" tooltip rendering and GUI offsetting on resize
7a671de
@screret
parsing 😋
597b72a
@screret
add some more widgets to test item
ac90962
@screret
sbolbges
df33f52
@screret
Merge branch 'refs/heads/1.20.1' into yo/ui
7c800a7 
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
@screret
remove generics from recipeviewer UI adapters
7474028
@YoungOnionMC
start of tank components
28ccaba
@YoungOnionMC
accessors for tank
592aa92
@screret
fix toLowerCase/toUpperCase issues
b26150a
@screret
add renderdoc capture utils
8038a9e
@screret
make appendFluidTooltips take in a FluidStack instead of fluid and …
9c1db39 
…amount separately
@screret
use lombok more
ca156ba
@screret
remove handlerName fields from slot & tank in favor of using the pre-…
6bd2d40 
…existing `id` field for the same thing
@screret
annotation-based component->handler linking
a503d71
@screret
add XML schema
915deac
@screret
TODO: remake the whole server initialization process as I forgot UIAd…
8995517 
…apter is client only.
@screret
remove UIFieldLink & co. in favor of just mapping the UI slots like w…
35501c8 
…e do with MUI; attempt to fix opening GUIs on server (didn't work); attempt to fix XML-loaded UIs' positions being wack (didn't work)
@YoungOnionMC YoungOnionMC added the Do Not Merge DO NOT MERGE THIS PR YET! label Dec 9, 2024
YoungOnionMC and others added 7 commits December 10, 2024 19:21
@YoungOnionMC
attempt at tank netwrok
e0a728c
@screret
continue client->server comms (add set held message, add way to send …
54066ea 
…messages to server from widgets)
@screret
start on IFancyUIMachine migration, dynamic texture support
f4d323a
@screret
halfway done or something idk
9f2c793
@screret
continue IFancyUIMachine migration
8b91966
@screret
backport 1.21.4 owolib changes
a515a7a
@screret
"finish" internals.
14dc583 
TODO:
- lots of network sync code is commented out. figure out how to do it sanely.
- update covers
- update machine default UIs
- prospecting widget
- etc.

@YoungOnionMC @krossgg @Spicierspace153 you do the rest pls pls pls tysm
@screret screret added the type: refactor Suggestion to refactor a section of code label Dec 12, 2024
@screret
Merge branch '1.20.1' into yo/ui
725e67e 
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/recipe/ui/GTRecipeTypeUI.java
@screret
simple, steam, primitive machines, some hatches done
d8d58cc
@screret
continue
3282b77
@screret
:agony: (at least 75% done) but at least I figured out how to do the …
a95fd4f 
…syncing and clearing the listeners so that's nice but AAAAAAAAAAAAAAAAAAAAAAAAAAA
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Do Not Merge DO NOT MERGE THIS PR YET! type: refactor Suggestion to refactor a section of code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Spicierspace153 @YoungOnionMC @screret