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 63 commits into
base: 1.20.1
Choose a base branch
from
Draft

In house UI migration #2512

wants to merge 63 commits into from

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
  • port 1.12 MUI2 cover UIs (they're so good)
  • allow cycling cycle buttons (like filter mode) backwards with right-click

@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
@screret screret added the type: refactor Suggestion to refactor a section of code label Dec 12, 2024
screret and others added 29 commits December 13, 2024 09:37
@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
@screret
redo LabelComponent to support wrapping etc. like TextTexture
5637269
@screret
stuff pt.2
3805c90
@screret
remove visible area from texture component because IDK what it's doing
c7c089c
@screret
convert recipe viewer compatibility layers
547e599
@screret
Merge branch 'refs/heads/1.20.1' into yo/ui
79add3f 
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/kinetic/ElectricGearBoxMachine.java
#	src/main/resources/gtceu.mixins.json
@screret
IT LAUNCHES!!!!! doesn't work all that well tho
386ac54 
TODO:
- fix UI layout errors :)
- fix EMI clearing all slots after viewing a tab once
- fix recipe viewers' recipe components being 0 tall
- add server side for almost everything
- fix client/server sync logic for most components
- port 1.12 cover UIs
- port 1.12 multiblock UIs
- etc.
@screret
Merge branch '1.20.1' into yo/ui
43817b2 
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/capability/recipe/FluidRecipeCapability.java
#	src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java
#	src/main/java/com/gregtechceu/gtceu/api/gui/widget/SlotWidget.java
#	src/main/java/com/gregtechceu/gtceu/api/gui/widget/TankWidget.java
#	src/main/java/com/gregtechceu/gtceu/api/ui/component/PatternPreviewComponent.java
#	src/main/java/com/gregtechceu/gtceu/client/TooltipsHandler.java
#	src/main/java/com/gregtechceu/gtceu/common/data/GCYMRecipeTypes.java
#	src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java
#	src/main/java/com/gregtechceu/gtceu/core/mixins/emi/FluidEmiStackMixin.java
#	src/main/java/com/gregtechceu/gtceu/core/mixins/rei/FluidEntryRendererMixin.java
#	src/main/java/com/gregtechceu/gtceu/integration/ae2/gui/widget/list/AEFluidDisplayWidget.java
#	src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java
#	src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java
#	src/main/java/com/gregtechceu/gtceu/integration/rei/GTREIPlugin.java
#	src/main/java/com/gregtechceu/gtceu/integration/xei/entry/fluid/FluidEntryList.java
#	src/main/java/com/gregtechceu/gtceu/integration/xei/entry/item/ItemEntryList.java
#	src/main/java/com/gregtechceu/gtceu/integration/xei/entry/item/ItemTagList.java
#	src/main/java/com/gregtechceu/gtceu/integration/xei/handlers/fluid/CycleFluidStackHandler.java
#	src/main/java/com/gregtechceu/gtceu/integration/xei/handlers/item/CycleItemStackHandler.java
#	src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTOreByProductComponent.java
@screret
forgot these lol
23885b4
@YoungOnionMC
fixes
b9933be
@screret
spotless
c9723c8
@screret
try to fix machine UIs not centering
bd53e58
@screret
why does it scissor the slots in the middle into a 60x60 box wtf
0df230e
@screret
switch to StackLayout because it turns out I just reimplemented an ex…
b4ec942 
…isting container LMAO
@screret
om,g I can see slot s lets
574f17d
@screret
fix all UI being drawn twice (it was literally just the adapter being…
12bda5b 
… added as a renderable twice LMAO)
@screret
fix resource textures not rendering correctly
bc8e47d
@screret
slots gone :wuh:
7aa96ba
@screret
fix content factor
fb82287
@screret
FIX SMALL DISTILLERY RECIPES BEING WAY TOO FAST
8a3480b
@screret
STARTING TO LOOK BETTER FINALLY
92d6d11
@screret
Merge branch '1.20.1' into yo/ui
dbac507 
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java
#	src/main/java/com/gregtechceu/gtceu/api/fluids/FluidBuilder.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IRotorHolderMachine.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/steam/SimpleSteamMachine.java
#	src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/electric/WorldAcceleratorMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/generator/LargeCombustionEngineMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java
#	src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/SteamParallelMultiblockMachine.java
#	src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java
#	src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java
#	src/main/java/com/gregtechceu/gtceu/integration/jei/multiblock/MultiblockInfoCategory.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/GregTechKubeJSPlugin.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/GTRecipeCategoryBuilder.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/CustomMultiblockBuilder.java
#	src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/machine/MachineFunctionPresets.java
#	src/main/java/com/gregtechceu/gtceu/integration/rei/multiblock/MultiblockInfoDisplayCategory.java
#	src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTRecipeComponent.java
@screret
spotless
96c06ac
@screret
formatting change idk
66d9f7c
@screret
remove send/receiveMessage and comment out all uses (switching to sen…
6b25582 
…ding messages another way as this just didn't work.)
@screret
I got fluid slots to sync and then I broke them again
6cbed2f
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