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.

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

In house UI migration #2512

Draft
wants to merge 63 commits into
base: 1.20.1
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
df0e2c4
start of owo lib forge port
YoungOnionMC Dec 7, 2024
e4968a3
move ui/ to api/ui/
screret Dec 7, 2024
021be67
it works :fire: (I believe, no way of *testing it* yet)
screret Dec 7, 2024
0a6d78e
maybe fix event listener? I think?
screret Dec 7, 2024
c9b8b23
start of gui stuff and fluid/slot components
YoungOnionMC Dec 8, 2024
26154b0
it works (don't change window size (onion fix that))
screret Dec 8, 2024
f990549
slot rendering
YoungOnionMC Dec 9, 2024
7a671de
"fix" tooltip rendering and GUI offsetting on resize
screret Dec 9, 2024
597b72a
parsing :yum:
screret Dec 9, 2024
ac90962
add some more widgets to test item
screret Dec 9, 2024
df33f52
sbolbges
screret Dec 9, 2024
7c800a7
Merge branch 'refs/heads/1.20.1' into yo/ui
screret Dec 9, 2024
7474028
remove generics from recipeviewer UI adapters
screret Dec 9, 2024
28ccaba
start of tank components
YoungOnionMC Dec 9, 2024
592aa92
accessors for tank
YoungOnionMC Dec 9, 2024
b26150a
fix toLowerCase/toUpperCase issues
screret Dec 9, 2024
8038a9e
add renderdoc capture utils
screret Dec 9, 2024
9c1db39
make `appendFluidTooltips` take in a FluidStack instead of fluid and …
screret Dec 9, 2024
ca156ba
use lombok more
screret Dec 9, 2024
6bd2d40
remove handlerName fields from slot & tank in favor of using the pre-…
screret Dec 9, 2024
a503d71
annotation-based component->handler linking
screret Dec 9, 2024
915deac
add XML schema
screret Dec 9, 2024
8995517
TODO: remake the whole server initialization process as I forgot UIAd…
screret Dec 9, 2024
35501c8
remove UIFieldLink & co. in favor of just mapping the UI slots like w…
screret Dec 9, 2024
eb6cb66
start of tank slot interaction
YoungOnionMC Dec 10, 2024
79b8629
split client and server init to be separate, add start of server->cli…
screret Dec 10, 2024
4cc3860
IT WORKS LETSSSSSS
screret Dec 10, 2024
e0a728c
attempt at tank netwrok
YoungOnionMC Dec 11, 2024
54066ea
continue client->server comms (add set held message, add way to send …
screret Dec 11, 2024
f4d323a
start on IFancyUIMachine migration, dynamic texture support
screret Dec 11, 2024
9f2c793
halfway done or something idk
screret Dec 11, 2024
8b91966
continue IFancyUIMachine migration
screret Dec 12, 2024
a515a7a
backport 1.21.4 owolib changes
screret Dec 12, 2024
14dc583
"finish" internals.
screret Dec 12, 2024
725e67e
Merge branch '1.20.1' into yo/ui
screret Dec 13, 2024
d8d58cc
simple, steam, primitive machines, some hatches done
screret Dec 13, 2024
3282b77
continue
screret Dec 13, 2024
a95fd4f
:agony: (at least 75% done) but at least I figured out how to do the …
screret Dec 13, 2024
5637269
redo LabelComponent to support wrapping etc. like TextTexture
screret Dec 14, 2024
3805c90
stuff pt.2
screret Dec 14, 2024
c7c089c
remove visible area from texture component because IDK what it's doing
screret Dec 15, 2024
547e599
convert recipe viewer compatibility layers
screret Dec 15, 2024
79add3f
Merge branch 'refs/heads/1.20.1' into yo/ui
screret Dec 15, 2024
386ac54
IT LAUNCHES!!!!! doesn't work all that well tho
screret Dec 15, 2024
43817b2
Merge branch '1.20.1' into yo/ui
screret Dec 15, 2024
23885b4
forgot these lol
screret Dec 15, 2024
b9933be
fixes
YoungOnionMC Dec 16, 2024
c9723c8
spotless
screret Dec 16, 2024
bd53e58
try to fix machine UIs not centering
screret Dec 16, 2024
0df230e
why does it scissor the slots in the middle into a 60x60 box wtf
screret Dec 16, 2024
b4ec942
switch to StackLayout because it turns out I just reimplemented an ex…
screret Dec 17, 2024
574f17d
om,g I can see slot s lets
screret Dec 17, 2024
12bda5b
fix all UI being drawn twice (it was literally just the adapter being…
screret Dec 18, 2024
bc8e47d
fix resource textures not rendering correctly
screret Dec 18, 2024
7aa96ba
slots gone :wuh:
screret Dec 18, 2024
fb82287
fix content factor
screret Dec 19, 2024
8a3480b
FIX SMALL DISTILLERY RECIPES BEING WAY TOO FAST
screret Dec 19, 2024
92d6d11
STARTING TO LOOK BETTER FINALLY
screret Dec 20, 2024
dbac507
Merge branch '1.20.1' into yo/ui
screret Dec 24, 2024
96c06ac
spotless
screret Dec 24, 2024
66d9f7c
formatting change idk
screret Dec 24, 2024
6b25582
remove send/receiveMessage and comment out all uses (switching to sen…
screret Dec 25, 2024
6cbed2f
I got fluid slots to sync and then I broke them again
screret Dec 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ src/generated/resources/.cache/
*.patch
*.DS_Store

# ignore renderdoc files
*.cap
*.rdc
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ mod_issue_tracker = https://github.com/GregTechCEu/GregTech-Modern/issues/

maven_group = com.gregtechceu.gtceu

enabled_platforms = forge
loom.platform = forge

win_renderdoc_path=C:\\Program Files\\RenderDoc\\renderdoc.dll
13 changes: 12 additions & 1 deletion gradle/scripts/moddevgradle.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import org.gradle.internal.os.OperatingSystem
OperatingSystem os = OperatingSystem.current();

mixin {
add sourceSets.main, "gtceu.refmap.json"
config 'gtceu.mixins.json'
}

neoForge {
// Specify the version of NeoForge to use.
version = forge.versions.minecraftForge.get()
Expand All @@ -15,6 +16,7 @@ neoForge {

// This line is optional. Access Transformers are automatically detected
accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')
interfaceInjectionData.from "interface_injection/interfaces.json"

addModdingDependenciesTo(sourceSets.test)
addModdingDependenciesTo(sourceSets.extra)
Expand All @@ -35,6 +37,9 @@ neoForge {
ideName = "Client 1"

systemProperty('forge.enabledGameTestNamespaces', project.mod_id)
if (os.isWindows()) {
systemProperty("gtceu.renderdocPath", win_renderdoc_path)
}
}

client2 {
Expand All @@ -44,6 +49,9 @@ neoForge {

programArguments.addAll('--username', 'YoungOnion')
systemProperty('forge.enabledGameTestNamespaces', project.mod_id)
if (os.isWindows()) {
systemProperty("gtceu.renderdocPath", win_renderdoc_path)
}
}

// Client with GTM + Jade, EMI, AE2
Expand All @@ -53,6 +61,9 @@ neoForge {
ideName = "Clean Client"

systemProperty('forge.enabledGameTestNamespaces', project.mod_id)
if (os.isWindows()) {
systemProperty("gtceu.renderdocPath", win_renderdoc_path)
}
}

server {
Expand Down
4 changes: 2 additions & 2 deletions gradle/scripts/repositories.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ repositories {
includeGroup "thedarkcolour"
}
}
maven { url "https://maven.architectury.dev/" }
maven { url = "https://maven.architectury.dev/" }
maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
maven { url 'https://jitpack.io' } // Mixin Extras, Fabric ASM
maven { url = 'https://jitpack.io' } // Mixin Extras, Fabric ASM
}
Loading
Loading