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

Upstreamify profiles #2390

Merged
merged 3 commits into from
Dec 13, 2021
Merged

Upstreamify profiles #2390

merged 3 commits into from
Dec 13, 2021

Conversation

artdeell
Copy link
Member

No description provided.

@artdeell artdeell merged commit 9fc4d5d into profiles-2-electric-boogaloo Dec 13, 2021
gusbunce added a commit to QuestCraftPlusPlus/PojavLauncher that referenced this pull request Apr 6, 2022
commit 5f94f25
Author: artdeell <ultramaksim@gmail.com>
Date:   Sun Mar 20 20:32:49 2022 +0300

    Redesign control flows a bit

commit 3aa5615
Author: ArtDev <45949002+artdeell@users.noreply.github.com>
Date:   Sun Mar 20 14:30:06 2022 +0300

    Update ProfileAdapter.java

commit e8697c6
Author: ArtDev <45949002+artdeell@users.noreply.github.com>
Date:   Sun Mar 20 14:25:39 2022 +0300

    Update ProfileAdapter.java

commit 89d42b9
Author: artdeell <ultramaksim@gmail.com>
Date:   Sun Mar 20 13:47:46 2022 +0300

    Make 'em private

commit 68b10bc
Author: artdeell <ultramaksim@gmail.com>
Date:   Sun Mar 20 13:42:16 2022 +0300

    Fixations

commit 8685b49
Author: artdeell <ultramaksim@gmail.com>
Date:   Sun Mar 20 13:17:58 2022 +0300

    Rename ProfileConstants to ExtraConstants and move it to extra package
    Add the 3rd constant

commit 05cf75e
Author: artdeell <ultramaksim@gmail.com>
Date:   Sun Mar 20 13:07:27 2022 +0300

    Remove StringCRC64 since its now useless
    Move all ExtraCore constants into a separate class

commit 19037b8
Author: artdeell <ultramaksim@gmail.com>
Date:   Thu Mar 17 20:31:53 2022 +0300

    Implement PVC migrator, remove PVC dialog, add a couple of helper methods and sanitize the code according to serpent's recommendations

commit 965cad4
Author: artdeell <ultramaksim@gmail.com>
Date:   Thu Mar 17 19:03:38 2022 +0300

    A lot of changes

    - Force profiles, no more profiles on/off switch!
    - (probably partially) Conventionalize all profile changes
    - Rename most variables for the changes to look nice
    - Squash a couple null checks
    - Separate cache from adapter and change how it works
    - Don't keep Context

commit a4eabb6
Merge: 0b4d775 cf72668
Author: ArtDev <45949002+artdeell@users.noreply.github.com>
Date:   Thu Mar 17 17:50:18 2022 +0300

    Merge pull request PojavLauncherTeam#2917 from PojavLauncherTeam/merge-profiles

    Merge and resolve conflicts

commit cf72668
Merge: 6cef72e 0b4d775
Author: ArtDev <45949002+artdeell@users.noreply.github.com>
Date:   Thu Mar 17 17:48:58 2022 +0300

    Merge branch 'profiles-2-electric-boogaloo' into merge-profiles

commit 6cef72e
Author: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
Date:   Tue Mar 15 08:27:49 2022 +0700

    MultiRT config dialog list: fix orientation

commit 0b4d775
Author: ArtDev <45949002+artdeell@users.noreply.github.com>
Date:   Sun Feb 20 21:12:36 2022 +0300

    Upstreamify profiles (PojavLauncherTeam#2765)

    * add Arc capes DNS injector

    * Bug fix: Arc DNS injector breaks on Java 17

    Error:
    Failed to inject cache!
    java.lang.reflect.InaccessibleObjectException: Unable to make java.net.InetAddress$CachedAddresses(java.lang.String,java.net.InetAddress[],long) accessible: module java.base does not "opens java.net" to unnamed module @4157f54e

    * Validate assets even if it’s fully downloaded (PojavLauncherTeam#2730)

    * Update MinecraftDownloaderTask.java

    Co-authored-by: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>

commit d7556c3
Merge: b85dd16 97dace3
Author: artDev <ultramaksim@gmail.com>
Date:   Fri Feb 4 17:20:51 2022 +0300

    Upstreamify

commit b85dd16
Merge: 15030ac bb9d2ea
Author: artdeell <ultramaksim@gmail.com>
Date:   Mon Jan 10 17:50:38 2022 +0300

    Fix merge conflicts

commit 15030ac
Merge: 015e27d 8588933
Author: artdeell <ultramaksim@gmail.com>
Date:   Mon Jan 10 17:38:46 2022 +0300

    Merge remote-tracking branch 'origin/profiles-2-electric-boogaloo' into profiles-2-electric-boogaloo

commit 015e27d
Author: artdeell <ultramaksim@gmail.com>
Date:   Mon Jan 10 17:38:16 2022 +0300

    Make the profile settings from the previous commit user-editable

commit ac40da2
Author: artdeell <ultramaksim@gmail.com>
Date:   Wed Jan 5 12:47:07 2022 +0300

    TMP_COMMIT

commit 8588933
Author: ArtDev <45949002+artdeell@users.noreply.github.com>
Date:   Tue Dec 28 11:19:57 2021 +0300

    Upstreamify profiles (PojavLauncherTeam#2472)

    * Extended MCOptionUtils to support list values

    * Mitigation for the Apache Log4j RCE in 1.8.x-1.18

    Related issue: PojavLauncherTeam#2378

    * Update JREUtils.java

    * Completely fix Log4J RCE (1.7-1.16.5) (not yet tested)
    PojavLauncherTeam#2378

    * fix moment

    * Fix a NullPointerException when launching ≤ 1.6.4

    * Updated virgl vtest (arm64 only)

    Experimental changes:
    - HACK: explicitly set location for fsout_c0/1. this might not work, not tested
    - Fix empty screen on OF + shader: caused by target fb/texture changed

    * Trigger a texture creation, which then set VIRGL_TEXTURE_ID

    * Replace sprintf with asprintf for auto allocation

    * Update egl_bridge.c

    * Updated vtest lib: fixes flipped screen

    * CI: Update gl4es

    * Updated vtest arm64: fixes black screen on <1.13(?)

    Co-authored-by: SerpentSpirale <mathiasboulay@free.fr>
    Co-authored-by: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
    Co-authored-by: khanhduytran0 <khanhduytran0@users.noreply.github.com>
    Co-authored-by: github-actions <github-actions@users.noreply.github.com>

commit 9fc4d5d
Author: ArtDev <45949002+artdeell@users.noreply.github.com>
Date:   Mon Dec 13 22:49:22 2021 +0300

    Upstreamify profiles (PojavLauncherTeam#2390)

    * Extended MCOptionUtils to support list values

    * Mitigation for the Apache Log4j RCE in 1.8.x-1.18

    Related issue: PojavLauncherTeam#2378

    * Update JREUtils.java

    Co-authored-by: SerpentSpirale <mathiasboulay@free.fr>
    Co-authored-by: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>

commit ad8d115
Author: artdeell <ultramaksim@gmail.com>
Date:   Mon Dec 13 22:45:52 2021 +0300

    ▼▼▼

    - Probably fix race condition when clearing the cache
    - Unload unneeded launcher activity while in game

commit 2478758
Merge: 870d86d 51ca5d8
Author: artdeell <ultramaksim@gmail.com>
Date:   Sat Dec 11 23:11:14 2021 +0300

    Update from mainline

commit 870d86d
Author: ArtDev <45949002+artdeell@users.noreply.github.com>
Date:   Tue Dec 7 21:23:42 2021 +0300

    check for null value insert (PojavLauncherTeam#2350)

    Co-authored-by: SerpentSpirale <serpentspirale@gmail.com>

commit 095b62a
Author: artdeell <ultramaksim@gmail.com>
Date:   Tue Dec 7 15:45:57 2021 +0300

    Changes
     - Add profile enabler-disabler
     - Change the lifecycle a bit
     - Fix: recreating PojavLauncherActivity causes crashes in Laun
     cherPreferences

commit 14a460a
Merge: 9608545 4219779
Author: artdeell <ultramaksim@gmail.com>
Date:   Tue Dec 7 14:29:47 2021 +0300

    Fix merging

commit 9608545
Author: artdeell <ultramaksim@gmail.com>
Date:   Sun Dec 5 15:13:06 2021 +0300

    Changes

    - The game runs now

commit 213c6a7
Author: artdeell <ultramaksim@gmail.com>
Date:   Sun Dec 5 12:26:48 2021 +0300

    Changes

    - Added the ability create profiles
    - Now the changes to profiles are immediately saved

commit 4961acf
Author: artdeell <ultramaksim@gmail.com>
Date:   Thu Dec 2 23:21:32 2021 +0300

    New shit
     - Removed profiles fragment because Serpent begged me not to use viewpager
     - Progressed further with the profiles dialog, now it's actually usable
     - Now launcher doesn't have profile amnesia
     - More splitting of raw version selector and profile selector
     Bugs:
     - Saving profiles in the editor does nothing
     TODO:
     - Implement launching the game with selected profile
     - Replace "Unknown" version ID in profiles with mProfile.selectedVersion for ease of migration

commit 0fc0623
Author: ArtDev <45949002+artdeell@users.noreply.github.com>
Date:   Wed Dec 1 16:25:30 2021 +0300

    ExtraCore can now deal all kinds of values (PojavLauncherTeam#2315)

    The extraListener is now an interface

    Co-authored-by: SerpentSpirale <mathiasboulay@free.fr>

commit 4bea845
Author: artdeell <ultramaksim@gmail.com>
Date:   Tue Nov 30 20:57:48 2021 +0300

    Start implementing new, cleaner Profiles
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants